2005-07-06 [colin] 1.9.12cvs24
[claws.git] / src / account.c
index a876992384328f59df990829bef29944779a0d28..566fde42521bdda3029e4fd7509f8fd44db5fe67 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * 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
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
@@ -37,7 +37,8 @@
 #include "account.h"
 #include "prefs_gtk.h"
 #include "prefs_account.h"
-#include "prefs_folder_item.h"
+#include "prefs_common.h"
+#include "folder_item_prefs.h"
 #include "compose.h"
 #include "manage_window.h"
 #include "stock_pixmap.h"
 #include "utils.h"
 #include "alertpanel.h"
 #include "procheader.h"
+#include "customheader.h"
+#include "remotefolder.h"
+
+enum {
+       ACCOUNT_IS_DEFAULT,             /* GDK_TYPE_PIXMAP! */
+       ACCOUNT_ENABLE_GET_ALL, 
+       ACCOUNT_NAME,
+       ACCOUNT_PROTOCOL,
+       ACCOUNT_SERVER,
+       ACCOUNT_DATA,
+       N_ACCOUNT_COLUMNS
+};
+
 
 typedef enum
 {
@@ -66,49 +80,99 @@ static GList *account_list = NULL;
 
 static struct EditAccount {
        GtkWidget *window;
-       GtkWidget *clist;
+       GtkWidget *list_view;
        GtkWidget *close_btn;
 } edit_account;
 
-static GdkPixmap *markxpm;
-static GdkBitmap *markxpmmask;
-static GdkPixmap *checkboxonxpm;
-static GdkPixmap *checkboxonxpmmask;
-static GdkPixmap *checkboxoffxpm;
-static GdkPixmap *checkboxoffxpmmask;
+static GdkPixbuf *mark_pixbuf;
 
 static void account_edit_create                (void);
 
-static void account_edit_prefs         (void);
-static void account_delete             (void);
+static void account_edit_prefs         (GtkWidget *widget, gpointer data);
+static void account_delete             (GtkWidget *widget, gpointer data);
+static void account_clone              (GtkWidget *widget, gpointer data);
 
-static void account_up                 (void);
-static void account_down               (void);
+static void account_up                 (GtkWidget *widget, gpointer data);
+static void account_down               (GtkWidget *widget, gpointer data);
 
-static void account_set_default                (void);
+static void account_set_default                (GtkWidget *widget, gpointer data);
+
+static void account_edit_close         (GtkWidget *widget, gpointer data);
 
-static void account_edit_close         (void);
 static gint account_delete_event       (GtkWidget      *widget,
                                         GdkEventAny    *event,
                                         gpointer        data);
-static void account_selected           (GtkCList       *clist,
-                                        gint            row,
-                                        gint            column,
-                                        GdkEvent       *event,
-                                        gpointer        data);
-static void account_row_moved          (GtkCList       *clist,
-                                        gint            source_row,
-                                        gint            dest_row);
-static void account_key_pressed                (GtkWidget      *widget,
+static gboolean account_key_pressed    (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
 
-static gint account_clist_set_row      (PrefsAccount   *ac_prefs,
-                                        gint            row);
-static void account_clist_set          (void);
+static void account_list_view_add      (PrefsAccount   *ac_prefs);
+static void account_list_view_set      (void);
 
 static void account_list_set           (void);
 
+typedef struct FindAccountInStore {
+       gint             account_id;
+       GtkTreePath     *path;
+       GtkTreeIter      iter;
+} FindAccountInStore;
+
+static GtkListStore* account_create_data_store (void);
+
+static void account_list_view_insert_account_item (GtkListStore        *list_store, 
+                                                  const gchar  *account_name,
+                                                  const gchar  *protocol, 
+                                                  const gchar  *server_name,
+                                                  gboolean      is_default, 
+                                                  gboolean      is_get_all,
+                                                  PrefsAccount *account_data);
+
+static GtkWidget *account_list_view_create     (void);
+static void account_create_list_view_images    (GtkWidget *list_view);
+static void account_create_list_view_columns   (GtkWidget *list_view);
+
+static gint account_list_view_get_selected_account_id          (GtkWidget *list_view);
+GtkTreePath *account_list_view_get_selected_account_path       (GtkWidget *list_view);
+PrefsAccount *account_list_view_get_selected_account           (GtkWidget *list_view);
+gboolean account_list_view_select_account                      (GtkWidget *list_view, 
+                                                                gint       account_id);
+
+static void account_list_view_set_default_by_id(GtkWidget *list_view,
+                                               gint account_id);
+
+static gboolean set_new_default_account                (GtkTreeModel *model,
+                                                GtkTreePath  *path,
+                                                GtkTreeIter  *iter,
+                                                gint         *account_id);
+
+static gboolean find_account_in_store          (GtkTreeModel *model,
+                                                GtkTreePath  *path,
+                                                GtkTreeIter  *iter,
+                                                FindAccountInStore *data);
+
+static void account_get_all_toggled            (GtkCellRendererToggle  *widget, 
+                                                gchar                  *path, 
+                                                GtkWidget              *list_view);
+                                                
+static void account_double_clicked             (GtkTreeView            *list_view,
+                                                GtkTreePath            *path,
+                                                GtkTreeViewColumn      *column,
+                                                gpointer                data);
+                                                
+static void drag_begin                         (GtkTreeView *list_view,
+                                                GdkDragContext *context,
+                                                gpointer data);
+
+static void drag_end                           (GtkTreeView *list_view,
+                                                GdkDragContext *context,
+                                                gpointer data);
+                     
+static void account_row_changed_while_drag_drop        (GtkTreeModel *model, 
+                                                GtkTreePath  *path,
+                                                GtkTreeIter  *iter,
+                                                gpointer      arg3,
+                                                GtkTreeView  *list_view);
+
 void account_read_config_all(void)
 {
        GSList *ac_label_list = NULL, *cur;
@@ -165,9 +229,9 @@ void account_read_config_all(void)
        }
 }
 
-void account_save_config_all(void)
+void account_write_config_all(void)
 {
-       prefs_account_save_config_all(account_list);
+       prefs_account_write_config_all(account_list);
 }
 
 /*
@@ -234,7 +298,7 @@ PrefsAccount *account_find_from_address(const gchar *address)
        for (cur = account_list; cur != NULL; cur = cur->next) {
                ac = (PrefsAccount *)cur->data;
                if (ac->protocol != A_NNTP && ac->address &&
-                   g_strcasecmp(address, ac->address) == 0)
+                   g_ascii_strcasecmp(address, ac->address) == 0)
                        return ac;
        }
 
@@ -263,13 +327,13 @@ PrefsAccount *account_find_from_item(FolderItem *item)
 
        ac = item->account;
        if (!ac) {
-               FolderItem *cur_item = item->parent;
+               FolderItem *cur_item = folder_item_parent(item);
                while (cur_item != NULL) {
                        if (cur_item->account && cur_item->apply_sub) {
                                ac = cur_item->account;
                                break;
                        }                               
-                       cur_item = cur_item->parent;
+                       cur_item = folder_item_parent(cur_item);
                }
        }
        if (!ac)
@@ -302,8 +366,9 @@ void account_edit_open(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."));
+               alertpanel_error(_("Some composing windows are open.\n"
+                                  "Please close all the composing "
+                                  "windows before editing the accounts."));
                inc_unlock();
                return;
        }
@@ -313,7 +378,7 @@ void account_edit_open(void)
        if (!edit_account.window)
                account_edit_create();
 
-       account_clist_set();
+       account_list_view_set();
 
        manage_window_set_transient(GTK_WINDOW(edit_account.window));
        gtk_widget_grab_focus(edit_account.close_btn);
@@ -335,7 +400,7 @@ void account_add(void)
        if (ac_prefs->is_default)
                account_set_as_default(ac_prefs);
 
-       account_clist_set();
+       account_list_view_set();
 
        if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
                Folder *folder;
@@ -347,9 +412,12 @@ void account_add(void)
                        folder = folder_new(folder_get_class_from_string("news"), ac_prefs->account_name,
                                            ac_prefs->nntp_server);
                }
-
+               if (folder == NULL) {
+                       alertpanel_error(_("Can't create folder."));
+                       return;
+               }
                folder->account = ac_prefs;
-               ac_prefs->folder = REMOTE_FOLDER(folder);
+               ac_prefs->folder = folder;
                folder_add(folder);
                if (ac_prefs->protocol == A_IMAP4)
                        folder->klass->create_tree(folder);
@@ -379,7 +447,7 @@ void account_open(PrefsAccount *ac_prefs)
                folderview_set_all();
        }
 
-       account_save_config_all();
+       account_write_config_all();
        account_set_menu();
        main_window_reflect_prefs_all();
 }
@@ -430,9 +498,10 @@ void account_set_missing_folder(void)
                                folder = folder_new(folder_get_class_from_string("news"), ap->account_name,
                                                    ap->nntp_server);
                        }
-
+                       if (folder == NULL)
+                               return;
                        folder->account = ap;
-                       ap->folder = REMOTE_FOLDER(folder);
+                       ap->folder = folder;
                        folder_add(folder);
                        if (ap->protocol == A_IMAP4)
                                folder->klass->create_tree(folder);
@@ -479,10 +548,16 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
                }
                break;
        case F_QUEUE:
-               if (ac_prefs->folder)
-                       item = FOLDER(ac_prefs->folder)->queue;
-               if (!item)
-                       item = folder_get_default_queue();
+               if (ac_prefs->set_queue_folder && ac_prefs->queue_folder) {
+                       item = folder_find_item_from_identifier
+                               (ac_prefs->queue_folder);
+               }
+               if (!item) {
+                       if (ac_prefs->folder)
+                               item = FOLDER(ac_prefs->folder)->queue;
+                       if (!item)
+                               item = folder_get_default_queue();
+               }
                break;
        case F_TRASH:
                if (ac_prefs->set_trash_folder && ac_prefs->trash_folder) {
@@ -531,14 +606,13 @@ static void account_edit_create(void)
        GtkWidget *label;
        GtkWidget *hbox;
        GtkWidget *scrolledwin;
-       GtkWidget *clist;
-       gchar *titles[N_EDIT_ACCOUNT_COLS];
-       gint i;
+       GtkWidget *list_view;
 
        GtkWidget *vbox2;
        GtkWidget *add_btn;
        GtkWidget *edit_btn;
        GtkWidget *del_btn;
+       GtkWidget *clone_btn;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
 
@@ -549,15 +623,15 @@ static void account_edit_create(void)
 
        debug_print("Creating account edit window...\n");
 
-       window = gtk_window_new (GTK_WINDOW_DIALOG);
-       gtk_widget_set_usize (window, 500, 320);
+       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       gtk_widget_set_size_request (window, 500, 350);
        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);
-       gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-                           GTK_SIGNAL_FUNC (account_delete_event), NULL);
-       gtk_signal_connect (GTK_OBJECT (window), "key_press_event",
-                           GTK_SIGNAL_FUNC (account_key_pressed), NULL);
+       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);
 
@@ -588,68 +662,53 @@ static void account_edit_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
-       titles[COL_DEFAULT]  = "D";
-       titles[COL_GETALL]   = "G";
-       titles[COL_NAME]     = _("Name");
-       titles[COL_PROTOCOL] = _("Protocol");
-       titles[COL_SERVER]   = _("Server");
-
-       clist = gtk_clist_new_with_titles (N_EDIT_ACCOUNT_COLS, titles);
-       gtk_widget_show (clist);
-       gtk_container_add (GTK_CONTAINER (scrolledwin), clist);
-       gtk_clist_set_column_width (GTK_CLIST(clist), COL_DEFAULT , 10);
-       gtk_clist_set_column_width (GTK_CLIST(clist), COL_GETALL  , 11);
-       gtk_clist_set_column_width (GTK_CLIST(clist), COL_NAME    , 100);
-       gtk_clist_set_column_width (GTK_CLIST(clist), COL_PROTOCOL, 100);
-       gtk_clist_set_column_width (GTK_CLIST(clist), COL_SERVER  , 100);
-       gtk_clist_set_column_justification (GTK_CLIST(clist), COL_DEFAULT,
-                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_column_justification (GTK_CLIST(clist), COL_GETALL,
-                                           GTK_JUSTIFY_CENTER);
-       gtk_clist_set_selection_mode (GTK_CLIST(clist), GTK_SELECTION_BROWSE);
-
-       for (i = 0; i < N_EDIT_ACCOUNT_COLS; i++)
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
-                                      GTK_CAN_FOCUS);
-
-       gtk_signal_connect (GTK_OBJECT (clist), "select_row",
-                           GTK_SIGNAL_FUNC (account_selected), NULL);
-       gtk_signal_connect_after (GTK_OBJECT (clist), "row_move",
-                                 GTK_SIGNAL_FUNC (account_row_moved), NULL);
+       list_view = account_list_view_create();
+       gtk_widget_show(list_view);
+       gtk_container_add(GTK_CONTAINER(scrolledwin), list_view);
 
        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_with_label (_("Add"));
+       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);
-       gtk_signal_connect (GTK_OBJECT(add_btn), "clicked",
-                           GTK_SIGNAL_FUNC (account_add), NULL);
+       g_signal_connect (G_OBJECT(add_btn), "clicked",
+                         G_CALLBACK (account_add), NULL);
 
-       edit_btn = gtk_button_new_with_label (_("Edit"));
+#ifdef GTK_STOCK_EDIT
+       edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+#else
+       edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
+#endif
        gtk_widget_show (edit_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), edit_btn, FALSE, FALSE, 4);
-       gtk_signal_connect (GTK_OBJECT(edit_btn), "clicked",
-                           GTK_SIGNAL_FUNC (account_edit_prefs), NULL);
+       g_signal_connect (G_OBJECT(edit_btn), "clicked",
+                         G_CALLBACK (account_edit_prefs), NULL);
 
-       del_btn = gtk_button_new_with_label (_(" Delete "));
+       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);
-       gtk_signal_connect (GTK_OBJECT(del_btn), "clicked",
-                           GTK_SIGNAL_FUNC (account_delete), NULL);
-
-       down_btn = gtk_button_new_with_label (_("Down"));
+       g_signal_connect (G_OBJECT(del_btn), "clicked",
+                         G_CALLBACK (account_delete), NULL);
+
+       clone_btn = gtk_button_new_from_stock(GTK_STOCK_COPY);
+       gtk_widget_show (clone_btn);
+       gtk_box_pack_start (GTK_BOX (vbox2), clone_btn, FALSE, FALSE, 4);
+       g_signal_connect(G_OBJECT(clone_btn), "clicked",
+                        G_CALLBACK(account_clone), 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);
-       gtk_signal_connect (GTK_OBJECT(down_btn), "clicked",
-                           GTK_SIGNAL_FUNC (account_down), NULL);
+       g_signal_connect (G_OBJECT(down_btn), "clicked",
+                         G_CALLBACK (account_down), NULL);
 
-       up_btn = gtk_button_new_with_label (_("Up"));
+       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);
-       gtk_signal_connect (GTK_OBJECT(up_btn), "clicked",
-                           GTK_SIGNAL_FUNC (account_up), NULL);
+       g_signal_connect (G_OBJECT(up_btn), "clicked",
+                         G_CALLBACK (account_up), NULL);
 
        hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);
@@ -662,43 +721,41 @@ static void account_edit_create(void)
        default_btn = gtk_button_new_with_label (_(" Set as default account "));
        gtk_widget_show (default_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), default_btn, TRUE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT(default_btn), "clicked",
-                           GTK_SIGNAL_FUNC (account_set_default), NULL);
+       g_signal_connect (G_OBJECT(default_btn), "clicked",
+                         G_CALLBACK (account_set_default), NULL);
 
-       gtkut_button_set_create(&hbbox, &close_btn, _("Close"),
-                               NULL, NULL, NULL, NULL);
+       hbbox = gtk_hbutton_box_new();
+       gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
+       gtk_box_set_spacing(GTK_BOX(hbbox), 5);
+
+       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);
 
-       gtk_signal_connect (GTK_OBJECT (close_btn), "clicked",
-                           GTK_SIGNAL_FUNC (account_edit_close),
-                           NULL);
+       g_signal_connect (G_OBJECT (close_btn), "clicked",
+                         G_CALLBACK (account_edit_close),
+                         NULL);
 
-       stock_pixmap_gdk(clist, STOCK_PIXMAP_MARK, &markxpm, &markxpmmask);
-       stock_pixmap_gdk(clist, STOCK_PIXMAP_CHECKBOX_ON,
-                        &checkboxonxpm, &checkboxonxpmmask);
-       stock_pixmap_gdk(clist, STOCK_PIXMAP_CHECKBOX_OFF,
-                        &checkboxoffxpm, &checkboxoffxpmmask);
+       account_create_list_view_images(list_view);
 
        edit_account.window    = window;
-       edit_account.clist     = clist;
+       edit_account.list_view = list_view;
        edit_account.close_btn = close_btn;
 }
 
-static void account_edit_prefs(void)
+static void account_edit_prefs(GtkWidget *widget, gpointer data)
 {
-       GtkCList *clist = GTK_CLIST(edit_account.clist);
        PrefsAccount *ac_prefs;
-       gint row;
-
-       if (!clist->selection) return;
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       ac_prefs = gtk_clist_get_row_data(clist, row);
-       account_open(ac_prefs);
+       ac_prefs = account_list_view_get_selected_account(edit_account.list_view);
        
-       account_clist_set();
+       if (ac_prefs) {
+               account_open(ac_prefs);
+               account_list_view_set();
+       }               
 }
 
 static gboolean account_delete_references_func(GNode *node, gpointer data)
@@ -718,34 +775,185 @@ static gboolean account_delete_references_func(GNode *node, gpointer data)
        
        item->prefs->enable_default_account = FALSE;
        item->prefs->default_account = 0;
-       prefs_folder_item_save_config(item);
+       folder_item_prefs_save_config(item);
 
        return FALSE;
 }
 
-static void account_delete(void)
+       
+#define ACP_FDUP(fld) ac_clon->fld = ((ac_prefs->fld) != NULL)?\
+                                    g_strdup(ac_prefs->fld): NULL
+#define ACP_FASSIGN(fld) ac_clon->fld = ac_prefs->fld
+static void account_clone(GtkWidget *widget, gpointer data)
+{
+       PrefsAccount *ac_prefs, *ac_clon;
+       GSList *hdrs = NULL;
+       CustomHeader *cch = NULL, *ch = NULL;
+       
+       ac_prefs = account_list_view_get_selected_account(edit_account.list_view);
+       if (ac_prefs == NULL)
+               return;
+
+       if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
+               alertpanel_error(_("Accounts with remote folders cannot be cloned"));
+               return;
+       }
+       
+       ac_clon = prefs_account_new();
+       /* copy fields */
+       ac_clon->account_name = g_strdup_printf(_("Cloned %s"), 
+                                               ac_prefs->account_name);
+       /* personal */
+       ACP_FDUP(name);
+       ACP_FDUP(address);
+       ACP_FDUP(organization);
+
+       /* server */
+       ACP_FASSIGN(protocol);
+       ACP_FDUP(recv_server);
+       ACP_FDUP(smtp_server);
+       ACP_FDUP(nntp_server);
+       ACP_FASSIGN(use_nntp_auth);
+       ACP_FASSIGN(use_nntp_auth_onconnect);
+       ACP_FDUP(userid);
+       ACP_FDUP(passwd);
+
+       ACP_FDUP(local_mbox);
+       ACP_FASSIGN(use_mail_command);
+       ACP_FDUP(mail_command);
+       
+#if USE_OPENSSL
+       ACP_FASSIGN(ssl_pop);
+       ACP_FASSIGN(ssl_imap);
+       ACP_FASSIGN(ssl_nntp);
+       ACP_FASSIGN(ssl_smtp);
+       ACP_FASSIGN(use_nonblocking_ssl);
+#endif /* USE_OPENSSL */
+       
+       ac_clon->tmp_pass = NULL;
+
+       /* receive */
+       ACP_FASSIGN(rmmail);
+       ACP_FASSIGN(msg_leave_time);
+       ACP_FASSIGN(getall);
+       ACP_FASSIGN(recv_at_getall);
+       ACP_FASSIGN(sd_rmmail_on_download);
+       ACP_FASSIGN(sd_filter_on_recv);
+       ACP_FASSIGN(enable_size_limit);
+       ACP_FASSIGN(size_limit);
+       ACP_FASSIGN(filter_on_recv);
+       ACP_FDUP(inbox);
+       ACP_FASSIGN(max_articles);
+
+       ACP_FASSIGN(imap_auth_type);
+
+       /* send */
+       ACP_FASSIGN(add_date);
+       ACP_FASSIGN(gen_msgid);
+       ACP_FASSIGN(add_customhdr);
+       ACP_FASSIGN(use_smtp_auth);
+       ACP_FASSIGN(smtp_auth_type);
+       ACP_FDUP(smtp_userid);
+       ACP_FDUP(smtp_passwd);
+
+       ac_clon->tmp_smtp_pass = NULL;
+
+       ACP_FASSIGN(pop_before_smtp);
+       ACP_FASSIGN(pop_before_smtp_timeout);
+       ACP_FASSIGN(last_pop_login_time);
+
+       ac_clon->customhdr_list = NULL;
+       hdrs = ac_prefs->customhdr_list;
+       while (hdrs != NULL) {
+               ch = (CustomHeader *)hdrs->data;
+
+               cch = g_new0(CustomHeader, 1);
+               cch->account_id = ac_clon->account_id;  
+               cch->name = (ch->name != NULL) ? g_strdup(ch->name) : NULL;
+               cch->value = (ch->value != NULL) ? g_strdup(ch->value) : NULL;
+               
+               ac_clon->customhdr_list = g_slist_append(ac_clon->customhdr_list, cch);
+               
+               hdrs = g_slist_next(hdrs);
+       }
+
+       /* compose */
+        ACP_FASSIGN(sig_type);
+        ACP_FDUP(sig_path);
+        ACP_FASSIGN(auto_sig);
+        ACP_FDUP(sig_sep);
+        ACP_FASSIGN(set_autocc);
+        ACP_FDUP(auto_cc);
+        ACP_FASSIGN(set_autobcc);
+        ACP_FDUP(auto_bcc);
+        ACP_FASSIGN(set_autoreplyto);
+        ACP_FDUP(auto_replyto);
+
+        /* privacy */
+        ACP_FASSIGN(default_encrypt);
+        ACP_FASSIGN(default_sign);
+       
+        /* advanced */
+        ACP_FASSIGN(set_smtpport);
+        ACP_FASSIGN(smtpport);
+        ACP_FASSIGN(set_popport);
+        ACP_FASSIGN(popport);
+        ACP_FASSIGN(set_imapport);
+        ACP_FASSIGN(imapport);
+        ACP_FASSIGN(set_nntpport);
+        ACP_FASSIGN(nntpport);
+        ACP_FASSIGN(set_domain);
+        ACP_FDUP(domain);
+        ACP_FASSIGN(mark_crosspost_read);
+        ACP_FASSIGN(crosspost_col);
+
+        ACP_FASSIGN(set_tunnelcmd);
+        ACP_FDUP(tunnelcmd);
+
+        ACP_FDUP(imap_dir);
+
+        ACP_FASSIGN(set_sent_folder);
+        ACP_FDUP(sent_folder);
+        ACP_FASSIGN(set_draft_folder);
+        ACP_FDUP(draft_folder);
+        ACP_FASSIGN(set_trash_folder);
+        ACP_FDUP(trash_folder);
+       /* don't want two default accounts */
+       ac_clon->is_default = FALSE;
+       ACP_FASSIGN(folder);
+
+       account_list = g_list_append(account_list, ac_clon);
+       account_list_view_set();
+}
+#undef ACP_FDUP
+#undef ACP_FASSIGN
+
+static void account_delete(GtkWidget *widget, gpointer data)
 {
-       GtkCList *clist = GTK_CLIST(edit_account.clist);
        PrefsAccount *ac_prefs;
-       gint row;
        GList *list;
        Folder *folder;
-       
-       if (!clist->selection) return;
+       ac_prefs = account_list_view_get_selected_account(edit_account.list_view);
+       if (ac_prefs == NULL)
+               return;
 
        if (alertpanel(_("Delete account"),
                       _("Do you really want to delete this account?"),
                       _("Yes"), _("+No"), NULL) != G_ALERTDEFAULT)
                return;
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       ac_prefs = gtk_clist_get_row_data(clist, row);
        if (ac_prefs->folder) {
+               FolderItem *item;
+
+               item = mainwindow_get_mainwindow()->summaryview->folder_item;
+               if (item && item->folder == FOLDER(ac_prefs->folder))
+                       summary_clear_all(mainwindow_get_mainwindow()->summaryview);
                folder_destroy(FOLDER(ac_prefs->folder));
                folderview_set_all();
        }
        account_destroy(ac_prefs);
-       account_clist_set();
+       account_list_view_set();
 
        debug_print("Removing deleted account references for all the folders...\n");
        list = folder_get_list();
@@ -759,52 +967,108 @@ static void account_delete(void)
        }
 }
 
