diff options
Diffstat (limited to 'libnm/nm-remote-settings.c')
| -rw-r--r-- | libnm/nm-remote-settings.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index fa3a0f09f5..d8b275b835 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -33,7 +33,6 @@ #include "nm-remote-connection-private.h" #include "nm-object-private.h" #include "nm-dbus-helpers.h" -#include "nm-object-private.h" #include "nm-core-internal.h" #include "nmdbus-settings.h" @@ -46,7 +45,6 @@ typedef struct { NMDBusSettings *proxy; GPtrArray *all_connections; GPtrArray *visible_connections; - GCancellable *props_cancellable; /* AddConnectionInfo objects that are waiting for the connection to become initialized */ GSList *add_list; @@ -134,9 +132,6 @@ get_connection_by_string (NMRemoteSettings *settings, NMConnection *candidate; int i; - if (!_nm_object_get_nm_running (NM_OBJECT (settings))) - return NULL; - priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); for (i = 0; i < priv->visible_connections->len; i++) { @@ -601,65 +596,6 @@ nm_remote_settings_save_hostname_finish (NMRemoteSettings *settings, return g_simple_async_result_get_op_res_gboolean (simple); } -static void -updated_properties (GObject *object, GAsyncResult *result, gpointer user_data) -{ - GError *error = NULL; - - if (!_nm_object_reload_properties_finish (NM_OBJECT (object), result, &error)) { - if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) - g_warning ("%s: error reading NMRemoteSettings properties: %s", __func__, error->message); - g_error_free (error); - } -} - -static void -nm_running_changed (GObject *object, - GParamSpec *pspec, - gpointer user_data) -{ - NMRemoteSettings *self = NM_REMOTE_SETTINGS (object); - NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self); - - g_object_freeze_notify (object); - - if (!_nm_object_get_nm_running (NM_OBJECT (self))) { - GPtrArray *connections; - int i; - - nm_clear_g_cancellable (&priv->props_cancellable); - - /* Clear connections */ - connections = priv->all_connections; - priv->all_connections = g_ptr_array_new (); - for (i = 0; i < connections->len; i++) - g_signal_emit (self, signals[CONNECTION_REMOVED], 0, connections->pdata[i]); - g_ptr_array_unref (connections); - - /* Clear properties */ - if (priv->hostname) { - g_free (priv->hostname); - priv->hostname = NULL; - g_object_notify (G_OBJECT (self), NM_REMOTE_SETTINGS_HOSTNAME); - } - - if (priv->can_modify) { - priv->can_modify = FALSE; - g_object_notify (G_OBJECT (self), NM_REMOTE_SETTINGS_CAN_MODIFY); - } - - _nm_object_suppress_property_updates (NM_OBJECT (self), TRUE); - } else { - _nm_object_suppress_property_updates (NM_OBJECT (self), FALSE); - - nm_clear_g_cancellable (&priv->props_cancellable); - priv->props_cancellable = g_cancellable_new (); - _nm_object_reload_properties_async (NM_OBJECT (self), priv->props_cancellable, updated_properties, self); - } - - g_object_thaw_notify (object); -} - /*****************************************************************************/ static void @@ -688,9 +624,6 @@ init_dbus (NMObject *object) _nm_object_register_properties (object, NM_DBUS_INTERFACE_SETTINGS, property_info); - - g_signal_connect (object, "notify::" NM_OBJECT_NM_RUNNING, - G_CALLBACK (nm_running_changed), object); } static GObject * @@ -736,8 +669,6 @@ dispose (GObject *object) g_clear_pointer (&priv->all_connections, g_ptr_array_unref); } - g_signal_handlers_disconnect_by_func (object, G_CALLBACK (nm_running_changed), self); - g_clear_pointer (&priv->visible_connections, g_ptr_array_unref); g_clear_pointer (&priv->hostname, g_free); @@ -774,9 +705,6 @@ nm_remote_settings_class_init (NMRemoteSettingsClass *class) g_type_class_add_private (class, sizeof (NMRemoteSettingsPrivate)); - _nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_SETTINGS); - _nm_dbus_register_proxy_type (NM_DBUS_INTERFACE_SETTINGS, NMDBUS_TYPE_SETTINGS_PROXY); - /* Virtual methods */ object_class->constructor = constructor; object_class->get_property = get_property; |