reverse previous changes
[claws.git] / src / folderview.c
index 8ead09c90e9c23b9753548e76ed056dc7757dd62..d27cb30155fa6770666556c1ec04c9c12ed37f76 100644 (file)
@@ -43,6 +43,7 @@
 #include "folderview.h"
 #include "summaryview.h"
 #include "inputdialog.h"
+#include "grouplistdialog.h"
 #include "manage_window.h"
 #include "alertpanel.h"
 #include "menu.h"
@@ -53,7 +54,6 @@
 #include "prefs_account.h"
 #include "account.h"
 #include "folder.h"
-#include "grouplist_dialog.h"
 
 #include "pixmaps/inbox.xpm"
 #include "pixmaps/outbox.xpm"
@@ -91,6 +91,11 @@ static GList *folderview_list = NULL;
 static GdkFont *normalfont;
 static GdkFont *boldfont;
 
+static GtkStyle *normal_style;
+static GtkStyle *normal_color_style;
+static GtkStyle *bold_style;
+static GtkStyle *bold_color_style;
+
 static GdkPixmap *inboxxpm;
 static GdkBitmap *inboxxpmmask;
 static GdkPixmap *outboxxpm;
@@ -147,6 +152,10 @@ static void folderview_col_resized (GtkCList       *clist,
                                         gint            width,
                                         FolderView     *folderview);
 
+static void folderview_update_tree_cb  (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void folderview_new_folder_cb   (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -156,6 +165,9 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview,
 static void folderview_rename_folder_cb        (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
+static void folderview_rename_mbox_folder_cb(FolderView *folderview,
+                                            guint action,
+                                            GtkWidget *widget);
 static void folderview_delete_folder_cb        (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -201,16 +213,20 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
                                          guint             info,
                                          guint             time,
                                          FolderView       *folderview);
+static void folderview_scoring_cb(FolderView *folderview, guint action,
+                                 GtkWidget *widget);
+static void folderview_property_cb(FolderView *folderview, guint action, GtkWidget *widget);
 
 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
 {
        {N_("/Create _new folder..."),  NULL, folderview_new_mbox_folder_cb,    0, NULL},
-       {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb, 0, NULL},
+       {N_("/_Rename folder..."),      NULL, folderview_rename_mbox_folder_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),           NULL, NULL, 0, NULL}
+       {N_("/_Property..."),           NULL, NULL, 0, NULL},
+       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_mail_popup_entries[] =
@@ -219,9 +235,11 @@ static GtkItemFactoryEntry folderview_mail_popup_entries[] =
        {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/_Update folder tree"),    NULL, folderview_update_tree_cb, 0, NULL},
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),           NULL, NULL, 0, NULL}
+       {N_("/_Property..."),           NULL, folderview_property_cb, 0, NULL},
+       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_imap_popup_entries[] =
@@ -230,9 +248,11 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/_Rename folder..."),      NULL, NULL, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_rm_imap_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/Remove _IMAP4 server"),   NULL, folderview_rm_imap_server_cb, 0, NULL},
+       {N_("/_Update folder tree"),    NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/Remove _IMAP4 account"),  NULL, folderview_rm_imap_server_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),           NULL, NULL, 0, NULL}
+       {N_("/_Property..."),           NULL, NULL, 0, NULL},
+       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_news_popup_entries[] =
@@ -241,9 +261,10 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
                                         NULL, folderview_new_news_group_cb, 0, NULL},
        {N_("/_Remove newsgroup"),       NULL, folderview_rm_news_group_cb, 0, NULL},
        {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/Remove _news server"),     NULL, folderview_rm_news_server_cb, 0, NULL},
+       {N_("/Remove _news account"),    NULL, folderview_rm_news_server_cb, 0, NULL},
        {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Property..."),            NULL, NULL, 0, NULL}
+       {N_("/_Property..."),            NULL, NULL, 0, NULL},
+       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 
@@ -297,7 +318,7 @@ FolderView *folderview_create(void)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_SQUARE);
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
-       
+
        /* don't let title buttons take key focus */
        for (i = 0; i < N_FOLDER_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
@@ -341,7 +362,6 @@ FolderView *folderview_create(void)
        gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
                           GTK_SIGNAL_FUNC(folderview_selected), folderview);
 
-
        gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_expand",
                                 GTK_SIGNAL_FUNC(folderview_tree_expanded),
                                 folderview);
