diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | embed/Makefile.am | 2 | ||||
| -rw-r--r-- | embed/ephy-embed-single.c | 38 | ||||
| -rw-r--r-- | embed/ephy-password-manager.c | 218 | ||||
| -rw-r--r-- | embed/ephy-password-manager.h | 101 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/pdm-dialog.c | 393 |
7 files changed, 265 insertions, 491 deletions
diff --git a/configure.ac b/configure.ac index 717d9a752..0d9bb6df1 100644 --- a/configure.ac +++ b/configure.ac @@ -102,6 +102,7 @@ LIBNOTIFY_REQUIRED=0.4 DBUS_GLIB_REQUIRED=0.35 WEBKIT_GTK_REQUIRED=1.1.11 LIBSOUP_GNOME_REQUIRED=2.26.0 +GNOME_KEYRING_REQUIRED=2.26.0 PKG_CHECK_EXISTS([libnotify >= $LIBNOTIFY_REQUIRED],[have_libnotify=yes],[have_libnotify=no]) @@ -137,6 +138,7 @@ PKG_CHECK_MODULES([DEPENDENCIES], [ $LIBNOTIFY_PACKAGE webkit-1.0 >= $WEBKIT_GTK_REQUIRED libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED + gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED ]) # **** diff --git a/embed/Makefile.am b/embed/Makefile.am index b1f23303b..f4a49983e 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -26,7 +26,6 @@ INST_H_FILES = \ ephy-embed-shell.h \ ephy-embed-utils.h \ ephy-history.h \ - ephy-password-manager.h \ ephy-permission-manager.h \ ephy-web-view.h @@ -51,7 +50,6 @@ libephyembed_la_SOURCES = \ ephy-encodings.c \ ephy-favicon-cache.c \ ephy-history.c \ - ephy-password-manager.c \ ephy-permission-manager.c \ ephy-embed-prefs.c \ ephy-web-view.c \ diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index b41850a2a..f3f99965d 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -26,7 +26,6 @@ #include "ephy-file-helpers.h" #include "ephy-marshal.h" #include "ephy-signal-accumulator.h" -#include "ephy-password-manager.h" #include "ephy-permission-manager.h" #ifdef ENABLE_CERTIFICATE_MANAGER @@ -50,7 +49,6 @@ enum { static void ephy_embed_single_init (EphyEmbedSingle *single); static void ephy_embed_single_class_init (EphyEmbedSingleClass *klass); static void ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface); -static void ephy_password_manager_iface_init (EphyPasswordManagerIface *iface); #ifdef ENABLE_CERTIFICATE_MANAGER static void ephy_certificate_manager_iface_init (EphyCertificateManagerIface *iface); #endif @@ -96,16 +94,12 @@ ephy_embed_single_set_property (GObject *object, #ifdef ENABLE_CERTIFICATE_MANAGER G_DEFINE_TYPE_WITH_CODE (EphyEmbedSingle, ephy_embed_single, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (EPHY_TYPE_PASSWORD_MANAGER, - ephy_password_manager_iface_init) G_IMPLEMENT_INTERFACE (EPHY_TYPE_CERTIFICATE_MANAGER, ephy_certificate_manager_iface_init) G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER, ephy_permission_manager_iface_init)) #else G_DEFINE_TYPE_WITH_CODE (EphyEmbedSingle, ephy_embed_single, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (EPHY_TYPE_PASSWORD_MANAGER, - ephy_password_manager_iface_init) G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER, ephy_permission_manager_iface_init)) #endif @@ -289,38 +283,6 @@ ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface) iface->list = impl_permission_manager_list; } -static GList * -impl_list_passwords (EphyPasswordManager *manager) -{ - return NULL; -} - -static void -impl_remove_password (EphyPasswordManager *manager, - EphyPasswordInfo *info) -{ -} - -static void -impl_remove_all_passwords (EphyPasswordManager *manager) -{ -} - -static void -impl_add_password (EphyPasswordManager *manager, - EphyPasswordInfo *info) -{ -} - -static void -ephy_password_manager_iface_init (EphyPasswordManagerIface *iface) -{ - iface->add = impl_add_password; - iface->remove = impl_remove_password; - iface->remove_all = impl_remove_all_passwords; - iface->list = impl_list_passwords; -} - #ifdef ENABLE_CERTIFICATE_MANAGER static gboolean diff --git a/embed/ephy-password-manager.c b/embed/ephy-password-manager.c deleted file mode 100644 index aa757c7e4..000000000 --- a/embed/ephy-password-manager.c +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright © 2003 Marco Pesenti Gritti - * Copyright © 2003 Christian Persch - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "config.h" - -#include "ephy-password-manager.h" -#include "ephy-marshal.h" -#include "ephy-debug.h" - -/* EphyPasswordInfo */ - -GType -ephy_password_info_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) - { - type = g_boxed_type_register_static ("EphyPasswordInfo", - (GBoxedCopyFunc) ephy_password_info_copy, - (GBoxedFreeFunc) ephy_password_info_free); - } - - return type; -} - -/** - * ephy_password_info_new: - * @host: a host name - * @username: a user name - * @password: a password, or NULL - * - * Generates a new #EphyPasswordInfo. - * - * Return value: the new password info. - **/ -EphyPasswordInfo * -ephy_password_info_new (const char *host, - const char *username, - const char *password) -{ - EphyPasswordInfo *info = g_slice_new0 (EphyPasswordInfo); - - info->host = g_strdup (host); - info->username = g_strdup (username); - info->password = g_strdup (password); - - return info; -} - -/** - * ephy_password_info_copy: - * @info: a #EphyPasswordInfo - * - * Return value: a copy of @info - **/ -EphyPasswordInfo * -ephy_password_info_copy (const EphyPasswordInfo *info) -{ - EphyPasswordInfo *copy = g_slice_new0 (EphyPasswordInfo); - - copy->host = g_strdup (info->host); - copy->username = g_strdup (info->username); - copy->password = g_strdup (info->password); - copy->httpRealm = g_strdup (info->httpRealm); - copy->passwordField = g_strdup (info->passwordField); - copy->usernameField = g_strdup (info->usernameField); - copy->formSubmitURL = g_strdup (info->formSubmitURL); - - return copy; -} - -/** - * ephy_password_info_free: - * @info: - * - * Frees @info. - **/ -void -ephy_password_info_free (EphyPasswordInfo *info) -{ - if (info != NULL) - { - g_free (info->host); - g_free (info->username); - g_free (info->password); - g_slice_free (EphyPasswordInfo, info); - } -} - -/* EphyPasswordManager */ - -static void ephy_password_manager_base_init (gpointer g_class); - -GType -ephy_password_manager_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) - { - const GTypeInfo our_info = - { - sizeof (EphyPasswordManagerIface), - ephy_password_manager_base_init, - NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, - "EphyPasswordManager", - &our_info, - (GTypeFlags) 0); - } - - return type; -} - -static void -ephy_password_manager_base_init (gpointer g_class) -{ - static gboolean initialised = FALSE; - - if (initialised == FALSE) - { - /** - * EphyPasswordManager::changed - * @manager: the #EphyPermissionManager - * - * The ::passwords-changed signal is emitted when the list of passwords - * has changed. - */ - g_signal_new ("passwords-changed", - EPHY_TYPE_PASSWORD_MANAGER, - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyPasswordManagerIface, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - initialised = TRUE; - } -} - -/** - * ephy_password_manager_add_password: - * @manager: the #EphyPasswordManager - * @info: a #EphyPasswordInfo - * - * Adds the password entry @info to the the passwords database. - **/ -void -ephy_password_manager_add_password (EphyPasswordManager *manager, - EphyPasswordInfo *info) -{ - EphyPasswordManagerIface *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); - iface->add (manager, info); -} - -/** - * ephy_password_manager_remove_password: - * @manager: the #EphyPasswordManager - * @info: a #EphyPasswordInfo - * - * Removes the password entry @info from the passwords database. - **/ -void -ephy_password_manager_remove_password (EphyPasswordManager *manager, - EphyPasswordInfo *info) -{ - EphyPasswordManagerIface *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); - iface->remove (manager, info); -} - -/** - * ephy_password_manager_remove_all_passwords: - * @manager: the #EphyPasswordManager - * - * Removes all the password entries from the password database. - **/ -void -ephy_password_manager_remove_all_passwords (EphyPasswordManager *manager) -{ - EphyPasswordManagerIface *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); - iface->remove_all (manager); -} - -/** - * ephy_password_manager_list_passwords: - * @manager: the #EphyPasswordManager - * - * Lists all password entries in the passwords database. - * - * Return value: the list of password entries - **/ -GList * -ephy_password_manager_list_passwords(EphyPasswordManager *manager) -{ - EphyPasswordManagerIface *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); - return iface->list (manager); -} diff --git a/embed/ephy-password-manager.h b/embed/ephy-password-manager.h deleted file mode 100644 index 8e8b7bc3b..000000000 --- a/embed/ephy-password-manager.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright © 2003 Marco Pesenti Gritti - * Copyright © 2003 Christian Persch - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - -#ifndef EPHY_PASSWORD_MANAGER_H -#define EPHY_PASSWORD_MANAGER_H - -#include <glib-object.h> -#include <glib.h> - -G_BEGIN_DECLS - -#define EPHY_TYPE_PASSWORD_MANAGER (ephy_password_manager_get_type ()) -#define EPHY_PASSWORD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManager)) -#define EPHY_PASSWORD_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIface)) -#define EPHY_IS_PASSWORD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PASSWORD_MANAGER)) -#define EPHY_IS_PASSWORD_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PASSWORD_MANAGER)) -#define EPHY_PASSWORD_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIface)) - -#define EPHY_TYPE_PASSWORD_INFO (ephy_password_info_get_type ()) - -typedef struct _EphyPasswordManager EphyPasswordManager; -typedef struct _EphyPasswordManagerIface EphyPasswordManagerIface; - -typedef struct -{ - char *host; - char *username; - char *password; - - char *httpRealm; - char *formSubmitURL; - char *usernameField; - char *passwordField; -} EphyPasswordInfo; - -struct _EphyPasswordManagerIface -{ - GTypeInterface base_iface; - - /* Signals */ - void (* changed) (EphyPasswordManager *manager); - - /* Methods */ - void (* add) (EphyPasswordManager *manager, - EphyPasswordInfo *info); - void (* remove) (EphyPasswordManager *manager, - EphyPasswordInfo *info); - void (* remove_all) (EphyPasswordManager *manager); - GList * (* list) (EphyPasswordManager *manager); -}; - -/* EphyPasswordInfo */ - -GType ephy_password_info_get_type (void); - -EphyPasswordInfo *ephy_password_info_new (const char *host, - const char *username, - const char *password); - -EphyPasswordInfo *ephy_password_info_copy (const EphyPasswordInfo *info); - -void ephy_password_info_free (EphyPasswordInfo *info); - -/* EphyPasswordManager */ - -GType ephy_password_manager_get_type (void); - -void ephy_password_manager_add_password (EphyPasswordManager *manager, - EphyPasswordInfo *info); - -void ephy_password_manager_remove_password (EphyPasswordManager *manager, - EphyPasswordInfo *info); - -void ephy_password_manager_remove_all_passwords (EphyPasswordManager *manager); - -GList * ephy_password_manager_list_passwords (EphyPasswordManager *manager); - -G_END_DECLS - -#endif diff --git a/src/Makefile.am b/src/Makefile.am index 85e3a37bb..46f531aae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,6 +27,7 @@ NOINST_H_FILES = \ ephy-lockdown.h \ ephy-location-action.h \ ephy-navigation-action.h \ + ephy-password-info.h \ ephy-profile-migration.h \ ephy-tabs-menu.h \ ephy-toolbars-model.h \ @@ -74,6 +75,7 @@ libephymain_la_SOURCES = \ ephy-lockdown.c \ ephy-navigation-action.c \ ephy-notebook.c \ + ephy-password-info.c \ ephy-profile-migration.c \ ephy-session.c \ ephy-shell.c \ diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index c262fdff4..ebc5edc36 100644 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -2,7 +2,8 @@ * Copyright © 2002 Jorn Baayen * Copyright © 2003 Marco Pesenti Gritti * Copyright © 2003, 2004 Christian Persch - * Copyright © 2009 Igalia S.L., Author: Xan Lopez <xlopez@igalia.com> + * Copyright © 2009 Igalia S.L. + * Copyright © 2009 Holger Hans Peter Freyther * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +26,6 @@ #include "pdm-dialog.h" #include "ephy-shell.h" #include "ephy-file-helpers.h" -#include "ephy-password-manager.h" #include "ephy-gui.h" #include "ephy-state.h" #include "ephy-string.h" @@ -35,17 +35,20 @@ #include "ephy-embed-single.h" #include "ephy-favicon-cache.h" #include "ephy-history.h" +#include "ephy-password-info.h" #include <gtk/gtk.h> #include <glib/gi18n.h> #include <libsoup/soup.h> #include <webkit/webkit.h> +#include <gnome-keyring.h> +#include <gnome-keyring-memory.h> #include <string.h> #include <time.h> typedef struct PdmActionInfo PdmActionInfo; - + struct PdmActionInfo { /* Methods */ @@ -70,6 +73,13 @@ struct PdmActionInfo gboolean delete_row_on_remove; }; +typedef struct PdmCallBackData PdmCallBackData; +struct PdmCallBackData +{ + guint key; + GtkListStore *store; +}; + #define EPHY_PDM_DIALOG_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_PDM_DIALOG, PdmDialogPrivate)) struct PdmDialogPrivate @@ -99,7 +109,7 @@ enum COL_PASSWORDS_HOST, COL_PASSWORDS_USER, COL_PASSWORDS_PASSWORD, - COL_PASSWORDS_DATA + COL_PASSWORDS_DATA, }; enum @@ -138,10 +148,7 @@ EphyDialogProperty properties [] = static void pdm_dialog_class_init (PdmDialogClass *klass); static void pdm_dialog_init (PdmDialog *dialog); static void pdm_dialog_finalize (GObject *object); - -static void passwords_changed_cb (EphyPasswordManager *manager, - PdmDialog *dialog); - +static void pdm_dialog_password_remove (PdmActionInfo *info, gpointer data); G_DEFINE_TYPE (PdmDialog, pdm_dialog, EPHY_TYPE_DIALOG) @@ -216,6 +223,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) @@ -246,41 +277,39 @@ clear_all_dialog_response_cb (GtkDialog *dialog, SoupCookieJar *jar; jar = get_cookie_jar (); - clear_all_cookies (jar); } if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_passwords))) { - EphyPasswordManager *manager; - - manager = EPHY_PASSWORD_MANAGER (ephy_embed_shell_get_embed_single - (EPHY_EMBED_SHELL (ephy_shell))); - - /* we don't remove the password from the liststore in the callback - * like we do for cookies, since the callback doesn't carry that - * information, and we'd have to reload the whole list, losing the - * selection in the process. - */ - - if (EPHY_IS_PDM_DIALOG (checkbuttons->dialog)) - { - g_signal_handlers_block_by_func - (manager, G_CALLBACK (passwords_changed_cb), - EPHY_PDM_DIALOG (checkbuttons->dialog)); - } + GtkTreeIter iter; + PdmDialog *pdialog = EPHY_PDM_DIALOG (checkbuttons->dialog); + PdmActionInfo *pinfo = pdialog->priv->passwords; + + gboolean valid = gtk_tree_model_get_iter_first (pinfo->model, &iter); + + while (valid) { + 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); - /* Flush the list */ - ephy_password_manager_remove_all_passwords (manager); + gnome_keyring_item_delete (GNOME_KEYRING_DEFAULT, + info->keyring_id, + (GnomeKeyringOperationDoneCallback) pdm_dialog_password_remove_cb, + row, + (GDestroyNotify) gtk_tree_row_reference_free); - if (EPHY_IS_PDM_DIALOG (checkbuttons->dialog)) - { - g_signal_handlers_unblock_by_func - (manager, G_CALLBACK (passwords_changed_cb), - EPHY_PDM_DIALOG (checkbuttons->dialog)); + valid = gtk_tree_model_iter_next (pinfo->model, &iter); - /* And now refresh explicitly */ - passwords_changed_cb (manager, EPHY_PDM_DIALOG (checkbuttons->dialog)); + g_slice_free (EphyPasswordInfo, info); + gtk_tree_path_free (path); } } if (gtk_toggle_button_get_active @@ -309,7 +338,7 @@ clear_all_dialog_checkbutton_toggled_cb (GtkToggleButton *toggle, { GtkWidget *dialog; dialog = gtk_widget_get_toplevel (GTK_WIDGET (toggle)); - + if (gtk_toggle_button_get_active (toggle) == TRUE) { data->num_checked++; @@ -321,6 +350,7 @@ clear_all_dialog_checkbutton_toggled_cb (GtkToggleButton *toggle, gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, data->num_checked != 0); } + void pdm_dialog_show_clear_all_dialog (EphyDialog *edialog, GtkWidget *parent, @@ -409,7 +439,7 @@ pdm_dialog_show_clear_all_dialog (EphyDialog *edialog, { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); } - + /* Cache */ check = gtk_check_button_new_with_mnemonic (_("_Temporary files")); checkbuttons->checkbutton_cache = check; @@ -491,14 +521,14 @@ pdm_cmd_delete_selection (PdmActionInfo *action) } /* Intelligent selection logic, no actual selection yet */ - - path = gtk_tree_row_reference_get_path + + path = gtk_tree_row_reference_get_path ((GtkTreeRowReference *) g_list_first (rlist)->data); - + gtk_tree_model_get_iter (model, &iter, path); gtk_tree_path_free (path); iter2 = iter; - + if (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter)) { path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter); @@ -513,16 +543,13 @@ pdm_cmd_delete_selection (PdmActionInfo *action) } } gtk_tree_path_free (path); - + /* Removal */ - for (r = rlist; r != NULL; r = r->next) { GValue val = { 0, }; - path = gtk_tree_row_reference_get_path - ((GtkTreeRowReference *)r->data); - + path = gtk_tree_row_reference_get_path ((GtkTreeRowReference *)r->data); gtk_tree_model_get_iter (model, &iter, path); gtk_tree_model_get_value (model, &iter, action->data_col, &val); action->remove (action, g_value_get_boxed (&val)); @@ -534,6 +561,7 @@ pdm_cmd_delete_selection (PdmActionInfo *action) gtk_list_store_remove (GTK_LIST_STORE (model), &iter); } + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); gtk_tree_row_reference_free ((GtkTreeRowReference *)r->data); gtk_tree_path_free (path); } @@ -543,7 +571,6 @@ pdm_cmd_delete_selection (PdmActionInfo *action) g_list_free (rlist); /* Selection */ - if (row_ref != NULL) { path = gtk_tree_row_reference_get_path (row_ref); @@ -627,7 +654,7 @@ show_cookies_properties (PdmDialog *dialog, GTK_WINDOW (parent), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, 0, NULL); - ephy_state_add_window (GTK_WIDGET (gdialog), "cookie_properties", + ephy_state_add_window (GTK_WIDGET (gdialog), "cookie_properties", -1, -1, FALSE, EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION); gtk_dialog_set_has_separator (GTK_DIALOG(gdialog), FALSE); @@ -740,8 +767,7 @@ cookies_properties_clicked_cb (GtkWidget *button, GtkTreeSelection *selection; selection = gtk_tree_view_get_selection (dialog->priv->cookies->treeview); - l = gtk_tree_selection_get_selected_rows - (selection, &model); + l = gtk_tree_selection_get_selected_rows (selection, &model); path = (GtkTreePath *)l->data; gtk_tree_model_get_iter (model, &iter, path); @@ -964,7 +990,7 @@ cookie_host_to_iter (GtkTreeModel *model, /* Start on the \0 */ p = key1 + len; q = key2 + strlen (key2); - + do { if (*p == '.') ++n; @@ -1050,7 +1076,7 @@ pdm_dialog_fill_cookies_list (PdmActionInfo *info) gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (info->model), COL_COOKIES_HOST_KEY, GTK_SORT_ASCENDING); - + info->filled = TRUE; g_signal_connect (jar, "changed", @@ -1109,11 +1135,8 @@ pdm_dialog_cookie_remove (PdmActionInfo *info, gpointer data) { SoupCookie *cookie = (SoupCookie *) data; - SoupCookieJar *jar; - jar = get_cookie_jar(); - - soup_cookie_jar_delete_cookie (jar, cookie); + soup_cookie_jar_delete_cookie (get_cookie_jar(), cookie); } static void @@ -1140,6 +1163,70 @@ pdm_dialog_cookie_scroll_to (PdmActionInfo *info) } /* "Passwords" tab */ +static void +passwords_data_func_get_item_cb (GnomeKeyringResult result, + GnomeKeyringItemInfo *info, + 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)) { + EphyPasswordInfo *epinfo; + GValue val = {0, }; + + gtk_tree_model_get_value (model, &iter, COL_PASSWORDS_DATA, &val); + epinfo = g_value_get_boxed (&val); + epinfo->secret = gnome_keyring_memory_strdup (gnome_keyring_item_info_get_secret (info)); + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COL_PASSWORDS_DATA, epinfo, + COL_PASSWORDS_PASSWORD, epinfo->secret, -1); + g_value_unset (&val); + } + } +} + +static void +passwords_data_func (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, + GtkTreeModel *model, GtkTreeIter *iter, gpointer data) +{ + GValue val = { 0, }; + EphyPasswordInfo *info; + + if (!gtk_tree_view_column_get_visible (tree_column)) + return; + + gtk_tree_model_get_value (model, iter, COL_PASSWORDS_DATA, &val); + info = g_value_get_boxed (&val); + + if (info->secret == NULL) { + GtkTreePath *path; + GtkTreeRowReference *rowref; + + path = gtk_tree_model_get_path (model, iter); + rowref = gtk_tree_row_reference_new (model, path); + + gnome_keyring_item_get_info_full (GNOME_KEYRING_DEFAULT, + info->keyring_id, + GNOME_KEYRING_ITEM_INFO_SECRET, + (GnomeKeyringOperationGetItemInfoCallback) passwords_data_func_get_item_cb, + rowref, + (GDestroyNotify) gtk_tree_row_reference_free); + gtk_tree_path_free (path); + } + g_value_unset (&val); +} static void passwords_show_toggled_cb (GtkWidget *button, @@ -1154,7 +1241,7 @@ passwords_show_toggled_cb (GtkWidget *button, column = gtk_tree_view_get_column (treeview, COL_PASSWORDS_PASSWORD); active = gtk_toggle_button_get_active ((GTK_TOGGLE_BUTTON (button))); - + gtk_tree_view_column_set_visible (column, active); } @@ -1185,6 +1272,7 @@ pdm_dialog_passwords_construct (PdmActionInfo *info) G_TYPE_STRING, G_TYPE_STRING, EPHY_TYPE_PASSWORD_INFO); + gtk_tree_view_set_model (treeview, GTK_TREE_MODEL(liststore)); gtk_tree_view_set_headers_visible (treeview, TRUE); selection = gtk_tree_view_get_selection (treeview); @@ -1207,6 +1295,7 @@ pdm_dialog_passwords_construct (PdmActionInfo *info) gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); gtk_tree_view_column_set_sort_column_id (column, COL_PASSWORDS_HOST); + renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (treeview, COL_PASSWORDS_USER, _("User Name"), @@ -1219,6 +1308,7 @@ pdm_dialog_passwords_construct (PdmActionInfo *info) gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); gtk_tree_view_column_set_sort_column_id (column, COL_PASSWORDS_USER); + renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (treeview, COL_PASSWORDS_PASSWORD, _("User Password"), @@ -1226,100 +1316,151 @@ pdm_dialog_passwords_construct (PdmActionInfo *info) "text", COL_PASSWORDS_PASSWORD, NULL); column = gtk_tree_view_get_column (treeview, COL_PASSWORDS_PASSWORD); - /* Hide this info by default */ + gtk_tree_view_column_set_cell_data_func (column, + renderer, + passwords_data_func, + info, + NULL); + /* Initially shown as hidden colum */ gtk_tree_view_column_set_visible (column, FALSE); gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_column_set_reorderable (column, TRUE); gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_column_set_sort_column_id (column, COL_PASSWORDS_PASSWORD); info->treeview = treeview; - setup_action (info); } static void -passwords_changed_cb (EphyPasswordManager *manager, - PdmDialog *dialog) +pdm_dialog_fill_passwords_list_async_cb (GnomeKeyringResult result, + GList *list, + gpointer data) { - GtkTreeModel *model = dialog->priv->passwords->model; + GList *l; + PdmActionInfo *info = (PdmActionInfo *)data; - LOG ("passwords changed"); + if (result != GNOME_KEYRING_RESULT_OK) + return; - /* since the callback doesn't carry any information about what - * exactly has changed, we have to rebuild the list from scratch. - */ - gtk_list_store_clear (GTK_LIST_STORE (model)); + for (l = list; l != NULL; l = l->next) + info->add (info, l->data); - /* And turn off sorting */ - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), - GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, + info->filled = TRUE; + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (info->model), + COL_PASSWORDS_HOST, GTK_SORT_ASCENDING); - - dialog->priv->passwords->fill (dialog->priv->passwords); } static void pdm_dialog_fill_passwords_list (PdmActionInfo *info) { - EphyPasswordManager *manager; - GList *list, *l; - - manager = EPHY_PASSWORD_MANAGER (ephy_embed_shell_get_embed_single - (EPHY_EMBED_SHELL (ephy_shell))); + gnome_keyring_list_item_ids (GNOME_KEYRING_DEFAULT, + pdm_dialog_fill_passwords_list_async_cb, + info, + NULL); +} - list = ephy_password_manager_list_passwords (manager); +static void +pdm_dialog_passwords_destruct (PdmActionInfo *info) +{ +} - for (l = list; l != NULL; l = l->next) - { - info->add (info, l->data); - } +static void +pdm_dialog_password_add_item_attrs_cb (GnomeKeyringResult result, + GnomeKeyringAttributeList *attributes, + gpointer data) +{ + EphyPasswordInfo *pinfo; + PdmCallBackData *cbdata; + GnomeKeyringAttribute *attribute; + gchar *user, *host, *protocol; + GtkTreeIter iter; + int i; - /* the element data has been consumed, so we need only to free the list */ - g_list_free (list); + if (result != GNOME_KEYRING_RESULT_OK) + return; - /* Let's get notified when the list changes */ - if (info->filled == FALSE) - { - g_signal_connect (manager, "passwords-changed", - G_CALLBACK (passwords_changed_cb), info->dialog); - } + cbdata = (PdmCallBackData *)data; + + user = host = protocol = NULL; + attribute = (GnomeKeyringAttribute *) attributes->data; + for (i = 0; i < attributes->len; ++i) { + if (attribute[i].type == GNOME_KEYRING_ATTRIBUTE_TYPE_STRING) { + if (strcmp (attribute[i].name, "server") == 0) + host = g_strdup (attribute[i].value.string); + else if (strcmp (attribute[i].name, "user") == 0) + user = g_strdup (attribute[i].value.string); + else if (strcmp (attribute[i].name, "protocol") == 0) + protocol = attribute[i].value.string; + } + } + if (!protocol || strncmp("http", protocol, 4) != 0) + return; - info->filled = TRUE; + pinfo = ephy_password_info_new (cbdata->key); + if (!pinfo) + return; - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (info->model), - COL_PASSWORDS_HOST, - GTK_SORT_ASCENDING); + gtk_list_store_append (cbdata->store, &iter); + gtk_list_store_set (cbdata->store, &iter, + COL_PASSWORDS_HOST, host, + COL_PASSWORDS_USER, user, + COL_PASSWORDS_PASSWORD, NULL, + COL_PASSWORDS_DATA, pinfo, + -1); } static void -pdm_dialog_passwords_destruct (PdmActionInfo *info) +pdm_dialog_password_add_item_info_cb (GnomeKeyringResult result, + GnomeKeyringItemInfo *info, + gpointer data) { + if (result != GNOME_KEYRING_RESULT_OK) + return; + + if (gnome_keyring_item_info_get_type (info) == GNOME_KEYRING_ITEM_NETWORK_PASSWORD) { + PdmCallBackData *cbdata = (PdmCallBackData *)data; + gnome_keyring_item_get_attributes (GNOME_KEYRING_DEFAULT, + cbdata->key, + (GnomeKeyringOperationGetAttributesCallback) pdm_dialog_password_add_item_attrs_cb, + g_memdup (cbdata, sizeof (PdmCallBackData)), + (GDestroyNotify) g_free); + + } + } static void pdm_dialog_password_add (PdmActionInfo *info, gpointer data) { - EphyPasswordInfo *pinfo = (EphyPasswordInfo *) data; - GtkListStore *store; - GtkTreeIter iter; - GValue value = { 0, }; + PdmCallBackData *cbdata; + guint key_id = GPOINTER_TO_UINT(data); - store = GTK_LIST_STORE (info->model); + /* + * We have the item id of the password. We will have to check if this + * password entry is of the right type and then can proceed to get the + * the private information. Seahorse is treating every protocol that + * starts with http as Web Access and we will do the same here. + */ - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, - &iter, - COL_PASSWORDS_HOST, pinfo->host, - COL_PASSWORDS_USER, pinfo->username, - COL_PASSWORDS_PASSWORD, pinfo->password, - -1); + cbdata = g_malloc (sizeof (PdmCallBackData)); + cbdata->key = key_id; + cbdata->store = GTK_LIST_STORE (info->model); + + /* Get the type of the key_id */ + gnome_keyring_item_get_info_full (GNOME_KEYRING_DEFAULT, + key_id, + GNOME_KEYRING_ITEM_INFO_BASICS, + (GnomeKeyringOperationGetItemInfoCallback) pdm_dialog_password_add_item_info_cb, + cbdata, + (GDestroyNotify) g_free); +} - g_value_init (&value, EPHY_TYPE_PASSWORD_INFO); - g_value_take_boxed (&value, pinfo); - gtk_list_store_set_value (store, &iter, COL_PASSWORDS_DATA, &value); - g_value_unset (&value); +static void +pdm_dialog_password_remove_dummy_cb (GnomeKeyringResult result, + gpointer data) +{ } static void @@ -1327,23 +1468,12 @@ pdm_dialog_password_remove (PdmActionInfo *info, gpointer data) { EphyPasswordInfo *pinfo = (EphyPasswordInfo *) data; - EphyPasswordManager *manager; - manager = EPHY_PASSWORD_MANAGER (ephy_embed_shell_get_embed_single - (EPHY_EMBED_SHELL (ephy_shell))); - - /* we don't remove the password from the liststore in the callback - * like we do for cookies, since the callback doesn't carry that - * information, and we'd have to reload the whole list, losing the - * selection in the process. - */ - g_signal_handlers_block_by_func - (manager, G_CALLBACK (passwords_changed_cb), info->dialog); - - ephy_password_manager_remove_password (manager, pinfo); - - g_signal_handlers_unblock_by_func - (manager, G_CALLBACK (passwords_changed_cb), info->dialog); + gnome_keyring_item_delete (GNOME_KEYRING_DEFAULT, + pinfo->keyring_id, + (GnomeKeyringOperationDoneCallback) pdm_dialog_password_remove_dummy_cb, + NULL, + NULL); } /* common routines */ @@ -1360,7 +1490,6 @@ sync_notebook_tab (GtkWidget *notebook, if (page_num == 0 && priv->cookies->filled == FALSE) { priv->cookies->fill (priv->cookies); - priv->cookies->scroll_to (priv->cookies); } else if (page_num == 1 && priv->passwords->filled == FALSE) @@ -1383,7 +1512,7 @@ pdm_dialog_response_cb (GtkDialog *widget, { int page; GtkWidget *parent; - + parent = ephy_dialog_get_control (EPHY_DIALOG (dialog), properties[PROP_WINDOW].id); @@ -1391,14 +1520,14 @@ pdm_dialog_response_cb (GtkDialog *widget, if (page == 0) { /* Cookies */ - pdm_dialog_show_clear_all_dialog (EPHY_DIALOG (dialog), + pdm_dialog_show_clear_all_dialog (EPHY_DIALOG (dialog), parent, CLEAR_ALL_COOKIES); } if (page == 1) { /* Passwords */ pdm_dialog_show_clear_all_dialog (EPHY_DIALOG (dialog), - parent, CLEAR_ALL_PASSWORDS); + parent, CLEAR_ALL_PASSWORDS); } return; } |