[Commits] [SCM] claws branch, vfolder, updated. 3.10.1-123-g05417cc

[miras at claws-mail.org]

The branch vfolder of project "claws" (Claws Mail) has been updated
       via  05417cc84aabb4e098f8ab659724bdb3fe4b1780 (commit)
      from  5ff57b539a48ebca1fad1c670ff7d9e72020c0ac (commit)

Summary of changes:
 src/foldersel.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 05417cc84aabb4e098f8ab659724bdb3fe4b1780
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Jul 3 00:57:22 2014 +0200

    If cur_folder was 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..7be1207 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  */
 
 #include "defs.h"
@@ -463,7 +463,7 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
 			   FOLDERSEL_FOREGROUND, foreground,
 			   FOLDERSEL_BOLD, weight,
 			   -1);
-        
+
         g_free(tmpname);
 }
 
@@ -500,6 +500,10 @@ static void foldersel_set_tree(Folder *cur_folder, FolderSelectionType type)
 				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);
 	}
 
@@ -611,7 +615,7 @@ static void foldersel_new_folder(GtkButton *button, gpointer data)
 
 	/* add new child */
 	foldersel_append_item(store, new_item, &new_child, &selected);
-        
+
 	selected_p = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &selected);
 	new_child_p = gtk_tree_model_get_path(GTK_TREE_MODEL(store),
 					      &new_child);

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


hooks/post-receive
-- 
Claws Mail