@@ -414,6 +434,20 @@ void folderview_init(FolderView *folderview)
                normalfont = gdk_fontset_load(NORMAL_FONT);
        if (!boldfont)
                boldfont = gdk_fontset_load(BOLD_FONT);
+
+       if (!bold_style) {
+               bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
+               bold_style->font = boldfont;
+               bold_color_style = gtk_style_copy(bold_style);
+               bold_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
+       }
+       if (!normal_style) {
+               normal_style = gtk_style_copy(gtk_widget_get_style(ctree));
+               normal_style->font = normalfont;
+               normal_color_style = gtk_style_copy(normal_style);
+               normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
+       }
+
 }
 
 void folderview_set(FolderView *folderview)
@@ -441,15 +475,27 @@ void folderview_set(FolderView *folderview)
        STATUSBAR_POP(mainwin);
 }
 
+void folderview_set_all(void)
+{
+       GList *list;
+
+       for (list = folderview_list; list != NULL; list = list->next)
+               folderview_set((FolderView *)list->data);
+}
+
 void folderview_select(FolderView *folderview, FolderItem *item)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node;
+       GtkCTreeNode *old_selected = folderview->selected;
 
        if (!item) return;
 
        node = gtk_ctree_find_by_row_data(ctree, NULL, item);
        if (node) folderview_select_node(folderview, node);
+
+       if (old_selected != node)
+               folder_update_op_count();
 }
 
 static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
@@ -466,9 +512,7 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
        else
                gtk_widget_grab_focus(folderview->ctree);
 
-       while ((node = gtkut_ctree_find_collapsed_parent(ctree, node))
-              != NULL)
-               gtk_ctree_expand(ctree, node);
+       gtkut_ctree_expand_parent_all(ctree, node);
 }
 
 void folderview_unselect(FolderView *folderview)
@@ -558,6 +602,15 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
                                      gpointer data)
 {
        GList *list;
+       gchar *rootpath;
+
+       if (FOLDER_IS_LOCAL(folder))
+               rootpath = LOCAL_FOLDER(folder)->rootpath;
+       else if (folder->type == F_IMAP && folder->account &&
+                folder->account->recv_server)
+               rootpath = folder->account->recv_server;
+       else
+               return;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                FolderView *folderview = (FolderView *)list->data;
@@ -566,12 +619,11 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
 
                if (item->path)
                        str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
-                                             LOCAL_FOLDER(folder)->rootpath,
-                                             G_DIR_SEPARATOR,
+                                             rootpath, G_DIR_SEPARATOR,
                                              item->path);
                else
                        str = g_strdup_printf(_("Scanning folder %s ..."),
-                                             LOCAL_FOLDER(folder)->rootpath);
+                                             rootpath);
 
                STATUSBAR_PUSH(mainwin, str);
                STATUSBAR_POP(mainwin);
@@ -602,6 +654,26 @@ static GtkWidget *label_window_create(const gchar *str)
        return window;
 }
 
+void folderview_update_tree(Folder *folder)
+{
+       GtkWidget *window;
+
+       g_return_if_fail(folder != NULL);
+
+       if (!folder->scan_tree) return;
+
+       window = label_window_create(_("Updating folder tree..."));
+
+       folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
+       folder->scan_tree(folder);
+       folder_set_ui_func(folder, NULL, NULL);
+
+       folder_write_list();
+       folderview_set_all();
+
+       gtk_widget_destroy(window);
+}
+
 void folderview_update_all(void)
 {
        GList *list;
@@ -620,13 +692,39 @@ void folderview_update_all(void)
        }
 
        folder_write_list();
+       folderview_set_all();
+
+       gtk_widget_destroy(window);
+}
+
+void folderview_update_all_node(void)
+{
+       GList *list;
+       FolderItem *item;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+       GtkWidget *window;
+
+       window = label_window_create(_("Updating all folders..."));
 
        for (list = folderview_list; list != NULL; list = list->next) {
-               FolderView *folderview = (FolderView *)list->data;
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
 
-               folderview_set(folderview);
+               for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+                    node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+                       item = gtk_ctree_node_get_row_data(ctree, node);
+                       if (!item || !FOLDER_IS_LOCAL(item->folder) ||
+                           !item->path)
+                               continue;
+                       folderview_scan_tree_func(item->folder, item, NULL);
+                       folder_item_scan(item);
+                       folderview_update_node(folderview, node);
+               }
        }
 
+       folder_write_list();
        gtk_widget_destroy(window);
 }
 
