1 files changed, 6 insertions, 711 deletions

diff --git a/src/account.c b/src/account.c
index 77b604eb..9986d61a 100644
--- a/src/account.c
+++ b/src/account.c
@@ -25,40 +25,17 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <errno.h>
 
 #include "main.h"
-#include "mainwindow.h"
-#include "folderview.h"
 #include "folder.h"
 #include "account.h"
 #include "prefs.h"
 #include "prefs_account.h"
-#include "prefs_account_dialog.h"
 #include "procmsg.h"
 #include "procheader.h"
-#include "compose.h"
-#include "manage_window.h"
-#include "stock_pixmap.h"
-#include "statusbar.h"
-#include "inc.h"
-#include "gtkutils.h"
 #include "utils.h"
-#include "alertpanel.h"
-
-enum
-{
-	COL_DEFAULT,
-	COL_GETALL,
-	COL_NAME,
-	COL_PROTOCOL,
-	COL_SERVER,
-	COL_ACCOUNT,
-	N_COLS
-};
 
 #define PREFSBUFSIZE		1024
 
@@ -66,66 +43,6 @@ PrefsAccount *cur_account;
 
 static GList *account_list = NULL;
 
-static struct EditAccount {
-	GtkWidget *window;
-
-	GtkWidget *treeview;
-	GtkListStore *store;
-	GtkTreeSelection *selection;
-
-	GtkWidget *close_btn;
-} edit_account;
-
-static void account_edit_create		(void);
-
-static void account_edit_prefs		(void);
-static void account_delete		(void);
-
-static void account_up			(void);
-static void account_down		(void);
-
-static void account_set_default		(void);
-
-static void account_edit_close		(void);
-
-static gboolean account_selected	(GtkTreeSelection	*selection,
-					 GtkTreeModel		*model,
-					 GtkTreePath		*path,
-					 gboolean		 cur_selected,
-					 gpointer		 data);
-
-static void account_default_toggled	(GtkCellRenderer	*cell,
-					 gchar			*path,
-					 gpointer		 data);
-static void account_getall_toggled	(GtkCellRenderer	*cell,
-					 gchar			*path,
-					 gpointer		 data);
-
-static void account_row_activated	(GtkTreeView		*treeview,
-					 GtkTreePath		*path,
-					 GtkTreeViewColumn	*column,
-					 gpointer		 data);
-static void account_row_reordered	(GtkTreeModel		*model,
-					 GtkTreePath		*path,
-					 GtkTreeIter		*iter,
-					 gpointer		 data);
-
-static gint account_delete_event	(GtkWidget	*widget,
-					 GdkEventAny	*event,
-					 gpointer	 data);
-static gboolean account_key_pressed	(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 gpointer	 data);
-
-static void account_set_row		(PrefsAccount	*ac_prefs,
-					 GtkTreeIter	*iter,
-					 GtkTreeIter	*new,
-					 gboolean	 move_view);
-static void account_set_dialog		(void);
-static void account_update_dialog	(void);
-
-static void account_set_list		(void);
-
 
 void account_read_config_all(void)
 {
@@ -173,9 +90,6 @@ void account_read_config_all(void)
 		cur_account = ac_prefs;
 	}
 
