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

[Geobert] fix chat_merge_consecutive_nickname after textview is cleared.

Browse source
This commit is contained in:
Yann Leboulanger 2010-02-26 22:42:36 +01:00
parent c9f31ec966
commit e5e5a0363f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/conversation_textview.py
View file

@ -703,6 +703,7 @@ class ConversationTextview(gobject.GObject):
size = 2 * size - 1 size = 2 * size - 1
self.marks_queue = Queue.Queue(size) self.marks_queue = Queue.Queue(size)
self.focus_out_end_mark = None self.focus_out_end_mark = None
self.just_cleared = True
def visit_url_from_menuitem(self, widget, link): def visit_url_from_menuitem(self, widget, link):
""" """
@ -1167,6 +1168,7 @@ class ConversationTextview(gobject.GObject):
buffer_ = self.tv.get_buffer() buffer_ = self.tv.get_buffer()
end_iter = buffer_.get_end_iter() end_iter = buffer_.get_end_iter()
buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol')
self.just_cleared = False
def print_conversation_line(self, text, jid, kind, name, tim, def print_conversation_line(self, text, jid, kind, name, tim,
other_tags_for_name=[], other_tags_for_time=[], other_tags_for_name=[], other_tags_for_time=[],
@ -1246,7 +1248,7 @@ class ConversationTextview(gobject.GObject):
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('chat_merge_consecutive_nickname'): if gajim.config.get('chat_merge_consecutive_nickname'):
if kind != old_kind: if kind != old_kind or self.just_cleared:
self.print_name(name, kind, other_tags_for_name) self.print_name(name, kind, other_tags_for_name)
else: else:
self.print_real_text(gajim.config.get( self.print_real_text(gajim.config.get(
@ -1269,6 +1271,7 @@ class ConversationTextview(gobject.GObject):
else: else:
gobject.idle_add(self.scroll_to_end) gobject.idle_add(self.scroll_to_end)
self.just_cleared = False
buffer_.end_user_action() buffer_.end_user_action()
def get_time_to_show(self, tim): def get_time_to_show(self, tim):