X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fimap_gtk.c;h=11f2d1ff2effb3863dd0cc9be5cde280bf81633a;hp=72b5ef3700a9a5f632bd26c4a79f631c0cf1096d;hb=dd7568a78b47756ba690be540f8960d5771eac2b;hpb=ba291dc1bba839bb195530ca9beb7e1eb8317033

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index 72b5ef370..11f2d1ff2 100644
--- 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-2011 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);
@@ -173,7 +176,6 @@ static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
 static void new_folder_cb(GtkAction *action, gpointer data)
 {
 	FolderView *folderview = (FolderView *)data;
-	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
 	FolderItem *item;
 	FolderItem *new_item;
 	gchar *new_folder;
@@ -181,9 +183,8 @@ static void new_folder_cb(GtkAction *action, gpointer data)
 	gchar *p;
 	gchar separator = '/';
 	
-	if (!folderview->selected) return;
+	if ((item = folderview_get_selected_item(folderview)) == NULL) return;
 
-	item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
 	cm_return_if_fail(item != NULL);
 	cm_return_if_fail(item->folder != NULL);
 	cm_return_if_fail(item->folder->account != NULL);
@@ -244,7 +245,6 @@ 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;
@@ -272,7 +272,7 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
 		return;
 	}
 	if (strchr(new_folder, '/') != NULL) {
-		alertpanel_error(_("`%c' can't be included in folder name."),
+		alertpanel_error(_("'%c' can't be included in folder name."),
 				 '/');
 		return;
 	}
@@ -284,8 +284,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 +296,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);
 
@@ -315,7 +313,7 @@ static void move_folder_cb(GtkAction *action, gpointer data)
 	if (!from_folder || from_folder->folder->klass != imap_get_class())
 		return;
 
-	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE);
+	to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE);
 	if (!to_folder)
 		return;
 	
@@ -331,7 +329,7 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
 	if (!from_folder || from_folder->folder->klass != imap_get_class())
 		return;
 
-	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE);
+	to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE);
 	if (!to_folder)
 		return;
 	
