src/account.[ch]
[claws.git] / src / account.c
index 79d5705aeb5581b3e99b944142b2f48ca1c15181..0bc5e8375a350553eedf52a262c716e9b232496d 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 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 "account.h"
 #include "prefs.h"
 #include "prefs_account.h"
+#include "prefs_folder_item.h"
 #include "compose.h"
 #include "manage_window.h"
+#include "stock_pixmap.h"
 #include "inc.h"
 #include "gtkutils.h"
 #include "utils.h"
 typedef enum
 {
        COL_DEFAULT     = 0,
-       COL_NAME        = 1,
-       COL_PROTOCOL    = 2,
-       COL_SERVER      = 3
+       COL_GETALL      = 1,
+       COL_NAME        = 2,
+       COL_PROTOCOL    = 3,
+       COL_SERVER      = 4
 } EditAccountColumnPos;
 
-# define N_EDIT_ACCOUNT_COLS   4
+# define N_EDIT_ACCOUNT_COLS   5
 
 #define PREFSBUFSIZE           1024
 
@@ -66,6 +69,13 @@ static struct EditAccount {
        GtkWidget *close_btn;
 } edit_account;
 
+static GdkPixmap *markxpm;
+static GdkBitmap *markxpmmask;
+static GdkPixmap *checkboxonxpm;
+static GdkPixmap *checkboxonxpmmask;
+static GdkPixmap *checkboxoffxpm;
+static GdkPixmap *checkboxoffxpmmask;
+
 static void account_edit_create                (void);
 
 static void account_edit_prefs         (void);
@@ -77,6 +87,17 @@ static void account_down             (void);
 static void account_set_default                (void);
 
 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,
                                         GdkEventKey    *event,
                                         gpointer        data);