@@ -725,7 +823,7 @@ static gboolean folderview_have_unread_children(FolderView *folderview,
 static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkStyle *style, *prev_style, *ctree_style;
+       GtkStyle *style = NULL;
        GtkCTreeNode *parent;
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
@@ -833,13 +931,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        if (item->stype == F_TRASH) return;
 
-       ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
-       prev_style = gtk_ctree_node_get_row_style(ctree, node);
-       if (!prev_style)
-               prev_style = ctree_style;
-       style = gtk_style_copy(prev_style);
-       if (!style) return;
-
        if (item->stype == F_QUEUE) {
                /* highlight queue folder if there are any messages */
                use_bold = use_color = (item->total > 0);
@@ -853,19 +944,30 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                         folderview_have_new_children(folderview, node));
        }
 
-       if (use_bold && boldfont)
-               style->font = boldfont;
-       else
-               style->font = ctree_style->font;
-
-       if (use_color) {
-               style->fg[GTK_STATE_NORMAL]   = folderview->color_new;
-               style->fg[GTK_STATE_SELECTED] = folderview->color_new;
+       gtk_ctree_node_set_foreground(ctree, node, NULL);
+
+       if (use_bold && use_color)
+               style = bold_color_style;
+       else if (use_bold) {
+               style = bold_style;
+               if (item->op_count > 0) {
+                       gtk_ctree_node_set_foreground(ctree, node,
+                                                     &folderview->color_op);
+               } else {
+                       style = bold_style;
+               }
+       }
+       else if (use_color) {
+               style = normal_color_style;
+               gtk_ctree_node_set_foreground(ctree, node,
+                                             &folderview->color_new);
+       }
+       else if (item->op_count > 0) {
+               style = normal_color_style;
+               gtk_ctree_node_set_foreground(ctree, node,
+                                             &folderview->color_op);
        } else {
-               style->fg[GTK_STATE_NORMAL] =
-                       ctree_style->fg[GTK_STATE_NORMAL];
-               style->fg[GTK_STATE_SELECTED] =
-                       ctree_style->fg[GTK_STATE_SELECTED];
+               style = normal_style;
        }
 
        gtk_ctree_node_set_row_style(ctree, node, style);
@@ -928,8 +1030,18 @@ static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
 static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
                                   gpointer data)
 {
-       if (GTK_CTREE_ROW(node)->children)
-               gtk_ctree_expand(ctree, node);
+       FolderView *folderview = (FolderView *)data;
+       FolderItem *item;
+
+       if (GTK_CTREE_ROW(node)->children) {
+               item = gtk_ctree_node_get_row_data(ctree, node);
+               g_return_if_fail(item != NULL);
+
+               if (!item->collapsed)
+                       gtk_ctree_expand(ctree, node);
+               else
+                       folderview_update_node(folderview, node);
+       }
 }
 
 #define SET_SPECIAL_FOLDER(ctree, item) \