-static void account_up(void)
+static void account_up(GtkWidget *widget, gpointer data)
 {
-       GtkCList *clist = GTK_CLIST(edit_account.clist);
-       gint row;
+       GtkTreePath *sel = account_list_view_get_selected_account_path
+                               (edit_account.list_view),
+                   *up;
+       GtkTreeIter isel, iup;
+       GtkTreeModel *model = gtk_tree_view_get_model
+                               (GTK_TREE_VIEW(edit_account.list_view));
+       
+       if (!sel) 
+               return;
+
+       up = gtk_tree_path_copy(sel);
+       if (!up) {
+               gtk_tree_path_free(sel);
+               return;
+       }
+
+       if (!gtk_tree_path_prev(up)) {
+               gtk_tree_path_free(up);
+               gtk_tree_path_free(sel);
+               return;
+       }
+
+       if (!gtk_tree_model_get_iter(model, &isel, sel)
+       ||  !gtk_tree_model_get_iter(model, &iup,  up)) {
+               gtk_tree_path_free(up);
+               gtk_tree_path_free(sel);
+               return;
+       }
 
-       if (!clist->selection) return;
+       gtk_list_store_swap(GTK_LIST_STORE(model), &isel, &iup);
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row > 0)
-               gtk_clist_row_move(clist, row, row - 1);
+       account_list_set();
+       
+       gtk_tree_path_free(up);
+       gtk_tree_path_free(sel);
 }
 
