talons

commit c8d32f0ab3a9c936952acc2d40e4f9fa64817e7d
parent 247a4522704d7d79748b9b301ecc1c5e11b4ec5d
Author: Michael Rasmussen <mir@datanom.net>
Date:   Sat,  2 Aug 2014 15:38:58 +0200

Fix to apply to new behavior of foldersel_set_tree. See 247a452

Diffstat:
M
src/imap_gtk.c
 | 
4
++--
M
src/mh_gtk.c
 | 
4
++--
M
src/plugins/mailmbox/plugin_gtk.c
 | 
4
++--
M
src/summaryview.c
 | 
6
++----

4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
@@ -315,7 +315,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 +331,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;
 	
diff --git a/src/mh_gtk.c b/src/mh_gtk.c
@@ -297,7 +297,7 @@ static void move_folder_cb(GtkAction *action, gpointer data)
 	if (!from_folder || from_folder->folder->klass != mh_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;
 	
@@ -313,7 +313,7 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
 	if (!from_folder || from_folder->folder->klass != mh_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;
 	
diff --git a/src/plugins/mailmbox/plugin_gtk.c b/src/plugins/mailmbox/plugin_gtk.c
@@ -362,7 +362,7 @@ static void move_folder_cb(GtkAction *action, gpointer data)
 	if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
 		return;
 
-	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, FALSE);
+	to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE);
 	if (!to_folder)
 		return;
 
@@ -378,7 +378,7 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
 	if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
 		return;
 
-	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, FALSE);
+	to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE);
 	if (!to_folder)
 		return;
 
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -4602,8 +4602,7 @@ void summary_move_to(SummaryView *summaryview)
 	if (!summaryview->folder_item ||
 	    FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
 
-	to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
-					 FOLDER_SEL_MOVE, NULL, FALSE);
+	to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE);
 	summary_move_selected_to(summaryview, to_folder);
 }
 
@@ -4683,8 +4682,7 @@ void summary_copy_to(SummaryView *summaryview)
 
 	if (!summaryview->folder_item) return;
 
-	to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
-					 FOLDER_SEL_COPY, NULL, FALSE);
+	to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE);
 	summary_copy_selected_to(summaryview, to_folder);
 }