epiphany r8596 - branches/gnome-2-24/embed/mozilla

[jmouette svn gnome org]

Author: jmouette
Date: Wed Oct 22 06:59:37 2008
New Revision: 8596
URL: http://svn.gnome.org/viewvc/epiphany?rev=8596&view=rev

Log:
Convert strings to UTF16 before passing them to nsIPrintSettings with 
Gecko 1.9.

Analysis by Vincent Caron, fixes bug #549361.


Modified:
   branches/gnome-2-24/embed/mozilla/GeckoPrintService.cpp

Modified: branches/gnome-2-24/embed/mozilla/GeckoPrintService.cpp
==============================================================================
--- branches/gnome-2-24/embed/mozilla/GeckoPrintService.cpp	(original)
+++ branches/gnome-2-24/embed/mozilla/GeckoPrintService.cpp	Wed Oct 22 06:59:37 2008
@@ -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 :-) */