@@ -1026,8 +1138,9 @@ void folderview_rename_folder(FolderView *folderview)
        if (item->stype != F_NORMAL) return;
 
        switch (item->folder->type) {
-       case F_MH:
        case F_MBOX:
+               folderview_rename_mbox_folder_cb(folderview, 0, NULL);
+       case F_MH:
        case F_MAILDIR:
                folderview_rename_folder_cb(folderview, 0, NULL);
                break;
@@ -1121,41 +1234,58 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        menu_set_insensitive_all(GTK_MENU_SHELL(folderview->news_popup));
        menu_set_insensitive_all(GTK_MENU_SHELL(folderview->mbox_popup));
 
-       if (folder->type == F_MH && item->parent == NULL) {
+       if (FOLDER_IS_LOCAL(folder) && item->parent == NULL) {
                menu_set_sensitive(folderview->mail_factory,
                                   "/Create new folder...", TRUE);
+               menu_set_sensitive(folderview->mail_factory,
+                                  "/Update folder tree", TRUE);
                menu_set_sensitive(folderview->mail_factory,
                                   "/Remove mailbox", TRUE);
-       } else if (folder->type == F_MH && item->stype != F_NORMAL) {
+       } else if (FOLDER_IS_LOCAL(folder) && item->stype != F_NORMAL) {
                menu_set_sensitive(folderview->mail_factory,
                                   "/Create new folder...", TRUE);
-       } else if (folder->type == F_MH) {
+               menu_set_sensitive(folderview->mail_factory,
+                                  "/Scoring...", TRUE);
+       } else if (FOLDER_IS_LOCAL(folder)) {
                menu_set_sensitive(folderview->mail_factory,
                                   "/Create new folder...", TRUE);
                menu_set_sensitive(folderview->mail_factory,
                                   "/Rename folder...", TRUE);
                menu_set_sensitive(folderview->mail_factory,
                                   "/Delete folder", TRUE);
+               menu_set_sensitive(folderview->mail_factory,
+                                  "/Scoring...", TRUE);
+               menu_set_sensitive(folderview->mail_factory,
+                                  "/Property...", TRUE);
        } else if (folder->type == F_IMAP && item->parent == NULL) {
                menu_set_sensitive(folderview->imap_factory,
                                   "/Create new folder...", TRUE);
                menu_set_sensitive(folderview->imap_factory,
-                                  "/Remove IMAP4 server", TRUE);
-       } else if (folder->type == F_IMAP && item->parent != NULL) {
+                                  "/Update folder tree", TRUE);
+               menu_set_sensitive(folderview->imap_factory,
+                                  "/Remove IMAP4 account", TRUE);
+       } else if (folder->type == F_IMAP && item->stype != F_NORMAL) {
+               menu_set_sensitive(folderview->imap_factory,
+                                  "/Create new folder...", TRUE);
+       } else if (folder->type == F_IMAP) {
                menu_set_sensitive(folderview->imap_factory,
                                   "/Create new folder...", TRUE);
                menu_set_sensitive(folderview->imap_factory,
                                   "/Delete folder", TRUE);
+               menu_set_sensitive(folderview->imap_factory,
+                                  "/Scoring...", TRUE);
        } else if (folder->type == F_NEWS && item->parent == NULL) {
                menu_set_sensitive(folderview->news_factory,
                                   "/Subscribe to newsgroup...", TRUE);
                menu_set_sensitive(folderview->news_factory,
-                                  "/Remove news server", TRUE);
-       } else if (folder->type == F_NEWS && item->parent != NULL) {
+                                  "/Remove news account", TRUE);
+       } else if (folder->type == F_NEWS) {
                menu_set_sensitive(folderview->news_factory,
                                   "/Subscribe to newsgroup...", TRUE);
                menu_set_sensitive(folderview->news_factory,
                                   "/Remove newsgroup", TRUE);
+               menu_set_sensitive(folderview->news_factory,
+                                  "/Scoring...", TRUE);
        }
        if (folder->type == F_MBOX && item->parent == NULL) {
                menu_set_sensitive(folderview->mbox_factory,
@@ -1165,6 +1295,8 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        } else if (folder->type == F_MBOX && item->stype != F_NORMAL) {
                menu_set_sensitive(folderview->mbox_factory,
                                   "/Create new folder...", TRUE);
+               menu_set_sensitive(folderview->mbox_factory,
+                                  "/Scoring...", TRUE);
        } else if (folder->type == F_MBOX) {
                menu_set_sensitive(folderview->mbox_factory,
                                   "/Create new folder...", TRUE);
@@ -1172,9 +1304,11 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                                   "/Rename folder...", TRUE);
                menu_set_sensitive(folderview->mbox_factory,
                                   "/Delete folder", TRUE);
+               menu_set_sensitive(folderview->mbox_factory,
+                                  "/Scoring...", TRUE);
        }
 
-       if (folder->type == F_MH)
+       if (FOLDER_IS_LOCAL(folder))
                gtk_menu_popup(GTK_MENU(folderview->mail_popup), NULL, NULL,
                               NULL, NULL, event->button, event->time);
        else if (folder->type == F_IMAP)
