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 /libnm-glib/nm-remote-settings.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 'libnm-glib/nm-remote-settings.c')
| -rw-r--r-- | libnm-glib/nm-remote-settings.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index 0960160d7d..a911866919 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -25,7 +25,6 @@ #include <NetworkManager.h> #include <nm-connection.h> -#include "nm-glib-marshal.h" #include "nm-dbus-glib-types.h" #include "nm-remote-settings.h" #include "nm-remote-connection-private.h" @@ -876,7 +875,7 @@ constructed (GObject *object) DBUS_INTERFACE_DBUS); g_assert (priv->dbus_proxy); - dbus_g_object_register_marshaller (_nm_glib_marshal_VOID__STRING_STRING_STRING, + dbus_g_object_register_marshaller (g_cclosure_marshal_generic, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); @@ -910,7 +909,7 @@ constructed (GObject *object) g_assert (priv->props_proxy); /* Monitor properties */ - dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__BOXED, + dbus_g_object_register_marshaller (g_cclosure_marshal_generic, G_TYPE_NONE, DBUS_TYPE_G_MAP_OF_VARIANT, G_TYPE_INVALID); @@ -1224,8 +1223,7 @@ nm_remote_settings_class_init (NMRemoteSettingsClass *class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMRemoteSettingsClass, new_connection), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); signals[CONNECTIONS_READ] = @@ -1233,8 +1231,7 @@ nm_remote_settings_class_init (NMRemoteSettingsClass *class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMRemoteSettingsClass, connections_read), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } |