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

coding standard

This commit is contained in:
Yann Leboulanger 2008-11-30 21:32:59 +00:00
parent 1d4455bc20
commit e9b1726e99
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/conversation_textview.py
View File

@ -1253,8 +1253,7 @@ class ConversationTextview:
# note that color of /me may be overwritten in gc_control # note that color of /me may be overwritten in gc_control
text_tags.append(other_text_tag) text_tags.append(other_text_tag)
else: # not status nor /me else: # not status nor /me
if gajim.config.get( if gajim.config.get('chat_merge_consecutive_nickname'):
'chat_merge_consecutive_nickname'):
if kind != old_kind: if kind != old_kind:
self.print_name(name, kind, other_tags_for_name) self.print_name(name, kind, other_tags_for_name)
else: else:
@ -1332,17 +1331,17 @@ class ConversationTextview:
buffer.insert(end_iter, subject) buffer.insert(end_iter, subject)
self.print_empty_line() self.print_empty_line()
def print_real_text(self, text, text_tags = [], name = None, xhtml = None): def print_real_text(self, text, text_tags=[], name=None, xhtml=None):
'''this adds normal and special text. call this to add text''' '''this adds normal and special text. call this to add text'''
if xhtml: if xhtml:
try: try:
if name and (text.startswith('/me ') or text.startswith('/me\n')): if name and (text.startswith('/me ') or text.startswith('/me\n')):
xhtml = xhtml.replace('/me', '<dfn>%s</dfn>'% (name,), 1) xhtml = xhtml.replace('/me', '<dfn>%s</dfn>' % (name,), 1)
self.tv.display_html(xhtml.encode('utf-8')) self.tv.display_html(xhtml.encode('utf-8'))
return return
except Exception, e: except Exception, e:
gajim.log.debug(str('Error processing xhtml')+str(e)) gajim.log.debug(str('Error processing xhtml') + str(e))
gajim.log.debug(str('with |'+xhtml+'|')) gajim.log.debug(str('with |' + xhtml + '|'))
buffer = self.tv.get_buffer() buffer = self.tv.get_buffer()
# /me is replaced by name if name is given # /me is replaced by name if name is given