[ChatroomManager] find windows by channel path, not by TargetID

Otherwise two separate channels with the same TargetID (i.e. SMSChannel = False
and SMSChannel = True) will not result in two separate chat windows in Empathy.

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=644085

1 files changed, 4 insertions, 6 deletions

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index cfa38ec84..4ff6b7d30 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -119,18 +119,16 @@ process_tp_chat (EmpathyTpChat *tp_chat,
     gint64 user_action_time)
 {
   EmpathyChat *chat = NULL;
-  const gchar *id;
+  const char *channel_path;
 
   tell_chatroom_manager_if_needed (account, tp_chat);
 
-  id = empathy_tp_chat_get_id (tp_chat);
-  if (!tp_str_empty (id))
-    {
-      chat = empathy_chat_window_find_chat (account, id);
-    }
+  channel_path = empathy_tp_chat_get_channel_path (tp_chat);
+  chat = empathy_chat_window_find_chat_by_channel (channel_path);
 
   if (chat != NULL)
     {
+      DEBUG ("found chat %p for path %s", chat, channel_path);
       empathy_chat_set_tp_chat (chat, tp_chat);
     }
   else