[Commits] [SCM] claws branch, master, updated. 3.10.1-142-gc8d32f0

[miras at claws-mail.org]

The branch, master has been updated
       via  c8d32f0ab3a9c936952acc2d40e4f9fa64817e7d (commit)
       via  247a4522704d7d79748b9b301ecc1c5e11b4ec5d (commit)
      from  81b0679965b506fce98bedb70f74f8df70e81312 (commit)

Summary of changes:
 src/foldersel.c                   |    6 +++++-
 src/imap_gtk.c                    |    4 ++--
 src/mh_gtk.c                      |    4 ++--
 src/plugins/mailmbox/plugin_gtk.c |    4 ++--
 src/summaryview.c                 |    6 ++----
 5 files changed, 13 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit c8d32f0ab3a9c936952acc2d40e4f9fa64817e7d
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Aug 2 15:38:58 2014 +0200

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

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index dcda56e..abbb805 100644
--- 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
index 064fac4..81bf4c6 100644
--- 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
index 9f0e4b8..e6b30f5 100644
--- 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
index 4986a65..dacbc66 100644
--- 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);
 }
 

commit 247a4522704d7d79748b9b301ecc1c5e11b4ec5d
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Aug 2 15:37:01 2014 +0200

    If cur_folder is not NULL then the folder tree will have cur_folder as root

diff --git a/src/foldersel.c b/src/foldersel.c
index 02a0982..ac3cdf1 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -499,7 +499,11 @@ static void foldersel_set_tree(Folder *cur_folder, FolderSelectionType type)
 			if (FOLDER_TYPE(folder) == F_NEWS)
 				continue;
 		}
-
+		
+		if (cur_folder && (cur_folder->klass != folder->klass
+		    && strcmp2(cur_folder->name, folder->name) != 0))
+		    continue;
+		
 		foldersel_insert_gnode_in_store(tree_store, folder->node, NULL);
 	}
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail