diff --git a/.gitignore b/.gitignore index 3b9d587b9..6cd175edd 100644 --- a/.gitignore +++ b/.gitignore @@ -157,10 +157,8 @@ initscript/*/[Nn]etwork[Mm]anager *-bindings.h callouts/tests/test-dispatcher-envp 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/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 974cc0d28..d4b97c0a8 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -119,8 +119,7 @@ libnm_glib_la_csources = \ nm-secret-agent.c \ nm-device-wimax.c \ nm-wimax-nsp.c \ - nm-glib-enum-types.c \ - nm-glib-marshal.c + nm-glib-enum-types.c libnm_glib_la_private_headers = \ nm-object-private.h \ @@ -128,7 +127,6 @@ libnm_glib_la_private_headers = \ nm-types-private.h \ nm-object-cache.h \ nm-remote-connection-private.h \ - nm-glib-marshal.h \ nm-dbus-helpers-private.h libnm_glib_la_SOURCES = \ @@ -140,9 +138,6 @@ nm_glib_enum_types_sources = $(libnminclude_HEADERS) GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM -GLIB_GENERATED += nm-glib-marshal.h nm-glib-marshal.c -nm_glib_marshal_sources = $(libnm_glib_la_SOURCES) - libnm_glib_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(builddir)/libdeprecated-nm-glib.la \ diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 8cac927c6..9c9371eff 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -29,7 +29,6 @@ #include "nm-device-ethernet.h" #include "nm-device-wifi.h" #include "nm-device-private.h" -#include "nm-glib-marshal.h" #include "nm-types-private.h" #include "nm-object-private.h" #include "nm-active-connection.h" @@ -2016,8 +2015,7 @@ nm_client_class_init (NMClientClass *client_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMClientClass, device_added), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); @@ -2033,8 +2031,7 @@ nm_client_class_init (NMClientClass *client_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMClientClass, device_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); @@ -2050,8 +2047,7 @@ nm_client_class_init (NMClientClass *client_class) g_signal_new ("permission-changed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - _nm_glib_marshal_VOID__UINT_UINT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); } diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c index d7f48ce61..f2407352f 100644 --- a/libnm-glib/nm-device-modem.c +++ b/libnm-glib/nm-device-modem.c @@ -33,7 +33,6 @@ #include "nm-device-modem.h" #include "nm-device-private.h" #include "nm-object-private.h" -#include "nm-glib-marshal.h" G_DEFINE_TYPE (NMDeviceModem, nm_device_modem, NM_TYPE_DEVICE) diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 049b59193..43a593222 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -44,7 +44,6 @@ #include "nm-object-cache.h" #include "nm-remote-connection.h" #include "nm-types.h" -#include "nm-glib-marshal.h" #include "nm-dbus-glib-types.h" #include "nm-glib-compat.h" #include "nm-utils.h" @@ -328,7 +327,7 @@ constructed (GObject *object) register_properties (NM_DEVICE (object)); - dbus_g_object_register_marshaller (_nm_glib_marshal_VOID__UINT_UINT_UINT, + dbus_g_object_register_marshaller (g_cclosure_marshal_generic, G_TYPE_NONE, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID); @@ -813,8 +812,7 @@ nm_device_class_init (NMDeviceClass *device_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMDeviceClass, state_changed), - NULL, NULL, - _nm_glib_marshal_VOID__UINT_UINT_UINT, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); } diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index 70d6144b4..d143520c6 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -31,7 +31,6 @@ #include "nm-dbus-glib-types.h" #include "nm-glib-compat.h" #include "nm-types.h" -#include "nm-glib-marshal.h" #include "nm-dbus-helpers-private.h" #define DEBUG 0 @@ -461,8 +460,7 @@ nm_object_class_init (NMObjectClass *nm_object_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMObjectClass, object_creation_failed), - NULL, NULL, - _nm_glib_marshal_VOID__POINTER_POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); } diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index 0960160d7..a91186691 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -25,7 +25,6 @@ #include #include -#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); } diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index c293e5e41..2205f7e7b 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -26,7 +26,6 @@ #include "NetworkManager.h" #include "nm-secret-agent.h" #include "nm-glib-enum-types.h" -#include "nm-glib-marshal.h" #include "nm-dbus-helpers-private.h" static void impl_secret_agent_get_secrets (NMSecretAgent *self, @@ -824,7 +823,7 @@ nm_secret_agent_init (NMSecretAgent *self) 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); @@ -1010,8 +1009,7 @@ nm_secret_agent_class_init (NMSecretAgentClass *class) g_signal_new (NM_SECRET_AGENT_REGISTRATION_RESULT, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (class), diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c index bf6903379..abea04adb 100644 --- a/libnm-glib/nm-vpn-connection.c +++ b/libnm-glib/nm-vpn-connection.c @@ -25,7 +25,6 @@ #include "nm-vpn-connection.h" #include "NetworkManager.h" #include "nm-utils.h" -#include "nm-glib-marshal.h" #include "nm-object-private.h" #include "nm-active-connection.h" @@ -174,7 +173,7 @@ constructed (GObject *object) priv->proxy = _nm_object_new_proxy (NM_OBJECT (object), NULL, NM_DBUS_INTERFACE_VPN_CONNECTION); - dbus_g_object_register_marshaller (_nm_glib_marshal_VOID__UINT_UINT, + dbus_g_object_register_marshaller (g_cclosure_marshal_generic, G_TYPE_NONE, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID); @@ -268,8 +267,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMVPNConnectionClass, vpn_state_changed), - NULL, NULL, - _nm_glib_marshal_VOID__UINT_UINT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); } diff --git a/src/bluez-manager/nm-bluez-device.c b/src/bluez-manager/nm-bluez-device.c index b12a8619b..21e3d4624 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 (g_cclosure_marshal_generic, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID); @@ -588,8 +587,7 @@ nm_bluez_device_class_init (NMBluezDeviceClass *config_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMBluezDeviceClass, initialized), - NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); } diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c index a68486319..35d4b436b 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" @@ -370,8 +369,7 @@ nm_bluez_manager_class_init (NMBluezManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMBluezManagerClass, bdaddr_added), - NULL, NULL, - _nm_marshal_VOID__STRING_STRING_STRING_UINT, + NULL, NULL, NULL, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT); signals[BDADDR_REMOVED] = @@ -379,8 +377,7 @@ nm_bluez_manager_class_init (NMBluezManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMBluezManagerClass, bdaddr_removed), - NULL, NULL, - _nm_marshal_VOID__STRING_STRING, + NULL, NULL, 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 43d0b7e05..6885ad1de 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 f1d2d59ab..79ecf057a 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 9c9c2c918..dcb28d66c 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" @@ -1678,8 +1677,7 @@ nm_ip6_manager_class_init (NMIP6ManagerClass *manager_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMIP6ManagerClass, addrconf_complete), - NULL, NULL, - _nm_marshal_VOID__INT_UINT_BOOLEAN, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_BOOLEAN); signals[CONFIG_CHANGED] = @@ -1687,8 +1685,7 @@ nm_ip6_manager_class_init (NMIP6ManagerClass *manager_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMIP6ManagerClass, config_changed), - NULL, NULL, - _nm_marshal_VOID__INT_UINT_BOOLEAN, + NULL, NULL, 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 ef101b6c8..8832d2e65 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 (g_cclosure_marshal_generic, 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 dd01646ee..d3106506d 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 @@ -827,8 +826,7 @@ nm_modem_manager_class_init (NMModemManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemManagerClass, modem_added), - NULL, NULL, - _nm_marshal_VOID__OBJECT_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_STRING); signals[MODEM_REMOVED] = @@ -836,7 +834,6 @@ nm_modem_manager_class_init (NMModemManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemManagerClass, modem_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); } diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 7c98f49d7..7ec517616 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" @@ -876,8 +875,7 @@ nm_modem_class_init (NMModemClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemClass, ppp_stats), - NULL, NULL, - _nm_marshal_VOID__UINT_UINT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); @@ -886,8 +884,7 @@ nm_modem_class_init (NMModemClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemClass, ppp_failed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); signals[IP4_CONFIG_RESULT] = @@ -895,8 +892,7 @@ nm_modem_class_init (NMModemClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemClass, ip4_config_result), - NULL, NULL, - _nm_marshal_VOID__OBJECT_POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_POINTER); signals[PREPARE_RESULT] = @@ -904,8 +900,7 @@ nm_modem_class_init (NMModemClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemClass, prepare_result), - NULL, NULL, - _nm_marshal_VOID__BOOLEAN_UINT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_UINT); signals[AUTH_REQUESTED] = @@ -913,8 +908,7 @@ nm_modem_class_init (NMModemClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemClass, auth_requested), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); signals[AUTH_RESULT] = @@ -922,7 +916,6 @@ nm_modem_class_init (NMModemClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMModemClass, auth_result), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); } diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index c8a2010fa..5eb73f763 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 @@ -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 ecf82a303..2bd756543 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 (g_cclosure_marshal_generic, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID); @@ -1308,8 +1307,7 @@ nm_device_bt_class_init (NMDeviceBtClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMDeviceBtClass, ppp_stats), - NULL, NULL, - _nm_marshal_VOID__UINT_UINT, + NULL, NULL, 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 6b0d2d5a1..7c19f5850 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 f1f79cdd8..2b8ddd1c6 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" @@ -3737,8 +3736,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMDeviceWifiClass, access_point_added), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); @@ -3747,8 +3745,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); @@ -3757,8 +3754,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMDeviceWifiClass, hidden_ap_found), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); @@ -3771,8 +3767,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMDeviceWifiClass, scanning_allowed), - scanning_allowed_accumulator, NULL, - _nm_marshal_BOOLEAN__VOID, + scanning_allowed_accumulator, NULL, 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 68d75839d..38de7e02f 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" @@ -5111,8 +5110,7 @@ nm_device_class_init (NMDeviceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMDeviceClass, state_changed), - NULL, NULL, - _nm_marshal_VOID__UINT_UINT_UINT, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); @@ -5121,33 +5119,29 @@ nm_device_class_init (NMDeviceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, 0, - autoconnect_allowed_accumulator, NULL, - _nm_marshal_BOOLEAN__VOID, + autoconnect_allowed_accumulator, NULL, NULL, G_TYPE_BOOLEAN, 0); signals[AUTH_REQUEST] = g_signal_new (NM_DEVICE_AUTH_REQUEST, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, + 0, NULL, NULL, NULL, /* dbus-glib context, permission, allow_interaction, callback, user_data */ - _nm_marshal_VOID__POINTER_STRING_BOOLEAN_POINTER_POINTER, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_POINTER); signals[IP4_CONFIG_CHANGED] = g_signal_new (NM_DEVICE_IP4_CONFIG_CHANGED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - _nm_marshal_VOID__OBJECT_OBJECT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_OBJECT); signals[IP6_CONFIG_CHANGED] = g_signal_new (NM_DEVICE_IP6_CONFIG_CHANGED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - _nm_marshal_VOID__OBJECT_OBJECT, + 0, NULL, NULL, 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 ef43496ef..7b4de3d0b 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 (g_cclosure_marshal_generic, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); @@ -4636,8 +4635,7 @@ nm_manager_class_init (NMManagerClass *manager_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMManagerClass, device_added), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); signals[DEVICE_REMOVED] = @@ -4645,8 +4643,7 @@ nm_manager_class_init (NMManagerClass *manager_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMManagerClass, device_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); signals[STATE_CHANGED] = @@ -4654,8 +4651,7 @@ nm_manager_class_init (NMManagerClass *manager_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMManagerClass, state_changed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); signals[PROPERTIES_CHANGED] = @@ -4666,32 +4662,28 @@ nm_manager_class_init (NMManagerClass *manager_class) g_signal_new ("check-permissions", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + 0, NULL, NULL, NULL, G_TYPE_NONE, 0); signals[USER_PERMISSIONS_CHANGED] = g_signal_new ("user-permissions-changed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + 0, NULL, NULL, NULL, G_TYPE_NONE, 0); signals[ACTIVE_CONNECTION_ADDED] = g_signal_new (NM_MANAGER_ACTIVE_CONNECTION_ADDED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); signals[ACTIVE_CONNECTION_REMOVED] = g_signal_new (NM_MANAGER_ACTIVE_CONNECTION_REMOVED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (manager_class), diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c index 38b67a2ff..41cbbe66b 100644 --- a/src/nm-udev-manager.c +++ b/src/nm-udev-manager.c @@ -27,7 +27,6 @@ #include #include "nm-udev-manager.h" -#include "nm-marshal.h" #include "nm-logging.h" #include "nm-system.h" @@ -628,8 +627,7 @@ nm_udev_manager_class_init (NMUdevManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMUdevManagerClass, device_added), - NULL, NULL, - _nm_marshal_VOID__POINTER_POINTER_POINTER_POINTER_INT, + NULL, NULL, NULL, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_INT); signals[DEVICE_REMOVED] = @@ -637,8 +635,7 @@ nm_udev_manager_class_init (NMUdevManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMUdevManagerClass, device_removed), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); signals[RFKILL_CHANGED] = @@ -646,8 +643,7 @@ nm_udev_manager_class_init (NMUdevManagerClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMUdevManagerClass, rfkill_changed), - NULL, NULL, - _nm_marshal_VOID__UINT_UINT, + NULL, NULL, 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 32ea062f8..7034181c6 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__) @@ -1144,8 +1143,7 @@ nm_platform_init (NMPlatform *object) G_OBJECT_CLASS_TYPE (object_class), \ G_SIGNAL_RUN_FIRST, \ G_CALLBACK (method), \ - NULL, NULL, \ - _nm_marshal_VOID__INT_POINTER, \ + NULL, NULL, 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 aa03c82a5..866398ee8 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, @@ -256,34 +255,31 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) /* signals */ signals[STATE_CHANGED] = g_signal_new ("state-changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMPPPManagerClass, state_changed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, - G_TYPE_NONE, 1, - G_TYPE_UINT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMPPPManagerClass, state_changed), + NULL, NULL, NULL, + G_TYPE_NONE, 1, + G_TYPE_UINT); signals[IP4_CONFIG] = g_signal_new ("ip4-config", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMPPPManagerClass, ip4_config), - NULL, NULL, - _nm_marshal_VOID__STRING_OBJECT, - G_TYPE_NONE, 2, - G_TYPE_STRING, - G_TYPE_OBJECT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMPPPManagerClass, ip4_config), + NULL, NULL, NULL, + G_TYPE_NONE, 2, + G_TYPE_STRING, + G_TYPE_OBJECT); signals[STATS] = g_signal_new ("stats", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMPPPManagerClass, stats), - NULL, NULL, - _nm_marshal_VOID__UINT_UINT, - G_TYPE_NONE, 2, - G_TYPE_UINT, G_TYPE_UINT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMPPPManagerClass, stats), + NULL, NULL, NULL, + G_TYPE_NONE, 2, + G_TYPE_UINT, G_TYPE_UINT); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (manager_class), &dbus_glib_nm_ppp_manager_object_info); diff --git a/src/settings/nm-default-wired-connection.c b/src/settings/nm-default-wired-connection.c index 51add0b64..6c8ce41ff 100644 --- a/src/settings/nm-default-wired-connection.c +++ b/src/settings/nm-default-wired-connection.c @@ -29,7 +29,6 @@ #include #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 2d4a38472..7231b57ec 100644 --- a/src/settings/nm-inotify-helper.c +++ b/src/settings/nm-inotify-helper.c @@ -23,7 +23,6 @@ #include #include -#include "nm-marshal.h" #include "nm-inotify-helper.h" #include "nm-logging.h" @@ -200,8 +199,7 @@ nm_inotify_helper_class_init (NMInotifyHelperClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMInotifyHelperClass, event), - NULL, NULL, - _nm_marshal_VOID__POINTER_STRING, + NULL, NULL, 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 5c5e04073..11cf5d72d 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 a2170990e..ba7e0e523 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 (g_cclosure_marshal_generic, 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 (g_cclosure_marshal_generic, 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 (g_cclosure_marshal_generic, G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); @@ -1633,8 +1632,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, state), - NULL, NULL, - _nm_marshal_VOID__UINT_UINT_INT, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INT); signals[REMOVED] = @@ -1642,8 +1640,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, removed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); signals[NEW_BSS] = @@ -1651,8 +1648,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, new_bss), - NULL, NULL, - _nm_marshal_VOID__STRING_POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER); signals[BSS_UPDATED] = @@ -1660,8 +1656,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, bss_updated), - NULL, NULL, - _nm_marshal_VOID__STRING_POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER); signals[BSS_REMOVED] = @@ -1669,8 +1664,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, bss_removed), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); signals[SCAN_DONE] = @@ -1678,8 +1672,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, scan_done), - NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); signals[CONNECTION_ERROR] = @@ -1687,8 +1680,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, connection_error), - NULL, NULL, - _nm_marshal_VOID__STRING_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); signals[CREDENTIALS_REQUEST] = @@ -1696,8 +1688,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, credentials_request), - NULL, NULL, - _nm_marshal_VOID__STRING_STRING, + NULL, NULL, 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 f2e31a8d6..2f34a1a22 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" @@ -1606,16 +1605,14 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) g_signal_new ("vpn-state-changed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - _nm_marshal_VOID__UINT_UINT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); signals[INTERNAL_STATE_CHANGED] = g_signal_new (NM_VPN_CONNECTION_INTERNAL_STATE_CHANGED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, - _nm_marshal_VOID__UINT_UINT_UINT, + 0, NULL, NULL, 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 7743fddd7..5fab5d586 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"