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

make clearer what we do

Browse source
This commit is contained in:
Nikos Kouremenos 2006-03-25 11:12:31 +00:00
parent 2f503fa7bf
commit 4c2f8d9400
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/chat_control.py
View file

@ -906,7 +906,7 @@ class ChatControl(ChatControlBase):
status = contact.status status = contact.status
if status is not None: if status is not None:
banner_name_label.set_ellipsize(pango.ELLIPSIZE_END) banner_name_label.set_ellipsize(pango.ELLIPSIZE_END)
status = gtkgui_helpers.reduce_chars_newlines(status, 0, 2) status = gtkgui_helpers.reduce_chars_newlines(status, max_lines = 2)
status_escaped = gtkgui_helpers.escape_for_pango_markup(status) status_escaped = gtkgui_helpers.escape_for_pango_markup(status)
#FIXME: uncomment me when we support sending messages to specific resource #FIXME: uncomment me when we support sending messages to specific resource

2
src/groupchat_control.py
View file

@ -553,7 +553,7 @@ class GroupchatControl(ChatControlBase):
self.subject = subject self.subject = subject
self.name_label.set_ellipsize(pango.ELLIPSIZE_END) self.name_label.set_ellipsize(pango.ELLIPSIZE_END)
subject = gtkgui_helpers.reduce_chars_newlines(subject, 0, 2) subject = gtkgui_helpers.reduce_chars_newlines(subject, max_lines = 2)
subject = gtkgui_helpers.escape_for_pango_markup(subject) subject = gtkgui_helpers.escape_for_pango_markup(subject)
font_attrs, font_attrs_small = self.get_font_attrs() font_attrs, font_attrs_small = self.get_font_attrs()
text = '<span %s>%s</span>' % (font_attrs, self.room_jid) text = '<span %s>%s</span>' % (font_attrs, self.room_jid)

10
src/tooltips.py
View file

@ -1,11 +1,8 @@
## tooltips.py ## tooltips.py
## ##
## Copyright (C) 2005-2006 Gajim Team ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov@gmail.com>
## ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
## Contributors for this file: ## Copyright (C) 2005-2006 Yann Le Boulanger <asterix@lagaule.org>
## - Dimitur Kirov <dkirov@gmail.com>
## - Yann Le Boulanger <asterix@lagaule.org>
## - Nikos Kouremenos <kourem@gmail.com>
## ##
## This program is free software; you can redistribute it and/or modify ## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published ## it under the terms of the GNU General Public License as published
@ -185,6 +182,7 @@ class StatusTable:
# make sure 'status' is unicode before we send to to reduce_chars # make sure 'status' is unicode before we send to to reduce_chars
if isinstance(status, str): if isinstance(status, str):
status = unicode(status, encoding='utf-8') status = unicode(status, encoding='utf-8')
# reduce to 200 chars, 1 line
status = gtkgui_helpers.reduce_chars_newlines(status, 200, 1) status = gtkgui_helpers.reduce_chars_newlines(status, 200, 1)
str_status += ' - ' + status str_status += ' - ' + status
return gtkgui_helpers.escape_for_pango_markup(str_status) return gtkgui_helpers.escape_for_pango_markup(str_status)