evolution r35494 - trunk/mail

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed May 14 12:53:00 2008
New Revision: 35494
URL: http://svn.gnome.org/viewvc/evolution?rev=35494&view=rev

Log:
2008-05-14  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #463040, Patch by Milan Crha

	* mail/em-folder-browser.c (emfb_list_message_selectedi),
	(emfb_set_folder):
	Forget former selected uid as soon as we know we moved to other.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-folder-browser.c

Modified: trunk/mail/em-folder-browser.c
==============================================================================
--- trunk/mail/em-folder-browser.c	(original)
+++ trunk/mail/em-folder-browser.c	Wed May 14 12:53:00 2008
@@ -1356,6 +1356,8 @@
 
 	camel_object_meta_set (emfv->folder, "evolution:selected_uid", uid);
 	camel_object_state_write (emfv->folder);
+	g_free (emfb->priv->select_uid);
+	emfb->priv->select_uid = NULL;
 }
 
 /* ********************************************************************** */
@@ -2017,6 +2019,8 @@
 			if (camel_object_meta_set(emfv->folder, "evolution:show_preview", "0") &&
 			    camel_object_meta_set(emfv->folder, "evolution:selected_uid", NULL)) {
 				camel_object_state_write(emfv->folder);
+				g_free (emfb->priv->select_uid);
+				emfb->priv->select_uid = NULL;
 			}
 			gconf_client_set_bool (gconf, "/apps/evolution/mail/display/safe_list", FALSE, NULL);
 		}
@@ -2085,6 +2089,7 @@
 		/* set the query manually, so we dont pop up advanced or saved search stuff */
 
 		if ((sstate = camel_object_meta_get (folder, "evolution:selected_uid"))) {
+			g_free (emfb->priv->select_uid);
 			emfb->priv->select_uid = sstate;
 		} else {
 			g_free(p->select_uid);