aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-vfolder.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index cf6ad7cf89..f21ec45370 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-16 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #509697
+
+ * mail-vfolder.c: (vfolder_edit):
+ Ensure search folders are running before calling anything from this.
+
2008-01-14 Kjartan Maraas <kmaraas@gnome.org>
* evolution-mail.schemas.in: Add missing punctuation.
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index c240826b68..14655a769f 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -1001,6 +1001,10 @@ vfolder_edit (void)
return;
}
+ /* ensures vfolder is running */
+ if (!vfolder_loaded ())
+ vfolder_load_storage ();
+
vfolder_editor = GTK_WIDGET (em_vfolder_editor_new (context));
gtk_window_set_title (GTK_WINDOW (vfolder_editor), _("Search Folders"));
g_signal_connect(vfolder_editor, "response", G_CALLBACK(em_vfolder_editor_response), NULL);