nickname bug / options disabled when on inbox
[claws.git] / src / folderview.c
index 4b781a72a505059a3c369930666bffb2227b25a6..51345fbb16b3b0afc0251d7882f00d5c7b56fd9a 100644 (file)
@@ -54,6 +54,7 @@
 #include "prefs_account.h"
 #include "account.h"
 #include "folder.h"
+#include "inc.h"
 
 #include "pixmaps/inbox.xpm"
 #include "pixmaps/outbox.xpm"
@@ -91,6 +92,12 @@ 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 GtkStyle *bold_tgtfold_style;
+
 static GdkPixmap *inboxxpm;
 static GdkBitmap *inboxxpmmask;
 static GdkPixmap *outboxxpm;
@@ -210,6 +217,7 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
                                          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[] =
 {
@@ -230,9 +238,11 @@ static GtkItemFactoryEntry folderview_mail_popup_entries[] =
        {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_("/Re_scan folder tree"),    NULL, folderview_update_tree_cb, 1, 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, folderview_property_cb, 0, NULL},
        {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
@@ -243,6 +253,8 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/_Delete folder"),         NULL, folderview_rm_imap_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Update folder tree"),    NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/Re_scan folder tree"),    NULL, folderview_update_tree_cb, 1, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _IMAP4 account"),  NULL, folderview_rm_imap_server_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Property..."),           NULL, NULL, 0, NULL},
@@ -419,15 +431,30 @@ void folderview_init(FolderView *folderview)
 
        PIXMAP_CREATE(ctree, inboxxpm, inboxxpmmask, inbox_xpm);
        PIXMAP_CREATE(ctree, outboxxpm, outboxxpmmask, outbox_xpm);
-       PIXMAP_CREATE(ctree, folderxpm, folderxpmmask, DIRECTORY_CLOSE_XPM);
-       PIXMAP_CREATE(ctree, folderopenxpm, folderopenxpmmask,
-                     DIRECTORY_OPEN_XPM);
+       PIXMAP_CREATE(ctree, folderxpm, folderxpmmask, dir_close_xpm);
+       PIXMAP_CREATE(ctree, folderopenxpm, folderopenxpmmask, dir_open_xpm);
        PIXMAP_CREATE(ctree, trashxpm, trashxpmmask, trash_xpm);
 
        if (!normalfont)
                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;
+
+               bold_tgtfold_style = gtk_style_copy(bold_style);
+               bold_tgtfold_style->fg[GTK_STATE_NORMAL] = folderview->color_op;
+       }
+       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)
@@ -467,11 +494,15 @@ 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)
@@ -488,9 +519,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)
@@ -582,8 +611,7 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
        GList *list;
        gchar *rootpath;
 
-       if (folder->type == F_MH || folder->type == F_MBOX ||
-           folder->type == F_MAILDIR)
+       if (FOLDER_IS_LOCAL(folder))
                rootpath = LOCAL_FOLDER(folder)->rootpath;
        else if (folder->type == F_IMAP && folder->account &&
                 folder->account->recv_server)
@@ -641,7 +669,8 @@ void folderview_update_tree(Folder *folder)
 
        if (!folder->scan_tree) return;
 
-       window = label_window_create(_("Updating folder tree..."));
+       inc_lock();
+       window = label_window_create(_("Rescanning folder tree..."));
 
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
        folder->scan_tree(folder);
@@ -651,6 +680,7 @@ void folderview_update_tree(Folder *folder)
        folderview_set_all();
 
        gtk_widget_destroy(window);
+       inc_unlock();
 }
 
 void folderview_update_all(void)
@@ -658,7 +688,8 @@ void folderview_update_all(void)
        GList *list;
        GtkWidget *window;
 