@@ -98,7 +119,7 @@ void account_read_config_all(void)
        debug_print(_("Reading all config for each account...\n"));
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
-       if ((fp = fopen(rcpath, "r")) == NULL) {
+       if ((fp = fopen(rcpath, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
                g_free(rcpath);
                return;
@@ -154,6 +175,9 @@ PrefsAccount *account_find_from_smtp_server(const gchar *address,
        GList *cur;
        PrefsAccount *ac;
 
+       g_return_val_if_fail(address != NULL, NULL);
+       g_return_val_if_fail(smtp_server != NULL, NULL);
+
        for (cur = account_list; cur != NULL; cur = cur->next) {
                ac = (PrefsAccount *)cur->data;
                if (!strcmp2(address, ac->address) &&
@@ -164,6 +188,31 @@ PrefsAccount *account_find_from_smtp_server(const gchar *address,
        return NULL;
 }
 
+/*
+ * account_find_from_address:
+ * @address: Email address string.
+ *
+ * Find a mail (not news) account with the specified email address.
+ *
+ * Return value: The found account, or NULL if not found.
+ */
+PrefsAccount *account_find_from_address(const gchar *address)
+{
+       GList *cur;
+       PrefsAccount *ac;
+
+       g_return_val_if_fail(address != NULL, NULL);
+
+       for (cur = account_list; cur != NULL; cur = cur->next) {
+               ac = (PrefsAccount *)cur->data;
+               if (ac->protocol != A_NNTP && ac->address &&
+                   strcasestr(address, ac->address) != NULL)
+                       return ac;
+       }
+
+       return NULL;
+}
+
 PrefsAccount *account_find_from_id(gint id)
 {
        GList *cur;
@@ -178,6 +227,33 @@ PrefsAccount *account_find_from_id(gint id)
        return NULL;
 }
 
+/*
+ * account_find_all_from_address:
+ * @ac_list: initial list of accounts. NULL to create a new one.
+ * Accounts found in the @address will be appended to this list.
+ * @address: Email address string.
+ *
+ * Find all the mail (not news) accounts within the specified address.
+ *
+ * Return value: the original accounts list with the found accounts appended.
+ */
+GList *account_find_all_from_address(GList *ac_list, const gchar *address)
+{
+       GList *cur;
+       PrefsAccount *ac;
+
+       if (address == NULL)
+               return ac_list;
+
+       for (cur = account_list; cur != NULL; cur = cur->next) {
+               ac = (PrefsAccount *)cur->data;
+               if (ac->protocol != A_NNTP && ac->address &&
+                   strcasestr(address, ac->address) != NULL)
+                       ac_list = g_list_append(ac_list, ac);
+       }
+       return ac_list;
+}
+       
 void account_set_menu(void)
 {
        main_window_set_account_menu(account_list);
@@ -199,12 +275,12 @@ GList *account_get_list(void)
 
 void account_edit_open(void)
 {
-       inc_autocheck_timer_remove();
-       
+       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_autocheck_timer_set();                                      
+               inc_unlock();
                return;
        }
 
@@ -227,7 +303,6 @@ void account_add(void)
        PrefsAccount *ac_prefs;
 
        ac_prefs = prefs_account_open(NULL);
-       inc_autocheck_timer_remove();
 
        if (!ac_prefs) return;
 
@@ -248,10 +323,13 @@ void account_add(void)
                        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);
-               folderview_update_all();
+               if (ac_prefs->protocol == A_IMAP4)
+                       folder->create_tree(folder);
+               folderview_set_all();
        }
 }
 
@@ -301,13 +379,66 @@ void account_set_missing_folder(void)
                                folder = folder_new(F_NEWS, ap->account_name,
                                                    ap->nntp_server);
                        }
+
                        folder->account = ap;
                        ap->folder = REMOTE_FOLDER(folder);
                        folder_add(folder);
+                       if (ap->protocol == A_IMAP4)
+                               folder->create_tree(folder);
                }
        }
 }
 
+FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
+                                      SpecialFolderItemType type)
+{
+       FolderItem *item = NULL;
+
+       g_return_val_if_fail(ac_prefs != NULL, NULL);
+
+       if (type == F_OUTBOX) {
+               if (ac_prefs->set_sent_folder && ac_prefs->sent_folder) {
+                       item = folder_find_item_from_identifier
+                               (ac_prefs->sent_folder);
+               }
+               if (!item) {
+                       if (ac_prefs->folder)
+                               item = FOLDER(ac_prefs->folder)->outbox;
+                       if (!item)
+                               item = folder_get_default_outbox();
+               }
+       } else if (type == F_DRAFT) {
+               if (ac_prefs->set_draft_folder && ac_prefs->draft_folder) {
+                       item = folder_find_item_from_identifier
+                               (ac_prefs->draft_folder);
+               }
+               if (!item) {
+                       if (ac_prefs->folder)
+                               item = FOLDER(ac_prefs->folder)->draft;
+                       if (!item)
+                               item = folder_get_default_draft();
+               }
+       } else if (type == F_QUEUE) {
+               if (ac_prefs->folder)
+                       item = FOLDER(ac_prefs->folder)->queue;
+               if (!item)
+                       item = folder_get_default_queue();
+       } else if (type == F_TRASH) {
+               if (ac_prefs->set_trash_folder && ac_prefs->trash_folder) {
+                       item = folder_find_item_from_identifier
+                               (ac_prefs->trash_folder);
+               }
+               if (!item) {
+                       if (ac_prefs->folder)
+                               item = FOLDER(ac_prefs->folder)->trash;
+                       if (!item)
+                               item = folder_get_default_trash();
+               }
+       }
+
+       return item;
+}
+
 void account_destroy(PrefsAccount *ac_prefs)
 {
        g_return_if_fail(ac_prefs != NULL);
@@ -331,6 +462,7 @@ static void account_edit_create(void)
 {
        GtkWidget *window;
        GtkWidget *vbox;
+       GtkWidget *label;
        GtkWidget *hbox;
        GtkWidget *scrolledwin;
        GtkWidget *clist;
@@ -357,18 +489,27 @@ static void account_edit_create(void)
        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_edit_close), NULL);