@@ -1193,7 +1327,8 @@ static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
 {
        if (!event) return;
 
-       if (event->button == 1 && folderview->opened != NULL) {
+       if (event->button == 1 && folderview->open_folder == FALSE &&
+           folderview->opened != NULL) {
                gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
                gtkut_ctree_set_focus_row(GTK_CTREE(ctree),
                                          folderview->opened);
@@ -1235,8 +1370,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                                gint column, FolderView *folderview)
 {
        static gboolean can_select = TRUE;      /* exclusive lock */
+       gboolean opened;
        FolderItem *item;
-       gchar * s = NULL;
 
        folderview->selected = row;
 
@@ -1252,7 +1387,6 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        if (!folderview->open_folder) return;
-       folderview->open_folder = FALSE;
 
        item = gtk_ctree_node_get_row_data(ctree, row);
        if (!item) return;
@@ -1268,22 +1402,44 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
            !GTK_CTREE_ROW(folderview->opened)->children)
                gtk_ctree_collapse(ctree, folderview->opened);
 
-       folderview->opened = row;
+       /* ungrab the mouse event */
+       if (GTK_WIDGET_HAS_GRAB(ctree)) {
+               gtk_grab_remove(GTK_WIDGET(ctree));
+               if (gdk_pointer_is_grabbed())
+                       gdk_pointer_ungrab(GDK_CURRENT_TIME);
+       }
 
-       summary_show(folderview->summaryview, item, FALSE);
+       opened = summary_show(folderview->summaryview, item, FALSE);
 
+       if (!opened) {
+               gtk_ctree_select(ctree, folderview->opened);
+               gtkut_ctree_set_focus_row(ctree, folderview->opened);
+       } else
+               folderview->opened = row;
+
+       folderview->open_folder = FALSE;
        can_select = TRUE;
 }
 
 static void folderview_tree_expanded(GtkCTree *ctree, GtkCTreeNode *node,
                                     FolderView *folderview)
 {
+       FolderItem *item;
+
+       item = gtk_ctree_node_get_row_data(ctree, node);
+       g_return_if_fail(item != NULL);
+       item->collapsed = FALSE;
        folderview_update_node(folderview, node);
 }
 
 static void folderview_tree_collapsed(GtkCTree *ctree, GtkCTreeNode *node,
                                      FolderView *folderview)
 {
+       FolderItem *item;
+
+       item = gtk_ctree_node_get_row_data(ctree, node);
+       g_return_if_fail(item != NULL);
+       item->collapsed= TRUE;
        folderview_update_node(folderview, node);
 }
 
@@ -1340,6 +1496,23 @@ static GtkCTreeNode *folderview_find_by_name(GtkCTree *ctree,
        return NULL;
 }
 
+static void folderview_update_tree_cb(FolderView *folderview, guint action,
+                                     GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       summary_show(folderview->summaryview, NULL, FALSE);
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       folderview_update_tree(item->folder);
+}
+
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget)
 {
@@ -1508,6 +1681,61 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        folder_write_list();
 }
 
