]> git.0d.be Git - empathy.git/blobdiff - src/empathy-main-window.c
Merge branch 'debug-window'
[empathy.git] / src / empathy-main-window.c
index 07f4b9f7d828e334a574336fec42937952c49f1b..8fb127b90c2a6b2a93f653724af3e86d5373d1fa 100644 (file)
@@ -15,9 +15,9 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- * 
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
 
 #include <sys/stat.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <glib/gi18n.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-account-manager.h>
+#include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-contact-manager.h>
-#include <libempathy/empathy-contact-factory.h>
 #include <libempathy/empathy-status-presets.h>
 
+#include <libempathy-gtk/empathy-conf.h>
 #include <libempathy-gtk/empathy-contact-dialogs.h>
 #include <libempathy-gtk/empathy-contact-list-store.h>
 #include <libempathy-gtk/empathy-contact-list-view.h>
-#include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-conf.h>
-#include <libempathy-gtk/empathy-log-window.h>
-#include <libempathy-gtk/empathy-new-message-dialog.h>
 #include <libempathy-gtk/empathy-gtk-enum-types.h>
+#include <libempathy-gtk/empathy-new-message-dialog.h>
+#include <libempathy-gtk/empathy-log-window.h>
+#include <libempathy-gtk/empathy-presence-chooser.h>
+#include <libempathy-gtk/empathy-sound.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-accounts-dialog.h"
 #include "empathy-main-window.h"
 #include "ephy-spinner.h"
 #include "empathy-preferences.h"
 #include "empathy-about-dialog.h"
+#include "empathy-debug-window.h"
 #include "empathy-new-chatroom-dialog.h"
+#include "empathy-map-view.h"
 #include "empathy-chatrooms-window.h"
 #include "empathy-event-manager.h"
