Reorder functions to not declare them on top

From: Xavier Claessens <xclaesse@gmail.com>

svn path=/trunk/; revision=2865

1 files changed, 526 insertions, 613 deletions

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 9f100bb72..7130784dd 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -109,82 +109,6 @@ typedef struct {
 
 static EmpathyMainWindow *window = NULL;
 
-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,
-								GtkBuilder               *gui);
-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 void     main_window_account_created_or_deleted_cb      (EmpathyAccountManager    *manager,
-								McAccount                *account,
-								EmpathyMainWindow        *window);
-
 static void
 main_window_flash_stop (EmpathyMainWindow *window)
 {
@@ -372,6 +296,188 @@ main_window_row_activated_cb (EmpathyContactListView *view,
 }
 
 static void
+main_window_error_edit_clicked_cb (GtkButton         *button,
+				   EmpathyMainWindow *window)
+{
+	McAccount *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)
+{
+	McAccount *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,
+			   McAccount         *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",
+					       mc_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",
+				       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);
+
+	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->widgets_connected; l; l = l->next) {
+		gtk_widget_set_sensitive (l->data, (connected > 0));
+	}
+}
+
+static void
 main_window_connection_changed_cb (EmpathyAccountManager *manager,
 				   McAccount *account,
 				   TpConnectionStatusReason reason,
@@ -484,238 +590,35 @@ main_window_contact_presence_changed_cb (EmpathyContactMonitor *monitor,
 	}
 }
 
-GtkWidget *
-empathy_main_window_get (void)
-{
-  return window != NULL ? window->window : NULL;
-}
-
-GtkWidget *
-empathy_main_window_show (void)
+static void
+main_window_accels_load (void)
 {
-	EmpathyContactList       *list_iface;
-	EmpathyContactMonitor    *monitor;
-	GtkBuilder               *gui;
-	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_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);
 	}
 