-	account_set_menu();
-	main_window_reflect_prefs_all();
-
 	while (ac_label_list) {
 		g_free(ac_label_list->data);
 		ac_label_list = g_slist_remove(ac_label_list,
@@ -331,11 +245,6 @@ PrefsAccount *account_find_from_msginfo(MsgInfo *msginfo)
 	return ac;
 }
 
-void account_set_menu(void)
-{
-	main_window_set_account_menu(account_list);
-}
-
 void account_foreach(AccountFunc func, gpointer user_data)
 {
 	GList *cur;
@@ -350,96 +259,15 @@ GList *account_get_list(void)
 	return account_list;
 }
 
-void account_edit_open(void)
+void account_list_free(void)
 {
-	inc_lock();
-
-	if (compose_get_compose_list()) {
-		alertpanel_notice(_("Some composing windows are open.\n"
-				    "Please close all the composing windows before editing the accounts."));
-		inc_unlock();
-		return;
-	}
-
-	debug_print(_("Opening account edit window...\n"));
-
-	if (!edit_account.window)
-		account_edit_create();
-
-	account_set_dialog();
-
-	manage_window_set_transient(GTK_WINDOW(edit_account.window));
-	gtk_widget_grab_focus(edit_account.close_btn);
-	gtk_widget_show(edit_account.window);
-
-	manage_window_focus_in(edit_account.window, NULL, NULL);
+	g_list_free(account_list);
+	account_list = NULL;
 }
 
-void account_add(void)
+void account_append(PrefsAccount *ac_prefs)
 {
-	PrefsAccount *ac_prefs;
-
-	ac_prefs = prefs_account_open(NULL);
-
-	if (!ac_prefs) return;
-
 	account_list = g_list_append(account_list, ac_prefs);
-
-	if (ac_prefs->is_default)
-		account_set_as_default(ac_prefs);
-
-	account_set_row(ac_prefs, NULL, NULL, TRUE);
-
-	if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
-		Folder *folder;
-
-		if (ac_prefs->protocol == A_IMAP4) {
-			folder = folder_new(F_IMAP, ac_prefs->account_name,
-					    ac_prefs->recv_server);
-		} else {
-			folder = folder_new(F_NEWS, ac_prefs->account_name,
-					    ac_prefs->nntp_server);
-		}
-
-		folder->account = ac_prefs;
-		ac_prefs->folder = REMOTE_FOLDER(folder);
-		folder_add(folder);
-		if (ac_prefs->protocol == A_IMAP4) {
-			if (main_window_toggle_online_if_offline
-				(main_window_get())) {
-				folder->klass->create_tree(folder);
-				statusbar_pop_all();
-			}
-		}
-		folderview_set_all();
-	}
-}
-
-void account_open(PrefsAccount *ac_prefs)
-{
-	gboolean prev_default;
-	gchar *ac_name;
-
-	g_return_if_fail(ac_prefs != NULL);
-
-	prev_default = ac_prefs->is_default;
-	Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
-		  return);
-
-	prefs_account_open(ac_prefs);
-
-	if (!prev_default && ac_prefs->is_default)
-		account_set_as_default(ac_prefs);
-
-	if (ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
-		folder_set_name(FOLDER(ac_prefs->folder),
-				ac_prefs->account_name);
-		folderview_set_all();
-	}
-
-	account_write_config_all();
-	account_set_menu();
-	main_window_reflect_prefs_all();
 }
 
 void account_set_as_default(PrefsAccount *ac_prefs)
@@ -470,6 +298,7 @@ PrefsAccount *account_get_default(void)
 	return NULL;
 }
 
+#if 0
 void account_set_missing_folder(void)
 {
 	PrefsAccount *ap;
@@ -502,6 +331,7 @@ void account_set_missing_folder(void)
 		}
 	}
 }
+#endif
 
 FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
 				       SpecialFolderItemType type)
@@ -585,538 +415,3 @@ void account_destroy(PrefsAccount *ac_prefs)
 		}
 	}
 }
