Moved empathy-accounts-dialog from libempathy-gtk to src. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

svn path=/trunk/; revision=1234

4 files changed, 0 insertions, 1517 deletions

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 225c25ec0..fe914877d 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -20,7 +20,6 @@ libempathy_gtk_la_SOURCES =             	\
 	empathy-chat.c				\
 	empathy-irc-network-dialog.c		\
 	empathy-spell-dialog.c			\
-	empathy-accounts-dialog.c		\
 	empathy-chat-view.c			\
 	empathy-log-window.c			\
 	empathy-theme-boxes.c			\
@@ -69,7 +68,6 @@ libempathy_gtk_headers =			\
 	empathy-chat.h				\
 	empathy-irc-network-dialog.h		\
 	empathy-spell-dialog.h			\
-	empathy-accounts-dialog.h		\
 	empathy-chat-view.h			\
 	empathy-log-window.h			\
 	empathy-theme-boxes.h			\
@@ -108,7 +106,6 @@ glade_DATA = 					\
 	empathy-contact-widget.glade		\
 	empathy-contact-dialogs.glade		\
 	empathy-presence-chooser.glade		\
-	empathy-accounts-dialog.glade		\
 	empathy-account-widget-generic.glade	\
 	empathy-account-widget-jabber.glade	\
 	empathy-account-widget-msn.glade	\
