Merge back from master

[empathy.git] / src / empathy-chat-window.c

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index fb5a5c796f6c3495b3f0061e96d2f0284fce6892..5f81ac167b5aade48d4183c40a141192f6ae61e8 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -35,7 +35,6 @@
 #include <libnotify/notification.h>
 
 #include <telepathy-glib/util.h>
-#include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>
@@ -1268,7 +1267,7 @@ chat_window_drag_data_received (GtkWidget        *widget,
                strv = g_strsplit (id, "/", 2);
                account_id = strv[0];
                contact_id = strv[1];
-               account = empathy_account_manager_lookup (account_manager, account_id);
+               account = empathy_account_manager_get_account (account_manager, account_id);
                chat = empathy_chat_window_find_chat (account, contact_id);
 
                if (!chat) {
@@ -1281,11 +1280,9 @@ chat_window_drag_data_received (GtkWidget        *widget,
                                        connection, contact_id, NULL, NULL);
                        }
 
-                       g_object_unref (account);
                        g_strfreev (strv);
                        return;
                }
-               g_object_unref (account);
                g_object_unref (account_manager);
                g_strfreev (strv);
 
@@ -1777,7 +1774,7 @@ empathy_chat_window_find_chat (EmpathyAccount   *account,
 
                        chat = ll->data;
 
-                       if (empathy_account_equal (account, empathy_chat_get_account (chat)) &&
+                       if (account == empathy_chat_get_account (chat) &&
                            !tp_strdiff (id, empathy_chat_get_id (chat))) {
                                return chat;
                        }