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

Revert [9196]. Escape pep stuff in tooltips the right way.

This commit is contained in:
Jean-Marie Traissard 2007-12-27 15:53:42 +00:00
parent a67683919a
commit a467a1d48d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tooltips.py
View File

@ -503,6 +503,7 @@ class RosterTooltip(NotificationAreaTooltip):
mood_string = _('Mood:') + ' <b>%s</b>' % contact.mood['mood'].strip() mood_string = _('Mood:') + ' <b>%s</b>' % contact.mood['mood'].strip()
if contact.mood.has_key('text') and contact.mood['text'] != '': if contact.mood.has_key('text') and contact.mood['text'] != '':
mood_string += ' (%s)' % contact.mood['text'].strip() mood_string += ' (%s)' % contact.mood['text'].strip()
mood_string = gobject.markup_escape_text(mood_string)
properties.append((mood_string, None)) properties.append((mood_string, None))
if contact.activity.has_key('activity'): if contact.activity.has_key('activity'):
@ -516,6 +517,7 @@ class RosterTooltip(NotificationAreaTooltip):
if contact.activity.has_key('text'): if contact.activity.has_key('text'):
activity_text = contact.activity['text'].strip() activity_text = contact.activity['text'].strip()
activity_string += ' (%s)' % activity_text activity_string += ' (%s)' % activity_text
activity_string = gobject.markup_escape_text(activity_string)
properties.append((activity_string, None)) properties.append((activity_string, None))
if contact.tune.has_key('artist') or contact.tune.has_key('title'): if contact.tune.has_key('artist') or contact.tune.has_key('title'):
@ -533,6 +535,7 @@ class RosterTooltip(NotificationAreaTooltip):
source = _('Unknown Source') source = _('Unknown Source')
tune_string = _('Tune:') + ' ' + _('<b>"%(title)s"</b> by <i>%(artist)s</i>\nfrom <i>%(source)s</i>' %\ tune_string = _('Tune:') + ' ' + _('<b>"%(title)s"</b> by <i>%(artist)s</i>\nfrom <i>%(source)s</i>' %\
{'title': title, 'artist': artist, 'source': source}) {'title': title, 'artist': artist, 'source': source})
tune_string = gobject.markup_escape_text(tune_string)
properties.append((tune_string, None)) properties.append((tune_string, None))
if contact.status: if contact.status:
@ -592,8 +595,7 @@ class RosterTooltip(NotificationAreaTooltip):
vertical_fill, 0, 0) vertical_fill, 0, 0)
else: else:
if isinstance(property[0], (unicode, str)): #FIXME: rm unicode? if isinstance(property[0], (unicode, str)): #FIXME: rm unicode?
markup = gobject.markup_escape_text(property[0]) label.set_markup(property[0])
label.set_markup(markup)
label.set_line_wrap(True) label.set_line_wrap(True)
else: else:
label = property[0] label = property[0]