-static void account_down(void)
+static void account_down(GtkWidget *widget, gpointer data)
 {
-       GtkCList *clist = GTK_CLIST(edit_account.clist);
-       gint row;
+       GtkTreePath *sel = account_list_view_get_selected_account_path
+                               (edit_account.list_view),
+                   *dn;
+       GtkTreeIter isel, idn;
+       GtkTreeModel *model = gtk_tree_view_get_model
+                               (GTK_TREE_VIEW(edit_account.list_view));
+       
+       if (!sel) 
+               return;
+
+       dn = gtk_tree_path_copy(sel);
+       if (!dn) {
+               gtk_tree_path_free(sel);
+               return;
+       }
 
-       if (!clist->selection) return;
+       /* XXX no check possible??? however, if down but at bottom, then 
+        * nothing seems to happen much anyway, so the following seems to 
+        * be okay */
+       gtk_tree_path_next(dn);
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row < clist->rows - 1)
-               gtk_clist_row_move(clist, row, row + 1);
+       if (!gtk_tree_model_get_iter(model, &isel, sel)
+       ||  !gtk_tree_model_get_iter(model, &idn,  dn)) {
+               gtk_tree_path_free(dn);
+               gtk_tree_path_free(sel);
+               return;
+       }
+
+       gtk_list_store_swap(GTK_LIST_STORE(model), &isel, &idn);
+
+       account_list_set();
+       
+       gtk_tree_path_free(dn);
+       gtk_tree_path_free(sel);
 }
 
