aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-folder-tree.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 449b5b2996..8b14efe507 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-02 Milan Crha <mcrha@redhat.com>
+
+ * em-folder-tree.c: (em_folder_tree_get_selected_folder):
+ Do not ask for a folder when no folder selected.
+
2009-03-31 Hiroyuki Ikezoe <poincare@ikezoe.net>
** Fix for bug #576921
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 6b3e792809..14bdc832c8 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2550,7 +2550,8 @@ em_folder_tree_get_selected_folder (EMFolderTree *emft)
gtk_tree_model_get (model, &iter, COL_POINTER_CAMEL_STORE, &store,
COL_STRING_FULL_NAME, &full_name, -1);
- folder = camel_store_get_folder (store, full_name, CAMEL_STORE_FOLDER_INFO_FAST, &ex);
+ if (store && full_name)
+ folder = camel_store_get_folder (store, full_name, CAMEL_STORE_FOLDER_INFO_FAST, &ex);
camel_exception_clear (&ex);