diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-06-01 00:19:50 -0700 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-06-01 00:19:50 -0700 |
| commit | 281b1f9abcb6f997d8c760be83c5647275acd15f (patch) | |
| tree | d9f5746c06f51fd2ffdb4336002f536ce3c6f331 | |
| parent | a0b6e6ca38f38185b76826818cd0b2d39f91d60b (diff) | |
| download | network-manager-applet-281b1f9abcb6f997d8c760be83c5647275acd15f.tar.gz | |
gconf: remove fully deleted connections (rh #618973)
Sometimes the GConf directory will already be deleted by the time
the notify-consolidator runs, and before this patch the applet
simply wouldn't pick up that case because it checked for the
connection's GConf directory before treating the connection as
really deleted. Even when the directory is completely gone we
want to make sure we forget about the connection entirely.
| -rw-r--r-- | src/gconf-helpers/nma-gconf-settings.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gconf-helpers/nma-gconf-settings.c b/src/gconf-helpers/nma-gconf-settings.c index 344b92bc..f566cafb 100644 --- a/src/gconf-helpers/nma-gconf-settings.c +++ b/src/gconf-helpers/nma-gconf-settings.c @@ -318,11 +318,9 @@ connection_changes_done (gpointer data) if (connection) add_connection_real (info->settings, connection); } else { - if (gconf_client_dir_exists (priv->client, info->path, NULL)) { - /* Updated connection */ - if (!nma_gconf_connection_changed (connection)) - priv->connections = g_slist_remove (priv->connections, connection); - } + /* Updated or removed/invalid connection */ + if (!nma_gconf_connection_changed (connection)) + priv->connections = g_slist_remove (priv->connections, connection); } g_hash_table_remove (priv->pending_changes, info->path); |