From dadf1e0950e6f1bb809d46588957319630cc3686 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 12 Mar 2004 22:03:28 +0000 Subject: No-op if emfv->folder is NULL (this means we are looking at a store 2004-03-12 Jeffrey Stedfast * em-folder-browser.c (emfb_search_search_activated): No-op if emfv->folder is NULL (this means we are looking at a store folder? or else the folder hasn't loaded yet). Fixes bug #55293. svn path=/trunk/; revision=25052 --- mail/ChangeLog | 6 ++++++ mail/em-folder-browser.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 65421c4ec3..a6a76d7a2f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2004-03-12 Jeffrey Stedfast + + * em-folder-browser.c (emfb_search_search_activated): No-op if + emfv->folder is NULL (this means we are looking at a store folder? + or else the folder hasn't loaded yet). Fixes bug #55293. + 2004-03-11 Radek Doulik * mail-ops.c: remove junk learning thread, it's handled in diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 4711787565..c33d7c50be 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -420,7 +420,7 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) EMFolderView *emfv = (EMFolderView *) emfb; char *search_word, *search_state; - if (emfv->list == NULL) + if (emfv->list == NULL || emfv->folder == NULL) return; g_object_get (esb, "query", &search_word, NULL); -- cgit