diego

From 502c0887eed6a1c4a4cea52411d086cfc2a027b6 Mon Sep 17 00:00:00 2001From: Diego Escalante Urrelo <descalante@igalia.com>Date: Mon, 15 Mar 2010 17:57:16 -0500Subject: [PATCH] migration: be more strict with handle_forms checkTry harder to prevent that HTTP auth info is set as form data and vice versa.--- lib/ephy-profile-migration.c |    7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)diff --git a/lib/ephy-profile-migration.c b/lib/ephy-profile-migration.cindex fd717cc..a690782 100644--- a/lib/ephy-profile-migration.c+++ b/lib/ephy-profile-migration.c@@ -292,7 +292,8 @@ parse_and_decrypt_signons (const char *signons,           begin++;       } -      if (handle_forms && username && password && +      if (handle_forms && !realm &&+          username && password &&           !g_str_equal (form_username, "") &&           !g_str_equal (form_password, "*")) {         char *u = soup_uri_to_string (uri, FALSE);@@ -303,7 +304,9 @@ parse_and_decrypt_signons (const char *signons,                                             username,                                             password);         g_free (u);-      } else if (!handle_forms && username && password) {+      } else if (!handle_forms && realm &&+                 username && password &&+                 form_username == NULL && form_password == NULL) {         gnome_keyring_set_network_password_sync (NULL,                                                  username,                                                  realm,-- 1.7.0