r17307 - in /desktop/unstable/epiphany-browser/debian: changelog patches/20_print_garbage.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Oct 21 15:19:47 2008
New Revision: 17307

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17307
Log:
20_print_garbage.patch: pass UTF-16 to Gecko instead of UTF-8 for 
the print headers. Original patch by Vincent Caron. Closes: #492283.

Added:
    desktop/unstable/epiphany-browser/debian/patches/20_print_garbage.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    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=17307&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Tue Oct 21 15:19:47 2008
@@ -1,8 +1,10 @@
-epiphany-browser (2.22.3-5) UNRELEASED; urgency=low
+epiphany-browser (2.22.3-5) unstable; urgency=low
 
   * Fix first changelog entry. Closes: #501357.
-
- -- Josselin Mouette <joss at debian.org>  Tue, 07 Oct 2008 08:59:17 +0200
+  * 20_print_garbage.patch: pass UTF-16 to Gecko instead of UTF-8 for 
+    the print headers. Original patch by Vincent Caron. Closes: #492283.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 21 Oct 2008 17:09:31 +0200
 
 epiphany-browser (2.22.3-4) unstable; urgency=low
 

Added: desktop/unstable/epiphany-browser/debian/patches/20_print_garbage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/20_print_garbage.patch?rev=17307&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/20_print_garbage.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/20_print_garbage.patch Tue Oct 21 15:19:47 2008
@@ -1,0 +1,20 @@
+Debian #492283
+GNOME #549361
+Original patch by Vincent Caron
+
+Index: epiphany-2.22.3/embed/mozilla/GeckoPrintService.cpp
+===================================================================
+--- epiphany-2.22.3.orig/embed/mozilla/GeckoPrintService.cpp	2008-10-21 17:01:36.703320953 +0200
++++ epiphany-2.22.3/embed/mozilla/GeckoPrintService.cpp	2008-10-21 17:07:08.200124248 +0200
+@@ -62,7 +62,11 @@
+ #define CONF_PRINT_PAGE_TITLE           "/apps/epiphany/dialogs/print_page_title"
+ #define CONF_PRINT_PAGE_URL             "/apps/epiphany/dialogs/print_page_url"
+ 
++#ifdef HAVE_GECKO_1_9
++#define LITERAL(s) NS_ConvertUTF8toUTF16(s).get()
++#else
+ #define LITERAL(s) reinterpret_cast<const nsAString::char_type*>(NS_L(s))
++#endif
+ 
+ /* From nsIDeviceContext.h */
+ #define NS_ERROR_GFX_PRINTER_BASE (1) /* adjustable :-) */

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=17307&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Tue Oct 21 15:19:47 2008
@@ -18,4 +18,5 @@
 17_print-scaling.patch
 18_gnome-vfs-for-helper-display.patch
 19_passwords_crash.patch
+20_print_garbage.patch
 99_autoreconf.patch