evolution r36451 - trunk/mail

[pwithnall svn gnome org]

Author: pwithnall
Date: Thu Sep 25 15:59:03 2008
New Revision: 36451
URL: http://svn.gnome.org/viewvc/evolution?rev=36451&view=rev

Log:
2008-09-25  Philip Withnall  <philip tecnocode co uk>

	** Fix for bug #552551

	* em-folder-browser.c (emfb_search_search_activated): Add a NULL
	check for search_word before calling strcmp.



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	Thu Sep 25 15:59:03 2008
@@ -1147,7 +1147,7 @@
 		    g_free (word);
 		    word = NULL;
 		    g_object_get (esb, "query", &search_word, NULL);
-		    if (efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) {
+		    if (search_word && efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) {
 			    break;
 		    }
 		    gtk_widget_set_sensitive (esb->scopeoption, FALSE);