+                           GTK_SIGNAL_FUNC (account_delete_event), NULL);
        gtk_signal_connect (GTK_OBJECT (window), "key_press_event",
                            GTK_SIGNAL_FUNC (account_key_pressed), NULL);
-       gtk_signal_connect (GTK_OBJECT (window), "focus_in_event",
-                           GTK_SIGNAL_FUNC (manage_window_focus_in), NULL);
-       gtk_signal_connect (GTK_OBJECT (window), "focus_out_event",
-                           GTK_SIGNAL_FUNC (manage_window_focus_out), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT (window);
+       gtk_widget_realize(window);
 
-       vbox = gtk_vbox_new (FALSE, 12);
+       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);
@@ -381,7 +522,8 @@ static void account_edit_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
-       titles[COL_DEFAULT]  = "";
+       titles[COL_DEFAULT]  = "D";
+       titles[COL_GETALL]   = "G";
        titles[COL_NAME]     = _("Name");
        titles[COL_PROTOCOL] = _("Protocol");
        titles[COL_SERVER]   = _("Server");
@@ -389,16 +531,26 @@ static void account_edit_create(void)
        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 , 16);
+       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, 70);
+       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 (GTK_OBJECT (clist), "row_move",
+                           GTK_SIGNAL_FUNC (account_row_moved), NULL);
+
        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
@@ -441,7 +593,7 @@ static void account_edit_create(void)
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
 
-       default_btn = gtk_button_new_with_label (_(" Set as usually used account "));
+       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",
@@ -457,6 +609,12 @@ static void account_edit_create(void)
                            GTK_SIGNAL_FUNC (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);
+
        edit_account.window    = window;
        edit_account.clist     = clist;
        edit_account.close_btn = close_btn;
@@ -475,30 +633,52 @@ static void account_edit_prefs(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        ac_prefs = gtk_clist_get_row_data(clist, row);
        prev_default = ac_prefs->is_default;
-       Xstrdup_a(ac_name, ac_prefs->account_name, return);
+       Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
+                 return);
 
        prefs_account_open(ac_prefs);
-       inc_autocheck_timer_remove();
 
        if (!prev_default && ac_prefs->is_default)
                account_set_as_default(ac_prefs);
 
        if ((ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) &&
-           ac_prefs->folder && strcmp(ac_name, ac_prefs->account_name) != 0) {
+           ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
                folder_set_name(FOLDER(ac_prefs->folder),
                                ac_prefs->account_name);
-               folderview_update_all();
+               folderview_rescan_all();
        }
 
        account_clist_set();
 }
 