-       window = label_window_create(_("Updating all folders..."));
+       inc_lock();
+       window = label_window_create(_("Rescanning all folder trees..."));
 
        list = folder_get_list();
        for (; list != NULL; list = list->next) {
@@ -672,8 +703,43 @@ void folderview_update_all(void)
 
        folder_write_list();
        folderview_set_all();
-
        gtk_widget_destroy(window);
+       inc_unlock();
+}
+
+void folderview_update_all_node(void)
+{
+       GList *list;
+       FolderItem *item;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               inc_lock();
+               main_window_lock(folderview->mainwin);
+               gtk_widget_set_sensitive(folderview->ctree, FALSE);
+
+               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);
+               }
+
+               gtk_widget_set_sensitive(folderview->ctree, TRUE);
+               main_window_unlock(folderview->mainwin);
+               inc_unlock();
+       }
+
+       folder_write_list();
 }
 
 static gboolean folderview_search_new_recursive(GtkCTree *ctree,
@@ -771,8 +837,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;
-       GtkCTreeNode *parent;
+       GtkStyle *style = NULL;
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
@@ -877,20 +942,11 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total));
        }
 
-       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_TRASH)
+               use_bold = use_color = FALSE;
        if (item->stype == F_QUEUE) {
                /* highlight queue folder if there are any messages */
                use_bold = use_color = (item->total > 0);
-       } else if (item->stype == F_TRASH) {
-               /* Never highlight trash */
-               use_bold = FALSE;
-               use_color = FALSE;
        } else {
                /* if unread messages exist, print with bold font */
                use_bold = (item->unread > 0) || add_unread_mark;
@@ -901,27 +957,31 @@ 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 = normalfont;
+       gtk_ctree_node_set_foreground(ctree, node, NULL);
 
-       if (use_color) {
-               style->fg[GTK_STATE_NORMAL]   = folderview->color_new;
-               style->fg[GTK_STATE_SELECTED] = folderview->color_new;
+       if (use_bold && use_color)
+               style = bold_color_style;
+       else if (use_bold) {
+               style = bold_style;
+               if (item->op_count > 0) {
+                       style = bold_tgtfold_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 = bold_tgtfold_style;
        } 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);
 
-       parent = node;
-       while ((parent = gtkut_ctree_find_collapsed_parent(ctree, parent))
-              != NULL)
-               folderview_update_node(folderview, parent);
+       if ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
+               folderview_update_node(folderview, node);
 }
 
 void folderview_update_item(FolderItem *item, gboolean update_summary)
@@ -1134,6 +1194,15 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        gint prev_row = -1, row = -1, column = -1;
        FolderItem *item;
        Folder *folder;
+       GtkWidget *popup;
+       gboolean new_folder      = FALSE;
+       gboolean rename_folder   = FALSE;
+       gboolean delete_folder   = FALSE;
+       gboolean update_tree     = FALSE;
+       gboolean rescan_tree     = FALSE;
+       gboolean remove_tree     = FALSE;
+       gboolean folder_property = FALSE;
+       gboolean folder_scoring  = FALSE;
 
        if (!event) return;
 
@@ -1175,95 +1244,68 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        g_return_if_fail(item->folder != NULL);
        folder = item->folder;
 
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->mail_popup));
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->imap_popup));
-       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) {
-               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) {
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Scoring...", TRUE);
-       } else if (folder->type == F_MH) {
-               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);
-       } 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,
-                                  "/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 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,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Remove mailbox", TRUE);
-       } 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);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Rename folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Delete folder", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Scoring...", TRUE);
+       if (folderview->mainwin->lock_count == 0) {
+               new_folder = TRUE;
+               if (item->parent == NULL)
+                       update_tree = remove_tree = TRUE;
+               if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP || FOLDER_TYPE(folder) == F_MBOX) {
+                       if (item->parent == NULL)
+                               update_tree = rescan_tree = TRUE;
+                       else if (item->stype == F_NORMAL)
+                               rename_folder = delete_folder = folder_property = folder_scoring = TRUE;
+                       else if (item->stype == F_INBOX)
+                               folder_property = folder_scoring = TRUE;
+               } else if (FOLDER_TYPE(folder) == F_NEWS) {
+                       if (item->parent != NULL)
+                               delete_folder = folder_scoring = TRUE;
+               }
        }
 
