diff -r -u src/tooltips.py src-sobis/tooltips.py --- src/tooltips.py 2005-11-05 01:32:13.000000000 +0100 +++ src-sobis/tooltips.py 2005-11-06 15:11:32.000000000 +0100 @@ -199,7 +199,7 @@ else: message = message.strip() if message != '': - single_line += ': ' + message + single_line += ':\n' + message # the other solution is to hide offline accounts elif status == 'offline': message = helpers.get_uf_show(status) @@ -221,12 +221,12 @@ iconset = 'sun' file_path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16') for acct in accounts: - message = acct['message'] + message = acct['status_line'] # 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.reduce_chars_newlines(message, 50, 0) message = gtkgui_helpers.escape_for_pango_markup(message) self.add_status_row(file_path, acct['show'], '' + gtkgui_helpers.escape_for_pango_markup(acct['name']) + '' @@ -234,7 +234,7 @@ elif len(accounts) == 1: message = gtkgui_helpers.reduce_chars_newlines(accounts[0]['status_line'], - 50, 1) + 50, 0) message = gtkgui_helpers.escape_for_pango_markup(message) text = _('Gajim - %s') % message else: