Merge branch 'master' into mc5

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

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 8dcb68d2f62ea70799eb03ac9ae142b8515271ae..822f228268820fa7d3be7ced6500fc4ff1cb77c9 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>
@@ -1000,12 +999,11 @@ chat_window_set_highlight_room_tab_label (EmpathyChat *chat)
        gchar *markup;
        GtkWidget *widget;
 
-       if (empathy_chat_is_room (chat) == FALSE)
+       if (!empathy_chat_is_room (chat))
                return;
 
-       markup = g_markup_printf_escaped ("<span color=\"%s\">%s</span>",
-                       "red",
-                       empathy_chat_get_name (chat));
+       markup = g_markup_printf_escaped ("<span color=\"red\">%s</span>",
+               empathy_chat_get_name (chat));
 
        widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
        gtk_label_set_markup (GTK_LABEL (widget), markup);
@@ -1270,7 +1268,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) {
@@ -1283,11 +1281,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);
 
@@ -1779,7 +1775,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;
                        }