correctly handle resources when chat window get focus. Fixes #1785

src/chat_control.py

@@ -531,7 +531,7 @@ class ChatControlBase(MessageControl):
 					self.parent_win.redraw_tab(self)
 					self.parent_win.show_title()
 					if gajim.interface.systray_enabled:
-						gajim.interface.systray.remove_jid(jid,
+						gajim.interface.systray.remove_jid(self.get_full_jid(),
 										self.account,
 										self.type_id)
 			self.msg_textview.grab_focus()

src/message_window.py

@@ -260,7 +260,7 @@ class MessageWindow:
 
 		# Update external state
 		if gajim.interface.systray_enabled:
-			gajim.interface.systray.remove_jid(ctrl.contact.jid, ctrl.account,
+			gajim.interface.systray.remove_jid(ctrl.get_full_jid(), ctrl.account,
 				ctrl.type_id)
 		del gajim.last_message_time[ctrl.account][ctrl.get_full_jid()]