[epiphany/gnome-keyring-v2: 1/3] pdm-dialog.c: Make password list clearing asynchronous.



commit 7aa628b755de79f1940895adfe83c6c43f136274
Author: Priit Laes <plaes plaes org>
Date:   Tue Jul 28 13:21:46 2009 +0300

    pdm-dialog.c: Make password list clearing asynchronous.
    
    Signed-off-by: Priit Laes <plaes plaes org>

 src/pdm-dialog.c |   64 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 17 deletions(-)
---
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 8c05485..b8f371a 100644
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -215,6 +215,30 @@ clear_all_cookies (SoupCookieJar *jar)
 }
 
 static void
+pdm_dialog_password_remove_cb (GnomeKeyringResult result,
+						gpointer data)
+{
+	GtkTreeRowReference *rowref = (GtkTreeRowReference *)data;
+
+	if (result == GNOME_KEYRING_RESULT_OK) {
+		GtkTreeIter iter;
+		GtkTreePath *path;
+		GtkTreeModel *model;
+
+		if (!gtk_tree_row_reference_valid (rowref))
+			return;
+
+		path = gtk_tree_row_reference_get_path (rowref);
+		model = gtk_tree_row_reference_get_model (rowref);
+
+		if (path != NULL && gtk_tree_model_get_iter (model, &iter, path)) {
+			gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+			gtk_tree_path_free (path);
+		}
+	}
+}
+
+static void
 clear_all_dialog_response_cb (GtkDialog *dialog,
 			      int response,
 			      PdmClearAllDialogButtons *checkbuttons)
@@ -251,28 +275,34 @@ clear_all_dialog_response_cb (GtkDialog *dialog,
 		if (gtk_toggle_button_get_active
 			(GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_passwords)))
 		{
+			GtkTreeIter iter;
 			PdmDialog *pdialog = EPHY_PDM_DIALOG (checkbuttons->dialog);
 			PdmActionInfo *pinfo = pdialog->priv->passwords;
-			GtkTreeModel *model = pinfo->model;
-			GtkTreeIter iter;
-			gboolean valid;
 
-			valid = gtk_tree_model_get_iter_first (model, &iter);
+			gboolean valid = gtk_tree_model_get_iter_first (pinfo->model, &iter);
 
 			while (valid) {
-				GValue val = { 0, };
-				gboolean result;
-
-				gtk_tree_model_get_value (model, &iter,
-						COL_PASSWORDS_DATA, &val);
-				result = pdm_dialog_password_remove(pinfo,
-						g_value_get_boxed (&val));
-				g_value_unset (&val);
-
-				if (result)
-					valid = gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-				else
-					valid = gtk_tree_model_iter_next (model, &iter);
+				GtkTreePath *path;
+				EphyPasswordInfo *info;
+				GtkTreeRowReference *row;
+
+				path = gtk_tree_model_get_path (pinfo->model, &iter);
+				row = gtk_tree_row_reference_new (pinfo->model, path);
+
+				gtk_tree_model_get (pinfo->model, &iter,
+						COL_PASSWORDS_DATA, &info,
+						-1);
+
+				gnome_keyring_item_delete (GNOME_KEYRING_DEFAULT,
+					info->keyring_id,
+					(GnomeKeyringOperationDoneCallback) pdm_dialog_password_remove_cb,
+					row,
+					(GDestroyNotify) gtk_tree_row_reference_free);
+
+				valid = gtk_tree_model_iter_next (pinfo->model, &iter);
+
+				g_slice_free (EphyPasswordInfo, info);
+				gtk_tree_path_free (path);
 			}
 		}
 		if (gtk_toggle_button_get_active



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