evolution r35070 - trunk/mail

[sragavan svn gnome org]

Author: sragavan
Date: Fri Feb 22 10:31:15 2008
New Revision: 35070
URL: http://svn.gnome.org/viewvc/evolution?rev=35070&view=rev

Log:
2008-02-22  Srinivasa Ragavan  <sragavan novell com>
	
	** Fix for BNC #358697

	* em-folder-browser.c: (emfb_set_folder): Make sure the default search
	filter for sent/draft/outbox is "Recipients Contain"




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	Fri Feb 22 10:31:15 2008
@@ -2029,8 +2029,32 @@
 
 		/* Fixme */
 		sstate = camel_object_meta_get(folder, "evolution:search_state");
-		g_object_set(emfb->search, "state", sstate, NULL);
-		g_free(sstate);
+		if (sstate) {
+			g_object_set(emfb->search, "state", sstate, NULL);
+			g_free(sstate);
+		} else {
+			gboolean outgoing;
+			outgoing = em_utils_folder_is_drafts (emfv->folder, emfv->folder_uri)
+				|| em_utils_folder_is_sent (emfv->folder, emfv->folder_uri)
+				|| em_utils_folder_is_outbox (emfv->folder, emfv->folder_uri);
+
+			e_search_bar_set_text ((ESearchBar *)emfb->search, "");
+
+			if (outgoing) {
+				e_search_bar_set_item_id ((ESearchBar *)emfb->search, 1);
+				((ESearchBar *)emfb->search)->block_search = TRUE;
+				e_search_bar_set_item_menu ((ESearchBar *)emfb->search, 1);
+				((ESearchBar *)emfb->search)->block_search = FALSE;
+
+			} else {
+				e_search_bar_set_item_id ((ESearchBar *)emfb->search, 0);
+				((ESearchBar *)emfb->search)->block_search = TRUE;
+				e_search_bar_set_item_menu ((ESearchBar *)emfb->search, 0);
+				((ESearchBar *)emfb->search)->block_search = FALSE;
+
+			}
+			e_search_bar_paint ((ESearchBar *)emfb->search);
+		}
 
 		/* set the query manually, so we dont pop up advanced or saved search stuff */