diff --git a/libempathy-gtk/empathy-accounts-dialog.c b/libempathy-gtk/empathy-accounts-dialog.c
deleted file mode 100644
index 8e62f1ad9..000000000
--- a/libempathy-gtk/empathy-accounts-dialog.c
+++ /dev/null
@@ -1,1109 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * 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.
- * 
- * Authors: Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-#include <glib/gi18n.h>
-#include <dbus/dbus-glib.h>
-
-#include <libmissioncontrol/mc-account.h>
-#include <libmissioncontrol/mc-profile.h>
-#include <libmissioncontrol/mission-control.h>
-#include <libmissioncontrol/mc-account-monitor.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-accounts-dialog.h"
-#include "empathy-profile-chooser.h"
-#include "empathy-account-widget.h"
-#include "empathy-account-widget-irc.h"
-#include "empathy-account-widget-sip.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
-
-/* Flashing delay for icons (milliseconds). */
-#define FLASH_TIMEOUT 500
-
-typedef struct {
-	GtkWidget        *window;
-
-	GtkWidget        *alignment_settings;
-
-	GtkWidget        *vbox_details;
-	GtkWidget        *frame_no_account;
-	GtkWidget        *label_no_account;
-	GtkWidget        *label_no_account_blurb;
-
-	GtkWidget        *treeview;
-
-	GtkWidget        *button_add;
-	GtkWidget        *button_remove;
-
-	GtkWidget        *frame_new_account;
-	GtkWidget        *combobox_profile;
-	GtkWidget        *hbox_type;
-	GtkWidget        *button_create;
-	GtkWidget        *button_back;
-
-	GtkWidget        *image_type;
-	GtkWidget        *label_name;
-	GtkWidget        *label_type;
-	GtkWidget        *settings_widget;
-
-	gboolean          connecting_show;
-	guint             connecting_id;
-	gboolean          account_changed;
-
-	MissionControl   *mc;
-	McAccountMonitor *monitor;
-	gpointer          token;
-} EmpathyAccountsDialog;
-
-enum {
-	COL_ENABLED,
-	COL_NAME,
-	COL_STATUS,
-	COL_ACCOUNT_POINTER,
-	COL_COUNT
-};
-
-static void       accounts_dialog_setup                     (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_update_account            (EmpathyAccountsDialog    *dialog,
-							     McAccount                *account);
-static void       accounts_dialog_model_setup               (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_add_columns         (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_select_first        (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_pixbuf_data_func    (GtkTreeViewColumn        *tree_column,
-							     GtkCellRenderer          *cell,
-							     GtkTreeModel             *model,
-							     GtkTreeIter              *iter,
-							     EmpathyAccountsDialog    *dialog);
-static McAccount *accounts_dialog_model_get_selected        (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_set_selected        (EmpathyAccountsDialog    *dialog,
-							     McAccount                *account);
-static gboolean   accounts_dialog_model_remove_selected     (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_selection_changed   (GtkTreeSelection         *selection,
-							     EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_add_account               (EmpathyAccountsDialog    *dialog,
-							     McAccount                *account);
-static void       accounts_dialog_account_added_cb          (McAccountMonitor         *monitor,
-							     gchar                    *unique_name,
-							     EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_account_removed_cb        (McAccountMonitor         *monitor,
-							     gchar                    *unique_name,
-							     EmpathyAccountsDialog    *dialog);
-static gboolean   accounts_dialog_row_changed_foreach       (GtkTreeModel             *model,
-							     GtkTreePath              *path,
-							     GtkTreeIter              *iter,
-							     gpointer                  user_data);
-static gboolean   accounts_dialog_flash_connecting_cb       (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_status_changed_cb         (MissionControl           *mc,
-							     TpConnectionStatus        status,
-							     McPresence                presence,
-							     TpConnectionStatusReason  reason,
-							     const gchar              *unique_name,
-							     EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_create_clicked_cb  (GtkWidget                *button,
-							     EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_back_clicked_cb    (GtkWidget                *button,
-							     EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_add_clicked_cb     (GtkWidget                *button,
-							     EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_help_clicked_cb    (GtkWidget                *button,
-							     EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_remove_response_cb        (GtkWidget                *dialog,
-							     gint                      response,
-							     McAccount                *account);
-static void       accounts_dialog_button_remove_clicked_cb  (GtkWidget                *button,
-							     EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_response_cb               (GtkWidget                *widget,
-							     gint                      response,
-							     EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_destroy_cb                (GtkWidget                *widget,
-							     EmpathyAccountsDialog    *dialog);
-
-static void
-accounts_dialog_setup (EmpathyAccountsDialog *dialog)
-{
-	GtkTreeView  *view;
-	GtkListStore *store;
-	GtkTreeIter   iter;
-	GList        *accounts, *l;
-
-	view = GTK_TREE_VIEW (dialog->treeview);
-	store = GTK_LIST_STORE (gtk_tree_view_get_model (view));
-
-	accounts = mc_accounts_list ();
-
-	for (l = accounts; l; l = l->next) {
-		McAccount          *account;
-		const gchar        *name;
-		TpConnectionStatus  status;
-		gboolean            enabled;
-
-		account = l->data;
-
-		name = mc_account_get_display_name (account);
-		if (!name) {
-			g_object_unref (account);
-			continue;
-		}
-
-		status = mission_control_get_connection_status (dialog->mc, account, NULL);
-		enabled = mc_account_is_enabled (account);
-
-		gtk_list_store_insert_with_values (store, &iter,
-						   -1,
-						   COL_ENABLED, enabled,
-						   COL_NAME, name,
-						   COL_STATUS, status,
-						   COL_ACCOUNT_POINTER, account,
-						   -1);
-
-		accounts_dialog_status_changed_cb (dialog->mc,
-						   status,
-						   MC_PRESENCE_UNSET,
-						   TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED,
-						   mc_account_get_unique_name (account),
-						   dialog);
-
-		g_object_unref (account);
-	}
-
-	g_list_free (accounts);
-}
-
-static void
-accounts_dialog_update_account (EmpathyAccountsDialog *dialog,
-				McAccount            *account)
-{
-	if (dialog->settings_widget) {
-		gtk_widget_destroy (dialog->settings_widget);
-		dialog->settings_widget = NULL;
-	}
-
-	if (!account) {
-		GtkTreeView  *view;
-		GtkTreeModel *model;
-		GString      *string;
-		gchar        *str;
-
-		gtk_widget_show (dialog->frame_no_account);
-		gtk_widget_hide (dialog->vbox_details);
-
-		gtk_widget_set_sensitive (dialog->button_remove, FALSE);
-
-		view = GTK_TREE_VIEW (dialog->treeview);
-		model = gtk_tree_view_get_model (view);
-
-		if (empathy_profile_chooser_n_profiles (dialog->combobox_profile) > 0) {
-			string = g_string_new (_("To add a new account, you can click on the "
-						 "'Add' button and a new entry will be created "
-						 "for you to start configuring."));
-		} else {
-			string = g_string_new (_("To add a new account, you first have to "
-						 "install a backend for each protocol "
-						 "you want to use."));
-		}
-
-		if (gtk_tree_model_iter_n_children (model, NULL) > 0) {
-			gtk_label_set_markup (GTK_LABEL (dialog->label_no_account),
-					      _("<b>No Account Selected</b>"));
-			g_string_append (string, _("\n\n"
-					"If you do not want to add an account, simply "
-					"click on the account you want to configure in "
-					"the list on the left."));
-		} else {
-			gtk_label_set_markup (GTK_LABEL (dialog->label_no_account),
-					      _("<b>No Accounts Configured</b>"));
-		}
-
-		str = g_string_free (string, FALSE);
-		gtk_label_set_markup (GTK_LABEL (dialog->label_no_account_blurb),
-				      str);
-		g_free (str);
-	} else {
-		McProfile *profile;
-		const gchar *config_ui;
-
-		gtk_widget_hide (dialog->frame_no_account);
-		gtk_widget_show (dialog->vbox_details);
-
-		profile = mc_account_get_profile (account);
-		config_ui = mc_profile_get_configuration_ui (profile);
-		g_object_unref (profile);
-
-		if (!tp_strdiff (config_ui, "jabber")) {
-			dialog->settings_widget = 
-				empathy_account_widget_jabber_new (account);
-		} 
-		else if (!tp_strdiff (config_ui, "msn")) {
-			dialog ->settings_widget =
-				empathy_account_widget_msn_new (account);
-		}
-		else if (!tp_strdiff (config_ui, "local-xmpp")) {
-			dialog->settings_widget =
-				empathy_account_widget_salut_new (account);
-		}
-		else if (!tp_strdiff (config_ui, "irc")) {
-			dialog->settings_widget =
-				empathy_account_widget_irc_new (account);
-		}
-		else if (!tp_strdiff(config_ui, "icq")) {
-			dialog->settings_widget =
-				empathy_account_widget_icq_new (account);
-		}
-		else if (!tp_strdiff(config_ui, "aim")) {
-			dialog->settings_widget =
-				empathy_account_widget_aim_new (account);
-		}
-		else if (!tp_strdiff (config_ui, "yahoo")) {
-			dialog->settings_widget =
-				empathy_account_widget_yahoo_new (account);
-		}
-		else if  (!tp_strdiff (config_ui, "sofiasip")) {
-			dialog->settings_widget =
-				empathy_account_widget_sip_new (account);
-		}
-		else if  (!tp_strdiff (config_ui, "groupwise")) {
-			dialog->settings_widget =
-				empathy_account_widget_groupwise_new (account);
-		}
-		else {
-			dialog->settings_widget = 
-				empathy_account_widget_generic_new (account);
-		}
-	}
-
-	if (dialog->settings_widget) {
-		gtk_container_add (GTK_CONTAINER (dialog->alignment_settings),
-				   dialog->settings_widget);
-	}
-
-	if (account) {
-		McProfile *profile;
-		gchar     *text;
-
-		profile = mc_account_get_profile (account);
-		gtk_image_set_from_icon_name (GTK_IMAGE (dialog->image_type),
-					      mc_profile_get_icon_name (profile),
-					      GTK_ICON_SIZE_DIALOG);
-		gtk_widget_set_tooltip_text (dialog->image_type,
-					     mc_profile_get_display_name (profile));
-
-		text = g_markup_printf_escaped ("<big><b>%s</b></big>",
-				mc_account_get_display_name (account));
-		gtk_label_set_markup (GTK_LABEL (dialog->label_name), text);
-		g_free (text);
-	}
-}
-
-static void
-accounts_dialog_model_setup (EmpathyAccountsDialog *dialog)
-{
-	GtkListStore     *store;
-	GtkTreeSelection *selection;
-
-	store = gtk_list_store_new (COL_COUNT,
-				    G_TYPE_BOOLEAN,    /* enabled */
-				    G_TYPE_STRING,     /* name */
-				    G_TYPE_UINT,       /* status */
-				    MC_TYPE_ACCOUNT);  /* account */
-
-	gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->treeview),
-				 GTK_TREE_MODEL (store));
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->treeview));
-	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-
-	g_signal_connect (selection, "changed",
-			  G_CALLBACK (accounts_dialog_model_selection_changed),
-			  dialog);
-
-	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-					      COL_NAME, GTK_SORT_ASCENDING);
-
-	accounts_dialog_model_add_columns (dialog);
-
-	g_object_unref (store);
-}
-
-static void
-accounts_dialog_name_edited_cb (GtkCellRendererText   *renderer,
-				gchar                 *path,
-				gchar                 *new_text,
-				EmpathyAccountsDialog *dialog)
-{
-	McAccount    *account;
-	GtkTreeModel *model;
-	GtkTreePath  *treepath;
-	GtkTreeIter   iter;
-
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
-	treepath = gtk_tree_path_new_from_string (path);
-	gtk_tree_model_get_iter (model, &iter, treepath);
-	gtk_tree_model_get (model, &iter,
-			    COL_ACCOUNT_POINTER, &account,
-			    -1);
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-			    COL_NAME, new_text,
-			    -1);
-	gtk_tree_path_free (treepath);
-
-	mc_account_set_display_name (account, new_text);
-	g_object_unref (account);
-}
-
-static void
-accounts_dialog_enable_toggled_cb (GtkCellRendererToggle *cell_renderer,
-				   gchar                 *path,
-				   EmpathyAccountsDialog *dialog)
-{
-	McAccount    *account;
-	GtkTreeModel *model;
-	GtkTreePath  *treepath;
-	GtkTreeIter   iter;
-	gboolean      enabled;
-
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
-	treepath = gtk_tree_path_new_from_string (path);
-	gtk_tree_model_get_iter (model, &iter, treepath);
-	gtk_tree_model_get (model, &iter,
-			    COL_ACCOUNT_POINTER, &account,
-			    -1);
-	gtk_tree_path_free (treepath);
-
-	enabled = mc_account_is_enabled (account);
-	mc_account_set_enabled (account, !enabled);
-
-	DEBUG ("%s account %s", enabled ? "Disabled" : "Enable",
-		mc_account_get_display_name(account));
-
-	g_object_unref (account);
-}
-
-static void
-accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
-{
-	GtkTreeView       *view;
-	GtkTreeViewColumn *column;
-	GtkCellRenderer   *cell;
-
-	view = GTK_TREE_VIEW (dialog->treeview);
-	gtk_tree_view_set_headers_visible (view, TRUE);
-
-	/* Enabled column */
-	cell = gtk_cell_renderer_toggle_new ();
-	gtk_tree_view_insert_column_with_attributes (view, -1,
-						     _("Enabled"),
-						     cell,
-						     "active", COL_ENABLED,
-						     NULL);
-	g_signal_connect (cell, "toggled",
-			  G_CALLBACK (accounts_dialog_enable_toggled_cb),
-			  dialog);
-	
-	/* Account column */
-	column = gtk_tree_view_column_new ();
-	gtk_tree_view_column_set_title (column, _("Accounts"));
-	gtk_tree_view_column_set_expand (column, TRUE);
-	gtk_tree_view_append_column (view, column);
-
-	/* Icon renderer */
-	cell = gtk_cell_renderer_pixbuf_new ();
-	gtk_tree_view_column_pack_start (column, cell, FALSE);
-	gtk_tree_view_column_set_cell_data_func (column, cell,
-						 (GtkTreeCellDataFunc)
-						 accounts_dialog_model_pixbuf_data_func,
-						 dialog,
-						 NULL);
-
-	/* Name renderer */
-	cell = gtk_cell_renderer_text_new ();
-	g_object_set (cell,
-		      "ellipsize", PANGO_ELLIPSIZE_END,
-		      "editable", TRUE,
-		      NULL);
-	gtk_tree_view_column_pack_start (column, cell, TRUE);
-	gtk_tree_view_column_add_attribute (column, cell, "text", COL_NAME);
-	g_signal_connect (cell, "edited",
-			  G_CALLBACK (accounts_dialog_name_edited_cb),
-			  dialog);
-}
-
-static void
-accounts_dialog_model_select_first (EmpathyAccountsDialog *dialog)
-{
-	GtkTreeView      *view;
-	GtkTreeModel     *model;
-	GtkTreeSelection *selection;
-	GtkTreeIter       iter;
-
-	/* select first */
-	view = GTK_TREE_VIEW (dialog->treeview);
-	model = gtk_tree_view_get_model (view);
-	
-	if (gtk_tree_model_get_iter_first (model, &iter)) {
-		selection = gtk_tree_view_get_selection (view);
-		gtk_tree_selection_select_iter (selection, &iter);
-	} else {
-		accounts_dialog_update_account (dialog, NULL);
-	}
-}
-
-static void
-accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn    *tree_column,
-					GtkCellRenderer      *cell,
-					GtkTreeModel         *model,
-					GtkTreeIter          *iter,
-					EmpathyAccountsDialog *dialog)
-{
-	McAccount          *account;
-	const gchar        *icon_name;
-	GdkPixbuf          *pixbuf;
-	TpConnectionStatus  status;
-
-	gtk_tree_model_get (model, iter,
-			    COL_STATUS, &status,
-			    COL_ACCOUNT_POINTER, &account,
-			    -1);
-
-	icon_name = empathy_icon_name_from_account (account);
-	pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
-
-	if (pixbuf) {
-		if (status == TP_CONNECTION_STATUS_DISCONNECTED ||
-		    (status == TP_CONNECTION_STATUS_CONNECTING && 
-		     !dialog->connecting_show)) {
-			GdkPixbuf *modded_pixbuf;
-
-			modded_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-							TRUE,
-							8,
-							gdk_pixbuf_get_width (pixbuf),
-							gdk_pixbuf_get_height (pixbuf));
-
-			gdk_pixbuf_saturate_and_pixelate (pixbuf,
-							  modded_pixbuf,
-							  1.0,
-							  TRUE);
-			g_object_unref (pixbuf);
-			pixbuf = modded_pixbuf;
-		}
-	}
-
-	g_object_set (cell,
-		      "visible", TRUE,
-		      "pixbuf", pixbuf,
-		      NULL);
-
-	g_object_unref (account);
-	if (pixbuf) {
-		g_object_unref (pixbuf);
-	}
-}
-
-static gboolean
-accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
-				 McAccount             *account,
-				 GtkTreeIter           *iter)
-{
-	GtkTreeView      *view;
-	GtkTreeSelection *selection;
-	GtkTreeModel     *model;
-	gboolean          ok;
-	
-	/* Update the status in the model */
-	view = GTK_TREE_VIEW (dialog->treeview);
-	selection = gtk_tree_view_get_selection (view);
-	model = gtk_tree_view_get_model (view);
-
-	for (ok = gtk_tree_model_get_iter_first (model, iter);
-	     ok;
-	     ok = gtk_tree_model_iter_next (model, iter)) {
-		McAccount *this_account;
-		gboolean   equal;
-
-		gtk_tree_model_get (model, iter,
-				    COL_ACCOUNT_POINTER, &this_account,
-				    -1);
-
-		equal = empathy_account_equal (this_account, account);
-		g_object_unref (this_account);
-
-		if (equal) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static McAccount *
-accounts_dialog_model_get_selected (EmpathyAccountsDialog *dialog)
-{
-	GtkTreeView      *view;
-	GtkTreeModel     *model;
-	GtkTreeSelection *selection;
-	GtkTreeIter       iter;
-	McAccount        *account;
-
-	view = GTK_TREE_VIEW (dialog->treeview);
-	selection = gtk_tree_view_get_selection (view);
-
-	if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-		return NULL;
-	}
-
-	gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, &account, -1);
-
-	return account;
-}
-
-static void
-accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
-				    McAccount             *account)
-{
-	GtkTreeSelection *selection;
-	GtkTreeIter       iter;
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->treeview));
-	if (accounts_dialog_get_account_iter (dialog, account, &iter)) {
-		gtk_tree_selection_select_iter (selection, &iter);
-	}
-}
-
-static gboolean
-accounts_dialog_model_remove_selected (EmpathyAccountsDialog *dialog)
-{
-	GtkTreeView      *view;
-	GtkTreeModel     *model;
-	GtkTreeSelection *selection;
-	GtkTreeIter       iter;
-
-	view = GTK_TREE_VIEW (dialog->treeview);
-	selection = gtk_tree_view_get_selection (view);
-
-	if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-		return FALSE;
-	}
-
-	return gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-}
-
-static void
-accounts_dialog_model_selection_changed (GtkTreeSelection     *selection,
-					 EmpathyAccountsDialog *dialog)
-{
-	McAccount    *account;
-	GtkTreeModel *model;
-	GtkTreeIter   iter;
-	gboolean      is_selection;
-
-	is_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
-
-	gtk_widget_set_sensitive (dialog->button_add, TRUE);
-	gtk_widget_set_sensitive (dialog->button_remove, is_selection);
-
-	account = accounts_dialog_model_get_selected (dialog);
-	accounts_dialog_update_account (dialog, account);
-
-	if (account) {
-		g_object_unref (account);
-	}
-
-	/* insure new account frame is hidden when a row is selected*/
-	gtk_widget_hide (dialog->frame_new_account);
-}
-
-static void
-accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
-			     McAccount             *account)
-{
-	GtkTreeModel       *model;
-	GtkTreeIter         iter;
-	TpConnectionStatus  status;
-	const gchar        *name;
-	gboolean            enabled;
-
-	if (accounts_dialog_get_account_iter (dialog, account, &iter)) {
-		return;
-	}
-
-	status = mission_control_get_connection_status (dialog->mc, account, NULL);
-	name = mc_account_get_display_name (account);
-	enabled = mc_account_is_enabled (account);
-
-	g_return_if_fail (name != NULL);
-
-	DEBUG ("Adding new account: %s", name);
-
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
-	gtk_list_store_insert_with_values (GTK_LIST_STORE (model), &iter,
-					   -1,
-					   COL_ENABLED, enabled,
-					   COL_NAME, name,
-					   COL_STATUS, status,
-					   COL_ACCOUNT_POINTER, account,
-					   -1);
-}
-
-static void
-accounts_dialog_account_added_cb (McAccountMonitor     *monitor,
-				  gchar                *unique_name,
-				  EmpathyAccountsDialog *dialog)
-{
-	McAccount *account;
-
-	account = mc_account_lookup (unique_name);
-	accounts_dialog_add_account (dialog, account);
-	g_object_unref (account);
-}
-
-static void
-accounts_dialog_account_removed_cb (McAccountMonitor     *monitor,
-				    gchar                *unique_name,
-				    EmpathyAccountsDialog *dialog)
-{
-	McAccount *account;
-
-	account = mc_account_lookup (unique_name);
-
-	accounts_dialog_model_set_selected (dialog, account);
-	accounts_dialog_model_remove_selected (dialog);
-
-	g_object_unref (account);
-}
-
-static gboolean
-accounts_dialog_row_changed_foreach (GtkTreeModel *model,
-				     GtkTreePath  *path,
-				     GtkTreeIter  *iter,
-				     gpointer      user_data)
-{
-	gtk_tree_model_row_changed (model, path, iter);
-
-	return FALSE;
-}
-
-static gboolean
-accounts_dialog_flash_connecting_cb (EmpathyAccountsDialog *dialog)
-{
-	GtkTreeView  *view;
-	GtkTreeModel *model;
-
-	dialog->connecting_show = !dialog->connecting_show;
-
-	view = GTK_TREE_VIEW (dialog->treeview);
-	model = gtk_tree_view_get_model (view);
-
-	gtk_tree_model_foreach (model, accounts_dialog_row_changed_foreach, NULL);
-
-	return TRUE;
-}
-
-static void
-accounts_dialog_status_changed_cb (MissionControl           *mc,
-				   TpConnectionStatus        status,
-				   McPresence                presence,
-				   TpConnectionStatusReason  reason,
-				   const gchar              *unique_name,
-				   EmpathyAccountsDialog    *dialog)
-{
-	GtkTreeModel *model;
-	GtkTreeIter   iter;
-	McAccount    *account;
-	GList        *accounts, *l;
-	gboolean      found = FALSE;
-	
-	/* Update the status in the model */
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
-	account = mc_account_lookup (unique_name);
-
-	DEBUG ("Status changed for account %s: status=%d presence=%d",
-		unique_name, status, presence);
-
-	if (accounts_dialog_get_account_iter (dialog, account, &iter)) {
-		GtkTreePath *path;
-
-		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-				    COL_STATUS, status,
-				    -1);
-
-		path = gtk_tree_model_get_path (model, &iter);
-		gtk_tree_model_row_changed (model, path, &iter);
-		gtk_tree_path_free (path);
-	}
-	g_object_unref (account);
-
-	/* Check if there is still accounts in CONNECTING state */
-	accounts = mc_accounts_list_by_enabled (TRUE);
-	for (l = accounts; l; l = l->next) {
-		McAccount          *this_account = l->data;
-		TpConnectionStatus  status;
-
-		if (found) {
-			g_object_unref (this_account);
-			continue;
-		}
-
-		status = mission_control_get_connection_status (mc, this_account, NULL);
-		if (status == TP_CONNECTION_STATUS_CONNECTING) {
-			found = TRUE;
-		}
-
-		g_object_unref (this_account);
-	}
-	g_list_free (accounts);
-
-	if (!found && dialog->connecting_id) {
-		g_source_remove (dialog->connecting_id);
-		dialog->connecting_id = 0;
-	}
-	if (found && !dialog->connecting_id) {
-		dialog->connecting_id = g_timeout_add (FLASH_TIMEOUT,
-						       (GSourceFunc) accounts_dialog_flash_connecting_cb,
-						       dialog);
-	}
-}
-
-static void
-accounts_dialog_account_enabled_cb (McAccountMonitor      *monitor,
-				    gchar                 *unique_name,
-				    EmpathyAccountsDialog *dialog)
-{
-	GtkTreeModel *model;
-	GtkTreeIter   iter;
-	McAccount    *account;
-	gboolean      enabled;
-
-	/* Update the status in the model */
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
-	account = mc_account_lookup (unique_name);
-	enabled = mc_account_is_enabled (account);
-
-	DEBUG ("Account %s is now %s",
-		mc_account_get_display_name (account),
-		enabled ? "enabled" : "disabled");
-
-	if (accounts_dialog_get_account_iter (dialog, account, &iter)) {
-		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-				    COL_ENABLED, enabled,
-				    -1);
-	}
-
-	g_object_unref (account);
-}
-
-static void
-accounts_dialog_button_create_clicked_cb (GtkWidget             *button,
-					  EmpathyAccountsDialog  *dialog)
-{
-	McProfile   *profile;
-	McAccount   *account;
-	const gchar *str;
-
-	/* Update widgets */
-	gtk_widget_show (dialog->vbox_details);
-	gtk_widget_hide (dialog->frame_no_account);
-	gtk_widget_hide (dialog->frame_new_account);
-
-	profile = empathy_profile_chooser_get_selected (dialog->combobox_profile);
-
-	/* Create account */
-	account = mc_account_create (profile);
-
-	str = mc_account_get_unique_name (account);
-	mc_account_set_display_name (account, str);
-
-	accounts_dialog_add_account (dialog, account);
-	accounts_dialog_model_set_selected (dialog, account);
-
-	g_object_unref (account);
-	g_object_unref (profile);
-}
-
-static void
-accounts_dialog_button_back_clicked_cb (GtkWidget             *button,
-					EmpathyAccountsDialog  *dialog)
-{
-	McAccount *account;
-
-	gtk_widget_hide (dialog->vbox_details);
-	gtk_widget_hide (dialog->frame_no_account);
-	gtk_widget_hide (dialog->frame_new_account);
-
-	gtk_widget_set_sensitive (dialog->button_add, TRUE);
-
-	account = accounts_dialog_model_get_selected (dialog);
-	accounts_dialog_update_account (dialog, account);
-}
-
-static void
-accounts_dialog_button_add_clicked_cb (GtkWidget             *button,
-				       EmpathyAccountsDialog *dialog)
-{
-	GtkTreeView      *view;
-	GtkTreeSelection *selection;
-
-	view = GTK_TREE_VIEW (dialog->treeview);
-	selection = gtk_tree_view_get_selection (view);
-	gtk_tree_selection_unselect_all (selection);
-
-	gtk_widget_set_sensitive (dialog->button_add, FALSE);
-	gtk_widget_hide (dialog->vbox_details);
-	gtk_widget_hide (dialog->frame_no_account);
-	gtk_widget_show (dialog->frame_new_account);
-
-	gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->combobox_profile), 0);
-	gtk_widget_grab_focus (dialog->combobox_profile);
-}
-
-static void
-accounts_dialog_button_help_clicked_cb (GtkWidget             *button,
-					EmpathyAccountsDialog *dialog)
-{
-	empathy_url_show ("ghelp:empathy?empathy-create-account");
-}
-
-static void
-accounts_dialog_remove_response_cb (GtkWidget *dialog,
-				    gint       response,
-				    McAccount *account)
-{
-	if (response == GTK_RESPONSE_YES) {
-		mc_account_delete (account);
-	}
-
-	gtk_widget_destroy (dialog);
-}
-
-static void
-accounts_dialog_button_remove_clicked_cb (GtkWidget            *button,
-					  EmpathyAccountsDialog *dialog)
-{
-	McAccount *account;
-	GtkWidget *message_dialog;
-
-	account = accounts_dialog_model_get_selected (dialog);
-
-	if (!mc_account_is_complete (account)) {
-		accounts_dialog_model_remove_selected (dialog);
-		return;
-	}
-	message_dialog = gtk_message_dialog_new
-		(GTK_WINDOW (dialog->window),
-		 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-		 GTK_MESSAGE_QUESTION,
-		 GTK_BUTTONS_NONE,
-		 _("You are about to remove your %s account!\n"
-		   "Are you sure you want to proceed?"),
-		 mc_account_get_display_name (account));
-
-	gtk_message_dialog_format_secondary_text
-		(GTK_MESSAGE_DIALOG (message_dialog),
-		 _("Any associated conversations and chat rooms will NOT be "
-		   "removed if you decide to proceed.\n"
-		   "\n"
-		   "Should you decide to add the account back at a later time, "
-		   "they will still be available."));
-
-	gtk_dialog_add_button (GTK_DIALOG (message_dialog),
-			       GTK_STOCK_CANCEL, 
-			       GTK_RESPONSE_NO);
-	gtk_dialog_add_button (GTK_DIALOG (message_dialog),
-			       GTK_STOCK_REMOVE, 
-			       GTK_RESPONSE_YES);
-
-	g_signal_connect (message_dialog, "response",
-			  G_CALLBACK (accounts_dialog_remove_response_cb),
-			  account);
-
-	gtk_widget_show (message_dialog);
-}
-
-static void
-accounts_dialog_response_cb (GtkWidget            *widget,
-			     gint                  response,
-			     EmpathyAccountsDialog *dialog)
-{
-	if (response == GTK_RESPONSE_CLOSE) {
-		gtk_widget_destroy (widget);
-	}
-}
-
-static void
-accounts_dialog_destroy_cb (GtkWidget            *widget,
-			    EmpathyAccountsDialog *dialog)
-{
-	GList *accounts, *l;
-
-	/* Disconnect signals */
-	g_signal_handlers_disconnect_by_func (dialog->monitor,
-					      accounts_dialog_account_added_cb,
-					      dialog);
-	g_signal_handlers_disconnect_by_func (dialog->monitor,
-					      accounts_dialog_account_removed_cb,
-					      dialog);
-	g_signal_handlers_disconnect_by_func (dialog->monitor,
-					      accounts_dialog_account_enabled_cb,
-					      dialog);
-	empathy_disconnect_account_status_changed (dialog->token);
-
-	/* Delete incomplete accounts */
-	accounts = mc_accounts_list ();
-	for (l = accounts; l; l = l->next) {
-		McAccount *account;
-
-		account = l->data;
-		if (!mc_account_is_complete (account)) {
-			/* FIXME: Warn the user the account is not complete
-			 *        and is going to be removed. */
-			mc_account_delete (account);
-		}
-
-		g_object_unref (account);
-	}
-	g_list_free (accounts);
-
-	if (dialog->connecting_id) {
-		g_source_remove (dialog->connecting_id);
-	}
-
-	g_object_unref (dialog->mc);
-	g_object_unref (dialog->monitor);
-	
-	g_free (dialog);
-}
-
-GtkWidget *
-empathy_accounts_dialog_show (GtkWindow *parent,
-			      McAccount *selected_account)
-{
-	static EmpathyAccountsDialog *dialog = NULL;
-	GladeXML                     *glade;
-	gchar                        *filename;
-
-	if (dialog) {
-		gtk_window_present (GTK_WINDOW (dialog->window));
-		return dialog->window;
-	}
-
-	dialog = g_new0 (EmpathyAccountsDialog, 1);
-
-	filename = empathy_file_lookup ("empathy-accounts-dialog.glade",
-					"libempathy-gtk");
-	glade = empathy_glade_get_file (filename,
-				       "accounts_dialog",
-				       NULL,
-				       "accounts_dialog", &dialog->window,
-				       "vbox_details", &dialog->vbox_details,
-				       "frame_no_account", &dialog->frame_no_account,
-				       "label_no_account", &dialog->label_no_account,
-				       "label_no_account_blurb", &dialog->label_no_account_blurb,
-				       "alignment_settings", &dialog->alignment_settings,
-				       "treeview", &dialog->treeview,
-				       "frame_new_account", &dialog->frame_new_account,
-				       "hbox_type", &dialog->hbox_type,
-				       "button_create", &dialog->button_create,
-				       "button_back", &dialog->button_back,
-				       "image_type", &dialog->image_type,
-				       "label_name", &dialog->label_name,
-				       "button_add", &dialog->button_add,
-				       "button_remove", &dialog->button_remove,
-				       NULL);
-	g_free (filename);
-
-	empathy_glade_connect (glade,
-			      dialog,
-			      "accounts_dialog", "destroy", accounts_dialog_destroy_cb,
-			      "accounts_dialog", "response", accounts_dialog_response_cb,
-			      "button_create", "clicked", accounts_dialog_button_create_clicked_cb,
-			      "button_back", "clicked", accounts_dialog_button_back_clicked_cb,
-			      "button_add", "clicked", accounts_dialog_button_add_clicked_cb,
-			      "button_remove", "clicked", accounts_dialog_button_remove_clicked_cb,
-			      "button_help", "clicked", accounts_dialog_button_help_clicked_cb,
-			      NULL);
-
-	g_object_add_weak_pointer (G_OBJECT (dialog->window), (gpointer) &dialog);
-
-	g_object_unref (glade);
-
-	/* Create profile chooser */
-	dialog->combobox_profile = empathy_profile_chooser_new ();
-	gtk_box_pack_end (GTK_BOX (dialog->hbox_type),
-			  dialog->combobox_profile,
-			  TRUE, TRUE, 0);
-	gtk_widget_show (dialog->combobox_profile);
-	if (empathy_profile_chooser_n_profiles (dialog->combobox_profile) <= 0) {
-		gtk_widget_set_sensitive (dialog->button_add, FALSE);
-	}
-
-	/* Set up signalling */
-	dialog->mc = empathy_mission_control_new ();
-	dialog->monitor = mc_account_monitor_new ();
-
-	g_signal_connect (dialog->monitor, "account-created",
-			  G_CALLBACK (accounts_dialog_account_added_cb),
-			  dialog);
-	g_signal_connect (dialog->monitor, "account-deleted",
-			  G_CALLBACK (accounts_dialog_account_removed_cb),
-			  dialog);
-	g_signal_connect (dialog->monitor, "account-enabled",
-			  G_CALLBACK (accounts_dialog_account_enabled_cb),
-			  dialog);
-	g_signal_connect (dialog->monitor, "account-disabled",
-			  G_CALLBACK (accounts_dialog_account_enabled_cb),
-			  dialog);
-	dialog->token = empathy_connect_to_account_status_changed (dialog->mc,
-						   G_CALLBACK (accounts_dialog_status_changed_cb),
-						   dialog, NULL);
-
-	accounts_dialog_model_setup (dialog);
-	accounts_dialog_setup (dialog);
-
-	if (selected_account) {
-		accounts_dialog_model_set_selected (dialog, selected_account);
-	} else {
-		accounts_dialog_model_select_first (dialog);
-	}
-
-	if (parent) {
-		gtk_window_set_transient_for (GTK_WINDOW (dialog->window),
-					      GTK_WINDOW (parent));
-	}
-
-	gtk_widget_show (dialog->window);
-
-	return dialog->window;
-}
-
diff --git a/libempathy-gtk/empathy-accounts-dialog.glade b/libempathy-gtk/empathy-accounts-dialog.glade
deleted file mode 100644
index 9678092f2..000000000
--- a/libempathy-gtk/empathy-accounts-dialog.glade
+++ /dev/null
@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkDialog" id="accounts_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Accounts</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkHBox" id="hbox146">
-            <property name="visible">True</property>
-            <property name="border_width">6</property>
-            <property name="spacing">18</property>
-            <child>
-              <widget class="GtkVBox" id="vbox195">
-                <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow17">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <child>
-                      <widget class="GtkTreeView" id="treeview">
-                        <property name="width_request">250</property>
-                        <property name="height_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="enable_search">False</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkHBox" id="hbox148">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <property name="homogeneous">True</property>
-                    <child>
-                      <widget class="GtkButton" id="button_add">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="label">gtk-add</property>
-                        <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="button_remove">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="label">gtk-remove</property>
-                        <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox214">
-                <property name="width_request">415</property>
-                <property name="visible">True</property>
-                <property name="spacing">18</property>
-                <child>
-                  <widget class="GtkVBox" id="vbox_details">
-                    <property name="visible">True</property>
-                    <property name="spacing">18</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox183">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <widget class="GtkLabel" id="label_name">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label">&lt;big&gt;&lt;b&gt;Gmail&lt;/b&gt;&lt;/big&gt;</property>
-                            <property name="use_markup">True</property>
-                            <property name="selectable">True</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkImage" id="image_type">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                            <property name="stock">gtk-cut</property>
-                            <property name="icon_size">6</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkFrame" id="frame2">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment_settings">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="left_padding">20</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label599">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Settings&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame_new_account">
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment29">
-                        <property name="visible">True</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">20</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox216">
-                            <property name="visible">True</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <widget class="GtkHBox" id="hbox_type">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <widget class="GtkLabel" id="label645">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Type:</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkHBox" id="hbox181">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <widget class="GtkButton" id="button_create">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="response_id">0</property>
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment1">
-                                        <property name="visible">True</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <child>
-                                          <widget class="GtkHBox" id="hbox1">
-                                            <property name="visible">True</property>
-                                            <property name="spacing">2</property>
-                                            <child>
-                                              <widget class="GtkImage" id="image1">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-new</property>
-                                              </widget>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <widget class="GtkLabel" id="label1">
-                                                <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Cr_eate</property>
-                                                <property name="use_underline">True</property>
-                                              </widget>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">GTK_PACK_END</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkButton" id="button_back">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label">gtk-go-back</property>
-                                    <property name="use_stock">True</property>
-                                    <property name="response_id">0</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">GTK_PACK_END</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="pack_type">GTK_PACK_END</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label643">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;New Account&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame_no_account">
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment21">
-                        <property name="visible">True</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkLabel" id="label_no_account_blurb">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">To add a new account, you can click on the 'Add' button and a new entry will be created for you to started configuring.
-
-If you do not want to add an account, simply click on the account you want to configure in the list on the left.</property>
-                            <property name="use_markup">True</property>
-                            <property name="wrap">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label_no_account">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;No Account Selected&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <widget class="GtkButton" id="button_help">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-help</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">-11</property>
-              </widget>
-              <packing>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button_close">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">-7</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/libempathy-gtk/empathy-accounts-dialog.h b/libempathy-gtk/empathy-accounts-dialog.h
deleted file mode 100644
index 369b2f75b..000000000
--- a/libempathy-gtk/empathy-accounts-dialog.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * 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.
- * 
- * Authors: Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- */
-
-#ifndef __EMPATHY_ACCOUNTS_DIALOG_H__
-#define __EMPATHY_ACCOUNTS_DIALOG_H__
-
-#include <gtk/gtkwidget.h>
-
-#include <libmissioncontrol/mc-account.h>
-
-G_BEGIN_DECLS
-
-GtkWidget *empathy_accounts_dialog_show (GtkWindow *parent,
-					 McAccount *selected_account);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_ACCOUNTS_DIALOG_H__ */