-	window = g_new0 (EmpathyMainWindow, 1);
-
-	/* 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,
-				       "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,
-				       "chat_history", &window->chat_history_menu_item,
-				       NULL);
 	g_free (filename);
+}
 
-	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,
-			      "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);
-
-	/* Set up connection related widgets. */
-	main_window_connection_items_setup (window, gui);
-	g_object_unref (gui);
-
-	window->mc = empathy_mission_control_dup_singleton ();
-	window->account_manager = empathy_account_manager_dup_singleton ();
-
-	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_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);
-	}
-
-	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_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);
-
-	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);
-
-	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);
+static void
+main_window_accels_save (void)
+{
+	gchar *dir;
+	gchar *file_with_path;
 
-	/* 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);
+	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);
 
-	main_window_update_status (window, window->account_manager);
+	DEBUG ("Saving to:'%s'", file_with_path);
+	gtk_accel_map_save (file_with_path);
 
-	return window->window;
+	g_free (file_with_path);
 }
 
 static void
@@ -752,32 +655,57 @@ main_window_destroy_cb (GtkWidget         *widget,
 }
 
 static void
-main_window_favorite_chatroom_menu_setup (EmpathyMainWindow *window)
+main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
 {
-	GList *chatrooms, *l;
+	MissionControl *mc;
+	McAccount      *account;
+	const gchar    *room;
 
-	window->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
-	chatrooms = empathy_chatroom_manager_get_chatrooms (window->chatroom_manager, NULL);
-	window->room_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (window->room));
+	mc = empathy_mission_control_dup_singleton ();
+	account = empathy_chatroom_get_account (chatroom);
+	room = empathy_chatroom_get_room (chatroom);
 
-	for (l = chatrooms; l; l = l->next) {
-		main_window_favorite_chatroom_menu_add (window, l->data);
+	 if (mission_control_get_connection_status (mc, account, NULL) !=
+			TP_CONNECTION_STATUS_CONNECTED) {
+		return;
 	}
 
-	if (!chatrooms) {
-		gtk_widget_hide (window->room_sep);
+	DEBUG ("Requesting channel for '%s'", room);
+	empathy_dispatcher_join_muc (account, room, NULL, NULL);
+
+	g_object_unref (mc);
+}
+
+static void
+main_window_favorite_chatroom_menu_activate_cb (GtkMenuItem    *menu_item,
+						EmpathyChatroom *chatroom)
+{
+	main_window_favorite_chatroom_join (chatroom);
+}
+
+static void
+main_window_favorite_chatroom_menu_add (EmpathyMainWindow *window,
+					EmpathyChatroom    *chatroom)
+{
+	GtkWidget   *menu_item;
+	const gchar *name;
+
+	if (g_object_get_data (G_OBJECT (chatroom), "menu_item")) {
+		return;
 	}
 
-	gtk_widget_set_sensitive (window->room_join_favorites, chatrooms != NULL);
+	name = empathy_chatroom_get_name (chatroom);
+	menu_item = gtk_menu_item_new_with_label (name);
 
-	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_object_set_data (G_OBJECT (chatroom), "menu_item", menu_item);
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (main_window_favorite_chatroom_menu_activate_cb),
+			  chatroom);
 
-	g_list_free (chatrooms);
+	gtk_menu_shell_insert (GTK_MENU_SHELL (window->room_menu),
+			       menu_item, 3);
+
+	gtk_widget_show (menu_item);
 }
 
 static void
@@ -796,29 +724,13 @@ main_window_favorite_chatroom_menu_removed_cb (EmpathyChatroomManager *manager,
 					       EmpathyMainWindow     *window)
 {
 	GtkWidget *menu_item;
+	GList *chatrooms;
 
 	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);
 
-	main_window_favorite_chatroom_menu_update (window);
-}
-
-static void
-main_window_favorite_chatroom_menu_activate_cb (GtkMenuItem    *menu_item,
-						EmpathyChatroom *chatroom)
-{
-	main_window_favorite_chatroom_join (chatroom);
-}
-
-static void
-main_window_favorite_chatroom_menu_update (EmpathyMainWindow *window)
-{
-	GList *chatrooms;
-
 	chatrooms = empathy_chatroom_manager_get_chatrooms (window->chatroom_manager, NULL);
-
 	if (chatrooms) {
 		gtk_widget_show (window->room_sep);
 	} else {
@@ -830,50 +742,32 @@ main_window_favorite_chatroom_menu_update (EmpathyMainWindow *window)
 }
 
 static void
-main_window_favorite_chatroom_menu_add (EmpathyMainWindow *window,
-					EmpathyChatroom    *chatroom)
+main_window_favorite_chatroom_menu_setup (EmpathyMainWindow *window)
 {
-	GtkWidget   *menu_item;
-	const gchar *name;
-
-	if (g_object_get_data (G_OBJECT (chatroom), "menu_item")) {
-		return;
-	}
-
-	name = empathy_chatroom_get_name (chatroom);
-	menu_item = gtk_menu_item_new_with_label (name);
-
-	g_object_set_data (G_OBJECT (chatroom), "menu_item", menu_item);
-	g_signal_connect (menu_item, "activate",
-			  G_CALLBACK (main_window_favorite_chatroom_menu_activate_cb),
-			  chatroom);
-
-	gtk_menu_shell_insert (GTK_MENU_SHELL (window->room_menu),
-			       menu_item, 3);
-
-	gtk_widget_show (menu_item);
-}
+	GList *chatrooms, *l;
 
-static void
-main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
-{
-	MissionControl *mc;
-	McAccount      *account;
-	const gchar    *room;
+	window->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
+	chatrooms = empathy_chatroom_manager_get_chatrooms (window->chatroom_manager, NULL);
+	window->room_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (window->room));
 
-	mc = empathy_mission_control_dup_singleton ();
-	account = empathy_chatroom_get_account (chatroom);
-	room = empathy_chatroom_get_room (chatroom);
+	for (l = chatrooms; l; l = l->next) {
+		main_window_favorite_chatroom_menu_add (window, l->data);
+	}
 
-	 if (mission_control_get_connection_status (mc, account, NULL) !=
-			TP_CONNECTION_STATUS_CONNECTED) {
-		return;
+	if (!chatrooms) {
+		gtk_widget_hide (window->room_sep);
 	}
 
-	DEBUG ("Requesting channel for '%s'", room);
-	empathy_dispatcher_join_muc (account, room, NULL, NULL);
+	gtk_widget_set_sensitive (window->room_join_favorites, chatrooms != NULL);
 
-	g_object_unref (mc);
+	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
@@ -1074,244 +968,6 @@ main_window_throbber_button_press_event_cb (GtkWidget         *throbber_ebox,
 	return FALSE;
 }
 
-static void
-main_window_error_edit_clicked_cb (GtkButton         *button,
-				   EmpathyMainWindow *window)
-{
-	McAccount *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)
-{
-	McAccount *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,
-			   McAccount         *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",
-					       mc_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",
-				       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);
-
-	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->widgets_connected; l; l = l->next) {
-		gtk_widget_set_sensitive (l->data, (connected > 0));
-	}
-}
-
-/*
- * Accels
- */
-static void
-main_window_accels_load (void)
-{
-	gchar *filename;
-
-	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);
-	}
-
-	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,
-				    GtkBuilder        *gui)
-{
-	GList         *list;
-	GObject       *w;
-	gint           i;
-	const gchar *widgets_connected[] = {
-		"room",
-		"chat_new_message",
-		"chat_add_contact",
-		"edit_personal_information"
-	};
-
-	for (i = 0, list = NULL; i < G_N_ELEMENTS (widgets_connected); i++) {
-		w = gtk_builder_get_object (gui, widgets_connected[i]);
-		list = g_list_prepend (list, w);
-	}
-
-	window->widgets_connected = list;
-}
-
 static gboolean
 main_window_configure_event_timeout_cb (EmpathyMainWindow *window)
 {
@@ -1344,6 +1000,15 @@ main_window_configure_event_cb (GtkWidget         *widget,
 }
 
 static void
+main_window_account_created_or_deleted_cb (EmpathyAccountManager  *manager,
+					   McAccount              *account,
+					   EmpathyMainWindow      *window)
+{
+	gtk_widget_set_sensitive (GTK_WIDGET (window->chat_history_menu_item),
+		empathy_account_manager_get_count (manager) > 0);
+}
+
+static void
 main_window_notify_show_offline_cb (EmpathyConf  *conf,
 				    const gchar *key,
 				    gpointer     check_menu_item)
@@ -1407,10 +1072,258 @@ main_window_notify_sort_criterium_cb (EmpathyConf       *conf,
 }
 
 static void
-main_window_account_created_or_deleted_cb (EmpathyAccountManager  *manager,
-					   McAccount              *account,
-					   EmpathyMainWindow      *window)
+main_window_connection_items_setup (EmpathyMainWindow *window,
+				    GtkBuilder        *gui)
 {
-	gtk_widget_set_sensitive (GTK_WIDGET (window->chat_history_menu_item),
-		empathy_account_manager_get_count (manager) > 0);
+	GList         *list;
+	GObject       *w;
+	gint           i;
+	const gchar *widgets_connected[] = {
+		"room",
+		"chat_new_message",
+		"chat_add_contact",
+		"edit_personal_information"
+	};
+
+	for (i = 0, list = NULL; i < G_N_ELEMENTS (widgets_connected); i++) {
+		w = gtk_builder_get_object (gui, widgets_connected[i]);
+		list = g_list_prepend (list, w);
+	}
+
+	window->widgets_connected = list;
 }
+
+GtkWidget *
+empathy_main_window_get (void)
+{
+  return window != NULL ? window->window : NULL;
+}
+
+GtkWidget *
+empathy_main_window_show (void)
+{
+	EmpathyContactList       *list_iface;
+	EmpathyContactMonitor    *monitor;
+	GtkBuilder               *gui;
+	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;
+
+	if (window) {
+		empathy_window_present (GTK_WINDOW (window->window), TRUE);
+		return window->window;
+	}
+
+	window = g_new0 (EmpathyMainWindow, 1);
+
+	/* 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,
+				       "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,
+				       "chat_history", &window->chat_history_menu_item,
+				       NULL);
+	g_free (filename);
+
+	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,
+			      "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);
+
+	/* Set up connection related widgets. */
+	main_window_connection_items_setup (window, gui);
+	g_object_unref (gui);
+
+	window->mc = empathy_mission_control_dup_singleton ();
+	window->account_manager = empathy_account_manager_dup_singleton ();
+
+	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_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);
+	}
+
+	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_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);
+
+	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);
+
+	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;
+}
+