changeset b3973c2aadd7 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=b3973c2aadd7
description: [Geobert] fix chat_merge_consecutive_nickname after textview is
cleared.
diffstat:
src/conversation_textview.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diffs (36 lines):
diff -r 4c83e84e4377 -r b3973c2aadd7 src/conversation_textview.py
--- a/src/conversation_textview.py Fri Feb 26 18:54:42 2010 +0100
+++ b/src/conversation_textview.py Fri Feb 26 22:42:36 2010 +0100
@@ -703,6 +703,7 @@
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):
"""
@@ -1167,6 +1168,7 @@
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=[],
@@ -1246,7 +1248,7 @@
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(
@@ -1269,6 +1271,7 @@
else:
gobject.idle_add(self.scroll_to_end)
+ self.just_cleared = False
buffer_.end_user_action()
def get_time_to_show(self, tim):
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
