This Just Works(tm). However, there is one ugly part worth calling out - we're still calling dbus_g_object_register_marshaller(). In the future, that won't be necessary with:
See https://bugs.freedesktop.org/show_bug.cgi?id=64214 --- .gitignore | 1 - src/bluez-manager/nm-bluez-device.c | 3 +-- src/bluez-manager/nm-bluez-manager.c | 5 ++--- src/dhcp-manager/nm-dhcp-manager.c | 1 - src/generated/Makefile.am | 7 +------ src/ip6-manager/nm-ip6-manager.c | 5 ++--- src/modem-manager/nm-modem-generic.c | 3 +-- src/modem-manager/nm-modem-manager.c | 3 +-- src/modem-manager/nm-modem.c | 7 +++---- src/nm-dbus-manager.c | 9 ++++----- src/nm-device-bt.c | 5 ++--- src/nm-device-modem.c | 1 - src/nm-device-wifi.c | 3 +-- src/nm-device.c | 11 +++++------ src/nm-manager.c | 3 +-- src/nm-udev-manager.c | 5 ++--- src/platform/nm-platform.c | 3 +-- src/ppp-manager/nm-ppp-manager.c | 5 ++--- src/settings/nm-default-wired-connection.c | 1 - src/settings/nm-inotify-helper.c | 3 +-- src/settings/nm-settings-connection.c | 1 - src/supplicant-manager/nm-supplicant-interface.c | 17 ++++++++--------- src/vpn-manager/nm-vpn-connection.c | 5 ++--- src/vpn-manager/nm-vpn-manager.c | 1 - 24 files changed, 40 insertions(+), 68 deletions(-)
>From d3df947623f1f2d8487f0792a3e0981228e1ae89 Mon Sep 17 00:00:00 2001 From: Colin Walters <[email protected]> Date: Wed, 8 May 2013 08:53:59 -0400 Subject: [PATCH] Use g_cclosure_marshal_generic This Just Works(tm). However, there is one ugly part worth calling out - we're still calling dbus_g_object_register_marshaller(). In the future, that won't be necessary with: See https://bugs.freedesktop.org/show_bug.cgi?id=64214 --- .gitignore | 1 - src/bluez-manager/nm-bluez-device.c | 3 +-- src/bluez-manager/nm-bluez-manager.c | 5 ++--- src/dhcp-manager/nm-dhcp-manager.c | 1 - src/generated/Makefile.am | 7 +------ src/ip6-manager/nm-ip6-manager.c | 5 ++--- src/modem-manager/nm-modem-generic.c | 3 +-- src/modem-manager/nm-modem-manager.c | 3 +-- src/modem-manager/nm-modem.c | 7 +++---- src/nm-dbus-manager.c | 9 ++++----- src/nm-device-bt.c | 5 ++--- src/nm-device-modem.c | 1 - src/nm-device-wifi.c | 3 +-- src/nm-device.c | 11 +++++------ src/nm-manager.c | 3 +-- src/nm-udev-manager.c | 5 ++--- src/platform/nm-platform.c | 3 +-- src/ppp-manager/nm-ppp-manager.c | 5 ++--- src/settings/nm-default-wired-connection.c | 1 - src/settings/nm-inotify-helper.c | 3 +-- src/settings/nm-settings-connection.c | 1 - src/supplicant-manager/nm-supplicant-interface.c | 17 ++++++++--------- src/vpn-manager/nm-vpn-connection.c | 5 ++--- src/vpn-manager/nm-vpn-manager.c | 1 - 24 files changed, 40 insertions(+), 68 deletions(-) diff --git a/.gitignore b/.gitignore index 3b9d587..8c8da45 100644 --- a/.gitignore +++ b/.gitignore @@ -160,7 +160,6 @@ libnm-glib/libnm-glib-test libnm-glib/nm-glib-marshal.* src/NetworkManager src/nm-crash-logger -src/generated/nm-marshal.* src/supplicant-manager/tests/test-supplicant-config src/dhcp-manager/nm-dhcp-helper system-settings/src diff --git a/src/bluez-manager/nm-bluez-device.c b/src/bluez-manager/nm-bluez-device.c index b12a861..9b593a4 100644 --- a/src/bluez-manager/nm-bluez-device.c +++ b/src/bluez-manager/nm-bluez-device.c @@ -31,7 +31,6 @@ #include "nm-bluez-common.h" #include "nm-dbus-glib-types.h" #include "nm-logging.h" -#include "nm-marshal.h" G_DEFINE_TYPE (NMBluezDevice, nm_bluez_device, G_TYPE_OBJECT) @@ -424,7 +423,7 @@ nm_bluez_device_new (const char *path, NMConnectionProvider *provider) BLUEZ_DEVICE_INTERFACE); g_object_unref (dbus_mgr); - dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED, + dbus_g_object_register_marshaller (NULL, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID); diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c index a684863..184819d 100644 --- a/src/bluez-manager/nm-bluez-manager.c +++ b/src/bluez-manager/nm-bluez-manager.c @@ -26,7 +26,6 @@ #include "nm-logging.h" #include "nm-dbus-glib-types.h" -#include "nm-marshal.h" #include "nm-bluez-manager.h" #include "nm-bluez-adapter.h" #include "nm-dbus-manager.h" @@ -371,7 +370,7 @@ nm_bluez_manager_class_init (NMBluezManagerClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMBluezManagerClass, bdaddr_added), NULL, NULL, - _nm_marshal_VOID__STRING_STRING_STRING_UINT, + NULL, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT); signals[BDADDR_REMOVED] = @@ -380,7 +379,7 @@ nm_bluez_manager_class_init (NMBluezManagerClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMBluezManagerClass, bdaddr_removed), NULL, NULL, - _nm_marshal_VOID__STRING_STRING, + NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); } diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 43d0b7e..6885ad1 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -37,7 +37,6 @@ #include "nm-dhcp-manager.h" #include "nm-dhcp-dhclient.h" #include "nm-dhcp-dhcpcd.h" -#include "nm-marshal.h" #include "nm-logging.h" #include "nm-dbus-manager.h" #include "nm-hostname-provider.h" diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am index f1d2d59..79ecf05 100644 --- a/src/generated/Makefile.am +++ b/src/generated/Makefile.am @@ -4,9 +4,7 @@ noinst_LTLIBRARIES = libnm-generated.la libnm_generated_la_SOURCES = \ nm-enum-types.c \ - nm-enum-types.h \ - nm-marshal.c \ - nm-marshal.h + nm-enum-types.h nm_daemon_all_sources = \ $(top_srcdir)/src/*.[ch] \ @@ -49,9 +47,6 @@ nm_enum_types_sources = $(nm_daemon_sources) GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM -GLIB_GENERATED += nm-marshal.h nm-marshal.c -nm_marshal_sources = $(nm_daemon_sources) - INCLUDES = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c index 9c9c2c9..f10417e 100644 --- a/src/ip6-manager/nm-ip6-manager.c +++ b/src/ip6-manager/nm-ip6-manager.c @@ -32,7 +32,6 @@ #include "nm-ip6-manager.h" #include "nm-netlink-monitor.h" #include "NetworkManagerUtils.h" -#include "nm-marshal.h" #include "nm-logging.h" #include "nm-utils.h" @@ -1679,7 +1678,7 @@ nm_ip6_manager_class_init (NMIP6ManagerClass *manager_class) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMIP6ManagerClass, addrconf_complete), NULL, NULL, - _nm_marshal_VOID__INT_UINT_BOOLEAN, + NULL, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_BOOLEAN); signals[CONFIG_CHANGED] = @@ -1688,7 +1687,7 @@ nm_ip6_manager_class_init (NMIP6ManagerClass *manager_class) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMIP6ManagerClass, config_changed), NULL, NULL, - _nm_marshal_VOID__INT_UINT_BOOLEAN, + NULL, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_BOOLEAN); } diff --git a/src/modem-manager/nm-modem-generic.c b/src/modem-manager/nm-modem-generic.c index ef101b6..6f18444 100644 --- a/src/modem-manager/nm-modem-generic.c +++ b/src/modem-manager/nm-modem-generic.c @@ -24,7 +24,6 @@ #include "nm-system.h" #include "nm-dbus-manager.h" #include "nm-setting-connection.h" -#include "nm-marshal.h" #include "nm-properties-changed-signal.h" #include "nm-modem-types.h" #include "nm-logging.h" @@ -385,7 +384,7 @@ constructor (GType type, MM_OLD_DBUS_SERVICE, nm_modem_get_path (NM_MODEM (object)), DBUS_INTERFACE_PROPERTIES); - dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED, + dbus_g_object_register_marshaller (NULL, G_TYPE_NONE, G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT, G_TYPE_INVALID); diff --git a/src/modem-manager/nm-modem-manager.c b/src/modem-manager/nm-modem-manager.c index dd01646..a8955b9 100644 --- a/src/modem-manager/nm-modem-manager.c +++ b/src/modem-manager/nm-modem-manager.c @@ -29,7 +29,6 @@ #include "nm-modem-cdma.h" #include "nm-dbus-manager.h" #include "nm-modem-types.h" -#include "nm-marshal.h" #include "nm-dbus-glib-types.h" #if WITH_MODEM_MANAGER_1 @@ -828,7 +827,7 @@ nm_modem_manager_class_init (NMModemManagerClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemManagerClass, modem_added), NULL, NULL, - _nm_marshal_VOID__OBJECT_STRING, + NULL, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_STRING); signals[MODEM_REMOVED] = diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 7c98f49..e999c11 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -24,7 +24,6 @@ #include "nm-system.h" #include "nm-dbus-manager.h" #include "nm-setting-connection.h" -#include "nm-marshal.h" #include "nm-properties-changed-signal.h" #include "nm-modem-types.h" #include "nm-logging.h" @@ -877,7 +876,7 @@ nm_modem_class_init (NMModemClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemClass, ppp_stats), NULL, NULL, - _nm_marshal_VOID__UINT_UINT, + NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); @@ -896,7 +895,7 @@ nm_modem_class_init (NMModemClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemClass, ip4_config_result), NULL, NULL, - _nm_marshal_VOID__OBJECT_POINTER, + NULL, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_POINTER); signals[PREPARE_RESULT] = @@ -905,7 +904,7 @@ nm_modem_class_init (NMModemClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemClass, prepare_result), NULL, NULL, - _nm_marshal_VOID__BOOLEAN_UINT, + NULL, G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_UINT); signals[AUTH_REQUESTED] = diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index c8a2010..5eb73f7 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); } diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c index ecf82a3..b0c3f16 100644 --- a/src/nm-device-bt.c +++ b/src/nm-device-bt.c @@ -33,7 +33,6 @@ #include "nm-device-bt.h" #include "nm-device-private.h" #include "nm-logging.h" -#include "nm-marshal.h" #include "ppp-manager/nm-ppp-manager.h" #include "nm-properties-changed-signal.h" #include "nm-setting-connection.h" @@ -877,7 +876,7 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) } /* Watch for BT device property changes */ - dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED, + dbus_g_object_register_marshaller (NULL, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID); @@ -1309,7 +1308,7 @@ nm_device_bt_class_init (NMDeviceBtClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMDeviceBtClass, ppp_stats), NULL, NULL, - _nm_marshal_VOID__UINT_UINT, + NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); diff --git a/src/nm-device-modem.c b/src/nm-device-modem.c index 6b0d2d5..7c19f58 100644 --- a/src/nm-device-modem.c +++ b/src/nm-device-modem.c @@ -29,7 +29,6 @@ #include "nm-device-private.h" #include "nm-properties-changed-signal.h" #include "nm-rfkill.h" -#include "nm-marshal.h" #include "nm-logging.h" #include "nm-system.h" diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index f1f79cd..9e9dd2f 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -42,7 +42,6 @@ #include "nm-device-private.h" #include "nm-utils.h" #include "nm-logging.h" -#include "nm-marshal.h" #include "NetworkManagerUtils.h" #include "nm-activation-request.h" #include "nm-supplicant-manager.h" @@ -3772,7 +3771,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMDeviceWifiClass, scanning_allowed), scanning_allowed_accumulator, NULL, - _nm_marshal_BOOLEAN__VOID, + NULL, G_TYPE_BOOLEAN, 0); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), &dbus_glib_nm_device_wifi_object_info); diff --git a/src/nm-device.c b/src/nm-device.c index 68d7583..656d012 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -55,7 +55,6 @@ #include "nm-dnsmasq-manager.h" #include "nm-dhcp4-config.h" #include "nm-ip6-manager.h" -#include "nm-marshal.h" #include "nm-rfkill.h" #include "nm-firewall-manager.h" #include "nm-properties-changed-signal.h" @@ -5112,7 +5111,7 @@ nm_device_class_init (NMDeviceClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMDeviceClass, state_changed), NULL, NULL, - _nm_marshal_VOID__UINT_UINT_UINT, + NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); @@ -5122,7 +5121,7 @@ nm_device_class_init (NMDeviceClass *klass) G_SIGNAL_RUN_LAST, 0, autoconnect_allowed_accumulator, NULL, - _nm_marshal_BOOLEAN__VOID, + NULL, G_TYPE_BOOLEAN, 0); signals[AUTH_REQUEST] = @@ -5131,7 +5130,7 @@ nm_device_class_init (NMDeviceClass *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, /* dbus-glib context, permission, allow_interaction, callback, user_data */ - _nm_marshal_VOID__POINTER_STRING_BOOLEAN_POINTER_POINTER, + NULL, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_POINTER); signals[IP4_CONFIG_CHANGED] = @@ -5139,7 +5138,7 @@ nm_device_class_init (NMDeviceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - _nm_marshal_VOID__OBJECT_OBJECT, + NULL, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_OBJECT); signals[IP6_CONFIG_CHANGED] = @@ -5147,7 +5146,7 @@ nm_device_class_init (NMDeviceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - _nm_marshal_VOID__OBJECT_OBJECT, + NULL, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_OBJECT); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), diff --git a/src/nm-manager.c b/src/nm-manager.c index ef43496..5acdc8d 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -57,7 +57,6 @@ #include "nm-setting-connection.h" #include "nm-setting-wireless.h" #include "nm-setting-vpn.h" -#include "nm-marshal.h" #include "nm-dbus-glib-types.h" #include "nm-udev-manager.h" #include "nm-hostname-provider.h" @@ -4468,7 +4467,7 @@ nm_manager_init (NMManager *manager) "/", NM_AUTOIP_DBUS_IFACE); if (priv->aipd_proxy) { - dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_STRING_STRING, + dbus_g_object_register_marshaller (NULL, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c index 38b67a2..c9059f4 100644 --- a/src/nm-udev-manager.c +++ b/src/nm-udev-manager.c @@ -27,7 +27,6 @@ #include <gudev/gudev.h> #include "nm-udev-manager.h" -#include "nm-marshal.h" #include "nm-logging.h" #include "nm-system.h" @@ -629,7 +628,7 @@ nm_udev_manager_class_init (NMUdevManagerClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMUdevManagerClass, device_added), NULL, NULL, - _nm_marshal_VOID__POINTER_POINTER_POINTER_POINTER_INT, + NULL, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_INT); signals[DEVICE_REMOVED] = @@ -647,7 +646,7 @@ nm_udev_manager_class_init (NMUdevManagerClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMUdevManagerClass, rfkill_changed), NULL, NULL, - _nm_marshal_VOID__UINT_UINT, + NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); } diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 32ea062..cc51845 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -27,7 +27,6 @@ #include "nm-platform.h" #include "nm-logging.h" -#include "nm-marshal.h" #define debug(...) nm_log_dbg (LOGD_PLATFORM, __VA_ARGS__) @@ -1145,7 +1144,7 @@ nm_platform_init (NMPlatform *object) G_SIGNAL_RUN_FIRST, \ G_CALLBACK (method), \ NULL, NULL, \ - _nm_marshal_VOID__INT_POINTER, \ + NULL, \ G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER); \ static void diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index aa03c82..7a79722 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -52,7 +52,6 @@ #include "nm-setting-cdma.h" #include "nm-dbus-manager.h" #include "nm-logging.h" -#include "nm-marshal.h" #include "nm-posix-signals.h" static void impl_ppp_manager_need_secrets (NMPPPManager *manager, @@ -270,7 +269,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMPPPManagerClass, ip4_config), NULL, NULL, - _nm_marshal_VOID__STRING_OBJECT, + NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_OBJECT); @@ -281,7 +280,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMPPPManagerClass, stats), NULL, NULL, - _nm_marshal_VOID__UINT_UINT, + NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); diff --git a/src/settings/nm-default-wired-connection.c b/src/settings/nm-default-wired-connection.c index 51add0b..6c8ce41 100644 --- a/src/settings/nm-default-wired-connection.c +++ b/src/settings/nm-default-wired-connection.c @@ -29,7 +29,6 @@ #include <nm-utils.h> #include "nm-dbus-glib-types.h" -#include "nm-marshal.h" #include "nm-default-wired-connection.h" #include "nm-device-ethernet.h" diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c index 2d4a384..30f153b 100644 --- a/src/settings/nm-inotify-helper.c +++ b/src/settings/nm-inotify-helper.c @@ -23,7 +23,6 @@ #include <sys/inotify.h> #include <glib.h> -#include "nm-marshal.h" #include "nm-inotify-helper.h" #include "nm-logging.h" @@ -201,7 +200,7 @@ nm_inotify_helper_class_init (NMInotifyHelperClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMInotifyHelperClass, event), NULL, NULL, - _nm_marshal_VOID__POINTER_STRING, + NULL, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_STRING); } diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 5c5e040..11cf5d7 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -38,7 +38,6 @@ #include "nm-dbus-glib-types.h" #include "nm-logging.h" #include "nm-manager-auth.h" -#include "nm-marshal.h" #include "nm-agent-manager.h" #include "NetworkManagerUtils.h" diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index a217099..c825677 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -27,7 +27,6 @@ #include "nm-supplicant-interface.h" #include "nm-supplicant-manager.h" #include "nm-logging.h" -#include "nm-marshal.h" #include "nm-supplicant-config.h" #include "nm-dbus-manager.h" #include "nm-call-store.h" @@ -315,7 +314,7 @@ handle_new_bss (NMSupplicantInterface *self, proxies); /* Standard D-Bus PropertiesChanged signal */ - dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED_BOXED, + dbus_g_object_register_marshaller (NULL, G_TYPE_NONE, G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT, G_TYPE_STRV, G_TYPE_INVALID); @@ -871,7 +870,7 @@ interface_add_done (NMSupplicantInterface *self, char *path) self, NULL); - dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED, + dbus_g_object_register_marshaller (NULL, G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, DBUS_TYPE_G_MAP_OF_VARIANT, G_TYPE_INVALID); @@ -895,7 +894,7 @@ interface_add_done (NMSupplicantInterface *self, char *path) self, NULL); - dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_STRING_STRING, + dbus_g_object_register_marshaller (NULL, G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); @@ -1634,7 +1633,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, state), NULL, NULL, - _nm_marshal_VOID__UINT_UINT_INT, + NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INT); signals[REMOVED] = @@ -1652,7 +1651,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, new_bss), NULL, NULL, - _nm_marshal_VOID__STRING_POINTER, + NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER); signals[BSS_UPDATED] = @@ -1661,7 +1660,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, bss_updated), NULL, NULL, - _nm_marshal_VOID__STRING_POINTER, + NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER); signals[BSS_REMOVED] = @@ -1688,7 +1687,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, connection_error), NULL, NULL, - _nm_marshal_VOID__STRING_STRING, + NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); signals[CREDENTIALS_REQUEST] = @@ -1697,7 +1696,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, credentials_request), NULL, NULL, - _nm_marshal_VOID__STRING_STRING, + NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); } diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index f2e31a8..c418d1d 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -38,7 +38,6 @@ #include "nm-logging.h" #include "nm-utils.h" #include "nm-vpn-plugin-bindings.h" -#include "nm-marshal.h" #include "nm-active-connection.h" #include "nm-properties-changed-signal.h" #include "nm-dbus-glib-types.h" @@ -1607,7 +1606,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - _nm_marshal_VOID__UINT_UINT, + NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); signals[INTERNAL_STATE_CHANGED] = @@ -1615,7 +1614,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - _nm_marshal_VOID__UINT_UINT_UINT, + NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (object_class), diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 7743fdd..5fab5d5 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -28,7 +28,6 @@ #include "nm-setting-vpn.h" #include "nm-dbus-manager.h" #include "NetworkManagerVPN.h" -#include "nm-marshal.h" #include "nm-enum-types.h" #include "nm-logging.h" -- 1.7.1
_______________________________________________ networkmanager-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/networkmanager-list
