[network-manager-applet/rm-userset] editor: don't error out if no secrets are returned



commit 6c5833ca0c8a5c6d744f2ca5d48f05e82d0a1609
Author: Dan Williams <dcbw redhat com>
Date:   Wed Feb 2 20:38:11 2011 -0600

    editor: don't error out if no secrets are returned
    
    Treat another NM error as success; we dont' really care if no
    agents were available, but somebody might, which is why the
    error exists.

 src/connection-editor/ce-page.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index 29b921e..db18593 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -187,10 +187,12 @@ ce_page_complete_init (CEPage *self,
 	g_return_if_fail (CE_IS_PAGE (self));
 
 	/* Ignore missing settings errors */
-	if (error && !dbus_g_error_has_name (error, "org.freedesktop.NetworkManagerSettings.InvalidSetting")) {
+	if (   error
+	    && !dbus_g_error_has_name (error, "org.freedesktop.NetworkManager.Settings.InvalidSetting")
+	    && !dbus_g_error_has_name (error, "org.freedesktop.NetworkManager.AgentManager.NoSecrets")) {
 		emit_initialized (self, error);
 		return;
-	} else if (!setting_name || !secrets) {
+	} else if (!setting_name || !secrets || !g_hash_table_size (secrets)) {
 		/* Success, no secrets */
 		emit_initialized (self, NULL);
 		return;



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