Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
24320c89
by Philipp Hörist at 2017-11-19T14:34:04+01:00
2 changed files:
Changes:
| ... | ... | @@ -313,8 +313,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): |
| 313 | 313 |
self.was_at_the_end = True
|
| 314 | 314 |
self.correcting = False
|
| 315 | 315 |
self.last_sent_msg = None
|
| 316 |
- self.last_received_txt = {} # one per name
|
|
| 317 |
- self.last_received_id = {} # one per name
|
|
| 318 | 316 |
|
| 319 | 317 |
# add MessageTextView to UI and connect signals
|
| 320 | 318 |
self.msg_textview = MessageTextView()
|
| ... | ... | @@ -970,10 +968,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): |
| 970 | 968 |
|
| 971 | 969 |
if not count_as_new:
|
| 972 | 970 |
return
|
| 973 |
- if kind in ('incoming', 'incoming_queue', 'outgoing'):
|
|
| 974 |
- self.last_received_txt[name] = text
|
|
| 975 |
- if correct_id:
|
|
| 976 |
- self.last_received_id[name] = correct_id[0]
|
|
| 977 | 971 |
if kind == 'incoming':
|
| 978 | 972 |
if not self.type_id == message_control.TYPE_GC or \
|
| 979 | 973 |
app.config.get('notify_on_all_muc_messages') or \
|
| ... | ... | @@ -1743,13 +1743,6 @@ class GroupchatControl(ChatControlBase): |
| 1743 | 1743 |
tv.last_received_message_id[obj.new_nick] = \
|
| 1744 | 1744 |
tv.last_received_message_id[obj.nick]
|
| 1745 | 1745 |
del tv.last_received_message_id[obj.nick]
|
| 1746 |
- if obj.nick in self.last_received_txt:
|
|
| 1747 |
- self.last_received_txt[obj.new_nick] = \
|
|
| 1748 |
- self.last_received_txt[obj.nick]
|
|
| 1749 |
- del self.last_received_txt[obj.nick]
|
|
| 1750 |
- self.last_received_id[obj.new_nick] = \
|
|
| 1751 |
- self.last_received_id[obj.nick]
|
|
| 1752 |
- del self.last_received_id[obj.nick]
|
|
| 1753 | 1746 |
# We add new nick to muc roster here, so we don't see
|
| 1754 | 1747 |
# that "new_nick has joined the room" when he just changed
|
| 1755 | 1748 |
# nick.
|