diff options
| author | Dan Williams <dcbw@redhat.com> | 2015-07-20 17:30:02 -0500 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-11-18 15:15:05 +0100 |
| commit | b023d0754bdc094c91fea0ac9b73e017c49fc195 (patch) | |
| tree | 30425685a1f3a18aeda64fe23f05958d36f43185 /src/nm-bus-manager.h | |
| parent | 83b8b9e1f66ca325264cf0108a5a2025a7a9b77c (diff) | |
| download | NetworkManager-b023d0754bdc094c91fea0ac9b73e017c49fc195.tar.gz | |
exported-object: add support for DBus ObjectManager interface
NMExportedObject now derives from GDBusObjectSkeleton, which is what
GDBusObjectManagerServer wants. The main GDBusConnection and each
private server connection now gets a new GDBusObjectManagerServer,
and exported objects are registered with that instead of individually
exporting each GDBusInterfaceSkeleton.
Previously exported objects were not referenced by the BusManager,
but instead removed from the exports hash via weak references. The
GDBusObjectManagerServer instead references exported objects, which
can make them live much longer than they did before.
Co-Authored-By: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'src/nm-bus-manager.h')
| -rw-r--r-- | src/nm-bus-manager.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nm-bus-manager.h b/src/nm-bus-manager.h index 8dd4be7ba2..8e72a3ce99 100644 --- a/src/nm-bus-manager.h +++ b/src/nm-bus-manager.h @@ -72,8 +72,8 @@ gboolean nm_bus_manager_get_caller_info (NMBusManager *self, gulong *out_uid, gulong *out_pid); -gboolean nm_bus_manager_connection_is_private (NMBusManager *self, - GDBusConnection *connection); +const char *nm_bus_manager_connection_get_private_name (NMBusManager *self, + GDBusConnection *connection); gboolean nm_bus_manager_get_unix_user (NMBusManager *self, const char *sender, @@ -87,12 +87,13 @@ gboolean nm_bus_manager_get_caller_info_from_message (NMBusManager *self, gulong *out_pid); void nm_bus_manager_register_object (NMBusManager *self, - NMExportedObject *object); + GDBusObjectSkeleton *object); -void nm_bus_manager_unregister_object (NMBusManager *self, NMExportedObject *object); +void nm_bus_manager_unregister_object (NMBusManager *self, + GDBusObjectSkeleton *object); -NMExportedObject *nm_bus_manager_get_registered_object (NMBusManager *self, - const char *path); +GDBusObjectSkeleton *nm_bus_manager_get_registered_object (NMBusManager *self, + const char *path); void nm_bus_manager_private_server_register (NMBusManager *self, const char *path, |