[network-manager-applet/rm-userset] applet: properly handle keyring returning no secrets



commit c4bb9e2df2c969b3e688094fa2f5ea2ab0264482
Author: Dan Williams <dcbw redhat com>
Date:   Wed Jan 19 17:30:26 2011 -0600

    applet: properly handle keyring returning no secrets

 src/applet-agent.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/applet-agent.c b/src/applet-agent.c
index 1aa56e1..720b4ec 100644
--- a/src/applet-agent.c
+++ b/src/applet-agent.c
@@ -262,7 +262,8 @@ keyring_find_secrets_cb (GnomeKeyringResult result,
 		                             NM_SECRET_AGENT_ERROR_USER_CANCELED,
 		                             "The secrets request was canceled by the user");
 		goto done;
-	} else if (result != GNOME_KEYRING_RESULT_OK) {
+	} else if (   result != GNOME_KEYRING_RESULT_OK
+	           && result != GNOME_KEYRING_RESULT_NO_MATCH) {
 		error = g_error_new (NM_SECRET_AGENT_ERROR,
 		                     NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
 		                     "%s.%d - failed to read secrets from keyring (result %d)",
@@ -555,7 +556,7 @@ delete_find_items_cb (GnomeKeyringResult result, GList *list, gpointer data)
 	GList *iter;
 	GError *error = NULL;
 
-	if (result == GNOME_KEYRING_RESULT_OK) {
+	if ((result == GNOME_KEYRING_RESULT_OK) || (result == GNOME_KEYRING_RESULT_NO_MATCH)) {
 		for (iter = list; iter != NULL; iter = g_list_next (iter)) {
 			GnomeKeyringFound *found = (GnomeKeyringFound *) iter->data;
 



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