Add a function that returns the D-Bus local machine ID
Cherry-picked from 4.8 59bd3bcd961fb3198dc9ba24996f7f9af67aeda3 Change-Id: Id3c8f9edbcbe9bbea83d4d54a6eb25500ab80b68 Reviewed-on: http://codereview.qt.nokia.com/655 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
parent
1b9c679eb5
commit
ea933359b7
@ -301,6 +301,8 @@ DEFINEFUNC(void , dbus_get_version , (int *major_version_p,
|
|||||||
int *minor_version_p,
|
int *minor_version_p,
|
||||||
int *micro_version_p),
|
int *micro_version_p),
|
||||||
(major_version_p, minor_version_p, micro_version_p), )
|
(major_version_p, minor_version_p, micro_version_p), )
|
||||||
|
DEFINEFUNC(char* , dbus_get_local_machine_id , (void), (), return)
|
||||||
|
|
||||||
|
|
||||||
/* dbus-pending-call.h */
|
/* dbus-pending-call.h */
|
||||||
DEFINEFUNC(dbus_bool_t , dbus_pending_call_set_notify, (DBusPendingCall *pending,
|
DEFINEFUNC(dbus_bool_t , dbus_pending_call_set_notify, (DBusPendingCall *pending,
|
||||||
|
@ -1123,6 +1123,27 @@ void QDBusConnectionPrivate::setBusService(const QDBusConnection &connection)
|
|||||||
Qt::QueuedConnection);
|
Qt::QueuedConnection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
\since 4.8
|
||||||
|
Returns the local machine ID as known to the D-Bus system. Each
|
||||||
|
node or host that runs D-Bus has a unique identifier that can be
|
||||||
|
used to distinguish it from other hosts if they are sharing
|
||||||
|
resources like the filesystem.
|
||||||
|
|
||||||
|
Note that the local machine ID is not guaranteed to be persistent
|
||||||
|
across boots of the system, so this identifier should not be
|
||||||
|
stored in persistent storage (like the filesystem). It is
|
||||||
|
guaranteed to remain constant only during the lifetime of this
|
||||||
|
boot session.
|
||||||
|
*/
|
||||||
|
QByteArray QDBusConnection::localMachineId()
|
||||||
|
{
|
||||||
|
char *dbus_machine_id = q_dbus_get_local_machine_id();
|
||||||
|
QByteArray result = dbus_machine_id;
|
||||||
|
q_dbus_free(dbus_machine_id);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\namespace QDBus
|
\namespace QDBus
|
||||||
\inmodule QtDBus
|
\inmodule QtDBus
|
||||||
|
@ -176,6 +176,8 @@ public:
|
|||||||
static void disconnectFromBus(const QString &name);
|
static void disconnectFromBus(const QString &name);
|
||||||
static void disconnectFromPeer(const QString &name);
|
static void disconnectFromPeer(const QString &name);
|
||||||
|
|
||||||
|
static QByteArray localMachineId();
|
||||||
|
|
||||||
static QDBusConnection sessionBus();
|
static QDBusConnection sessionBus();
|
||||||
static QDBusConnection systemBus();
|
static QDBusConnection systemBus();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user