r24668 - in /desktop/unstable/epiphany-browser/debian: changelog patches/13_accept-languages.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jul  3 00:27:38 2010
New Revision: 24668

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24668
Log:
13_accept-languages.patch: patch from Mario Sanchez Prada, with a 
small modification. Set the accept-languages string correctly.

Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=24668&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Sat Jul  3 00:27:38 2010
@@ -3,8 +3,8 @@
   * Stop renaming help files paths. Closes: #586721.
   * Drop type-handling usage. Closes: #587864.
   * Bump standards version accordingly.
-  * 13_accept-languages.patch: patch from Mario Sanchez Prada, approved 
-    by upstream. Set the accept-languages string correctly.
+  * 13_accept-languages.patch: patch from Mario Sanchez Prada, with a 
+    small modification. Set the accept-languages string correctly.
     Closes: #570142.
   * Switch to 3.0 source package format.
   * Move the packaging to use quilt.
@@ -13,7 +13,7 @@
   * Add to it a pair of missing renames: g_set_prgname (used by 
     bug-buddy) and the --help message.
 
- -- Josselin Mouette <joss at debian.org>  Fri, 02 Jul 2010 21:35:39 +0200
+ -- Josselin Mouette <joss at debian.org>  Sat, 03 Jul 2010 01:38:24 +0200
 
 epiphany-browser (2.30.2-2) unstable; urgency=low
 

Modified: desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch?rev=24668&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/13_accept-languages.patch [utf-8] Sat Jul  3 00:27:38 2010
@@ -1,22 +1,10 @@
-From 8c6de6244609ade75abc3830bd9a1d9904618743 Mon Sep 17 00:00:00 2001
-From: Mario Sanchez Prada <msanchez at igalia.com>
-Date: Thu, 18 Mar 2010 17:35:44 +0100
-Subject: [PATCH] Set the quality values (qv) for the accept-languages string
-
-Make sure every item in the list of preferred languages gets an
-appropriate qv value according to the RFC2616, to better define the
-actual selection made by the user.
-
-Bug #602547
----
- embed/ephy-embed-prefs.c |   51 ++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 47 insertions(+), 4 deletions(-)
-
-diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
-index 125cdde..cf79309 100644
---- a/embed/ephy-embed-prefs.c
-+++ b/embed/ephy-embed-prefs.c
-@@ -278,6 +278,48 @@ webkit_pref_callback_font_family (GConfClient *client,
+Debian #570142
+GNOME #602547
+Index: epiphany-2.30.2/embed/ephy-embed-prefs.c
+===================================================================
+--- epiphany-2.30.2.orig/embed/ephy-embed-prefs.c	2010-07-03 01:44:43.275611283 +0200
++++ epiphany-2.30.2/embed/ephy-embed-prefs.c	2010-07-03 02:08:48.128112573 +0200
+@@ -278,6 +278,49 @@ webkit_pref_callback_font_family (GConfC
    }
  }
  
@@ -46,8 +34,9 @@
 +    gint quality = 100 - i * delta;
 +
 +    if (quality > 0 && quality < 100) {
-+      double qvalue = quality / 100.0;
-+      langs[i] = g_strdup_printf ("%s;q=%.2g", lang, qvalue);
++      gchar buf[8];
++      g_ascii_formatd (buf, 8, "%.2f", quality/100.0);
++      langs[i] = g_strdup_printf ("%s;q=%s", lang, buf);
 +    } else {
 +      /* Just dup the string in this case */
 +      langs[i] = g_strdup (lang);
@@ -65,7 +54,7 @@
  /* Based on Christian Persch's code from gecko backend of epiphany
     (old transform_accept_languages_list() function) */
  static void
-@@ -290,7 +332,7 @@ webkit_pref_callback_accept_languages (GConfClient *client,
+@@ -290,7 +333,7 @@ webkit_pref_callback_accept_languages (G
    GConfValue *gcvalue;
    GArray *array;
    GSList *languages, *l;
@@ -74,7 +63,7 @@
    char *langs_str;
    char *webkit_pref;
  
-@@ -318,14 +360,15 @@ webkit_pref_callback_accept_languages (GConfClient *client,
+@@ -318,14 +361,15 @@ webkit_pref_callback_accept_languages (G
  
    ephy_langs_sanitise (array);
  
@@ -93,6 +82,3 @@
    g_free (langs_str);
  }
  
--- 
-1.7.0
-