diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-08-13 16:00:58 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-08-13 16:02:16 +0200 |
| commit | 9f1ce3be92e1a4204c85cff7c3e4d1ad4dcf295b (patch) | |
| tree | 65921756c64fe38622e8521b2e1e8f89be46c12e | |
| parent | ea2c0ad5cbe7f08fb20b0d46e92e005af809d538 (diff) | |
| download | NetworkManager-dcbw/gdbus-object-manager-1.tar.gz | |
fixup! fixup! WIP: add support for DBus ObjectManager interfacedcbw/gdbus-object-manager-1
| -rw-r--r-- | src/nm-bus-manager.c | 1 | ||||
| -rw-r--r-- | src/nm-bus-manager.h | 1 | ||||
| -rw-r--r-- | src/nm-exported-object.c | 2 | ||||
| -rw-r--r-- | src/nm-iface-helper.c | 4 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index 47c37e7e74..975637be19 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -842,7 +842,6 @@ nm_bus_manager_get_connection (NMBusManager *self) void nm_bus_manager_register_object (NMBusManager *self, - const char *path, GDBusObjectSkeleton *object) { NMBusManagerPrivate *priv = NM_BUS_MANAGER_GET_PRIVATE (self); diff --git a/src/nm-bus-manager.h b/src/nm-bus-manager.h index 95c8b113d6..f6be7cc8cb 100644 --- a/src/nm-bus-manager.h +++ b/src/nm-bus-manager.h @@ -84,7 +84,6 @@ gboolean nm_bus_manager_get_caller_info_from_message (NMBusManager *self, gulong *out_pid); void nm_bus_manager_register_object (NMBusManager *self, - const char *path, GDBusObjectSkeleton *object); void nm_bus_manager_unregister_object (NMBusManager *self, diff --git a/src/nm-exported-object.c b/src/nm-exported-object.c index 81dd5baa52..9329e881a9 100644 --- a/src/nm-exported-object.c +++ b/src/nm-exported-object.c @@ -467,7 +467,7 @@ nm_exported_object_export (NMExportedObject *self) for (iter = priv->interfaces; iter; iter = iter->next) g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (self), iter->data); - nm_bus_manager_register_object (dbus_manager, priv->path, G_DBUS_OBJECT_SKELETON (self)); + nm_bus_manager_register_object (dbus_manager, G_DBUS_OBJECT_SKELETON (self)); return priv->path; } diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 1b5fdc5a31..cc16bac5c4 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -502,7 +502,7 @@ gconstpointer nm_config_get (void); const char *nm_config_get_dhcp_client (gpointer unused); gboolean nm_config_get_configure_and_quit (gpointer unused); gconstpointer nm_bus_manager_get (void); -void nm_bus_manager_register_object (gpointer unused, const char *path, gpointer object); +void nm_bus_manager_register_object (gpointer unused, gpointer object); void nm_bus_manager_unregister_object (gpointer unused, gpointer object); gconstpointer @@ -530,7 +530,7 @@ nm_bus_manager_get (void) } void -nm_bus_manager_register_object (gpointer unused, const char *path, gpointer object) +nm_bus_manager_register_object (gpointer unused, gpointer object) { } |