copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed TB in notification area on long nonascii 

status messages
This commit is contained in:
Dimitur Kirov 2005-08-17 14:14:32 +00:00
parent eda8c90779
commit 2094f6bf11
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tooltips.py
View File

@ -138,8 +138,10 @@ class StatusTable:
if status: if status:
status = status.strip() status = status.strip()
if status != '': if status != '':
# make sure 'status' is unicode before we send to to reduce_chars...
if type(status) == str:
status = unicode(status, encoding='utf-8')
if gtk.gtk_version < (2, 6, 0) or gtk.pygtk_version < (2, 6, 0): if gtk.gtk_version < (2, 6, 0) or gtk.pygtk_version < (2, 6, 0):
# FIXME: check and do the same if we have more than one \n
status = gtkgui_helpers.reduce_chars_newlines(status, 50, 1) status = gtkgui_helpers.reduce_chars_newlines(status, 50, 1)
else: else:
status = gtkgui_helpers.reduce_chars_newlines(status, 0, 1) status = gtkgui_helpers.reduce_chars_newlines(status, 0, 1)
@ -218,7 +220,12 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable):
iconset = 'sun' iconset = 'sun'
file_path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16') file_path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
for acct in accounts: for acct in accounts:
message = gtkgui_helpers.reduce_chars_newlines(acct['message'], 50, 1) message = acct['message']
# before reducing the chars we should assure we send unicode, else
# there are possible pango TBs on 'set_markup'
if type(message) == str:
message = unicode(message, encoding='utf-8')
message = gtkgui_helpers.reduce_chars_newlines(message, 50, 1)
message = gtkgui_helpers.escape_for_pango_markup(message) message = gtkgui_helpers.escape_for_pango_markup(message)
self.add_status_row(file_path, acct['show'], '<span weight="bold">' + self.add_status_row(file_path, acct['show'], '<span weight="bold">' +
gtkgui_helpers.escape_for_pango_markup(acct['name']) + '</span>' gtkgui_helpers.escape_for_pango_markup(acct['name']) + '</span>'