diff options
| author | Dan Winship <danw@gnome.org> | 2013-05-06 13:37:25 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-05-08 14:59:29 -0400 |
| commit | d529580cbb62024c74d9b955e118d856c7b19b77 (patch) | |
| tree | 9edb42ffec3b4cf83577a2fa19caef7b9e319f5f /src/nm-dbus-manager.c | |
| parent | ec0a66861ecd3778a14e610c5fc3b42b499ffea6 (diff) | |
| download | NetworkManager-d529580cbb62024c74d9b955e118d856c7b19b77.tar.gz | |
libnm-glib, core: use g_cclosure_marshal_generic
Since we depend on new glib now, we can just use the generic
marshaller rather than generating our own.
Diffstat (limited to 'src/nm-dbus-manager.c')
| -rw-r--r-- | src/nm-dbus-manager.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index c8a2010fac..5eb73f763e 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -26,7 +26,6 @@ #include "NetworkManager.h" #include "nm-dbus-manager.h" -#include "nm-marshal.h" #include "nm-glib-compat.h" #include <dbus/dbus.h> @@ -502,7 +501,7 @@ nm_dbus_manager_class_init (NMDBusManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMDBusManagerClass, dbus_connection_changed), - NULL, NULL, _nm_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); signals[NAME_OWNER_CHANGED] = @@ -510,7 +509,7 @@ nm_dbus_manager_class_init (NMDBusManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMDBusManagerClass, name_owner_changed), - NULL, NULL, _nm_marshal_VOID__STRING_STRING_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); signals[PRIVATE_CONNECTION_NEW] = @@ -518,7 +517,7 @@ nm_dbus_manager_class_init (NMDBusManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, G_STRUCT_OFFSET (NMDBusManagerClass, private_connection_new), - NULL, NULL, _nm_marshal_VOID__STRING_POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); signals[PRIVATE_CONNECTION_DISCONNECTED] = @@ -526,7 +525,7 @@ nm_dbus_manager_class_init (NMDBusManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, G_STRUCT_OFFSET (NMDBusManagerClass, private_connection_disconnected), - NULL, NULL, _nm_marshal_VOID__STRING_POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); } |