Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim

Commits: afb2fb1f by Philipp Hörist at 2017-01-23T12:26:50+01:00 Include msg kind when merging nicknames

When two users had the same nickname merging was not working correctly

- - - - - 243ab148 by Philipp Hörist at 2017-01-23T12:40:08+01:00 Merge branch 'gajim_0.16' into 'gajim_0.16'

Fix chat_merge_consecutive_nickname

See merge request !34 - - - - -

1 changed file:

- src/conversation_textview.py

Changes:

===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -218,9 +218,10 @@ class ConversationTextview(gobject.GObject): # It's True when we scroll in the code, so we can detect scroll from user self.auto_scrolling = False

- # This holds the last Nickname we received a msg from + # Holds the last Nickname and Kind # for chat_merge_consecutive_nickname feature self.last_msg_name = None + self.last_msg_kind = None

# connect signals id_ = self.tv.connect('motion_notify_event', @@ -1329,7 +1330,8 @@ class ConversationTextview(gobject.GObject): mark1 = mark else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): - if self.last_msg_name != name or self.just_cleared: + if (self.last_msg_kind != kind or self.last_msg_name != name or + self.just_cleared): # Textview is empty or this is a msg from a new user # Print the Nickname self.print_name(name, kind, other_tags_for_name, @@ -1343,6 +1345,7 @@ class ConversationTextview(gobject.GObject): # Save the last Chatname so we know if we have to # print the nickname on the next message self.last_msg_name = name + self.last_msg_kind = kind else: self.print_name(name, kind, other_tags_for_name, direction_mark=direction_mark, iter_=end_iter)

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/23443819a2cfa970d8aa46c35ffa214d15...