2012-09-16 [mones] 3.8.1cvs60

[claws.git] / src / imap_gtk.c

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index a10c8226ef1d8b76a79723d630174b3f3abf8b31..aa5893e770c77edd84b333d8a3ce47222042cea3 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto & the Claws Mail Team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * 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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -31,6 +32,7 @@
 
 #include "utils.h"
 #include "folder.h"
+#include "folder_item_prefs.h"
 #include "folderview.h"
 #include "menu.h"
 #include "account.h"
@@ -42,6 +44,7 @@
 #include "prefs_common.h"
 #include "statusbar.h"
 #include "summaryview.h"
+#include "prefs_actions.h"
 
 static void new_folder_cb(GtkAction *action, gpointer data);
 static void rename_folder_cb(GtkAction *action, gpointer data);
@@ -184,9 +187,9 @@ static void new_folder_cb(GtkAction *action, gpointer data)
        if (!folderview->selected) return;
 
        item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->account != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item->folder->account != NULL);
 
        new_folder = input_dialog_with_checkbtn
                (_("New folder"),
@@ -244,16 +247,15 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
        gchar *new_folder;
        gchar *name;
        gchar *message;
-       gchar *old_path;
        gchar *old_id;
        gchar *new_id;
        gchar *base;
        gchar separator = '/';
 
        item = folderview_get_selected_item(folderview);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->path != NULL);
-       g_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->path != NULL);
+       cm_return_if_fail(item->folder != NULL);
 
        name = trim_string(item->name, 32);
        message = g_strdup_printf(_("Input new name for '%s':"), name);
@@ -284,8 +286,6 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
                return;
        }
 
-       Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
-
        old_id = folder_item_get_identifier(item);
        
        if (folder_item_rename(item, new_folder) < 0) {
@@ -298,7 +298,7 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
        new_id = folder_item_get_identifier(item);
        prefs_filtering_rename_path(old_id, new_id);
        account_rename_path(old_id, new_id);
-
+       prefs_actions_rename_path(old_id, new_id);
        g_free(old_id);
        g_free(new_id);
 
@@ -345,15 +345,14 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
        FolderItem *item;
        gchar *message, *name;
        AlertValue avalue;
-       gchar *old_path;
        gchar *old_id;
 
        if (!folderview->selected) return;
 
        item = gtk_cmctree_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);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->path != NULL);
+       cm_return_if_fail(item->folder != NULL);
 
        name = trim_string(item->name, 32);
        AUTORELEASE_STR(name, {g_free(name); return;});
@@ -367,7 +366,6 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
        g_free(message);
        if (avalue != G_ALERTALTERNATE) return;
 
-       Xstrdup_a(old_path, item->path, return);
        old_id = folder_item_get_identifier(item);
 
        if (folderview->opened == folderview->selected ||
@@ -401,15 +399,15 @@ static void update_tree_cb(GtkAction *action, gpointer data)
        const gchar *a_name = gtk_action_get_name(action);
 
        item = folderview_get_selected_item(folderview);
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
 
        summary_show(folderview->summaryview, NULL);
 
-       g_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item->folder != NULL);
 
        DO_ACTION("FolderViewPopup/CheckNewMessages", folderview_check_new(item->folder));
        DO_ACTION("FolderViewPopup/CheckNewFolders", folderview_rescan_tree(item->folder, FALSE));
-       DO_ACTION("FolderViewPopup/RebuildTree", folderview_rescan_tree(item->folder, FALSE));
+       DO_ACTION("FolderViewPopup/RebuildTree", folderview_rescan_tree(item->folder, TRUE));
 }
 
 static void sync_cb(GtkAction *action, gpointer data)
@@ -418,7 +416,7 @@ static void sync_cb(GtkAction *action, gpointer data)
        FolderItem *item;
 
        item = folderview_get_selected_item(folderview);
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
        folder_synchronise(item->folder);
 }
 
@@ -427,8 +425,8 @@ void imap_gtk_synchronise(FolderItem *item, gint days)
        MainWindow *mainwin = mainwindow_get_mainwindow();
        FolderView *folderview = mainwin->folderview;
        
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->folder != NULL);
 
        main_window_cursor_wait(mainwin);
        inc_lock();
@@ -495,8 +493,8 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
        if (!folderview->selected) return;
 
        item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->folder != NULL);
 
        name = trim_string(item->name, 32);
        AUTORELEASE_STR(name, {g_free(name); return;});
@@ -533,7 +531,9 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
                                transc_list = g_list_append(transc_list, 
                                        imap_modified_utf7_to_utf8(cur->data, FALSE));
                        }
-
+                       
+                       transc_list = g_list_sort(transc_list, g_str_equal);
+                       
                        child_folder = input_dialog_combo(_("Subscribe"), 
                                        msg,
                                        transc_list->next?_("All of them"):transc_list->data, transc_list);