+static void folderview_rename_mbox_folder_cb(FolderView *folderview,
+                                            guint action,
+                                            GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+       gchar *new_folder;
+       gchar *message;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->path != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       message = g_strdup_printf(_("Input new name for `%s':"),
+                                 g_basename(item->path));
+       new_folder = input_dialog(_("Rename folder"), message,
+                                 g_basename(item->path));
+       g_free(message);
+       if (!new_folder) return;
+
+       if (folderview_find_by_name
+               (ctree, GTK_CTREE_ROW(folderview->selected)->parent,
+                new_folder)) {
+               alertpanel_error(_("The folder `%s' already exists."),
+                                new_folder);
+               g_free(new_folder);
+               return;
+       }
+
+       if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
+               g_free(new_folder);
+               return;
+       }
+       g_free(new_folder);
+
+       gtk_clist_freeze(GTK_CLIST(ctree));
+
+       folderview_update_node(folderview, folderview->selected);
+       folderview_sort_folders(folderview,
+                               GTK_CTREE_ROW(folderview->selected)->parent,
+                               item->folder);
+       if (folderview->opened == folderview->selected) {
+               if (!GTK_CTREE_ROW(folderview->opened)->children)
+                       gtk_ctree_expand(ctree, folderview->opened);
+               summary_show(folderview->summaryview, item, FALSE);
+       }
+
+       gtk_clist_thaw(GTK_CLIST(ctree));
+
+       folder_write_list();
+}
+
 static void folderview_delete_folder_cb(FolderView *folderview, guint action,
                                        GtkWidget *widget)
 {
@@ -1533,7 +1761,8 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
        if (avalue != G_ALERTDEFAULT) return;
 
        if (item->folder->remove_folder(item->folder, item) < 0) {
-               g_warning(_("can't remove folder `%s'\n"), item->path);
+               alertpanel_error(_("Can't remove the folder `%s'."),
+                                item->path);
                return;
        }
 
@@ -1590,6 +1819,7 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
+       gchar *p;
 
        if (!folderview->selected) return;
 
@@ -1599,12 +1829,16 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
-       new_folder = input_dialog(_("New folder"),
-                                 _("Input the name of new folder:"),
-                                 _("NewFolder"));
+       new_folder = input_dialog
+               (_("New folder"),
+                _("Input the name of new folder:\n"
+                  "(if you want to create a folder to store subfolders,\n"
+                  " append `/' at the end of the name)"),
+                _("NewFolder"));
        if (!new_folder) return;
 
-       if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
+       if ((p = strchr(new_folder, G_DIR_SEPARATOR)) != NULL &&
+           *(p + 1) != '\0') {
                alertpanel_error(_("`%c' can't be included in folder name."),
                                 G_DIR_SEPARATOR);
                g_free(new_folder);
@@ -1620,8 +1854,13 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        }
 
        new_item = item->folder->create_folder(item->folder, item, new_folder);
+       if (!new_item) {
+               alertpanel_error(_("Can't create the folder `%s'."),
+                                new_folder);
+               g_free(new_folder);
+               return;
+       }
        g_free(new_folder);
-       if (!new_item) return;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -1664,7 +1903,12 @@ static void folderview_rm_imap_folder_cb(FolderView *folderview, guint action,
        if (avalue != G_ALERTDEFAULT) return;
 
        if (item->folder->remove_folder(item->folder, item) < 0) {
-               g_warning(_("can't remove folder `%s'\n"), item->path);
+               alertpanel_error(_("Can't remove the folder `%s'."),
+                                item->path);
+               if (folderview->opened == folderview->selected)
+                       summary_show(folderview->summaryview,
+                                    folderview->summaryview->folder_item,
+                                    FALSE);
                return;
        }
 
@@ -1696,9 +1940,9 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete IMAP4 server `%s'?"),
+       message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"),
                                  item->folder->name);
-       avalue = alertpanel(_("Delete IMAP4 server"), message,
+       avalue = alertpanel(_("Delete IMAP4 account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
 
@@ -1739,7 +1983,7 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       new_group = grouplist_dialog(item);
+       new_group = grouplist_dialog(item->folder);
        if (!new_group) return;
 
        if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
@@ -1827,9 +2071,9 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete news server `%s'?"),
+       message = g_strdup_printf(_("Really delete news account `%s'?"),
                                  item->folder->name);
-       avalue = alertpanel(_("Delete news server"), message,
+       avalue = alertpanel(_("Delete news account"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
 
@@ -1859,30 +2103,42 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          FolderView     *folderview)
 {
        gint row, column;
-       FolderItem *item;
-       GtkCTreeNode *node;
+       FolderItem *item, *current_item;
+       GtkCTreeNode *node = NULL;
+       gboolean acceptable = FALSE;
 
        if (gtk_clist_get_selection_info(GTK_CLIST(widget),
                                         x - 24, y - 24, &row, &column)) {
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+               current_item = folderview->summaryview->folder_item;
                if (item != NULL &&
                    item->path != NULL &&
-                   folderview->summaryview->folder_item != item) {
-                       if (item->folder->type != F_NEWS) {
-                               gtk_ctree_select(GTK_CTREE(widget), node);
-                               gdk_drag_status(context,
-                                               context->suggested_action,
-                                               time);
-                               return TRUE;
+                   current_item != NULL &&
+                   current_item != item) {
+                       switch (item->folder->type){
+                       case F_MH:
+                               if (current_item->folder->type == F_MH)
+                                   acceptable = TRUE;
+                               break;
+                       case F_IMAP:
+                               if (current_item->folder->account == item->folder->account)
+                                   acceptable = TRUE;
+                               break;
+                       default:
                        }
                }
        }
 
-       gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
-       gdk_drag_status(context, 0, time);
+       if (acceptable) {
+               gtk_ctree_select(GTK_CTREE(widget), node);
+               gdk_drag_status(context, context->suggested_action, time);
+       } else {
+               gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+               gdk_drag_status(context, 0, time);
+       }
 
-       return FALSE;
+       return acceptable;
 }
 
 static void folderview_drag_leave_cb(GtkWidget      *widget,
@@ -1927,3 +2183,41 @@ static gint folderview_compare_name(gconstpointer a, gconstpointer b)
        if (!item->path) return -1;
        return strcmp2(g_basename(item->path), name);
 }
+
+static void folderview_scoring_cb(FolderView *folderview, guint action,
+                                  GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       prefs_scoring_open(item);
+}
+
+static void folderview_property_cb(FolderView *folderview, guint action, GtkWidget *widget) {
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       prefs_folder_item_create(item);
+}
+
+void folderview_set_target_folder_color(gint color_op) {
+       GList *list;
+       FolderView *folderview;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               gtkut_convert_int_to_gdk_color(color_op, &folderview->color_op);
+       }
+}