aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-browser.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index fd1ac0b4d5..34686abb67 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2008-09-25 Sankar P <psankar@novell.com>
License Changes
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 9b6eb492a9..3ac2f7cead 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -1147,7 +1147,7 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb)
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);