evolution r35632 - branches/gnome-2-22/mail

[mcrha svn gnome org]

Author: mcrha
Date: Fri Jun 13 06:28:16 2008
New Revision: 35632
URL: http://svn.gnome.org/viewvc/evolution?rev=35632&view=rev

Log:
2008-06-13  Milan Crha  <mcrha redhat com>

	** Fix for bug #538002

	* em-folder-tree.c: (emft_drop_target): Do not allow dropping messages
	on folders with CAMEL_FOLDER_NOSELECT flag set.



Modified:
   branches/gnome-2-22/mail/ChangeLog
   branches/gnome-2-22/mail/em-folder-tree.c

Modified: branches/gnome-2-22/mail/em-folder-tree.c
==============================================================================
--- branches/gnome-2-22/mail/em-folder-tree.c	(original)
+++ branches/gnome-2-22/mail/em-folder-tree.c	Fri Jun 13 06:28:16 2008
@@ -1100,6 +1100,7 @@
 	gboolean is_store;
 	GtkTreeIter iter;
 	GList *targets;
+	guint32 flags = 0;
 
 	/* This is a bit of a mess, but should handle all the cases properly */
 
@@ -1108,6 +1109,7 @@
 
 	gtk_tree_model_get((GtkTreeModel *)p->model, &iter, COL_BOOL_IS_STORE, &is_store,
 			   COL_STRING_FULL_NAME, &full_name,
+			   COL_UINT_FLAGS, &flags,
 			   COL_POINTER_CAMEL_STORE, &dstore,
 			   COL_STRING_URI, &uri, -1);
 
@@ -1144,6 +1146,9 @@
 		if (!strcmp (full_name, CAMEL_VTRASH_NAME)
 		    || !strcmp (full_name, CAMEL_VJUNK_NAME))
 			goto done;
+
+		if (flags & CAMEL_FOLDER_NOSELECT)
+			goto done;
 	}
 
 	if (p->drag_row) {