-static void account_set_default(void)
+static void account_set_default(GtkWidget *widget, gpointer data)
 {
-       GtkCList *clist = GTK_CLIST(edit_account.clist);
-       gint row;
        PrefsAccount *ac_prefs;
 
-       if (!clist->selection) return;
+       if (NULL == (ac_prefs = account_list_view_get_selected_account
+                                       (edit_account.list_view))) 
+               return; 
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       ac_prefs = gtk_clist_get_row_data(clist, row);
+       /* we need to change the store variables by resetting everything
+        * and setting the new default one */
+       account_list_view_set_default_by_id(edit_account.list_view,
+                                           ac_prefs->account_id);               
+       
        account_set_as_default(ac_prefs);
-       account_clist_set();
-
+       account_list_view_set();
+       
        cur_account = ac_prefs;
        account_set_menu();
        main_window_reflect_prefs_all();
 }
 
-static void account_edit_close(void)
+static void account_edit_close(GtkWidget *widget, gpointer data)
 {
        account_list_set();
-       account_save_config_all();
+       account_write_config_all();
 
        if (!cur_account && account_list) {
                PrefsAccount *ac_prefs = (PrefsAccount *)account_list->data;
@@ -823,163 +1087,121 @@ static void account_edit_close(void)
 static gint account_delete_event(GtkWidget *widget, GdkEventAny *event,
                                 gpointer data)
 {
-       account_edit_close();
+       account_edit_close(NULL, NULL);
        return TRUE;
 }
 
-static void account_selected(GtkCList *clist, gint row, gint column,
-                            GdkEvent *event, gpointer data)
-{
-       if (event && event->type == GDK_2BUTTON_PRESS)
-               account_edit_prefs();
-
-       if (column == COL_GETALL) {
-               PrefsAccount *ac;
-
-               ac = gtk_clist_get_row_data(clist, row);
-               if (ac->protocol == A_POP3 || ac->protocol == A_APOP ||
-                   ac->protocol == A_IMAP4 || ac->protocol == A_NNTP ||
-                   ac->protocol == A_LOCAL) {
-                       ac->recv_at_getall ^= TRUE;
-                       account_clist_set_row(ac, row);
-               }
-       }
-}
-
-static void account_row_moved(GtkCList *clist, gint source_row, gint dest_row)
-{
-       account_list_set();
-       if (gtk_clist_row_is_visible(clist, dest_row) != GTK_VISIBILITY_FULL)
-               gtk_clist_moveto(clist, dest_row, -1, 0.5, 0.0);
-}
-
-static void account_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                               gpointer data)
+static gboolean account_key_pressed(GtkWidget *widget, GdkEventKey *event,
+                                   gpointer data)
 {
        if (event && event->keyval == GDK_Escape)
-               account_edit_close();
+               account_edit_close(NULL, NULL);
+       return FALSE;
 }
 
-/* set one CList row or add new row */
-static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
+static void account_list_view_add(PrefsAccount *ac_prefs)
 {
-       GtkCList *clist = GTK_CLIST(edit_account.clist);
-       gchar *text[N_EDIT_ACCOUNT_COLS];
+       GtkTreeView *list_view = GTK_TREE_VIEW(edit_account.list_view);
+       GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model(list_view));
+       gchar *name, *protocol, *server;
        gboolean has_getallbox;
        gboolean getall;
 
-       text[COL_DEFAULT] = "";
-       text[COL_GETALL]  = "";
-       text[COL_NAME]    = ac_prefs->account_name;
+       name = ac_prefs->account_name;
 #if USE_OPENSSL
-       text[COL_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_APOP ?
-                            (ac_prefs->ssl_pop == SSL_TUNNEL ?
-                             "POP3 (APOP, SSL)" :
-                             ac_prefs->ssl_pop == SSL_STARTTLS ?
-                             "POP3 (APOP, TLS)" : "POP3 (APOP)") :
-                            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") :
-                            "";
+       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
-       text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3  ? "POP3" :
-                            ac_prefs->protocol == A_APOP  ? "POP3 (APOP)" :
-                            ac_prefs->protocol == A_IMAP4 ? "IMAP4" :
-                            ac_prefs->protocol == A_LOCAL ? "Local" :
-                            ac_prefs->protocol == A_NNTP  ? "NNTP" : "";
+       protocol = ac_prefs->protocol == A_POP3  ? "POP3" :
+                  ac_prefs->protocol == A_IMAP4 ? "IMAP4" :
+                  ac_prefs->protocol == A_LOCAL ? "Local" :
+                  ac_prefs->protocol == A_NNTP  ? "NNTP" : "";
 #endif
-       text[COL_SERVER] = ac_prefs->protocol == A_NNTP
+       server= ac_prefs->protocol == A_NNTP
                ? ac_prefs->nntp_server : ac_prefs->recv_server;
 
-       if (row < 0)
-               row = gtk_clist_append(clist, text);
-       else {
-               gtk_clist_set_text(clist, row, COL_DEFAULT, text[COL_DEFAULT]);
-               gtk_clist_set_text(clist, row, COL_GETALL, text[COL_GETALL]);
-               gtk_clist_set_text(clist, row, COL_NAME, text[COL_NAME]);
-               gtk_clist_set_text(clist, row, COL_PROTOCOL, text[COL_PROTOCOL]);
-               gtk_clist_set_text(clist, row, COL_SERVER, text[COL_SERVER]);
-       }
-
        has_getallbox = (ac_prefs->protocol == A_POP3  ||
-                        ac_prefs->protocol == A_APOP  ||
                         ac_prefs->protocol == A_IMAP4 ||
-                        ac_prefs->protocol == A_NNTP ||
+                        ac_prefs->protocol == A_NNTP  ||
                         ac_prefs->protocol == A_LOCAL);
        getall = has_getallbox && ac_prefs->recv_at_getall;
 
-       if (ac_prefs->is_default)
-               gtk_clist_set_pixmap(clist, row, COL_DEFAULT,
-                                    markxpm, markxpmmask);
-       if (getall)
-               gtk_clist_set_pixmap(clist, row, COL_GETALL,
-                                    checkboxonxpm, checkboxonxpmmask);
-       else if (has_getallbox)
-               gtk_clist_set_pixmap(clist, row, COL_GETALL,
-                                    checkboxoffxpm, checkboxoffxpmmask);
-
-       gtk_clist_set_row_data(clist, row, ac_prefs);
-
-       return row;
+       account_list_view_insert_account_item(list_store,
+                                            name, protocol, server,
+                                            ac_prefs->is_default,
+                                            getall, ac_prefs);
+       return;
 }
 
-/* set CList from account list */
-static void account_clist_set(void)
+static void account_list_view_set(void)
 {
-       GtkCList *clist = GTK_CLIST(edit_account.clist);
        GList *cur;
-       gint row = -1, prev_row = -1;
-
-       if (clist->selection)
-               prev_row = GPOINTER_TO_INT(clist->selection->data);
+       gint prev_sel_account;
+       GtkListStore *store;
+       
+       store = GTK_LIST_STORE(gtk_tree_view_get_model
+               (GTK_TREE_VIEW(edit_account.list_view)));
 
-       gtk_clist_freeze(clist);
-       gtk_clist_clear(clist);
+       prev_sel_account = account_list_view_get_selected_account_id
+               (edit_account.list_view); 
 
+       gtk_list_store_clear(store);
+       
        for (cur = account_list; cur != NULL; cur = cur->next) {
-               row = account_clist_set_row((PrefsAccount *)cur->data, -1);
-               if ((PrefsAccount *)cur->data == cur_account) {
-                       gtk_clist_select_row(clist, row, -1);
-                       gtkut_clist_set_focus_row(clist, row);
-               }
-       }
-
-       if (prev_row >= 0) {
-               row = prev_row;
-               gtk_clist_select_row(clist, row, -1);
-               gtkut_clist_set_focus_row(clist, row);
+               account_list_view_add((PrefsAccount *)cur->data);
+               if ((PrefsAccount *)cur->data == cur_account)
+                       account_list_view_select_account
+                               (edit_account.list_view, 
+                                cur_account->account_id);
        }
-
-       if (row >= 0 &&
-           gtk_clist_row_is_visible(clist, row) != GTK_VISIBILITY_FULL)
-               gtk_clist_moveto(clist, row, -1, 0.5, 0);
-
-       gtk_clist_thaw(clist);
+       
+       if (prev_sel_account >= 0)
+               account_list_view_select_account(edit_account.list_view, 
+                                                prev_sel_account); 
 }
 
 /* set account list from CList */
 static void account_list_set(void)
 {
-       GtkCList *clist = GTK_CLIST(edit_account.clist);
-       gint row;
+       /* want to make sure we iterate *IN ORDER*, so therefore using
+        * gtk_tree_model_XXXX_nth_child() */
+       gint row, n_rows;
        PrefsAccount *ac_prefs;
-
+       GtkTreeModel *model = gtk_tree_view_get_model
+                               (GTK_TREE_VIEW(edit_account.list_view));
+       
        while (account_list)
                account_list = g_list_remove(account_list, account_list->data);
 
-       for (row = 0; (ac_prefs = gtk_clist_get_row_data(clist, row)) != NULL;
-            row++)
-               account_list = g_list_append(account_list, ac_prefs);
+       n_rows = gtk_tree_model_iter_n_children(model, NULL);
+
+       for (row = 0; row < n_rows; row++) {
+               GtkTreeIter iter;
+
+               if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row)) {
+                       g_warning("%s(%d) - no iter found???\n", __FILE__, __LINE__);                                         
+                       continue;
+               }
+       
+               ac_prefs = NULL;
+               gtk_tree_model_get(model, &iter,
+                                  ACCOUNT_DATA, &ac_prefs,
+                                  -1);
+               if (ac_prefs)
+                       account_list = g_list_append(account_list, ac_prefs);
+       }
 }
 
 /*!
@@ -997,32 +1219,405 @@ PrefsAccount *account_get_reply_account(MsgInfo *msginfo, gboolean reply_autosel
        if (msginfo->folder->prefs && msginfo->folder->prefs->enable_default_account)
                account = account_find_from_id(msginfo->folder->prefs->default_account);
        
+       /* select account by to: and cc: header if enabled */
+       if (reply_autosel) {
+               gchar * field = NULL;
+               int fieldno = 0;
+               for (field = msginfo->to; fieldno++ < 2; field = msginfo->cc) {
+                       if (!account && field) {
+                               gchar *to = NULL;
+                               if (!strchr(field, ',')) {
+                                       Xstrdup_a(to, field, return NULL);
+                                       extract_address(to);
+                                       account = account_find_from_address(to);
+                               } else {
+                                       gchar **split = g_strsplit(field, ",", -1);
+                                       int i = -1;
+                                       do {
+                                               i++;
+                                               if (!split[i])
+                                                       break;
+                                               Xstrdup_a(to, split[i], return NULL);
+                                               extract_address(to);
+                                               account = account_find_from_address(to);
+                                       } while (!account);
+                                       g_strfreev(split);
+                               }
+                       }
+               }
+       }
+
        /* select the account for the whole folder (IMAP / NNTP) */
