r16298 - in /desktop/unstable/epiphany-browser/debian: changelog patches/04_proxy_password.patch patches/16_embed_passwords.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun 21 09:01:26 2008
New Revision: 16298

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16298
Log:
* 16_embed_passwords.patch: patch from Mike Hommey to fix typos 
  causing passwords not being correctly removed from the password 
  manager. Closes: #487160.
* 04_proxy_password.patch: change the patch to still work with gecko 
  1.8 so that it is suitable for upstream.

Added:
    desktop/unstable/epiphany-browser/debian/patches/16_embed_passwords.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=16298&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Sat Jun 21 09:01:26 2008
@@ -2,8 +2,13 @@
 
   * epiphany-browser.README.Debian: explain how to change the backend. 
     Closes: #487147.
-
- -- Josselin Mouette <joss at debian.org>  Fri, 20 Jun 2008 10:25:28 +0200
+  * 16_embed_passwords.patch: patch from Mike Hommey to fix typos 
+    causing passwords not being correctly removed from the password 
+    manager. Closes: #487160.
+  * 04_proxy_password.patch: change the patch to still work with gecko 
+    1.8 so that it is suitable for upstream.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 21 Jun 2008 10:45:08 +0200
 
 epiphany-browser (2.22.2-3) unstable; urgency=low
 

Modified: desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch?rev=16298&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch Sat Jun 21 09:01:26 2008
@@ -1,15 +1,18 @@
 Index: epiphany-2.22.2/embed/mozilla/EphyPromptService.cpp
 ===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/EphyPromptService.cpp	2008-06-15 13:57:15.153819339 +0200
-+++ epiphany-2.22.2/embed/mozilla/EphyPromptService.cpp	2008-06-15 14:02:12.030320193 +0200
-@@ -995,8 +995,8 @@ MakeDialogText(nsIChannel* aChannel, nsI
+--- epiphany-2.22.2.orig/embed/mozilla/EphyPromptService.cpp	2008-05-26 19:56:35.000000000 +0200
++++ epiphany-2.22.2/embed/mozilla/EphyPromptService.cpp	2008-06-21 10:50:30.386428093 +0200
+@@ -995,8 +995,13 @@ MakeDialogText(nsIChannel* aChannel, nsI
      displayHost.AppendInt(port);
    }
  
--  NS_NAMED_LITERAL_STRING(proxyText, "EnterUserPasswordForProxy");
--  NS_NAMED_LITERAL_STRING(originText, "EnterUserPasswordForRealm");
++#ifdef HAVE_GECKO_1_9
 +  NS_NAMED_LITERAL_STRING(proxyText, "EnterLoginForProxy");
 +  NS_NAMED_LITERAL_STRING(originText, "EnterLoginForRealm");
++#else
+   NS_NAMED_LITERAL_STRING(proxyText, "EnterUserPasswordForProxy");
+   NS_NAMED_LITERAL_STRING(originText, "EnterUserPasswordForRealm");
++#endif /* HAVE_GECKO_1_9 */
    NS_NAMED_LITERAL_STRING(noRealmText, "EnterUserPasswordFor");
    NS_NAMED_LITERAL_STRING(passwordText, "EnterPasswordFor");
  

Added: desktop/unstable/epiphany-browser/debian/patches/16_embed_passwords.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/16_embed_passwords.patch?rev=16298&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/16_embed_passwords.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/16_embed_passwords.patch Sat Jun 21 09:01:26 2008
@@ -1,0 +1,22 @@
+Index: epiphany-2.22.2/embed/mozilla/mozilla-embed-single.cpp
+===================================================================
+--- epiphany-2.22.2.orig/embed/mozilla/mozilla-embed-single.cpp	2008-06-21 10:43:23.809927169 +0200
++++ epiphany-2.22.2/embed/mozilla/mozilla-embed-single.cpp	2008-06-21 10:44:38.998636139 +0200
+@@ -1090,7 +1090,7 @@ impl_remove_password (EphyPasswordManage
+ 
+         if (info->host)
+           NS_CStringToUTF16 (nsCString(info->host),
+-                            NS_CSTRING_ENCODING_UTF8, userName);
++                            NS_CSTRING_ENCODING_UTF8, host);
+         else
+           host.SetIsVoid (PR_TRUE);
+ 
+@@ -1104,7 +1104,7 @@ impl_remove_password (EphyPasswordManage
+           NS_CStringToUTF16 (nsCString(info->httpRealm),
+                             NS_CSTRING_ENCODING_UTF8, httpRealm);
+         else
+-          userName.SetIsVoid (PR_TRUE);
++          httpRealm.SetIsVoid (PR_TRUE);
+ 
+         if (info->password)
+           NS_CStringToUTF16 (nsCString(info->password),

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=16298&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Sat Jun 21 09:01:26 2008
@@ -15,4 +15,5 @@
 13_extensions_need_xpcom.patch
 14_contenthandler_api.patch
 15_certificates_oldapi.patch
+16_embed_passwords.patch
 99_autoreconf.patch