summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-04-09 16:40:52 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-04-09 16:40:52 +0000
commit2023fac5c5e144fe20c1c7574b41446176c15b89 (patch)
tree70c4710b7ffd727eec08f4e0830aa597995436b1
parentc3e7a78a7017c9af9f412fd65d5dc65b5595695d (diff)
downloaddeluge-2023fac5c5e144fe20c1c7574b41446176c15b89.tar.gz
deluge-2023fac5c5e144fe20c1c7574b41446176c15b89.tar.bz2
deluge-2023fac5c5e144fe20c1c7574b41446176c15b89.zip
Fix #883 segfault if locale is not using UTF-8 encoding
-rw-r--r--ChangeLog4
-rw-r--r--deluge/ui/gtkui/gtkui.py2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e660177d..ad9a26b7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+=== Deluge 1.1.7 - (In Development) ===
+==== GtkUI ====
+ * Fix #883 segfault if locale is not using UTF-8 encoding
+
=== Deluge 1.1.6 - (06 April 2009) ===
==== Core ====
* Fix udp trackers being classified as DHT source
diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index ac405d598..d780ac153 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -138,6 +138,8 @@ class GtkUI:
gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
gettext.textdomain("deluge")
gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n"))
+ gtk.glade.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
+ gtk.glade.textdomain("deluge")
except Exception, e:
log.error("Unable to initialize gettext/locale!")
log.exception(e)