+#include "empathy-ft-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
@@ -76,7 +79,6 @@
 typedef struct {
        EmpathyContactListView  *list_view;
        EmpathyContactListStore *list_store;
-       MissionControl          *mc;
        EmpathyAccountManager   *account_manager;
        EmpathyChatroomManager  *chatroom_manager;
        EmpathyEventManager     *event_manager;
@@ -90,92 +92,28 @@ typedef struct {
        GtkWidget              *presence_chooser;
        GtkWidget              *errors_vbox;
 
-       GtkWidget              *room;
+       GtkRadioAction         *sort_by_name;
+       GtkRadioAction         *sort_by_status;
+       GtkRadioAction         *normal_with_avatars;
+       GtkRadioAction         *normal_size;
+       GtkRadioAction         *compact_size;
+
+       GtkUIManager           *ui_manager;
+       GtkAction              *view_history;
+       GtkAction              *room_join_favorites;
        GtkWidget              *room_menu;
-       GtkWidget              *room_sep;
-       GtkWidget              *room_join_favorites;
+       GtkWidget              *room_separator;
        GtkWidget              *edit_context;
        GtkWidget              *edit_context_separator;
 
        guint                   size_timeout_id;
        GHashTable             *errors;
 
-       /* Widgets that are enabled when there are connected accounts */
-       GList                  *widgets_connected;
+       /* Actions that are enabled when there are connected accounts */
+       GList                  *actions_connected;
 } EmpathyMainWindow;
 
-static void     main_window_destroy_cb                         (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_favorite_chatroom_menu_setup       (EmpathyMainWindow        *window);
-static void     main_window_favorite_chatroom_menu_added_cb    (EmpathyChatroomManager   *manager,
-                                                               EmpathyChatroom          *chatroom,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_favorite_chatroom_menu_removed_cb  (EmpathyChatroomManager   *manager,
-                                                               EmpathyChatroom          *chatroom,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_favorite_chatroom_menu_activate_cb (GtkMenuItem              *menu_item,
-                                                               EmpathyChatroom          *chatroom);
-static void     main_window_favorite_chatroom_menu_update      (EmpathyMainWindow        *window);
-static void     main_window_favorite_chatroom_menu_add         (EmpathyMainWindow        *window,
-                                                               EmpathyChatroom          *chatroom);
-static void     main_window_favorite_chatroom_join             (EmpathyChatroom          *chatroom);
-static void     main_window_chat_quit_cb                       (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_chat_new_message_cb                (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_chat_history_cb                    (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_room_join_new_cb                   (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_room_join_favorites_cb             (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_room_manage_favorites_cb           (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_chat_add_contact_cb                (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_chat_show_offline_cb               (GtkCheckMenuItem         *item,
-                                                               EmpathyMainWindow        *window);
-static gboolean main_window_edit_button_press_event_cb         (GtkWidget                *widget,
-                                                               GdkEventButton           *event,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_edit_accounts_cb                   (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_edit_personal_information_cb       (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_edit_preferences_cb                (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_help_about_cb                      (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_help_contents_cb                   (GtkWidget                *widget,
-                                                               EmpathyMainWindow        *window);
-static gboolean main_window_throbber_button_press_event_cb     (GtkWidget                *throbber_ebox,
-                                                               GdkEventButton           *event,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_update_status                      (EmpathyMainWindow        *window,
-                                                               EmpathyAccountManager    *manager);
-static void     main_window_error_display                     (EmpathyMainWindow        *window,
-                                                               McAccount                *account,
-                                                               const gchar              *message);
-static void     main_window_accels_load                        (void);
-static void     main_window_accels_save                        (void);
-static void     main_window_connection_items_setup             (EmpathyMainWindow        *window,
-                                                               GladeXML                 *glade);
-static gboolean main_window_configure_event_timeout_cb         (EmpathyMainWindow        *window);
-static gboolean main_window_configure_event_cb                 (GtkWidget                *widget,
-                                                               GdkEventConfigure        *event,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_notify_show_offline_cb             (EmpathyConf              *conf,
-                                                               const gchar              *key,
-                                                               gpointer                  check_menu_item);
-static void     main_window_notify_show_avatars_cb             (EmpathyConf              *conf,
-                                                               const gchar              *key,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_notify_compact_contact_list_cb     (EmpathyConf              *conf,
-                                                               const gchar              *key,
-                                                               EmpathyMainWindow        *window);
-static void     main_window_notify_sort_criterium_cb           (EmpathyConf              *conf,
-                                                               const gchar              *key,
-                                                               EmpathyMainWindow        *window);
+static EmpathyMainWindow *window = NULL;
 
 static void
 main_window_flash_stop (EmpathyMainWindow *window)
@@ -201,7 +139,7 @@ main_window_flash_foreach (GtkTreeModel *model,
                           GtkTreeIter  *iter,
                           gpointer      user_data)
 {
-       FlashForeachData *data = (FlashForeachData*) user_data;
+       FlashForeachData *data = (FlashForeachData *) user_data;
        EmpathyContact   *contact;
        const gchar      *icon_name;
        GtkTreePath      *parent_path = NULL;
@@ -233,7 +171,7 @@ main_window_flash_foreach (GtkTreeModel *model,
 
        /* To make sure the parent is shown correctly, we emit
         * the row-changed signal on the parent so it prompts
-        * it to be refreshed by the filter func. 
+        * it to be refreshed by the filter func.
         */
        if (gtk_tree_model_iter_parent (model, &parent_iter, iter)) {
                parent_path = gtk_tree_model_get_path (model, &parent_iter);
@@ -263,7 +201,7 @@ main_window_flash_cb (EmpathyMainWindow *window)
        events = empathy_event_manager_get_events (window->event_manager);
        for (l = events; l; l = l->next) {
                data.event = l->data;
-               if (!data.event->contact) {
+               if (!data.event->contact || !data.event->must_ack) {
                        continue;
                }
 
@@ -283,10 +221,6 @@ main_window_flash_cb (EmpathyMainWindow *window)
 static void
 main_window_flash_start (EmpathyMainWindow *window)
 {
-       empathy_sound_play (GTK_WIDGET (window->window),
-                           EMPATHY_PREFS_SOUNDS_NEW_CONVERSATION,
-                           "message-new-instant", _("Incoming chat request"));
-
        if (window->flash_timeout_id != 0) {
                return;
        }
@@ -367,9 +301,191 @@ main_window_row_activated_cb (EmpathyContactListView *view,
        g_object_unref (contact);
 }
 
+static void
+main_window_error_edit_clicked_cb (GtkButton         *button,
+                                  EmpathyMainWindow *window)
+{
+       EmpathyAccount *account;
+       GtkWidget *error_widget;
+
+       account = g_object_get_data (G_OBJECT (button), "account");
+       empathy_accounts_dialog_show (GTK_WINDOW (window->window), account);
+
+       error_widget = g_hash_table_lookup (window->errors, account);
+       gtk_widget_destroy (error_widget);
+       g_hash_table_remove (window->errors, account);
+}
+
+static void
+main_window_error_clear_clicked_cb (GtkButton         *button,
+                                   EmpathyMainWindow *window)
+{
+       EmpathyAccount *account;
+       GtkWidget *error_widget;
+
+       account = g_object_get_data (G_OBJECT (button), "account");
+       error_widget = g_hash_table_lookup (window->errors, account);
+       gtk_widget_destroy (error_widget);
+       g_hash_table_remove (window->errors, account);
+}
+
+static void
+main_window_error_display (EmpathyMainWindow *window,
+                          EmpathyAccount    *account,
+                          const gchar       *message)
+{
+       GtkWidget *child;
+       GtkWidget *table;
+       GtkWidget *image;
+       GtkWidget *button_edit;
+       GtkWidget *alignment;
+       GtkWidget *hbox;
+       GtkWidget *label;
+       GtkWidget *fixed;
+       GtkWidget *vbox;
+       GtkWidget *button_close;
+       gchar     *str;
+
+       child = g_hash_table_lookup (window->errors, account);
+       if (child) {
+               label = g_object_get_data (G_OBJECT (child), "label");
+
+               /* Just set the latest error and return */
+               str = g_markup_printf_escaped ("<b>%s</b>\n%s",
+                                              empathy_account_get_display_name (account),
+                                              message);
+               gtk_label_set_markup (GTK_LABEL (label), str);
+               g_free (str);
+
+               return;
+       }
+
+       child = gtk_vbox_new (FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (window->errors_vbox), child, FALSE, TRUE, 0);
+       gtk_container_set_border_width (GTK_CONTAINER (child), 6);
+       gtk_widget_show (child);
+
+       table = gtk_table_new (2, 4, FALSE);
+       gtk_widget_show (table);
+       gtk_box_pack_start (GTK_BOX (child), table, TRUE, TRUE, 0);
+       gtk_table_set_row_spacings (GTK_TABLE (table), 12);
+       gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+
+       image = gtk_image_new_from_stock (GTK_STOCK_DISCONNECT, GTK_ICON_SIZE_MENU);
+       gtk_widget_show (image);
+       gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 2,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (GTK_FILL), 0, 0);
+       gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
+
+       button_edit = gtk_button_new ();
+       gtk_widget_show (button_edit);
+       gtk_table_attach (GTK_TABLE (table), button_edit, 1, 2, 1, 2,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);
+
+       alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
+       gtk_widget_show (alignment);
+       gtk_container_add (GTK_CONTAINER (button_edit), alignment);
+
+       hbox = gtk_hbox_new (FALSE, 2);
+       gtk_widget_show (hbox);
+       gtk_container_add (GTK_CONTAINER (alignment), hbox);
+
+       image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON);
+       gtk_widget_show (image);
+       gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+
+       label = gtk_label_new_with_mnemonic (_("_Edit account"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+       fixed = gtk_fixed_new ();
+       gtk_widget_show (fixed);
+       gtk_table_attach (GTK_TABLE (table), fixed, 2, 3, 1, 2,
+                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                         (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+       vbox = gtk_vbox_new (FALSE, 6);
+       gtk_widget_show (vbox);
+       gtk_table_attach (GTK_TABLE (table), vbox, 3, 4, 0, 2,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+       button_close = gtk_button_new ();
+       gtk_widget_show (button_close);
+       gtk_box_pack_start (GTK_BOX (vbox), button_close, FALSE, FALSE, 0);
+       gtk_button_set_relief (GTK_BUTTON (button_close), GTK_RELIEF_NONE);
+
+
+       image = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+       gtk_widget_show (image);
+       gtk_container_add (GTK_CONTAINER (button_close), image);
+
+       label = gtk_label_new ("");
+       gtk_widget_show (label);
+       gtk_table_attach (GTK_TABLE (table), label, 1, 3, 0, 1,
+                         (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL),
+                         (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), 0, 0);
+       gtk_widget_set_size_request (label, 175, -1);
+       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+       gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
+
+       str = g_markup_printf_escaped ("<b>%s</b>\n%s",
+                                      empathy_account_get_display_name (account),
+                                      message);
+       gtk_label_set_markup (GTK_LABEL (label), str);
+       g_free (str);
+
+       g_object_set_data (G_OBJECT (child), "label", label);
+       g_object_set_data_full (G_OBJECT (button_edit),
+                               "account", g_object_ref (account),
+                               g_object_unref);
+       g_object_set_data_full (G_OBJECT (button_close),
+                               "account", g_object_ref (account),
+                               g_object_unref);
+
+       g_signal_connect (button_edit, "clicked",
+                         G_CALLBACK (main_window_error_edit_clicked_cb),
+                         window);
+
+       g_signal_connect (button_close, "clicked",
+                         G_CALLBACK (main_window_error_clear_clicked_cb),
+                         window);
+
+       gtk_widget_show (window->errors_vbox);
+
+       g_hash_table_insert (window->errors, g_object_ref (account), child);
+}
+
+static void
+main_window_update_status (EmpathyMainWindow *window, EmpathyAccountManager *manager)
+{
+       int  connected;
+       int  connecting;
+       GList *l;
+
+       /* Count number of connected/connecting/disconnected accounts */
+       connected = empathy_account_manager_get_connected_accounts (manager);
+       connecting = empathy_account_manager_get_connecting_accounts (manager);
+
+       /* Update the spinner state */
+       if (connecting > 0) {
+               ephy_spinner_start (EPHY_SPINNER (window->throbber));
+       } else {
+               ephy_spinner_stop (EPHY_SPINNER (window->throbber));
+       }
+
+       /* Update widgets sensibility */
+       for (l = window->actions_connected; l; l = l->next) {
+               gtk_action_set_sensitive (l->data, (connected > 0));
+       }
+}
+
 static void
 main_window_connection_changed_cb (EmpathyAccountManager *manager,
-                                  McAccount *account,
+                                  EmpathyAccount *account,
                                   TpConnectionStatusReason reason,
                                   TpConnectionStatus current,
                                   TpConnectionStatus previous,
@@ -431,16 +547,14 @@ main_window_connection_changed_cb (EmpathyAccountManager *manager,
 
        if (current == TP_CONNECTION_STATUS_DISCONNECTED) {
                empathy_sound_play (GTK_WIDGET (window->window),
-                                   EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT,
-                                   "service-logout", _("Disconnected from server"));
+                                   EMPATHY_SOUND_ACCOUNT_DISCONNECTED);
        }
 
        if (current == TP_CONNECTION_STATUS_CONNECTED) {
                GtkWidget *error_widget;
 
                empathy_sound_play (GTK_WIDGET (window->window),
-                                   EMPATHY_PREFS_SOUNDS_SERVICE_LOGIN,
-                                   "service-login", _("Connected to server"));
+                                   EMPATHY_SOUND_ACCOUNT_CONNECTED);
 
                /* Account connected without error, remove error message if any */
                error_widget = g_hash_table_lookup (window->errors, account);
@@ -454,258 +568,71 @@ main_window_connection_changed_cb (EmpathyAccountManager *manager,
 static void
 main_window_contact_presence_changed_cb (EmpathyContactMonitor *monitor,
                                         EmpathyContact *contact,
-                                        McPresence current,
-                                        McPresence previous,
+                                        TpConnectionPresenceType current,
+                                        TpConnectionPresenceType previous,
                                         EmpathyMainWindow *window)
 {
-       McAccount *account;
+       EmpathyAccount *account;
        gboolean should_play;
 
        account = empathy_contact_get_account (contact);
-       should_play = !empathy_account_manager_is_account_just_connected (window->account_manager, account);
+       should_play = !empathy_account_is_just_connected (account);
 
        if (!should_play) {
                return;
        }
 
-       if (previous < MC_PRESENCE_AVAILABLE && current > MC_PRESENCE_OFFLINE) {
-               /* someone is logging in */
-               empathy_sound_play (GTK_WIDGET (window->window),
-                                   EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN,
-                                   "service-login", _("Contact connected"));
-               return;
-       }
-
-       if (previous > MC_PRESENCE_OFFLINE && current < MC_PRESENCE_AVAILABLE) {
-               /* someone is logging off */
-               empathy_sound_play (GTK_WIDGET (window->window),
-                                   EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT,
-                                   "service-logout", _("Contact disconnected"));
-       }
+  if (tp_connection_presence_type_cmp_availability (previous,
+     TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
+    {
+      /* contact was online */
+      if (tp_connection_presence_type_cmp_availability (current,
+          TP_CONNECTION_PRESENCE_TYPE_OFFLINE) <= 0)
+        /* someone is logging off */
+        empathy_sound_play (GTK_WIDGET (window->window),
+          EMPATHY_SOUND_CONTACT_DISCONNECTED);
+    }
+  else
+    {
+      /* contact was offline */
+      if (tp_connection_presence_type_cmp_availability (current,
+          TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
+        /* someone is logging in */
+        empathy_sound_play (GTK_WIDGET (window->window),
+          EMPATHY_SOUND_CONTACT_CONNECTED);
+    }
 }
 
-GtkWidget *
-empathy_main_window_show (void)
+static void
+main_window_accels_load (void)
 {
-       static EmpathyMainWindow *window = NULL;
-       EmpathyContactList       *list_iface;
-       EmpathyContactMonitor    *monitor;
-       GladeXML                 *glade;
-       EmpathyConf               *conf;
-       GtkWidget                *sw;
-       GtkWidget                *show_offline_widget;
-       GtkWidget                *ebox;
-       GtkToolItem              *item;
-       gboolean                  show_offline;
-       gboolean                  show_avatars;
-       gboolean                  compact_contact_list;
-       gint                      x, y, w, h;
-       gchar                    *filename;
-       GSList                   *l;
+       gchar *filename;
 
-       if (window) {
-               empathy_window_present (GTK_WINDOW (window->window), TRUE);
-               return window->window;
+       filename = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, ACCELS_FILENAME, NULL);
+       if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
+               DEBUG ("Loading from:'%s'", filename);
+               gtk_accel_map_load (filename);
        }
 
-       window = g_new0 (EmpathyMainWindow, 1);
-
-       /* Set up interface */
-       filename = empathy_file_lookup ("empathy-main-window.glade", "src");
-       glade = empathy_glade_get_file (filename,
-                                      "main_window",
-                                      NULL,
-                                      "main_window", &window->window,
-                                      "main_vbox", &window->main_vbox,
-                                      "errors_vbox", &window->errors_vbox,
-                                      "chat_show_offline", &show_offline_widget,
-                                      "room", &window->room,
-                                      "room_sep", &window->room_sep,
-                                      "room_join_favorites", &window->room_join_favorites,
-                                      "edit_context", &window->edit_context,
-                                      "edit_context_separator", &window->edit_context_separator,
-                                      "presence_toolbar", &window->presence_toolbar,
-                                      "roster_scrolledwindow", &sw,
-                                      NULL);
        g_free (filename);
+}
 
-       empathy_glade_connect (glade,
-                             window,
-                             "main_window", "destroy", main_window_destroy_cb,
-                             "main_window", "configure_event", main_window_configure_event_cb,
-                             "chat_quit", "activate", main_window_chat_quit_cb,
-                             "chat_new_message", "activate", main_window_chat_new_message_cb,
-                             "chat_history", "activate", main_window_chat_history_cb,
-                             "room_join_new", "activate", main_window_room_join_new_cb,
-                             "room_join_favorites", "activate", main_window_room_join_favorites_cb,
-                             "room_manage_favorites", "activate", main_window_room_manage_favorites_cb,
-                             "chat_add_contact", "activate", main_window_chat_add_contact_cb,
-                             "chat_show_offline", "toggled", main_window_chat_show_offline_cb,
-                             "edit", "button-press-event", main_window_edit_button_press_event_cb,
-                             "edit_accounts", "activate", main_window_edit_accounts_cb,
-                             "edit_personal_information", "activate", main_window_edit_personal_information_cb,
-                             "edit_preferences", "activate", main_window_edit_preferences_cb,
-                             "help_about", "activate", main_window_help_about_cb,
-                             "help_contents", "activate", main_window_help_contents_cb,
-                             NULL);
+static void
+main_window_accels_save (void)
+{
+       gchar *dir;
+       gchar *file_with_path;
 
-       /* Set up connection related widgets. */
-       main_window_connection_items_setup (window, glade);
-       g_object_unref (glade);
+       dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
+       g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
+       file_with_path = g_build_filename (dir, ACCELS_FILENAME, NULL);
+       g_free (dir);
 
-       window->mc = empathy_mission_control_new ();
-       window->account_manager = empathy_account_manager_dup_singleton ();
+       DEBUG ("Saving to:'%s'", file_with_path);
+       gtk_accel_map_save (file_with_path);
 
-       g_signal_connect (window->account_manager,
-                         "account-connection-changed",
-                         G_CALLBACK (main_window_connection_changed_cb), window);
-
-       window->errors = g_hash_table_new_full (empathy_account_hash,
-                                               empathy_account_equal,
-                                               g_object_unref,
-                                               NULL);
-
-       /* Set up menu */
-       main_window_favorite_chatroom_menu_setup (window);
-
-       gtk_widget_hide (window->edit_context);
-       gtk_widget_hide (window->edit_context_separator);
-
-       /* Set up presence chooser */
-       window->presence_chooser = empathy_presence_chooser_new ();
-       gtk_widget_show (window->presence_chooser);
-       item = gtk_tool_item_new ();
-       gtk_widget_show (GTK_WIDGET (item));
-       gtk_container_add (GTK_CONTAINER (item), window->presence_chooser);
-       gtk_tool_item_set_is_important (item, TRUE);
-       gtk_tool_item_set_expand (item, TRUE);
-       gtk_toolbar_insert (GTK_TOOLBAR (window->presence_toolbar), item, -1);
-
-       /* Set up the throbber */
-       ebox = gtk_event_box_new ();
-       gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
-       gtk_widget_set_tooltip_text (ebox, _("Show and edit accounts"));
-       g_signal_connect (ebox,
-                         "button-press-event",
-                         G_CALLBACK (main_window_throbber_button_press_event_cb),
-                         window);
-       gtk_widget_show (ebox);
-
-       window->throbber = ephy_spinner_new ();
-       ephy_spinner_set_size (EPHY_SPINNER (window->throbber), GTK_ICON_SIZE_LARGE_TOOLBAR);
-       gtk_container_add (GTK_CONTAINER (ebox), window->throbber);
-       gtk_widget_show (window->throbber);
-
-       item = gtk_tool_item_new ();
-       gtk_container_add (GTK_CONTAINER (item), ebox);
-       gtk_toolbar_insert (GTK_TOOLBAR (window->presence_toolbar), item, -1);
-       gtk_widget_show (GTK_WIDGET (item));
-
-       /* Set up contact list. */
-       empathy_status_presets_get_all ();
-
-       list_iface = EMPATHY_CONTACT_LIST (empathy_contact_manager_new ());
-       monitor = empathy_contact_list_get_monitor (list_iface);
-       window->list_store = empathy_contact_list_store_new (list_iface);
-       window->list_view = empathy_contact_list_view_new (window->list_store,
-                                                          EMPATHY_CONTACT_LIST_FEATURE_ALL,
-                                                          EMPATHY_CONTACT_FEATURE_ALL);
-       g_signal_connect (monitor, "contact-presence-changed",
-                         G_CALLBACK (main_window_contact_presence_changed_cb), window);
-       g_object_unref (list_iface);
-
-       gtk_widget_show (GTK_WIDGET (window->list_view));
-       gtk_container_add (GTK_CONTAINER (sw),
-                          GTK_WIDGET (window->list_view));
-       g_signal_connect (window->list_view, "row-activated",
-                         G_CALLBACK (main_window_row_activated_cb),
-                         window);
-
-       /* Load user-defined accelerators. */
-       main_window_accels_load ();
-
-       /* Set window size. */
-       empathy_geometry_load (GEOMETRY_NAME, &x, &y, &w, &h);
-
-       if (w >= 1 && h >= 1) {
-               /* Use the defaults from the glade file if we
-                * don't have good w, h geometry.
-                */
-               DEBUG ("Configuring window default size w:%d, h:%d", w, h);
-               gtk_window_set_default_size (GTK_WINDOW (window->window), w, h);
-       }
-
-       if (x >= 0 && y >= 0) {
-               /* Let the window manager position it if we
-                * don't have good x, y coordinates.
-                */
-               DEBUG ("Configuring window default position x:%d, y:%d", x, y);
-               gtk_window_move (GTK_WINDOW (window->window), x, y);
-       }
-
-       /* Enable event handling */
-       window->event_manager = empathy_event_manager_new ();
-       g_signal_connect (window->event_manager, "event-added",
-                         G_CALLBACK (main_window_event_added_cb),
-                         window);
-       g_signal_connect (window->event_manager, "event-removed",
-                         G_CALLBACK (main_window_event_removed_cb),
-                         window);
-
-       l = empathy_event_manager_get_events (window->event_manager);
-       while (l) {
-               main_window_event_added_cb (window->event_manager,
-                                           l->data, window);
-               l = l->next;
-       }
-
-       conf = empathy_conf_get ();
-
-       /* Show offline ? */
-       empathy_conf_get_bool (conf,
-                             EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE,
-                             &show_offline);
-       empathy_conf_notify_add (conf,
-                               EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE,
-                               main_window_notify_show_offline_cb,
-                               show_offline_widget);
-
-       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (show_offline_widget),
-                                       show_offline);
-
-       /* Show avatars ? */
-       empathy_conf_get_bool (conf,
-                             EMPATHY_PREFS_UI_SHOW_AVATARS,
-                             &show_avatars);
-       empathy_conf_notify_add (conf,
-                               EMPATHY_PREFS_UI_SHOW_AVATARS,
-                               (EmpathyConfNotifyFunc) main_window_notify_show_avatars_cb,
-                               window);
-       empathy_contact_list_store_set_show_avatars (window->list_store, show_avatars);
-
-       /* Is compact ? */
-       empathy_conf_get_bool (conf,
-                             EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
-                             &compact_contact_list);
-       empathy_conf_notify_add (conf,
-                               EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
-                               (EmpathyConfNotifyFunc) main_window_notify_compact_contact_list_cb,
-                               window);
-       empathy_contact_list_store_set_is_compact (window->list_store, compact_contact_list);
-
-       /* Sort criterium */
-       empathy_conf_notify_add (conf,
-                               EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
-                               (EmpathyConfNotifyFunc) main_window_notify_sort_criterium_cb,
-                               window);
-       main_window_notify_sort_criterium_cb (conf,
-                                             EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
-                                             window);
-
-       main_window_update_status (window, window->account_manager);
-
-       return window->window;
-}
+       g_free (file_with_path);
+}
 
 static void
 main_window_destroy_cb (GtkWidget         *widget,
@@ -722,9 +649,8 @@ main_window_destroy_cb (GtkWidget         *widget,
                g_source_remove (window->size_timeout_id);
        }
 
-       g_list_free (window->widgets_connected);
+       g_list_free (window->actions_connected);
 
-       g_object_unref (window->mc);
        g_object_unref (window->account_manager);
        g_object_unref (window->list_store);
        g_hash_table_destroy (window->errors);
@@ -736,86 +662,208 @@ main_window_destroy_cb (GtkWidget         *widget,
                                              main_window_event_removed_cb,
                                              window);
        g_object_unref (window->event_manager);
+       g_object_unref (window->ui_manager);
 
        g_free (window);
 }
 
 static void
-main_window_favorite_chatroom_menu_setup (EmpathyMainWindow *window)
+main_window_chat_quit_cb (GtkAction         *action,
+                         EmpathyMainWindow *window)
 {
-       GList *chatrooms, *l;
+       gtk_main_quit ();
+}
 
-       window->chatroom_manager = empathy_chatroom_manager_new (NULL);
-       chatrooms = empathy_chatroom_manager_get_chatrooms (window->chatroom_manager, NULL);
-       window->room_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (window->room));
+static void
+main_window_view_history_cb (GtkAction         *action,
+                            EmpathyMainWindow *window)
+{
+       empathy_log_window_show (NULL, NULL, FALSE, GTK_WINDOW (window->window));
+}
 
-       for (l = chatrooms; l; l = l->next) {
-               main_window_favorite_chatroom_menu_add (window, l->data);
-       }
+static void
+main_window_chat_new_message_cb (GtkAction         *action,
+                                EmpathyMainWindow *window)
+{
+       empathy_new_message_dialog_show (GTK_WINDOW (window->window));
+}
 
-       if (!chatrooms) {
-               gtk_widget_hide (window->room_sep);
-       }
+static void
+main_window_chat_add_contact_cb (GtkAction         *action,
+                                EmpathyMainWindow *window)
+{
+       empathy_new_contact_dialog_show (GTK_WINDOW (window->window));
+}
 
-       gtk_widget_set_sensitive (window->room_join_favorites, chatrooms != NULL);
+static void
+main_window_view_show_ft_manager (GtkAction         *action,
+                                 EmpathyMainWindow *window)
+{
+       empathy_ft_manager_show ();
+}
 
-       g_signal_connect (window->chatroom_manager, "chatroom-added",
-                         G_CALLBACK (main_window_favorite_chatroom_menu_added_cb),
-                         window);
-       g_signal_connect (window->chatroom_manager, "chatroom-removed",
-                         G_CALLBACK (main_window_favorite_chatroom_menu_removed_cb),
-                         window);
+static void
+main_window_view_show_offline_cb (GtkToggleAction   *action,
+                                 EmpathyMainWindow *window)
+{
+       gboolean current;
 
-       g_list_free (chatrooms);
+       current = gtk_toggle_action_get_active (action);
+       empathy_conf_set_bool (empathy_conf_get (),
+                             EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE,
+                             current);
+
+       /* Turn off sound just while we alter the contact list. */
+       // FIXME: empathy_sound_set_enabled (FALSE);
+       empathy_contact_list_store_set_show_offline (window->list_store, current);
+       //empathy_sound_set_enabled (TRUE);
 }
 
 static void
-main_window_favorite_chatroom_menu_added_cb (EmpathyChatroomManager *manager,
-                                            EmpathyChatroom        *chatroom,
-                                            EmpathyMainWindow     *window)
+main_window_notify_sort_contact_cb (EmpathyConf       *conf,
+                                   const gchar       *key,
+                                   EmpathyMainWindow *window)
 {
-       main_window_favorite_chatroom_menu_add (window, chatroom);
-       gtk_widget_show (window->room_sep);
-       gtk_widget_set_sensitive (window->room_join_favorites, TRUE);
+       gchar *str = NULL;
+
+       if (empathy_conf_get_string (conf, key, &str) && str) {
+               GType       type;
+               GEnumClass *enum_class;
+               GEnumValue *enum_value;
+
+               type = empathy_contact_list_store_sort_get_type ();
+               enum_class = G_ENUM_CLASS (g_type_class_peek (type));
+               enum_value = g_enum_get_value_by_nick (enum_class, str);
+               if (enum_value) {
+                       /* By changing the value of the GtkRadioAction,
+                          it emits a signal that calls main_window_view_sort_contacts_cb
+                          which updates the contacts list */
+                       gtk_radio_action_set_current_value (window->sort_by_name,
+                                                           enum_value->value);
+               } else {
+                       g_warning ("Wrong value for sort_criterium configuration : %s", str);
+               }
+               g_free (str);
+       }
 }
 
 static void
-main_window_favorite_chatroom_menu_removed_cb (EmpathyChatroomManager *manager,
-                                              EmpathyChatroom        *chatroom,
-                                              EmpathyMainWindow     *window)
+main_window_view_sort_contacts_cb (GtkRadioAction    *action,
+                                  GtkRadioAction    *current,
+                                  EmpathyMainWindow *window)
 {
-       GtkWidget *menu_item;
+       EmpathyContactListStoreSort value;
+       GSList      *group;
+       GType        type;
+       GEnumClass  *enum_class;
+       GEnumValue  *enum_value;
+
+       value = gtk_radio_action_get_current_value (action);
+       group = gtk_radio_action_get_group (action);
+
+       /* Get string from index */
+       type = empathy_contact_list_store_sort_get_type ();
+       enum_class = G_ENUM_CLASS (g_type_class_peek (type));
+       enum_value = g_enum_get_value (enum_class, g_slist_index (group, current));
+
+       if (!enum_value) {
+               g_warning ("No GEnumValue for EmpathyContactListSort with GtkRadioAction index:%d",
+                          g_slist_index (group, action));
+       } else {
+               empathy_conf_set_string (empathy_conf_get (),
+                                        EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
+                                        enum_value->value_nick);
+       }
+       empathy_contact_list_store_set_sort_criterium (window->list_store, value);
+}
 
-       menu_item = g_object_get_data (G_OBJECT (chatroom), "menu_item");
+/* Matches GtkRadioAction values set in empathy-main-window.ui */
+#define CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS          0
+#define CONTACT_LIST_NORMAL_SIZE                       1
+#define CONTACT_LIST_COMPACT_SIZE                      2
 
-       g_object_set_data (G_OBJECT (chatroom), "menu_item", NULL);
-       gtk_widget_destroy (menu_item);
+static void
+main_window_view_contacts_list_size_cb (GtkRadioAction    *action,
+                                       GtkRadioAction    *current,
+                                       EmpathyMainWindow *window)
+{
+       gint     value;
+
+       value = gtk_radio_action_get_current_value (action);
 
-       main_window_favorite_chatroom_menu_update (window);
+       empathy_conf_set_bool (empathy_conf_get (),
+                              EMPATHY_PREFS_UI_SHOW_AVATARS,
+                              value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS);
+       empathy_conf_set_bool (empathy_conf_get (),
+                              EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
+                              value == CONTACT_LIST_COMPACT_SIZE);
+
+       empathy_contact_list_store_set_show_avatars (window->list_store,
+                                                    value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS);
+       empathy_contact_list_store_set_is_compact (window->list_store,
+                                                  value == CONTACT_LIST_COMPACT_SIZE);
 }
 
 static void
-main_window_favorite_chatroom_menu_activate_cb (GtkMenuItem    *menu_item,
-                                               EmpathyChatroom *chatroom)
+main_window_notify_contact_list_size_cb (EmpathyConf       *conf,
+                                        const gchar       *key,
+                                        EmpathyMainWindow *window)
 {
-       main_window_favorite_chatroom_join (chatroom);
+       gboolean show_avatars;
+       gboolean compact_contact_list;
+       gint value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS;
+
+       if (empathy_conf_get_bool (conf,
+                                  EMPATHY_PREFS_UI_SHOW_AVATARS,
+                                  &show_avatars)
+           && empathy_conf_get_bool (conf,
+                                     EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
+                                     &compact_contact_list)) {
+               if (compact_contact_list) {
+                       value = CONTACT_LIST_COMPACT_SIZE;
+               } else if (show_avatars) {
+                       value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS;
+               } else {
+                       value = CONTACT_LIST_NORMAL_SIZE;
+               }
+       }
+       /* By changing the value of the GtkRadioAction,
+          it emits a signal that calls main_window_view_contacts_list_size_cb
+          which updates the contacts list */
+       gtk_radio_action_set_current_value (window->normal_with_avatars, value);
 }
 
 static void
-main_window_favorite_chatroom_menu_update (EmpathyMainWindow *window)
+main_window_view_show_map_cb (GtkCheckMenuItem  *item,
+                             EmpathyMainWindow *window)
 {
-       GList *chatrooms;
+#if HAVE_LIBCHAMPLAIN
+       empathy_map_view_show ();
+#endif
+}
 
-       chatrooms = empathy_chatroom_manager_get_chatrooms (window->chatroom_manager, NULL);
+static void
+main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
+{
+       EmpathyAccount *account;
+       TpConnection   *connection;
+       const gchar    *room;
 
-       if (chatrooms) {
-               gtk_widget_show (window->room_sep);
-       } else {
-               gtk_widget_hide (window->room_sep);
+       account = empathy_chatroom_get_account (chatroom);
+       connection = empathy_account_get_connection (account);
+       room = empathy_chatroom_get_room (chatroom);
+
+       if (connection != NULL) {
+               DEBUG ("Requesting channel for '%s'", room);
+               empathy_dispatcher_join_muc (connection, room, NULL, NULL);
        }
+}
 
-       gtk_widget_set_sensitive (window->room_join_favorites, chatrooms != NULL);
-       g_list_free (chatrooms);
+static void
+main_window_favorite_chatroom_menu_activate_cb (GtkMenuItem    *menu_item,
+                                               EmpathyChatroom *chatroom)
+{
+       main_window_favorite_chatroom_join (chatroom);
 }
 
 static void
@@ -838,68 +886,87 @@ main_window_favorite_chatroom_menu_add (EmpathyMainWindow *window,
                          chatroom);
 
        gtk_menu_shell_insert (GTK_MENU_SHELL (window->room_menu),
-                              menu_item, 3);
+                              menu_item, 4);
 
        gtk_widget_show (menu_item);
 }
 
 static void
-main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
+main_window_favorite_chatroom_menu_added_cb (EmpathyChatroomManager *manager,
+                                            EmpathyChatroom        *chatroom,
+                                            EmpathyMainWindow     *window)
 {
-       MissionControl *mc;
-       McAccount      *account;
-       TpConnection   *connection;
-       const gchar    *room;
-
-       mc = empathy_mission_control_new ();
-       account = empathy_chatroom_get_account (chatroom);
-       room = empathy_chatroom_get_room (chatroom);
-
-       DEBUG ("Requesting channel for '%s'", room);
-
-       connection = mission_control_get_tpconnection (mc, account, NULL);
-       if (connection) {
-               tp_connection_run_until_ready (connection, TRUE, NULL, NULL);   
-               empathy_connection_request_channel (connection, -1,
-                                                   TP_IFACE_CHANNEL_TYPE_TEXT,
-                                                   TP_HANDLE_TYPE_ROOM,
-                                                   room, TRUE,
-                                                   NULL, NULL, NULL, NULL);
-               g_object_unref (connection);
-       }
-       g_object_unref (mc);
+       main_window_favorite_chatroom_menu_add (window, chatroom);
+       gtk_widget_show (window->room_separator);
+       gtk_action_set_sensitive (window->room_join_favorites, TRUE);
 }
 
 static void
-main_window_chat_quit_cb (GtkWidget         *widget,
-                         EmpathyMainWindow *window)
+main_window_favorite_chatroom_menu_removed_cb (EmpathyChatroomManager *manager,
+                                              EmpathyChatroom        *chatroom,
+                                              EmpathyMainWindow     *window)
 {
-       gtk_main_quit ();
-}
+       GtkWidget *menu_item;
+       GList *chatrooms;
 
-static void
-main_window_chat_new_message_cb (GtkWidget         *widget,
-                                EmpathyMainWindow *window)
-{
-       empathy_new_message_dialog_show (GTK_WINDOW (window->window));
+       menu_item = g_object_get_data (G_OBJECT (chatroom), "menu_item");
+       g_object_set_data (G_OBJECT (chatroom), "menu_item", NULL);
+       gtk_widget_destroy (menu_item);
+
+       chatrooms = empathy_chatroom_manager_get_chatrooms (window->chatroom_manager, NULL);
+       if (chatrooms) {
+               gtk_widget_show (window->room_separator);
+       } else {
+               gtk_widget_hide (window->room_separator);
+       }
+
+       gtk_action_set_sensitive (window->room_join_favorites, chatrooms != NULL);
+       g_list_free (chatrooms);
 }
 
 static void
-main_window_chat_history_cb (GtkWidget         *widget,
-                            EmpathyMainWindow *window)
+main_window_favorite_chatroom_menu_setup (EmpathyMainWindow *window)
 {
-       empathy_log_window_show (NULL, NULL, FALSE, GTK_WINDOW (window->window));
+       GList *chatrooms, *l;
+       GtkWidget *room;
+
+       window->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
+       chatrooms = empathy_chatroom_manager_get_chatrooms (window->chatroom_manager, NULL);
+       room = gtk_ui_manager_get_widget (window->ui_manager,
+               "/menubar/room");
+       window->room_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (room));
+       window->room_separator = gtk_ui_manager_get_widget (window->ui_manager,
+               "/menubar/room/room_separator");
+
+       for (l = chatrooms; l; l = l->next) {
+               main_window_favorite_chatroom_menu_add (window, l->data);
+       }
+
+       if (!chatrooms) {
+               gtk_widget_hide (window->room_separator);
+       }
+
+       gtk_action_set_sensitive (window->room_join_favorites, chatrooms != NULL);
+
+       g_signal_connect (window->chatroom_manager, "chatroom-added",
+                         G_CALLBACK (main_window_favorite_chatroom_menu_added_cb),
+                         window);
+       g_signal_connect (window->chatroom_manager, "chatroom-removed",
+                         G_CALLBACK (main_window_favorite_chatroom_menu_removed_cb),
+                         window);
+
+       g_list_free (chatrooms);
 }
 
 static void
-main_window_room_join_new_cb (GtkWidget         *widget,
+main_window_room_join_new_cb (GtkAction         *action,
                              EmpathyMainWindow *window)
 {
        empathy_new_chatroom_dialog_show (GTK_WINDOW (window->window));
 }
 
 static void
-main_window_room_join_favorites_cb (GtkWidget         *widget,
+main_window_room_join_favorites_cb (GtkAction         *action,
                                    EmpathyMainWindow *window)
 {
        GList *chatrooms, *l;
@@ -912,48 +979,19 @@ main_window_room_join_favorites_cb (GtkWidget         *widget,
 }
 
 static void
-main_window_room_manage_favorites_cb (GtkWidget         *widget,
+main_window_room_manage_favorites_cb (GtkAction         *action,
                                      EmpathyMainWindow *window)
 {
        empathy_chatrooms_window_show (GTK_WINDOW (window->window));
 }
 
 static void
-main_window_chat_add_contact_cb (GtkWidget         *widget,
-                                EmpathyMainWindow *window)
-{
-       empathy_new_contact_dialog_show (GTK_WINDOW (window->window));
-}
-
-static void
-main_window_chat_show_offline_cb (GtkCheckMenuItem  *item,
-                                 EmpathyMainWindow *window)
-{
-       gboolean current;
-
-       current = gtk_check_menu_item_get_active (item);
-
-       empathy_conf_set_bool (empathy_conf_get (),
-                             EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE,
-                             current);
-
-       /* Turn off sound just while we alter the contact list. */
-       // FIXME: empathy_sound_set_enabled (FALSE);
-       empathy_contact_list_store_set_show_offline (window->list_store, current);
-       //empathy_sound_set_enabled (TRUE);
-}
-
-static gboolean
-main_window_edit_button_press_event_cb (GtkWidget         *widget,
-                                       GdkEventButton    *event,
-                                       EmpathyMainWindow *window)
+main_window_edit_cb (GtkAction *action,
+                    EmpathyMainWindow *window)
 {
        GtkWidget *submenu;
 
-       if (!event->button == 1) {
-               return FALSE;
-       }
-
+       /* FIXME: It should use the UIManager to merge the contact/group submenu */
        submenu = empathy_contact_list_view_get_contact_menu (window->list_view);
        if (submenu) {
                GtkMenuItem *item;
@@ -968,7 +1006,7 @@ main_window_edit_button_press_event_cb (GtkWidget         *widget,
 
                gtk_menu_item_set_submenu (item, submenu);
 
-               return FALSE;
+               return;
        }
 
        submenu = empathy_contact_list_view_get_group_menu (window->list_view);
@@ -985,72 +1023,55 @@ main_window_edit_button_press_event_cb (GtkWidget         *widget,
 
                gtk_menu_item_set_submenu (item, submenu);
 
-               return FALSE;
+               return;
        }
 
        gtk_widget_hide (window->edit_context);
        gtk_widget_hide (window->edit_context_separator);
 
-       return FALSE;
+       return;
 }
 
 static void
-main_window_edit_accounts_cb (GtkWidget         *widget,
+main_window_edit_accounts_cb (GtkAction         *action,
                              EmpathyMainWindow *window)
 {
        empathy_accounts_dialog_show (GTK_WINDOW (window->window), NULL);
 }
 
 static void
-main_window_edit_personal_information_cb (GtkWidget         *widget,
+main_window_edit_personal_information_cb (GtkAction         *action,
                                          EmpathyMainWindow *window)
 {
-       GSList *accounts;
-
-       accounts = mission_control_get_online_connections (window->mc, NULL);
-       if (accounts) {
-               EmpathyContactFactory *factory;
-               EmpathyContact        *contact;
-               McAccount             *account;
-
-               account = accounts->data;
-               factory = empathy_contact_factory_new ();
-               contact = empathy_contact_factory_get_user (factory, account);
-               empathy_contact_run_until_ready (contact,
-                                                EMPATHY_CONTACT_READY_HANDLE |
-                                                EMPATHY_CONTACT_READY_ID,
-                                                NULL);
-
-               empathy_contact_information_dialog_show (contact,
-                                                        GTK_WINDOW (window->window),
-                                                        TRUE, TRUE);
-
-               g_slist_foreach (accounts, (GFunc) g_object_unref, NULL);
-               g_slist_free (accounts);
-               g_object_unref (factory);
-               g_object_unref (contact);
-       }
+       empathy_contact_personal_dialog_show (GTK_WINDOW (window->window));
 }
 
 static void
-main_window_edit_preferences_cb (GtkWidget         *widget,
+main_window_edit_preferences_cb (GtkAction         *action,
                                 EmpathyMainWindow *window)
 {
        empathy_preferences_show (GTK_WINDOW (window->window));
 }
 
 static void
-main_window_help_about_cb (GtkWidget         *widget,
+main_window_help_about_cb (GtkAction         *action,
                           EmpathyMainWindow *window)
 {
        empathy_about_dialog_new (GTK_WINDOW (window->window));
 }
 
 static void
-main_window_help_contents_cb (GtkWidget         *widget,
+main_window_help_debug_cb (GtkAction         *action,
+                          EmpathyMainWindow *window)
+{
+       empathy_debug_window_new (GTK_WINDOW (window->window));
+}
+
+static void
+main_window_help_contents_cb (GtkAction         *action,
                              EmpathyMainWindow *window)
 {
-       empathy_url_show (widget, "ghelp:empathy");
+       empathy_url_show (window->window, "ghelp:empathy");
 }
 
 static gboolean
@@ -1068,335 +1089,323 @@ main_window_throbber_button_press_event_cb (GtkWidget         *throbber_ebox,
        return FALSE;
 }
 
-static void
-main_window_error_edit_clicked_cb (GtkButton         *button,
-                                  EmpathyMainWindow *window)
+static gboolean
+main_window_configure_event_timeout_cb (EmpathyMainWindow *window)
 {
-       McAccount *account;
-       GtkWidget *error_widget;
+       gint x, y, w, h;
 
-       account = g_object_get_data (G_OBJECT (button), "account");
-       empathy_accounts_dialog_show (GTK_WINDOW (window->window), account);
+       gtk_window_get_size (GTK_WINDOW (window->window), &w, &h);
+       gtk_window_get_position (GTK_WINDOW (window->window), &x, &y);
 
-       error_widget = g_hash_table_lookup (window->errors, account);
-       gtk_widget_destroy (error_widget);
-       g_hash_table_remove (window->errors, account);
-}
+       empathy_geometry_save (GEOMETRY_NAME, x, y, w, h);
 
-static void
-main_window_error_clear_clicked_cb (GtkButton         *button,
-                                   EmpathyMainWindow *window)
-{
-       McAccount *account;
-       GtkWidget *error_widget;
+       window->size_timeout_id = 0;
 
-       account = g_object_get_data (G_OBJECT (button), "account");
-       error_widget = g_hash_table_lookup (window->errors, account);
-       gtk_widget_destroy (error_widget);
-       g_hash_table_remove (window->errors, account);
+       return FALSE;
 }
 
-static void
-main_window_error_display (EmpathyMainWindow *window,
-                          McAccount         *account,
-                          const gchar       *message)
+static gboolean
+main_window_configure_event_cb (GtkWidget         *widget,
+                               GdkEventConfigure *event,
+                               EmpathyMainWindow *window)
 {
-       GtkWidget *child;
-       GtkWidget *table;
-       GtkWidget *image;
-       GtkWidget *button_edit;
-       GtkWidget *alignment;
-       GtkWidget *hbox;
-       GtkWidget *label;
-       GtkWidget *fixed;
-       GtkWidget *vbox;
-       GtkWidget *button_close;
-       gchar     *str;
-
-       child = g_hash_table_lookup (window->errors, account);
-       if (child) {
-               label = g_object_get_data (G_OBJECT (child), "label");
-
-               /* Just set the latest error and return */
-               str = g_markup_printf_escaped ("<b>%s</b>\n%s",
-                                              mc_account_get_display_name (account),
-                                              message);
-               gtk_label_set_markup (GTK_LABEL (label), str);
-               g_free (str);
-
-               return;
+       if (window->size_timeout_id) {
+               g_source_remove (window->size_timeout_id);
        }
 
-       child = gtk_vbox_new (FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (window->errors_vbox), child, FALSE, TRUE, 0);
-       gtk_container_set_border_width (GTK_CONTAINER (child), 6);
-       gtk_widget_show (child);
-
-       table = gtk_table_new (2, 4, FALSE);
-       gtk_widget_show (table);
-       gtk_box_pack_start (GTK_BOX (child), table, TRUE, TRUE, 0);
-       gtk_table_set_row_spacings (GTK_TABLE (table), 12);
-       gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-
-       image = gtk_image_new_from_stock (GTK_STOCK_DISCONNECT, GTK_ICON_SIZE_MENU);
-       gtk_widget_show (image);
-       gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 2,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (GTK_FILL), 0, 0);
-       gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
-
-       button_edit = gtk_button_new ();
-       gtk_widget_show (button_edit);
-       gtk_table_attach (GTK_TABLE (table), button_edit, 1, 2, 1, 2,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (0), 0, 0);
-
-       alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
-       gtk_widget_show (alignment);
-       gtk_container_add (GTK_CONTAINER (button_edit), alignment);
-
-       hbox = gtk_hbox_new (FALSE, 2);
-       gtk_widget_show (hbox);
-       gtk_container_add (GTK_CONTAINER (alignment), hbox);
-
-       image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON);
-       gtk_widget_show (image);
-       gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
-
-       label = gtk_label_new_with_mnemonic (_("_Edit account"));
-       gtk_widget_show (label);
-       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-       fixed = gtk_fixed_new ();
-       gtk_widget_show (fixed);
-       gtk_table_attach (GTK_TABLE (table), fixed, 2, 3, 1, 2,
-                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                         (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-       vbox = gtk_vbox_new (FALSE, 6);
-       gtk_widget_show (vbox);
-       gtk_table_attach (GTK_TABLE (table), vbox, 3, 4, 0, 2,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-       button_close = gtk_button_new ();
-       gtk_widget_show (button_close);
-       gtk_box_pack_start (GTK_BOX (vbox), button_close, FALSE, FALSE, 0);
-       gtk_button_set_relief (GTK_BUTTON (button_close), GTK_RELIEF_NONE);
-
-
-       image = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
-       gtk_widget_show (image);
-       gtk_container_add (GTK_CONTAINER (button_close), image);
-
-       label = gtk_label_new ("");
-       gtk_widget_show (label);
-       gtk_table_attach (GTK_TABLE (table), label, 1, 3, 0, 1,
-                         (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL),
-                         (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), 0, 0);
-       gtk_widget_set_size_request (label, 175, -1);
-       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-       gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
-
-       str = g_markup_printf_escaped ("<b>%s</b>\n%s",
-                                      mc_account_get_display_name (account),
-                                      message);
-       gtk_label_set_markup (GTK_LABEL (label), str);
-       g_free (str);
-
-       g_object_set_data (G_OBJECT (child), "label", label);
-       g_object_set_data_full (G_OBJECT (button_edit),
-                               "account", g_object_ref (account),
-                               g_object_unref);
-       g_object_set_data_full (G_OBJECT (button_close),
-                               "account", g_object_ref (account),
-                               g_object_unref);
-
-       g_signal_connect (button_edit, "clicked",
-                         G_CALLBACK (main_window_error_edit_clicked_cb),
-                         window);
-
-       g_signal_connect (button_close, "clicked",
-                         G_CALLBACK (main_window_error_clear_clicked_cb),
-                         window);
-
-       gtk_widget_show (window->errors_vbox);
+       window->size_timeout_id = g_timeout_add_seconds (1,
+                                                        (GSourceFunc) main_window_configure_event_timeout_cb,
+                                                        window);
 
-       g_hash_table_insert (window->errors, g_object_ref (account), child);
+       return FALSE;
 }
 
 static void
-main_window_update_status (EmpathyMainWindow *window, EmpathyAccountManager *manager)
+main_window_account_created_or_deleted_cb (EmpathyAccountManager  *manager,
+                                          EmpathyAccount         *account,
+                                          EmpathyMainWindow      *window)
 {
-       int  connected;
-       int  connecting;
-       GList *l;
-
-       /* Count number of connected/connecting/disconnected accounts */
-       connected = empathy_account_manager_get_connected_accounts (manager);
-       connecting = empathy_account_manager_get_connecting_accounts (manager);
-
-       /* Update the spinner state */
-       if (connecting > 0) {
-               ephy_spinner_start (EPHY_SPINNER (window->throbber));
-       } else {
-               ephy_spinner_stop (EPHY_SPINNER (window->throbber));
-       }
-
-       /* Update widgets sensibility */
-       for (l = window->widgets_connected; l; l = l->next) {
-               gtk_widget_set_sensitive (l->data, (connected > 0));
-       }
+       gtk_action_set_sensitive (window->view_history,
+               empathy_account_manager_get_count (manager) > 0);
 }
 
-/*
- * Accels
- */
 static void
-main_window_accels_load (void)
+main_window_notify_show_offline_cb (EmpathyConf *conf,
+                                   const gchar *key,
+                                   gpointer     toggle_action)
 {
-       gchar *filename;
+       gboolean show_offline;
 
-       filename = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, ACCELS_FILENAME, NULL);
-       if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
-               DEBUG ("Loading from:'%s'", filename);
-               gtk_accel_map_load (filename);
+       if (empathy_conf_get_bool (conf, key, &show_offline)) {
+               gtk_toggle_action_set_active (toggle_action, show_offline);
        }
-
-       g_free (filename);
-}
-
-static void
-main_window_accels_save (void)
-{
-       gchar *dir;
-       gchar *file_with_path;
-
-       dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
-       g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
-       file_with_path = g_build_filename (dir, ACCELS_FILENAME, NULL);
-       g_free (dir);
-
-       DEBUG ("Saving to:'%s'", file_with_path);
-       gtk_accel_map_save (file_with_path);
-
-       g_free (file_with_path);
 }
 
 static void
 main_window_connection_items_setup (EmpathyMainWindow *window,
-                                   GladeXML          *glade)
+                                   GtkBuilder        *gui)
 {
        GList         *list;
-       GtkWidget     *w;
+       GObject       *action;
        gint           i;
-       const gchar *widgets_connected[] = {
+       const gchar *actions_connected[] = {
                "room",
                "chat_new_message",
                "chat_add_contact",
                "edit_personal_information"
        };
 
-       for (i = 0, list = NULL; i < G_N_ELEMENTS (widgets_connected); i++) {
-               w = glade_xml_get_widget (glade, widgets_connected[i]);
-               list = g_list_prepend (list, w);
+       for (i = 0, list = NULL; i < G_N_ELEMENTS (actions_connected); i++) {
+               action = gtk_builder_get_object (gui, actions_connected[i]);
+               list = g_list_prepend (list, action);
        }
 
-       window->widgets_connected = list;
+       window->actions_connected = list;
 }
 
-static gboolean
-main_window_configure_event_timeout_cb (EmpathyMainWindow *window)
+GtkWidget *
+empathy_main_window_get (void)
 {
-       gint x, y, w, h;
+  return window != NULL ? window->window : NULL;
+}
 
-       gtk_window_get_size (GTK_WINDOW (window->window), &w, &h);
-       gtk_window_get_position (GTK_WINDOW (window->window), &x, &y);
+GtkWidget *
+empathy_main_window_show (void)
+{
+       EmpathyContactList       *list_iface;
+       EmpathyContactMonitor    *monitor;
+       GtkBuilder               *gui;
+       EmpathyConf              *conf;
+       GtkWidget                *sw;
+       GtkToggleAction          *show_offline_widget;
+       GtkWidget                *ebox;
+       GtkAction                *show_map_widget;
+       GtkToolItem              *item;
+       gboolean                  show_offline;
+       gint                      x, y, w, h;
+       gchar                    *filename;
+       GSList                   *l;
 
-       empathy_geometry_save (GEOMETRY_NAME, x, y, w, h);
+       if (window) {
+               empathy_window_present (GTK_WINDOW (window->window), TRUE);
+               return window->window;
+       }
 
-       window->size_timeout_id = 0;
+       window = g_new0 (EmpathyMainWindow, 1);
 
-       return FALSE;
-}
+       /* Set up interface */
+       filename = empathy_file_lookup ("empathy-main-window.ui", "src");
+       gui = empathy_builder_get_file (filename,
+                                      "main_window", &window->window,
+                                      "main_vbox", &window->main_vbox,
+                                      "errors_vbox", &window->errors_vbox,
+                                      "ui_manager", &window->ui_manager,
+                                      "view_show_offline", &show_offline_widget,
+                                      "view_sort_by_name", &window->sort_by_name,
+                                      "view_sort_by_status", &window->sort_by_status,
+                                      "view_normal_size_with_avatars", &window->normal_with_avatars,
+                                      "view_normal_size", &window->normal_size,
+                                      "view_compact_size", &window->compact_size,
+                                      "view_history", &window->view_history,
+                                      "view_show_map", &show_map_widget,
+                                      "room_join_favorites", &window->room_join_favorites,
+                                      "presence_toolbar", &window->presence_toolbar,
+                                      "roster_scrolledwindow", &sw,
+                                      NULL);
+       g_free (filename);
 
-static gboolean
-main_window_configure_event_cb (GtkWidget         *widget,
-                               GdkEventConfigure *event,
-                               EmpathyMainWindow *window)
-{
-       if (window->size_timeout_id) {
-               g_source_remove (window->size_timeout_id);
-       }
+       empathy_builder_connect (gui, window,
+                             "main_window", "destroy", main_window_destroy_cb,
+                             "main_window", "configure_event", main_window_configure_event_cb,
+                             "chat_quit", "activate", main_window_chat_quit_cb,
+                             "chat_new_message", "activate", main_window_chat_new_message_cb,
+                             "view_history", "activate", main_window_view_history_cb,
+                             "room_join_new", "activate", main_window_room_join_new_cb,
+                             "room_join_favorites", "activate", main_window_room_join_favorites_cb,
+                             "room_manage_favorites", "activate", main_window_room_manage_favorites_cb,
+                             "chat_add_contact", "activate", main_window_chat_add_contact_cb,
+                             "view_show_ft_manager", "activate", main_window_view_show_ft_manager,
+                             "view_show_offline", "toggled", main_window_view_show_offline_cb,
+                             "view_sort_by_name", "changed", main_window_view_sort_contacts_cb,
+                             "view_normal_size_with_avatars", "changed", main_window_view_contacts_list_size_cb,
+                             "view_show_map", "activate", main_window_view_show_map_cb,
+                             "edit", "activate", main_window_edit_cb,
+                             "edit_accounts", "activate", main_window_edit_accounts_cb,
+                             "edit_personal_information", "activate", main_window_edit_personal_information_cb,
+                             "edit_preferences", "activate", main_window_edit_preferences_cb,
+                             "help_about", "activate", main_window_help_about_cb,
+                             "help_debug", "activate", main_window_help_debug_cb,
+                             "help_contents", "activate", main_window_help_contents_cb,
+                             NULL);
 
-       window->size_timeout_id = g_timeout_add_seconds (1,
-                                                        (GSourceFunc) main_window_configure_event_timeout_cb,
-                                                        window);
+       /* Set up connection related widgets. */
+       main_window_connection_items_setup (window, gui);
 
-       return FALSE;
-}
+       g_object_ref (window->ui_manager);
+       g_object_unref (gui);
 
-static void
-main_window_notify_show_offline_cb (EmpathyConf  *conf,
-                                   const gchar *key,
-                                   gpointer     check_menu_item)
-{
-       gboolean show_offline;
+#if !HAVE_LIBCHAMPLAIN
+       gtk_action_set_visible (show_map_widget, FALSE);
+#endif
 
-       if (empathy_conf_get_bool (conf, key, &show_offline)) {
-               gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (check_menu_item),
-                                               show_offline);
-       }
-}
+       window->account_manager = empathy_account_manager_dup_singleton ();
 
-static void
-main_window_notify_show_avatars_cb (EmpathyConf        *conf,
-                                   const gchar       *key,
-                                   EmpathyMainWindow *window)
-{
-       gboolean show_avatars;
+       g_signal_connect (window->account_manager,
+                         "account-connection-changed",
+                         G_CALLBACK (main_window_connection_changed_cb), window);
 
-       if (empathy_conf_get_bool (conf, key, &show_avatars)) {
-               empathy_contact_list_store_set_show_avatars (window->list_store,
-                                                           show_avatars);
-       }
-}
+       window->errors = g_hash_table_new_full (g_direct_hash,
+                                               g_direct_equal,
+                                               g_object_unref,
+                                               NULL);
 
-static void
-main_window_notify_compact_contact_list_cb (EmpathyConf        *conf,
-                                           const gchar       *key,
-                                           EmpathyMainWindow *window)
-{
-       gboolean compact_contact_list;
+       /* Set up menu */
+       main_window_favorite_chatroom_menu_setup (window);
 
-       if (empathy_conf_get_bool (conf, key, &compact_contact_list)) {
-               empathy_contact_list_store_set_is_compact (window->list_store,
-                                                         compact_contact_list);
+       window->edit_context = gtk_ui_manager_get_widget (window->ui_manager,
+               "/menubar/edit/edit_context");
+       window->edit_context_separator = gtk_ui_manager_get_widget (window->ui_manager,
+               "/menubar/edit/edit_context_separator");
+       gtk_widget_hide (window->edit_context);
+       gtk_widget_hide (window->edit_context_separator);
+
+       /* Set up contact list. */
+       empathy_status_presets_get_all ();
+
+       /* Set up presence chooser */
+       window->presence_chooser = empathy_presence_chooser_new ();
+       gtk_widget_show (window->presence_chooser);
+       item = gtk_tool_item_new ();
+       gtk_widget_show (GTK_WIDGET (item));
+       gtk_container_add (GTK_CONTAINER (item), window->presence_chooser);
+       gtk_tool_item_set_is_important (item, TRUE);
+       gtk_tool_item_set_expand (item, TRUE);
+       gtk_toolbar_insert (GTK_TOOLBAR (window->presence_toolbar), item, -1);
+
+       /* Set up the throbber */
+       ebox = gtk_event_box_new ();
+       gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
+       gtk_widget_set_tooltip_text (ebox, _("Show and edit accounts"));
+       g_signal_connect (ebox,
+                         "button-press-event",
+                         G_CALLBACK (main_window_throbber_button_press_event_cb),
+                         window);
+       gtk_widget_show (ebox);
+
+       window->throbber = ephy_spinner_new ();
+       ephy_spinner_set_size (EPHY_SPINNER (window->throbber), GTK_ICON_SIZE_LARGE_TOOLBAR);
+       gtk_container_add (GTK_CONTAINER (ebox), window->throbber);
+       gtk_widget_show (window->throbber);
+
+       item = gtk_tool_item_new ();
+       gtk_container_add (GTK_CONTAINER (item), ebox);
+       gtk_toolbar_insert (GTK_TOOLBAR (window->presence_toolbar), item, -1);
+       gtk_widget_show (GTK_WIDGET (item));
+
+       list_iface = EMPATHY_CONTACT_LIST (empathy_contact_manager_dup_singleton ());
+       monitor = empathy_contact_list_get_monitor (list_iface);
+       window->list_store = empathy_contact_list_store_new (list_iface);
+       window->list_view = empathy_contact_list_view_new (window->list_store,
+                                                          EMPATHY_CONTACT_LIST_FEATURE_ALL,
+                                                          EMPATHY_CONTACT_FEATURE_ALL);
+       g_signal_connect (monitor, "contact-presence-changed",
+                         G_CALLBACK (main_window_contact_presence_changed_cb), window);
+       g_object_unref (list_iface);
+
+       gtk_widget_show (GTK_WIDGET (window->list_view));
+       gtk_container_add (GTK_CONTAINER (sw),
+                          GTK_WIDGET (window->list_view));
+       g_signal_connect (window->list_view, "row-activated",
+                         G_CALLBACK (main_window_row_activated_cb),
+                         window);
+
+       /* Load user-defined accelerators. */
+       main_window_accels_load ();
+
+       /* Set window size. */
+       empathy_geometry_load (GEOMETRY_NAME, &x, &y, &w, &h);
+
+       if (w >= 1 && h >= 1) {
+               /* Use the defaults from the ui file if we
+                * don't have good w, h geometry.
+                */
+               DEBUG ("Configuring window default size w:%d, h:%d", w, h);
+               gtk_window_set_default_size (GTK_WINDOW (window->window), w, h);
        }
-}
 
-static void
-main_window_notify_sort_criterium_cb (EmpathyConf       *conf,
-                                     const gchar       *key,
-                                     EmpathyMainWindow *window)
-{
-       gchar *str = NULL;
+       if (x >= 0 && y >= 0) {
+               /* Let the window manager position it if we
+                * don't have good x, y coordinates.
+                */
+               DEBUG ("Configuring window default position x:%d, y:%d", x, y);
+               gtk_window_move (GTK_WINDOW (window->window), x, y);
+       }
 
-       if (empathy_conf_get_string (conf, key, &str) && str) {
-               GType       type;
-               GEnumClass *enum_class;
-               GEnumValue *enum_value;
+       /* Enable event handling */
+       window->event_manager = empathy_event_manager_dup_singleton ();
+       g_signal_connect (window->event_manager, "event-added",
+                         G_CALLBACK (main_window_event_added_cb),
+                         window);
+       g_signal_connect (window->event_manager, "event-removed",
+                         G_CALLBACK (main_window_event_removed_cb),
+                         window);
 
-               type = empathy_contact_list_store_sort_get_type ();
-               enum_class = G_ENUM_CLASS (g_type_class_peek (type));
-               enum_value = g_enum_get_value_by_nick (enum_class, str);
-               g_free (str);
+       g_signal_connect (window->account_manager, "account-created",
+                         G_CALLBACK (main_window_account_created_or_deleted_cb),
+                         window);
+       g_signal_connect (window->account_manager, "account-deleted",
+                         G_CALLBACK (main_window_account_created_or_deleted_cb),
+                         window);
+       main_window_account_created_or_deleted_cb (window->account_manager, NULL, window);
 
-               if (enum_value) {
-                       empathy_contact_list_store_set_sort_criterium (window->list_store, 
-                                                                      enum_value->value);
-               }
+       l = empathy_event_manager_get_events (window->event_manager);
+       while (l) {
+               main_window_event_added_cb (window->event_manager,
+                                           l->data, window);
+               l = l->next;
        }
+
+       conf = empathy_conf_get ();
+
+       /* Show offline ? */
+       empathy_conf_get_bool (conf,
+                             EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE,
+                             &show_offline);
+       empathy_conf_notify_add (conf,
+                               EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE,
+                               main_window_notify_show_offline_cb,
+                               show_offline_widget);
+
+       gtk_toggle_action_set_active (show_offline_widget, show_offline);
+
+       /* Sort by name / by status ? */
+       empathy_conf_notify_add (conf,
+                                EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
+                                (EmpathyConfNotifyFunc) main_window_notify_sort_contact_cb,
+                                window);
+
+       main_window_notify_sort_contact_cb (conf,
+                                           EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
+                                           window);
+
+       /* Contacts list size */
+       empathy_conf_notify_add (conf,
+                                EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
+                                (EmpathyConfNotifyFunc) main_window_notify_contact_list_size_cb,
+                                window);
+       empathy_conf_notify_add (conf,
+                                EMPATHY_PREFS_UI_SHOW_AVATARS,
+                                (EmpathyConfNotifyFunc) main_window_notify_contact_list_size_cb,
+                                window);
+
+       main_window_notify_contact_list_size_cb (conf,
+                                                EMPATHY_PREFS_UI_SHOW_AVATARS,
+                                                window);
+
+       main_window_update_status (window, window->account_manager);
+
+       gtk_widget_show (window->window);
+
+       return window->window;
 }