-       if (folder->type == F_MH)
-               gtk_menu_popup(GTK_MENU(folderview->mail_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
-       else if (folder->type == F_IMAP)
-               gtk_menu_popup(GTK_MENU(folderview->imap_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
-       else if (folder->type == F_NEWS)
-               gtk_menu_popup(GTK_MENU(folderview->news_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
-       else if (folder->type == F_MBOX)
-               gtk_menu_popup(GTK_MENU(folderview->mbox_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
+#define SET_SENS(factory, name, sens) \
+       menu_set_sensitive(folderview->factory, name, sens)
+
+       if (FOLDER_IS_LOCAL(folder)) {
+               popup = folderview->mail_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(mail_factory, "/Create new folder...", new_folder);
+               SET_SENS(mail_factory, "/Rename folder...", rename_folder);
+               SET_SENS(mail_factory, "/Delete folder", delete_folder);
+               SET_SENS(mail_factory, "/Update folder tree", update_tree);
+               SET_SENS(mail_factory, "/Rescan folder tree", rescan_tree);
+               SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
+               SET_SENS(mail_factory, "/Property...", folder_property);
+               SET_SENS(mail_factory, "/Scoring...", folder_scoring);
+       } else if (FOLDER_TYPE(folder) == F_IMAP) {
+               popup = folderview->imap_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(imap_factory, "/Create new folder...", new_folder);
+               SET_SENS(imap_factory, "/Rename folder...", rename_folder);
+               SET_SENS(imap_factory, "/Delete folder", delete_folder);
+               SET_SENS(imap_factory, "/Update folder tree", update_tree);
+               SET_SENS(imap_factory, "/Rescan folder tree", rescan_tree);
+               SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
+               SET_SENS(imap_factory, "/Scoring...", folder_scoring);
+       } else if (FOLDER_TYPE(folder) == F_NEWS) {
+               popup = folderview->news_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
+               SET_SENS(news_factory, "/Remove newsgroup", delete_folder);
+               SET_SENS(news_factory, "/Remove news account", remove_tree);
+               SET_SENS(news_factory, "/Scoring...", folder_scoring);
+       } else if (FOLDER_TYPE(folder) == F_MBOX) {
+               popup = folderview->mbox_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(mbox_factory, "/Create new folder...", new_folder);
+               SET_SENS(mbox_factory, "/Rename folder...", rename_folder);
+               SET_SENS(mbox_factory, "/Delete folder", delete_folder);
+               SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
+       } else
+               return;
+
+#undef SET_SENS
+
+       gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
+                      event->button, event->time);
 }
 
 static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
@@ -1337,6 +1379,14 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        can_select = FALSE;
 
+       /* CLAWS: set compose button type: news folder items 
+        * always have a news folder as parent */
+       if (item->folder) 
+               main_window_toolbar_set_compose_button
+                       (folderview->mainwin,
+                        item->folder->type == F_NEWS ? 
+                        COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
+        
        if (item->path)
                debug_print(_("Folder %s is selected\n"), item->path);
 
@@ -1454,7 +1504,10 @@ static void folderview_update_tree_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       folderview_update_tree(item->folder);
+       if (action == 0)
+               folderview_update_all_node();
+       else
+               folderview_update_tree(item->folder);
 }
 
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
@@ -1494,8 +1547,13 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
        }
 
        new_item = item->folder->create_folder(item->folder, item, new_folder);
+       if (!new_item) {
+               alertpanel_error(_("The folder `%s' could not be created."), 
+                                new_folder);
+               g_free(new_folder);
+               return;
+       } 
        g_free(new_folder);
-       if (!new_item) return;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -1908,6 +1966,36 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
        folder_write_list();
 }
 
+
+
+
+
+static GList *folderview_news_get_subscriptions(GtkCTree *ctree,
+                                               GtkCTreeNode *node)
+{
+       FolderItem *item;
+       GList * result;
+
+       result = NULL;
+
+       if (!node)
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       if (!node)
+               return NULL;
+
+       node = GTK_CTREE_ROW(node)->children;
+
+       while (node) {
+               item = gtk_ctree_node_get_row_data(ctree, node);
+
+               result = g_list_append(result, item->name);
+               node = GTK_CTREE_ROW(node)->sibling;
+       }
+
+       return result;
+}
+
+
 static void folderview_new_news_group_cb(FolderView *folderview, guint action,
                                         GtkWidget *widget)
 {
@@ -1916,8 +2004,10 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
        GtkCTreeNode *servernode, *node;
        FolderItem *item;
        FolderItem *newitem;
-       gchar *new_group;
        const gchar *server;
+       GList * subscriptions;
+       GList * new_subscriptions;
+       GList * l;
 
        if (!folderview->selected) return;
 
@@ -1927,41 +2017,83 @@ 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->folder);
-       if (!new_group) return;
-
        if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
                servernode = GTK_CTREE_ROW(folderview->selected)->parent;
        else
                servernode = folderview->selected;
 
-       if (folderview_find_by_name(ctree, servernode, new_group)) {
-               alertpanel_error(_("The newsgroup `%s' already exists."),
-                                new_group);
-               g_free(new_group);
-               return;
-       }
+       subscriptions = folderview_news_get_subscriptions(ctree, servernode);
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
+       new_subscriptions = grouplist_dialog(item->folder, subscriptions);
 
-       text[COL_FOLDER] = new_group;
-       node = gtk_ctree_insert_node(ctree, servernode, NULL, text,
-                                    FOLDER_SPACING,
-                                    folderxpm, folderxpmmask,
-                                    folderopenxpm, folderopenxpmmask,
-                                    FALSE, FALSE);
-       gtk_ctree_expand(ctree, servernode);
+       for(l = subscriptions ; l != NULL ; l = l->next) {
+         gchar * name;
+         
+         name = (gchar *) l->data;
 
-       item = gtk_ctree_node_get_row_data(ctree, servernode);
-       server = item->folder->account->nntp_server;
+         if (g_list_find_custom(new_subscriptions, name,
+                                (GCompareFunc) g_strcasecmp) == NULL) {
+           GtkCTreeNode * sel;
 
-       newitem = folder_item_new(new_group, new_group);
-       g_free(new_group);
-       folder_item_append(item, newitem);
-       gtk_ctree_node_set_row_data(ctree, node, newitem);
-       gtk_ctree_sort_node(ctree, servernode);
+           /* remove subscription */
 
-       gtk_clist_thaw(GTK_CLIST(ctree));
+           sel = folderview_find_by_name(ctree, servernode, name);
+           g_return_if_fail(sel != NULL);
+
+           item = gtk_ctree_node_get_row_data(ctree, sel);
+
+           g_return_if_fail(item != NULL);
+           g_return_if_fail(item->folder != NULL);
+           g_return_if_fail(item->folder->type == F_NEWS);
+           g_return_if_fail(item->folder->account != NULL);
+
+           if (folderview->opened == sel) {
+             summary_clear_all(folderview->summaryview);
+             folderview->opened = NULL;
+           }
+           
+           folder_item_remove(item);
+           gtk_ctree_remove_node(ctree, sel);
+
+         }
+       }
+
+       g_list_free(subscriptions);
+
+       for(l = new_subscriptions ; l != NULL ; l = l->next) {
+         gchar * name;
+         
+         name = (gchar *) l->data;
+
+         if (folderview_find_by_name(ctree, servernode, name) == NULL) {
+
+           /* add newsgroup */
+
+           gtk_clist_freeze(GTK_CLIST(ctree));
+           
+           text[COL_FOLDER] = name;
+           node = gtk_ctree_insert_node(ctree, servernode, NULL, text,
+                                        FOLDER_SPACING,
+                                        folderxpm, folderxpmmask,
+                                        folderopenxpm, folderopenxpmmask,
+                                        FALSE, FALSE);
+           gtk_ctree_expand(ctree, servernode);
+           
+           item = gtk_ctree_node_get_row_data(ctree, servernode);
+           server = item->folder->account->nntp_server;
+           
+           newitem = folder_item_new(name, name);
+           folder_item_append(item, newitem);
+           gtk_ctree_node_set_row_data(ctree, node, newitem);
+           gtk_ctree_sort_node(ctree, servernode);
+           
+           gtk_clist_thaw(GTK_CLIST(ctree));
+           
+         }
+       }
+
+       list_free_strings(new_subscriptions);
+       g_list_free(new_subscriptions);
 
        folder_write_list();
 }
@@ -2142,3 +2274,32 @@ static void folderview_scoring_cb(FolderView *folderview, guint action,
 
        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) {
+       gint firstone = 1;
+       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);
+               if (firstone) {
+                       bold_tgtfold_style->fg[GTK_STATE_NORMAL] =
+                               folderview->color_op;
+                       firstone = 0;
+               }
+       }
+}