@@ -341,16 +339,14 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
 static void delete_folder_cb(GtkAction *action, gpointer data)
 {
 	FolderView *folderview = (FolderView *)data;
-	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
-	FolderItem *item;
+	FolderItem *item, *opened;
 	gchar *message, *name;
 	AlertValue avalue;
-	gchar *old_path;
 	gchar *old_id;
 
-	if (!folderview->selected) return;
+	if ((item = folderview_get_selected_item(folderview)) == NULL) return;
+	opened = folderview_get_opened_item(folderview);
 
-	item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
 	cm_return_if_fail(item != NULL);
 	cm_return_if_fail(item->path != NULL);
 	cm_return_if_fail(item->folder != NULL);
@@ -367,15 +363,12 @@ 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 ||
-	    gtk_cmctree_is_ancestor(ctree,
-				  folderview->selected,
-				  folderview->opened)) {
+	if (item == opened ||
+			folder_is_child_of(item, opened)) {
 		summary_clear_all(folderview->summaryview);
-		folderview->opened = NULL;
+		folderview_close_opened(folderview, TRUE);
 	}
 
 	if (item->folder->klass->remove_folder(item->folder, item) < 0) {
@@ -485,17 +478,13 @@ static gboolean imap_gtk_subscribe_func(GNode *node, gpointer data)
 
 static void subscribe_cb_full(FolderView *folderview, guint action)
 {
-	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
 	FolderItem *item;
 	gchar *message, *name;
 	AlertValue avalue;
 	GtkWidget *rec_chk;
 	gboolean recurse = FALSE;
 
-	if (!folderview->selected) return;
-
-	item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
-	cm_return_if_fail(item != NULL);
+	if ((item = folderview_get_selected_item(folderview)) == NULL) return;
 	cm_return_if_fail(item->folder != NULL);
 
 	name = trim_string(item->name, 32);
@@ -515,8 +504,8 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
 				G_CALLBACK(chk_update_val), &recurse);
 
 		avalue = alertpanel_full(_("Subscriptions"), message,
-		 			 GTK_STOCK_CANCEL, _("+_Search"), NULL, FALSE,
-					 rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
+		 			 GTK_STOCK_CANCEL, g_strconcat("+", _("_Search"), NULL),
+					 NULL, FALSE, rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
 		g_free(message);
 		if (avalue != G_ALERTALTERNATE) return;
 		
@@ -554,7 +543,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
 			for (cur = transc_list; cur; cur = cur->next) 
 				g_free((gchar *)cur->data);
 			if (r == 0)
-				folderview_fast_rescan_tree(item->folder);
+				folderview_rescan_tree(item->folder, FALSE);
 		} else {
 			alertpanel_notice(_("This folder is already subscribed and "
 				  "has no unsubscribed subfolders.\n\nIf there are new folders, "
@@ -574,19 +563,19 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
 			G_CALLBACK(chk_update_val), &recurse);
 
 	avalue = alertpanel_full(_("Subscriptions"), message,
-		 		 GTK_STOCK_CANCEL, action?_("+_Subscribe"):_("+_Unsubscribe"), NULL, FALSE,
+		 		 GTK_STOCK_CANCEL, action?g_strconcat("+", _("_Subscribe"), NULL):
+		 		 g_strconcat("+", _("_Unsubscribe"), NULL), NULL, FALSE,
 				 rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
 	g_free(message);
 	if (avalue != G_ALERTALTERNATE) return;
 	
-	
+	FolderItem *opened = folderview_get_opened_item(folderview);
+	FolderItem *selected = folderview_get_selected_item(folderview);
 	if (!action) {
-		if (folderview->opened == folderview->selected ||
-		    gtk_cmctree_is_ancestor(ctree,
-					  folderview->selected,
-					  folderview->opened)) {
+		if (opened == selected ||
+				folder_is_child_of(selected, opened)) {
 			summary_clear_all(folderview->summaryview);
-			folderview->opened = NULL;
+			folderview_close_opened(folderview, TRUE);
 		}
 	}
 
@@ -598,7 +587,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
 	}
 
 	if (!action && item->folder->account->imap_subsonly)
-		folderview_fast_rescan_tree(item->folder);
+		folderview_rescan_tree(item->folder, FALSE);
 }
 
 static void subscribe_cb(GtkAction *action, gpointer data)
@@ -614,34 +603,30 @@ static void unsubscribe_cb(GtkAction *action, gpointer data)
 static void subscribed_cb(GtkAction *action, gpointer data)
 {
 	FolderView *folderview = (FolderView *)data;
-	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
-	FolderItem *item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+	FolderItem *item = folderview_get_selected_item(folderview);
+	FolderItem *opened = folderview_get_opened_item(folderview);
 	
 	if (!item || !item->folder || !item->folder->account)
 		return;
 	if (item->folder->account->imap_subsonly == gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
 		return;
 
-	if (folderview->opened == folderview->selected ||
-	    gtk_cmctree_is_ancestor(ctree,
-				  folderview->selected,
-				  folderview->opened)) {
+	if (opened == item ||
+			folder_is_child_of(item, opened)) {
 		summary_clear_all(folderview->summaryview);
-		folderview->opened = NULL;
+		folderview_close_opened(folderview, TRUE);
 	}
 
 	item->folder->account->imap_subsonly = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-	folderview_fast_rescan_tree(item->folder);
+	folderview_rescan_tree(item->folder, FALSE);
 }
 
 static void download_cb(GtkAction *action, gpointer data)
 {
 	FolderView *folderview = (FolderView *)data;
-	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
 	FolderItem *item;
 
-	if (!folderview->selected) return;
-
-	item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+	if ((item = folderview_get_selected_item(folderview)) == NULL)
+		return;
 	imap_gtk_synchronise(item, 0);
 }