-       if (!account)
+       if (!account) 
                /* FIXME: this is not right, because folder may be nested. we should
                 * ascend the tree until we find a parent with proper account 
                 * information */
                account = msginfo->folder->folder->account;
 
-       /* select account by to: and cc: header if enabled */
-       if (reply_autosel) {
-               if (!account && msginfo->to) {
-                       gchar *to;
-                       Xstrdup_a(to, msginfo->to, return NULL);
-                       extract_address(to);
-                       account = account_find_from_address(to);
-               }
-               if (!account) {
-                       gchar cc[BUFFSIZE];
-                       if (!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
-                               extract_address(cc);
-                               account = account_find_from_address(cc);
-                       }        
-               }
-       }
-
        /* select current account */
        if (!account) account = cur_account;
        
        return account;
 }
+
+/*!
+ *\brief       Create data store
+ */
+static GtkListStore* account_create_data_store(void)
+{
+       return gtk_list_store_new(N_ACCOUNT_COLUMNS,
+                                GDK_TYPE_PIXBUF,       /* ACCOUNT_IS_DEFAULT */
+                                G_TYPE_BOOLEAN,        /* ACCOUNT_ENABLE_GET_ALL */
+                                G_TYPE_STRING,         /* ACCOUNT_NAME */
+                                G_TYPE_STRING,         /* ACCOUNT_PROTOCOL */
+                                G_TYPE_STRING,         /* ACCOUNT_SERVER */
+                                G_TYPE_POINTER,        /* ACCOUNT_DATA */
+                                -1);
+}
+
+/*!
+ *\brief       Insert an account item in the list. 
+ *
+ *\return      GtkTreeRowReference * A tree row reference, which is guaranteed to 
+ *             stable whatever operations are performed on the list.
+ */
+static void account_list_view_insert_account_item(GtkListStore *list_store, 
+                                                 const gchar *account_name,
+                                                 const gchar *protocol, 
+                                                 const gchar *server_name,
+                                                 gboolean is_default, 
+                                                 gboolean is_get_all,
+                                                 PrefsAccount *account_data)
+{
+       GtkTreeIter iter;
+       
+       gtk_list_store_append(list_store, &iter);
+       gtk_list_store_set(list_store, &iter, 
+                          ACCOUNT_IS_DEFAULT,     is_default ? mark_pixbuf : NULL,
+                          ACCOUNT_ENABLE_GET_ALL, is_get_all,
+                          ACCOUNT_NAME,           account_name,
+                          ACCOUNT_PROTOCOL,       protocol,
+                          ACCOUNT_SERVER,         server_name,
+                          ACCOUNT_DATA,           account_data,
+                          -1);
+}
+
+/*!
+ *\brief       Create and set up account list view, including tasks like
+ *             creating the data store (\ref account_create_data_store()),
+ *             creating images for the list view (\ref account_create_list_view_images()),
+ *             and setting up the account list's individual columns (\ref 
+ *             account_create_list_view_columns()).
+ *
+ *\return      GtkWidget * The created list view widget.
+ */
+static GtkWidget *account_list_view_create(void)
+{
+       GtkTreeView *list_view;
+       GtkTreeSelection *selector;
+       GtkListStore *store = account_create_data_store();
+
+       list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
+       g_object_unref(G_OBJECT(store));
+
+       gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+       
+       selector = gtk_tree_view_get_selection(list_view);
+       gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
+
+       /* create the columns */
+       account_create_list_view_columns(GTK_WIDGET(list_view));
+
+       /* set a double click listener */
+       g_signal_connect(G_OBJECT(list_view), "row_activated",
+                        G_CALLBACK(account_double_clicked),
+                        list_view);
+
+       g_signal_connect(G_OBJECT(list_view), "drag_begin",                      
+                        G_CALLBACK(drag_begin),
+                        list_view);
+                        
+       g_signal_connect(G_OBJECT(list_view), "drag_end",                        
+                        G_CALLBACK(drag_end),
+                        list_view);
+                        
+       gtk_tree_view_set_reorderable(list_view, TRUE);
+       return GTK_WIDGET(list_view);
+}
+
+static void account_create_list_view_images(GtkWidget *list_view)
+{
+       stock_pixbuf_gdk(list_view, STOCK_PIXMAP_MARK, &mark_pixbuf);
+}
+
+static void account_create_list_view_columns(GtkWidget *list_view)
+{
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+
+       renderer = gtk_cell_renderer_pixbuf_new();
+       column = gtk_tree_view_column_new_with_attributes
+               ("D", renderer,
+                "pixbuf", ACCOUNT_IS_DEFAULT,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);           
+
+       renderer = gtk_cell_renderer_toggle_new();
+       g_object_set(renderer, 
+                    "radio", FALSE, 
+                    "activatable", TRUE,
+                     NULL);
+       column = gtk_tree_view_column_new_with_attributes
+               ("G", renderer,
+                "active", ACCOUNT_ENABLE_GET_ALL,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+       g_signal_connect(G_OBJECT(renderer), "toggled",                      
+                        G_CALLBACK(account_get_all_toggled),
+                        list_view);
+       
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Name"), renderer,
+                "text", ACCOUNT_NAME,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+       
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Protocol"), renderer,
+                "text", ACCOUNT_PROTOCOL,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);           
+       
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Server"), renderer,
+                "text", ACCOUNT_SERVER,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);           
+}
+
+/*!
+ *\brief       Get currently selected account (by its unique ID)
+ */
+static gint account_list_view_get_selected_account_id(GtkWidget *list_view)
+{
+       GtkTreeSelection *selector;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       PrefsAccount *res = NULL;
+
+       selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
+       
+       if (!gtk_tree_selection_get_selected(selector, &model, &iter))
+               return -1;
+
+       gtk_tree_model_get(model, &iter, ACCOUNT_DATA, &res, -1);
+
+       return res->account_id;                    
+}
+
+/*!
+ *\brief       Get the tree path of the currently selected account
+ */
+GtkTreePath *account_list_view_get_selected_account_path(GtkWidget *list_view)
+{
+       GtkTreeSelection *selector;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+
+       selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
+       
+       if (!gtk_tree_selection_get_selected(selector, &model, &iter))
+               return NULL;
+
+       return gtk_tree_model_get_path(gtk_tree_view_get_model
+               (GTK_TREE_VIEW(list_view)), &iter);
+}
+
+/*!
+ *\brief       Get the account data of the currently selected account
+ */
+PrefsAccount *account_list_view_get_selected_account(GtkWidget *list_view)
+{
+       GtkTreeSelection *selector;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       PrefsAccount *res = NULL;
+
+       selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
+       
+       if (!gtk_tree_selection_get_selected(selector, &model, &iter))
+               return NULL;
+
+       gtk_tree_model_get(model, &iter, ACCOUNT_DATA, &res, -1);
+
+       return res;                        
+}
+
+/*!
+ *\brief       Select a row by the account it represents
+ *
+ *\return      gboolean TRUE if found and selected, FALSE if not.
+ */
+gboolean account_list_view_select_account(GtkWidget *list_view, gint account_id)
+{
+       FindAccountInStore fis;
+       GtkTreeModel *model;
+       
+       fis.account_id = account_id;
+       fis.path = NULL;
+
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(list_view));
+
+       gtk_tree_model_foreach(model, (GtkTreeModelForeachFunc) find_account_in_store,
+                              &fis);
+                              
+       if (fis.path) {
+               GtkTreeSelection *selection;
+               GtkTreePath* path;
+
+               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
+               gtk_tree_selection_select_iter(selection, &fis.iter);
+               path = gtk_tree_model_get_path(model, &fis.iter);
+               /* XXX returned path may not be valid??? create new one to be sure */ 
+               gtk_tree_view_set_cursor(GTK_TREE_VIEW(list_view), path, NULL, FALSE);
+               gtk_tree_path_free(path);
+       }
+
+       return fis.path != NULL;
+}
+
+/*!
+ *\brief       Set a new default account by its ID. (There is only one
+ *             default account.)
+ */
+static void account_list_view_set_default_by_id(GtkWidget *list_view,
+                                               gint account_id)
+{
+       GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list_view));
+       
+       gtk_tree_model_foreach
+               (model, (GtkTreeModelForeachFunc) set_new_default_account,
+                &account_id);
+}
+
+static gboolean set_new_default_account(GtkTreeModel *model,
+                                       GtkTreePath  *path,
+                                       GtkTreeIter  *iter,
+                                       gint         *account_id)
+{
+       PrefsAccount *account = NULL;
+       GdkPixbuf *pixbuf;
+       
+       gtk_tree_model_get(model, iter, 
+                          ACCOUNT_DATA, &account, 
+                          -1);
+
+       if (*account_id == account->account_id)
+               pixbuf = NULL;
+       else
+               pixbuf = mark_pixbuf;
+       
+       gtk_list_store_set(GTK_LIST_STORE(model), iter, 
+                          ACCOUNT_IS_DEFAULT, pixbuf,
+                          -1);
+
+       return FALSE;
+}
+                                       
+static gboolean find_account_in_store(GtkTreeModel *model,
+                                     GtkTreePath  *path,
+                                     GtkTreeIter  *iter,
+                                     FindAccountInStore *data)
+{
+       PrefsAccount *account = NULL;
+       gtk_tree_model_get(model, iter, ACCOUNT_DATA, &account, -1);
+
+       if (data->account_id == account->account_id) {
+               data->path = path; /* signal we found it */
+               data->iter = *iter;
+               return TRUE;
+       }
+
+       return FALSE; 
+}
+
+/*!
+ *\brief       Triggered when "get all" column is activated or de-activated
+ */
+static void account_get_all_toggled(GtkCellRendererToggle *widget, 
+                                   gchar *path, 
+                                   GtkWidget *list_view)
+{
+       GtkTreeIter iter;
+       GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list_view));
+       PrefsAccount *ac = NULL;
+       gboolean get_all;
+       
+       if (!gtk_tree_model_get_iter_from_string(model, &iter, path))
+               return;
+
+       gtk_tree_model_get(model, &iter, 
+                          ACCOUNT_DATA, &ac,
+                          ACCOUNT_ENABLE_GET_ALL, &get_all,
+                          -1);
+
+       /* check if the account has a selectable get all checkbox anyway... */
+       if (!(ac->protocol == A_POP3  || 
+             ac->protocol == A_IMAP4 ||
+             ac->protocol == A_NNTP  ||
+             ac->protocol == A_LOCAL))
+               return;       
+
+       /* set value in store */
+       gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+                          ACCOUNT_ENABLE_GET_ALL, !get_all,
+                          -1);
+
+       /* set value in account */
+       ac->recv_at_getall ^= TRUE;
+}
+
+static void account_double_clicked(GtkTreeView         *list_view,
+                                  GtkTreePath          *path,
+                                  GtkTreeViewColumn    *column,
+                                  gpointer              data)
+{
+       account_edit_prefs(NULL, NULL); 
+}
+
+static void drag_begin(GtkTreeView *list_view,
+                     GdkDragContext *context,
+                     gpointer data)
+{
+       /* XXX unfortunately a completed drag & drop does not emit 
+        * a "rows_reordered" signal, but a "row_changed" signal.
+        * So during drag and drop, listen to "row_changed", and
+        * update the account list accordingly */
+
+       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+       g_signal_connect(G_OBJECT(model), "row_changed",
+                        G_CALLBACK(account_row_changed_while_drag_drop),
+                        list_view);
+}
+
+static void drag_end(GtkTreeView *list_view,
+                   GdkDragContext *context,
+                   gpointer data)
+{
+       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+       g_signal_handlers_disconnect_by_func(G_OBJECT(model),
+                                            G_CALLBACK(account_row_changed_while_drag_drop),
+                                            list_view);
+}
+
+static void account_row_changed_while_drag_drop(GtkTreeModel *model, 
+                                  GtkTreePath  *path,
+                                  GtkTreeIter  *iter,
+                                  gpointer      arg3,
+                                  GtkTreeView  *list_view)
+{      
+       account_list_set();     
+}