Move chat chandler into the same process than contact list

[empathy.git] / libempathy-gtk / empathy-chatrooms-window.c

diff --git a/libempathy-gtk/empathy-chatrooms-window.c b/libempathy-gtk/empathy-chatrooms-window.c
index 9a0d125ed622f5d51d78ad12f45988415de34721..7855f3cf3b2eef5c5a0e3ab364aec79d4ed538b7 100644 (file)
--- a/libempathy-gtk/empathy-chatrooms-window.c
+++ b/libempathy-gtk/empathy-chatrooms-window.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2004-2007 Imendio AB
- * Copyright (C) 2007 Collabora Ltd.
+ * Copyright (C) 2007-2008 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -154,10 +154,10 @@ empathy_chatrooms_window_show (GtkWindow *parent)
        empathy_account_chooser_set_filter (EMPATHY_ACCOUNT_CHOOSER (window->account_chooser),
                                            empathy_account_chooser_filter_is_connected,
                                            NULL);
-       empathy_account_chooser_set_account (EMPATHY_ACCOUNT_CHOOSER (window->account_chooser), NULL);
        g_object_set (window->account_chooser, 
                      "has-all-option", TRUE,
                      NULL);
+       empathy_account_chooser_set_account (EMPATHY_ACCOUNT_CHOOSER (window->account_chooser), NULL);
 
        gtk_box_pack_start (GTK_BOX (window->hbox_account),
                            window->account_chooser,
@@ -188,6 +188,12 @@ static void
 chatrooms_window_destroy_cb (GtkWidget             *widget,
                             EmpathyChatroomsWindow *window)
 {
+       g_signal_handlers_disconnect_by_func (window->manager,
+                                             chatrooms_window_chatroom_added_cb,
+                                             window);
+       g_signal_handlers_disconnect_by_func (window->manager,
+                                             chatrooms_window_chatroom_removed_cb,
+                                             window);
        g_object_unref (window->manager);
        g_free (window);
 }