+static gboolean account_delete_references_func(GNode *node, gpointer data)
+{
+       FolderItem *item;
+       gint account;
+
+       g_return_val_if_fail(node->data != NULL, FALSE);
+
+       item = FOLDER_ITEM(node->data);
+       account = GPOINTER_TO_INT(data);
+
+       if(!item->prefs) /* && item->prefs->stype == F_NORMAL */
+               return FALSE;
+       if(item->prefs->default_account != account)
+               return FALSE;
+       
+       item->prefs->enable_default_account = FALSE;
+       item->prefs->default_account = 0;
+       prefs_folder_item_save_config(item);
+}
+
 static void account_delete(void)
 {
        GtkCList *clist = GTK_CLIST(edit_account.clist);
        PrefsAccount *ac_prefs;
        gint row;
-
+       GList *list;
+       Folder *folder;
+       
        if (!clist->selection) return;
 
        if (alertpanel(_("Delete account"),
@@ -510,10 +690,21 @@ static void account_delete(void)
        ac_prefs = gtk_clist_get_row_data(clist, row);
        if (ac_prefs->folder) {
                folder_destroy(FOLDER(ac_prefs->folder));
-               folderview_update_all();
+               folderview_rescan_all();
        }
        account_destroy(ac_prefs);
        account_clist_set();
+
+       debug_print(_("Removing deleted account references for all the folders...\n"));
+       list = folder_get_list();
+       for (; list != NULL; list = list->next) {
+               folder = FOLDER(list->data);
+               if (folder->node)  /* && folder->type == F_? */
+                       g_node_traverse(folder->node, G_PRE_ORDER,
+                               G_TRAVERSE_ALL, -1,
+                               account_delete_references_func,
+                               GINT_TO_POINTER(ac_prefs->account_id));
+       }
 }
 
 static void account_up(void)
@@ -524,10 +715,8 @@ static void account_up(void)
        if (!clist->selection) return;
 
        row = GPOINTER_TO_INT(clist->selection->data);
-       if (row > 0) {
+       if (row > 0)
                gtk_clist_row_move(clist, row, row - 1);
-               account_list_set();
-       }
 }
 
 static void account_down(void)
@@ -538,10 +727,8 @@ static void account_down(void)
        if (!clist->selection) return;
 
        row = GPOINTER_TO_INT(clist->selection->data);
-       if (row < clist->rows - 1) {
+       if (row < clist->rows - 1)
                gtk_clist_row_move(clist, row, row + 1);
-               account_list_set();
-       }
 }
 
 static void account_set_default(void)
@@ -578,7 +765,42 @@ static void account_edit_close(void)
 
        gtk_widget_hide(edit_account.window);
 
-       inc_autocheck_timer_set();
+       inc_unlock();
+}
+
+static gint account_delete_event(GtkWidget *widget, GdkEventAny *event,
+                                gpointer data)
+{
+       account_edit_close();
+       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,
+                                source_row < dest_row ? 1.0 : 0.0, 0.0);
+       }
 }
 
 static void account_key_pressed(GtkWidget *widget, GdkEventKey *event,
@@ -593,14 +815,39 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
 {
        GtkCList *clist = GTK_CLIST(edit_account.clist);
        gchar *text[N_EDIT_ACCOUNT_COLS];
-
-       text[COL_DEFAULT] = ac_prefs->is_default ? "*" : "";
-       text[COL_NAME] = ac_prefs->account_name;
-       text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3  ? "POP3"  :
-                            ac_prefs->protocol == A_APOP  ? "APOP"  :
+       gboolean has_getallbox;
+       gboolean getall;
+
+       text[COL_DEFAULT] = "";
+       text[COL_GETALL]  = "";
+       text[COL_NAME]    = ac_prefs->account_name;
+#if USE_SSL
+       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") :
+                            "";
+#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"  :  "";
+                            ac_prefs->protocol == A_NNTP  ? "NNTP" : "";
+#endif
        text[COL_SERVER] = ac_prefs->protocol == A_NNTP
                ? ac_prefs->nntp_server : ac_prefs->recv_server;
 
@@ -608,11 +855,29 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
                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_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;
@@ -623,26 +888,31 @@ static void account_clist_set(void)
 {
        GtkCList *clist = GTK_CLIST(edit_account.clist);
        GList *cur;
-       gint prev_row;
+       gint row = -1, prev_row = -1;
 
        if (clist->selection)
                prev_row = GPOINTER_TO_INT(clist->selection->data);
-       else
-               prev_row = -1;
 
        gtk_clist_freeze(clist);
        gtk_clist_clear(clist);
 
        for (cur = account_list; cur != NULL; cur = cur->next) {
-               gint row;
-
                row = account_clist_set_row((PrefsAccount *)cur->data, -1);
-               if ((PrefsAccount *)cur->data == cur_account)
+               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);
        }
 
-       if (prev_row >= 0)
-               gtk_clist_select_row(clist, prev_row, -1);
+       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);
 }