From 729370ec6386fb990fee328060f36ca75a60a3ac Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 19 Oct 2010 09:00:49 +0200
Subject: Crash on start with vfolders configured

---
 mail/em-vfolder-rule.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'mail/em-vfolder-rule.c')

diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 36027c1ebc..1bb7830aec 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -36,6 +36,7 @@
 #include "mail/em-utils.h"
 #include "mail/em-folder-tree.h"
 #include "mail/em-folder-selector.h"
+#include "shell/e-shell.h"
 
 #include "e-util/e-util.h"
 #include "e-util/e-alert.h"
@@ -78,6 +79,9 @@ static void
 vfolder_rule_set_session (EMVFolderRule *rule,
                           EMailSession *session)
 {
+	if (!session)
+		session = e_mail_backend_get_session (E_MAIL_BACKEND (e_shell_get_backend_by_name (e_shell_get_default(), "mail")));
+
 	g_return_if_fail (E_IS_MAIL_SESSION (session));
 	g_return_if_fail (rule->priv->session == NULL);
 
-- 
cgit v1.2.3