-
-
-static void account_edit_create(void)
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *label;
-	GtkWidget *hbox;
-	GtkWidget *scrolledwin;
-	GtkWidget *treeview;
-	GtkListStore *store;
-	GtkTreeSelection *selection;
-	GtkTreeViewColumn *column;
-	GtkCellRenderer *renderer;
-
-	GtkWidget *vbox2;
-	GtkWidget *add_btn;
-	GtkWidget *edit_btn;
-	GtkWidget *del_btn;
-	GtkWidget *up_btn;
-	GtkWidget *down_btn;
-
-	GtkWidget *default_btn;
-
-	GtkWidget *hbbox;
-	GtkWidget *close_btn;
-
-	debug_print(_("Creating account edit window...\n"));
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_widget_set_size_request (window, 500, 320);
-	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-	gtk_window_set_title (GTK_WINDOW (window), _("Edit accounts"));
-	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
-	g_signal_connect (G_OBJECT (window), "delete_event",
-			  G_CALLBACK (account_delete_event), NULL);
-	g_signal_connect (G_OBJECT (window), "key_press_event",
-			  G_CALLBACK (account_key_pressed), NULL);
-	MANAGE_WINDOW_SIGNALS_CONNECT (window);
-	gtk_widget_realize(window);
-
-	vbox = gtk_vbox_new (FALSE, 10);
-	gtk_widget_show (vbox);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-	label = gtk_label_new
-		(_("New messages will be checked in this order. Check the boxes\n"
-		   "on the `G' column to enable message retrieval by `Get all'."));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
-	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-
-	hbox = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
-
-	scrolledwin = gtk_scrolled_window_new(NULL, NULL);
-	gtk_widget_show(scrolledwin);
-	gtk_box_pack_start(GTK_BOX(hbox), scrolledwin, TRUE, TRUE, 0);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
-				       GTK_POLICY_AUTOMATIC,
-				       GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
-					    GTK_SHADOW_IN);
-
-	store = gtk_list_store_new
-		(N_COLS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING,
-		 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
-
-	treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
-	g_object_unref(G_OBJECT(store));
-	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), TRUE);
-	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
-	gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COL_NAME);
-	gtk_tree_view_set_reorderable(GTK_TREE_VIEW(treeview), TRUE);
-
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-	gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
-	gtk_tree_selection_set_select_function(selection, account_selected,
-					       NULL, NULL);
-
-	renderer = gtk_cell_renderer_toggle_new();
-	gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(renderer),
-					   TRUE);
-	g_signal_connect(renderer, "toggled",
-			 G_CALLBACK(account_default_toggled), NULL);
-	column = gtk_tree_view_column_new_with_attributes
-		("D", renderer, "active", COL_DEFAULT, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-
-	renderer = gtk_cell_renderer_toggle_new();
-	g_signal_connect(renderer, "toggled",
-			 G_CALLBACK(account_getall_toggled), NULL);
-	column = gtk_tree_view_column_new_with_attributes
-		("G", renderer, "active", COL_GETALL, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes
-		 (_("Name"), renderer, "text", COL_NAME, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes
-		 (_("Protocol"), renderer, "text", COL_PROTOCOL, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes
-		 (_("Server"), renderer, "text", COL_SERVER, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-
-	gtk_widget_show(treeview);
-	gtk_container_add(GTK_CONTAINER(scrolledwin), treeview);
-
-	g_signal_connect(G_OBJECT(treeview), "row-activated",
-			 G_CALLBACK(account_row_activated), NULL);
-	g_signal_connect_after(G_OBJECT(store), "rows-reordered",
-			       G_CALLBACK(account_row_reordered), NULL);
-
-	vbox2 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
-
-	add_btn = gtk_button_new_from_stock (GTK_STOCK_ADD);
-	gtk_widget_show (add_btn);
-	gtk_box_pack_start (GTK_BOX (vbox2), add_btn, FALSE, FALSE, 4);
-	g_signal_connect (G_OBJECT(add_btn), "clicked",
-			  G_CALLBACK (account_add), NULL);
-
-#ifdef GTK_STOCK_EDIT
-	edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
-#else
-	edit_btn = gtk_button_new_with_label (_("Edit"));
-#endif
-	gtk_widget_show (edit_btn);
-	gtk_box_pack_start (GTK_BOX (vbox2), edit_btn, FALSE, FALSE, 4);
-	g_signal_connect (G_OBJECT(edit_btn), "clicked",
-			  G_CALLBACK (account_edit_prefs), NULL);
-
-	del_btn = gtk_button_new_from_stock (GTK_STOCK_DELETE);
-	gtk_widget_show (del_btn);
-	gtk_box_pack_start (GTK_BOX (vbox2), del_btn, FALSE, FALSE, 4);
-	g_signal_connect (G_OBJECT(del_btn), "clicked",
-			  G_CALLBACK (account_delete), NULL);
-
-	down_btn = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
-	gtk_widget_show (down_btn);
-	gtk_box_pack_end (GTK_BOX (vbox2), down_btn, FALSE, FALSE, 4);
-	g_signal_connect (G_OBJECT(down_btn), "clicked",
-			  G_CALLBACK (account_down), NULL);
-
-	up_btn = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
-	gtk_widget_show (up_btn);
-	gtk_box_pack_end (GTK_BOX (vbox2), up_btn, FALSE, FALSE, 4);
-	g_signal_connect (G_OBJECT(up_btn), "clicked",
-			  G_CALLBACK (account_up), NULL);
-
-	hbox = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
-	vbox2 = gtk_vbox_new(FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
-
-	default_btn = gtk_button_new_with_mnemonic
-		(_(" _Set as default account "));
-	gtk_widget_show (default_btn);
-	gtk_box_pack_start (GTK_BOX (vbox2), default_btn, TRUE, FALSE, 0);
-	g_signal_connect (G_OBJECT(default_btn), "clicked",
-			  G_CALLBACK (account_set_default), NULL);
-
-	gtkut_stock_button_set_create(&hbbox, &close_btn, GTK_STOCK_CLOSE,
-				      NULL, NULL, NULL, NULL);
-	gtk_widget_show(hbbox);
-	gtk_box_pack_end (GTK_BOX (hbox), hbbox, FALSE, FALSE, 0);
-	gtk_widget_grab_default (close_btn);
-
-	g_signal_connect (G_OBJECT (close_btn), "clicked",
-			  G_CALLBACK (account_edit_close), NULL);
-
-	edit_account.window    = window;
-	edit_account.treeview  = treeview;
-	edit_account.store     = store;
-	edit_account.selection = selection;
-	edit_account.close_btn = close_btn;
-}
-
-static void account_edit_prefs(void)
-{
-	GtkTreeIter iter;
-	PrefsAccount *ac_prefs;
-
-	if (!gtk_tree_selection_get_selected(edit_account.selection,
-					     NULL, &iter))
-		return;
-
-	gtk_tree_model_get(GTK_TREE_MODEL(edit_account.store), &iter,
-			   COL_ACCOUNT, &ac_prefs, -1);
-	account_open(ac_prefs);
-
-	account_set_row(ac_prefs, &iter, NULL, FALSE);
-}
-
-static void account_delete(void)
-{
-	GtkTreeIter iter;
-	PrefsAccount *ac_prefs;
-	gchar buf[BUFFSIZE];
-
-	if (!gtk_tree_selection_get_selected(edit_account.selection,
-					     NULL, &iter))
-		return;
-
-	gtk_tree_model_get(GTK_TREE_MODEL(edit_account.store), &iter,
-			   COL_ACCOUNT, &ac_prefs, -1);
-	g_return_if_fail(ac_prefs != NULL);
-
-	g_snprintf(buf, sizeof(buf),
-		   _("Do you really want to delete the account '%s'?"),
-		   ac_prefs->account_name ? ac_prefs->account_name :
-		   _("(Untitled)"));
-	if (alertpanel_full(_("Delete account"), buf,
-			    ALERT_QUESTION, G_ALERTALTERNATE, FALSE,
-			    GTK_STOCK_YES, GTK_STOCK_NO, NULL)
-	    != G_ALERTDEFAULT)
-		return;
-
-	if (ac_prefs->folder) {
-		FolderItem *item;
-
-		item = main_window_get()->summaryview->folder_item;
-		if (item && item->folder == FOLDER(ac_prefs->folder))
-			summary_clear_all(main_window_get()->summaryview);
-		folder_destroy(FOLDER(ac_prefs->folder));
-		folderview_set_all();
-	}
-
-	account_destroy(ac_prefs);
-	gtk_list_store_remove(edit_account.store, &iter);
-	account_update_dialog();
-}
-
-static void account_up(void)
-{
-	GtkTreeModel *model = GTK_TREE_MODEL(edit_account.store);
-	GtkTreeIter iter, prev;
-	GtkTreePath *path;
-
-	if (!gtk_tree_selection_get_selected(edit_account.selection,
-					     NULL, &iter))
-		return;
-
-	path = gtk_tree_model_get_path(model, &iter);
-	if (gtk_tree_path_prev(path)) {
-		gtk_tree_model_get_iter(model, &prev, path);
-		gtk_list_store_swap(edit_account.store, &iter, &prev);
-	}
-	gtk_tree_path_free(path);
-}
-
-static void account_down(void)
-{
-	GtkTreeIter iter, next;
-
-	if (!gtk_tree_selection_get_selected(edit_account.selection,
-					     NULL, &iter))
-		return;
-
-	next = iter;
-	if (gtk_tree_model_iter_next(GTK_TREE_MODEL(edit_account.store),
-				     &next))
-		gtk_list_store_swap(edit_account.store, &iter, &next);
-}
-
-static void account_set_default(void)
-{
-	GtkTreeIter iter;
-	PrefsAccount *ac_prefs;
-
-	if (!gtk_tree_selection_get_selected(edit_account.selection,
-					     NULL, &iter))
-		return;
-
-	gtk_tree_model_get(GTK_TREE_MODEL(edit_account.store), &iter,
-			   COL_ACCOUNT, &ac_prefs, -1);
-	g_return_if_fail(ac_prefs != NULL);
-
-	account_set_as_default(ac_prefs);
-	account_update_dialog();
-
-	cur_account = ac_prefs;
-	account_set_menu();
-	main_window_reflect_prefs_all();
-}
-
-static void account_edit_close(void)
-{
-	account_set_list();
-	account_write_config_all();
-
-	if (!cur_account && account_list) {
-		PrefsAccount *ac_prefs = (PrefsAccount *)account_list->data;
-		account_set_as_default(ac_prefs);
-		cur_account = ac_prefs;
-	}
-
-	account_set_menu();
-	main_window_reflect_prefs_all();
-
-	gtk_widget_hide(edit_account.window);
-
-	inc_unlock();
-}
-
-static gint account_delete_event(GtkWidget *widget, GdkEventAny *event,
-				 gpointer data)
-{
-	account_edit_close();
-	return TRUE;
-}
-
-static gboolean account_selected(GtkTreeSelection *selection,
-				 GtkTreeModel *model, GtkTreePath *path,
-				 gboolean cur_selected, gpointer data)
-{
-	return TRUE;
-}
-
-static void account_default_toggled(GtkCellRenderer *cell, gchar *path_str,
-				    gpointer data)
-{
-	GtkTreeIter iter;
-	PrefsAccount *ac;
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string(path_str);
-	gtk_tree_model_get_iter(GTK_TREE_MODEL(edit_account.store),
-				&iter, path);
-	gtk_tree_path_free(path);
-	gtk_tree_model_get(GTK_TREE_MODEL(edit_account.store), &iter,
-			   COL_ACCOUNT, &ac, -1);
-
-	account_set_as_default(ac);
-	account_update_dialog();
-}
-
-static void account_getall_toggled(GtkCellRenderer *cell, gchar *path_str,
-				   gpointer data)
-{
-	GtkTreeIter iter;
-	PrefsAccount *ac;
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string(path_str);
-	gtk_tree_model_get_iter(GTK_TREE_MODEL(edit_account.store),
-				&iter, path);
-	gtk_tree_path_free(path);
-	gtk_tree_model_get(GTK_TREE_MODEL(edit_account.store), &iter,
-			   COL_ACCOUNT, &ac, -1);
-
-	if (ac->protocol == A_POP3 || ac->protocol == A_IMAP4 ||
-	    ac->protocol == A_NNTP) {
-		ac->recv_at_getall ^= TRUE;
-		account_set_row(ac, &iter, NULL, FALSE);
-	}
-}
-
-static void account_row_activated(GtkTreeView *treeview, GtkTreePath *path,
-				  GtkTreeViewColumn *column, gpointer data)
-{
-	account_edit_prefs();
-}
-
-static void account_row_reordered	(GtkTreeModel		*model,
-					 GtkTreePath		*path,
-					 GtkTreeIter		*iter,
-					 gpointer		 data)
-{
-	GtkTreeIter iter_;
-	GtkTreePath *path_;
-
-	if (!gtk_tree_selection_get_selected(edit_account.selection,
-					     NULL, &iter_))
-		return;
-	path_ = gtk_tree_model_get_path
-		(GTK_TREE_MODEL(edit_account.store), &iter_);
-	gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(edit_account.treeview),
-				     path_, NULL, FALSE, 0.0, 0.0);
-	gtk_tree_path_free(path_);
-}
-
-static gboolean account_key_pressed(GtkWidget *widget, GdkEventKey *event,
-				    gpointer data)
-{
-	if (event && event->keyval == GDK_Escape)
-		account_edit_close();
-	return FALSE;
-}
-
-static void account_set_row(PrefsAccount *ac_prefs, GtkTreeIter *iter,
-			    GtkTreeIter *new, gboolean move_view)
-{
-	GtkListStore *store = edit_account.store;
-	GtkTreeIter iter_;
-	const gchar *protocol, *server;
-	gboolean has_getall;
-
-	g_return_if_fail(ac_prefs != NULL);
-
-#if USE_SSL
-	protocol = ac_prefs->protocol == A_POP3 ?
-		   (ac_prefs->ssl_pop == SSL_TUNNEL ?
-		    "POP3 (SSL)" :
-		    ac_prefs->ssl_pop == SSL_STARTTLS ?
-		    "POP3 (TLS)" : "POP3") :
-		   ac_prefs->protocol == A_IMAP4 ?
-		   (ac_prefs->ssl_imap == SSL_TUNNEL ?
-		    "IMAP4 (SSL)" :
-		    ac_prefs->ssl_imap == SSL_STARTTLS ?
-		    "IMAP4 (TLS)" : "IMAP4") :
-		   ac_prefs->protocol == A_NNTP ?
-		   (ac_prefs->ssl_nntp == SSL_TUNNEL ?
-		    "NNTP (SSL)" : "NNTP") :
-		   "";
-#else
-	protocol = ac_prefs->protocol == A_POP3  ? "POP3" :
-		   ac_prefs->protocol == A_IMAP4 ? "IMAP4" :
-		   ac_prefs->protocol == A_NNTP  ? "NNTP" : "";
-#endif
-	server = ac_prefs->protocol == A_NNTP ?
-		ac_prefs->nntp_server : ac_prefs->recv_server;
-
-	has_getall = (ac_prefs->protocol == A_POP3  ||
-		      ac_prefs->protocol == A_IMAP4 ||
-		      ac_prefs->protocol == A_NNTP);
-
-	if (!iter)
-		gtk_list_store_append(store, &iter_);
-	else
-		iter_ = *iter;
-
-	gtk_list_store_set(store, &iter_,
-			   COL_DEFAULT, ac_prefs->is_default,
-			   COL_GETALL, has_getall && ac_prefs->recv_at_getall,
-			   COL_NAME, ac_prefs->account_name,
-			   COL_PROTOCOL, protocol,
-			   COL_SERVER, server,
-			   COL_ACCOUNT, ac_prefs,
-			   -1);
-
-	if (new)
-		*new = iter_;
-
-	if (move_view) {
-		GtkTreePath *path;
-
-		path = gtk_tree_model_get_path
-			(GTK_TREE_MODEL(edit_account.store), &iter_);
-		gtk_tree_view_scroll_to_cell
-			(GTK_TREE_VIEW(edit_account.treeview),
-			 path, NULL, TRUE, 0.5, 0.0);
-		gtk_tree_path_free(path);
-	}
-}
-
-/* set dialog from account list */
-static void account_set_dialog(void)
-{
-	GList *cur;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-
-	gtk_list_store_clear(edit_account.store);
-
-	for (cur = account_list; cur != NULL; cur = cur->next) {
-		account_set_row((PrefsAccount *)cur->data, NULL, &iter, FALSE);
-		if ((PrefsAccount *)cur->data == cur_account) {
-			gtk_tree_selection_select_iter(edit_account.selection,
-						       &iter);
-		}
-	}
-
-	if (!gtk_tree_selection_get_selected(edit_account.selection, NULL,
-					     &iter))
-		return;
-	path = gtk_tree_model_get_path(GTK_TREE_MODEL(edit_account.store),
-				       &iter);
-	gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(edit_account.treeview),
-				     path, NULL, FALSE, 0.0, 0.0);
-	gtk_tree_path_free(path);
-}
-
-/* update dialog to the latest state */
-static void account_update_dialog(void)
-{
-	GtkTreeIter iter;
-	GtkTreeModel *model = GTK_TREE_MODEL(edit_account.store);
-	PrefsAccount *ac;
-
-	if (!gtk_tree_model_get_iter_first(model, &iter))
-		return;
-
-	do {
-		gtk_tree_model_get(model, &iter, COL_ACCOUNT, &ac, -1);
-		if (ac)
-			account_set_row(ac, &iter, NULL, FALSE);
-	} while (gtk_tree_model_iter_next(model, &iter));
-}
-
-/* set account list from dialog */
-static void account_set_list(void)
-{
-	GtkTreeIter iter;
-	GtkTreeModel *model = GTK_TREE_MODEL(edit_account.store);
-	PrefsAccount *ac;
-
-	g_list_free(account_list);
-	account_list = NULL;
-
-	if (!gtk_tree_model_get_iter_first(model, &iter))
-		return;
-
-	do {
-		gtk_tree_model_get(model, &iter, COL_ACCOUNT, &ac, -1);
-		if (ac)
-			account_list = g_list_append(account_list, ac);
-	} while (gtk_tree_model_iter_next(model, &iter));
-}