r22280 - in /desktop/unstable/alacarte/debian: changelog patches/03-bind_textdomain_codeset.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Nov 11 15:56:21 2009
New Revision: 22280

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22280
Log:
03-bind_textdomain_codeset.patch: patch from Matt Kraai. Set the 
character set to UTF-8 since this is what GTK+ expects.
Closes: #552528.

Added:
    desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch
Modified:
    desktop/unstable/alacarte/debian/changelog

Modified: desktop/unstable/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/changelog?rev=22280&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/changelog [utf-8] (original)
+++ desktop/unstable/alacarte/debian/changelog [utf-8] Wed Nov 11 15:56:21 2009
@@ -1,3 +1,11 @@
+alacarte (0.12.4-2) UNRELEASED; urgency=low
+
+  * 03-bind_textdomain_codeset.patch: patch from Matt Kraai. Set the 
+    character set to UTF-8 since this is what GTK+ expects.
+    Closes: #552528.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 11 Nov 2009 16:53:52 +0100
+
 alacarte (0.12.4-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch?rev=22280&op=file
==============================================================================
--- desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch (added)
+++ desktop/unstable/alacarte/debian/patches/03-bind_textdomain_codeset.patch [utf-8] Wed Nov 11 15:56:21 2009
@@ -1,0 +1,23 @@
+Debian #552528
+
+diff -Nur -x '*.orig' -x '*~' alacarte-0.12.4/Alacarte/MainWindow.py alacarte-0.12.4.new/Alacarte/MainWindow.py
+--- alacarte-0.12.4/Alacarte/MainWindow.py	2009-09-08 07:24:13.000000000 -0700
++++ alacarte-0.12.4.new/Alacarte/MainWindow.py	2009-11-10 04:58:47.000000000 -0800
+@@ -18,13 +18,14 @@
+ 
+ import gtk, gmenu, gobject, gio
+ import cgi, os
+-import gettext
++import gettext, locale
+ import subprocess
+ import urllib
+ try:
+ 	from Alacarte import config
+-	gettext.bindtextdomain(GETTEXT_PACKAGE,config.localedir)
+-	gettext.textdomain(GETTEXT_PACKAGE)
++	gettext.bindtextdomain(config.GETTEXT_PACKAGE,config.localedir)
++	gettext.textdomain(config.GETTEXT_PACKAGE)
++	locale.bind_textdomain_codeset(config.GETTEXT_PACKAGE,'UTF-8')
+ except:
+ 	pass
+ _ = gettext.gettext