changeset 01881561712e in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=01881561712e description: [Dicson and I] fix some unicode issues
diffstat:
src/common/helpers.py | 12 ++++++++++++ src/tooltips.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-)
diffs (46 lines):
diff -r e55ebbfa86c7 -r 01881561712e src/common/helpers.py --- a/src/common/helpers.py Sun Dec 30 23:29:51 2012 +0100 +++ b/src/common/helpers.py Sun Dec 30 23:47:31 2012 +0100 @@ -46,6 +46,7 @@ import socket import time
+from gi.repository import GObject from encodings.punycode import punycode_encode from string import Template
@@ -474,6 +475,17 @@ pass return string
+def wrapped_ensure_utf8_string(fn): + def wrapped(n): + return ensure_utf8_string(n) + return wrapped + +@wrapped_ensure_utf8_string +def escape_text(text): + return GObject.markup_escape_text(text) + +GObject.markup_escape_text = escape_text + def get_windows_reg_env(varname, default=''): """ Ask for paths commonly used but not exposed as ENVs in english Windows 2003 diff -r e55ebbfa86c7 -r 01881561712e src/tooltips.py --- a/src/tooltips.py Sun Dec 30 23:29:51 2012 +0100 +++ b/src/tooltips.py Sun Dec 30 23:47:31 2012 +0100 @@ -487,11 +487,11 @@ vcard_current_row = 1 properties = []
- name_markup = u'<span weight="bold">' + \ + name_markup = '<span weight="bold">' + \ GObject.markup_escape_text(prim_contact.get_shown_name())\ + '</span>' if gajim.config.get('mergeaccounts'): - name_markup += u" <span foreground='%s'>(%s)</span>" % ( + name_markup += " <span foreground='%s'>(%s)</span>" % ( gajim.config.get('tooltip_account_name_color'), GObject.markup_escape_text(prim_contact.account.name))