diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2010-02-27 00:42:36 +0300 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2010-02-27 00:42:36 +0300 |
| commit | 3de7f769516ab4fda370622c9177ea0379b3d90e (patch) | |
| tree | 83574584ca49b73a343460c9931d291562a4b1b9 | |
| parent | 2ca38f5be61acc6cf658a5f68d14e9a47b477b02 (diff) | |
[Geobert] fix chat_merge_consecutive_nickname after textview is cleared.
| -rw-r--r-- | src/conversation_textview.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/conversation_textview.py b/src/conversation_textview.py index 4aa981297..6ca66281b 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -696,6 +696,8 @@ class ConversationTextview(gobject.GObject): size = 2 * size - 1 self.marks_queue = Queue.Queue(size) self.focus_out_end_mark = None + self.just_cleared = True + def visit_url_from_menuitem(self, widget, link): '''basically it filters out the widget instance''' @@ -1164,6 +1166,7 @@ class ConversationTextview(gobject.GObject): buffer_ = self.tv.get_buffer() end_iter = buffer_.get_end_iter() buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') + self.just_cleared = False def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], @@ -1240,7 +1243,7 @@ class ConversationTextview(gobject.GObject): text_tags.append(other_text_tag) else: # not status nor /me 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) else: self.print_real_text(gajim.config.get( @@ -1263,6 +1266,7 @@ class ConversationTextview(gobject.GObject): else: gobject.idle_add(self.scroll_to_end) + self.just_cleared = False buffer_.end_user_action() def get_time_to_show(self, tim): |