From 8b357f43c63cf39238cef92e8120ae14b7ef79db Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 13 Apr 2016 14:24:07 +0200 Subject: [PATCH] settings: drop signal slots from NMSettings NMSettings has no derived classes and obviously nobody is using those slots. Just drop them. (cherry picked from commit d571933505ca58700e0fb2db88d79b27a6029d5b) --- src/nm-connection-provider.c | 9 +++------ src/nm-connection-provider.h | 8 -------- src/settings/nm-settings.c | 15 +++++---------- src/settings/nm-settings.h | 13 ------------- 4 files changed, 8 insertions(+), 37 deletions(-) diff --git a/src/nm-connection-provider.c b/src/nm-connection-provider.c index 2e258bd5b1..e04cab928e 100644 --- a/src/nm-connection-provider.c +++ b/src/nm-connection-provider.c @@ -106,24 +106,21 @@ nm_connection_provider_default_init (NMConnectionProviderInterface *g_iface) g_signal_new (NM_CP_SIGNAL_CONNECTION_ADDED, iface_type, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMConnectionProviderInterface, connection_added), - NULL, NULL, + 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); g_signal_new (NM_CP_SIGNAL_CONNECTION_UPDATED, iface_type, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMConnectionProviderInterface, connection_updated), - NULL, NULL, + 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); g_signal_new (NM_CP_SIGNAL_CONNECTION_REMOVED, iface_type, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMConnectionProviderInterface, connection_removed), - NULL, NULL, + 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); } diff --git a/src/nm-connection-provider.h b/src/nm-connection-provider.h index 2485c56f4f..b31af05fbe 100644 --- a/src/nm-connection-provider.h +++ b/src/nm-connection-provider.h @@ -63,14 +63,6 @@ typedef struct { NMConnection * (*get_connection_by_uuid) (NMConnectionProvider *self, const char *uuid); - - /* Signals */ - void (*connection_added) (NMConnectionProvider *self, NMConnection *connection); - - void (*connection_updated) (NMConnectionProvider *self, NMConnection *connection); - - void (*connection_removed) (NMConnectionProvider *self, NMConnection *connection); - } NMConnectionProviderInterface; GType nm_connection_provider_get_type (void); diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 706960b893..d831cf68f0 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -2480,8 +2480,7 @@ nm_settings_class_init (NMSettingsClass *class) g_signal_new (NM_SETTINGS_SIGNAL_CONNECTION_ADDED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMSettingsClass, connection_added), - NULL, NULL, + 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, NM_TYPE_SETTINGS_CONNECTION); @@ -2489,8 +2488,7 @@ nm_settings_class_init (NMSettingsClass *class) g_signal_new (NM_SETTINGS_SIGNAL_CONNECTION_UPDATED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMSettingsClass, connection_updated), - NULL, NULL, + 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, NM_TYPE_SETTINGS_CONNECTION); @@ -2507,8 +2505,7 @@ nm_settings_class_init (NMSettingsClass *class) g_signal_new (NM_SETTINGS_SIGNAL_CONNECTION_REMOVED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMSettingsClass, connection_removed), - NULL, NULL, + 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, NM_TYPE_SETTINGS_CONNECTION); @@ -2516,8 +2513,7 @@ nm_settings_class_init (NMSettingsClass *class) g_signal_new (NM_SETTINGS_SIGNAL_CONNECTION_VISIBILITY_CHANGED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMSettingsClass, connection_visibility_changed), - NULL, NULL, + 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, NM_TYPE_SETTINGS_CONNECTION); @@ -2525,8 +2521,7 @@ nm_settings_class_init (NMSettingsClass *class) g_signal_new (NM_SETTINGS_SIGNAL_AGENT_REGISTERED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMSettingsClass, agent_registered), - NULL, NULL, + 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, NM_TYPE_SECRET_AGENT); diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h index fb7f113171..834eb762fc 100644 --- a/src/settings/nm-settings.h +++ b/src/settings/nm-settings.h @@ -56,19 +56,6 @@ struct _NMSettings { typedef struct { NMExportedObjectClass parent_class; - - /* Signals */ - void (*properties_changed) (NMSettings *self, GHashTable *properties); - - void (*connection_added) (NMSettings *self, NMSettingsConnection *connection); - - void (*connection_updated) (NMSettings *self, NMSettingsConnection *connection); - - void (*connection_removed) (NMSettings *self, NMSettingsConnection *connection); - - void (*connection_visibility_changed) (NMSettings *self, NMSettingsConnection *connection); - - void (*agent_registered) (NMSettings *self, NMSecretAgent *agent); } NMSettingsClass; typedef void (*NMSettingsSetHostnameCb) (const char *name, gboolean result, gpointer user_data);