diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 7e0d518a5..686481065 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -83,7 +83,7 @@ enum { enum { UPDATED, REMOVED, - DBUS_UPDATED, + UPDATED_BY_USER, LAST_SIGNAL }; static guint signals[LAST_SIGNAL] = { 0 }; @@ -1233,7 +1233,7 @@ con_update_cb (NMSettingsConnection *self, nm_agent_manager_save_secrets (info->agent_mgr, for_agent, info->subject); g_object_unref (for_agent); - g_signal_emit (self, signals[DBUS_UPDATED], 0); + g_signal_emit (self, signals[UPDATED_BY_USER], 0); } update_complete (self, info, error); @@ -2040,8 +2040,8 @@ nm_settings_connection_class_init (NMSettingsConnectionClass *class) G_TYPE_NONE, 0); /* Emitted when connection is changed from D-Bus */ - signals[DBUS_UPDATED] = - g_signal_new (NM_SETTINGS_CONNECTION_DBUS_UPDATED, + signals[UPDATED_BY_USER] = + g_signal_new (NM_SETTINGS_CONNECTION_UPDATED_BY_USER, G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index ab29ae81e..a16acc9f5 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -42,8 +42,8 @@ G_BEGIN_DECLS #define NM_SETTINGS_CONNECTION_GET_SECRETS "get-secrets" #define NM_SETTINGS_CONNECTION_CANCEL_SECRETS "cancel-secrets" -/* Emitted when connection is changed from D-Bus */ -#define NM_SETTINGS_CONNECTION_DBUS_UPDATED "dbus-updated" +/* Emitted when connection is changed by a user action */ +#define NM_SETTINGS_CONNECTION_UPDATED_BY_USER "updated-by-user" /* Properties */ #define NM_SETTINGS_CONNECTION_VISIBLE "visible" diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index a940656ee..5cc4938ca 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -1525,7 +1525,7 @@ default_wired_connection_removed_cb (NMSettingsConnection *connection, NMSetting } static void -default_wired_connection_dbus_updated_cb (NMSettingsConnection *connection, NMSettings *self) +default_wired_connection_updated_by_user_cb (NMSettingsConnection *connection, NMSettings *self) { NMDevice *device; @@ -1554,7 +1554,7 @@ default_wired_clear_tag (NMSettings *self, g_object_set_data (G_OBJECT (device), DEFAULT_WIRED_CONNECTION_TAG, NULL); g_signal_handlers_disconnect_by_func (connection, G_CALLBACK (default_wired_connection_removed_cb), self); - g_signal_handlers_disconnect_by_func (connection, G_CALLBACK (default_wired_connection_dbus_updated_cb), self); + g_signal_handlers_disconnect_by_func (connection, G_CALLBACK (default_wired_connection_updated_by_user_cb), self); if (add_to_no_auto_default) nm_config_set_ethernet_no_auto_default (NM_SETTINGS_GET_PRIVATE (self)->config, NM_CONFIG_DEVICE (device)); @@ -1631,8 +1631,8 @@ nm_settings_device_added (NMSettings *self, NMDevice *device) g_object_set_data (G_OBJECT (added), DEFAULT_WIRED_DEVICE_TAG, device); g_object_set_data (G_OBJECT (device), DEFAULT_WIRED_CONNECTION_TAG, added); - g_signal_connect (added, NM_SETTINGS_CONNECTION_DBUS_UPDATED, - G_CALLBACK (default_wired_connection_dbus_updated_cb), self); + g_signal_connect (added, NM_SETTINGS_CONNECTION_UPDATED_BY_USER, + G_CALLBACK (default_wired_connection_updated_by_user_cb), self); g_signal_connect (added, NM_SETTINGS_CONNECTION_REMOVED, G_CALLBACK (default_wired_connection_removed_cb), self);