[network-manager-applet] gconf: remove fully deleted connections (rh #618973)



commit 714bfd59dda0d54a30f073603eb218b14cd64dda
Author: Dan Williams <dcbw redhat com>
Date:   Tue Jun 1 00:15:33 2010 -0700

    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.

 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 f9a4f81..ba0864a 100644
--- a/src/gconf-helpers/nma-gconf-settings.c
+++ b/src/gconf-helpers/nma-gconf-settings.c
@@ -301,11 +301,9 @@ connection_changes_done (gpointer data)
 		if (connection)
 			internal_add_connection (info->settings, connection);
 	} else {
-		if (gconf_client_dir_exists (priv->client, info->path, NULL)) {
-			/* Updated connection */
-			if (!nma_gconf_connection_gconf_changed (connection))
-				priv->connections = g_slist_remove (priv->connections, connection);
-		}
+		/* Updated or removed/invalid connection */
+		if (!nma_gconf_connection_gconf_changed (connection))
+			priv->connections = g_slist_remove (priv->connections, connection);
 	}
 
 	g_hash_table_remove (priv->pending_changes, info->path);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]