aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-05-13 20:05:11 +0800
committerMilan Crha <mcrha@redhat.com>2011-05-13 20:05:11 +0800
commitc5765a097fd18989f16ed0cf4d2dcbcc153eb39b (patch)
tree17c8727f0cc937dec22961e3be5839aa97cdc1df
parent8807321506d4bed40c15e738679de995a5f98d86 (diff)
downloadgsoc2013-evolution-c5765a097fd18989f16ed0cf4d2dcbcc153eb39b.tar.gz
gsoc2013-evolution-c5765a097fd18989f16ed0cf4d2dcbcc153eb39b.tar.zst
gsoc2013-evolution-c5765a097fd18989f16ed0cf4d2dcbcc153eb39b.zip
GN-bug #649935 - Check folder validity before asking for its URI
-rw-r--r--modules/mail/e-mail-shell-view-private.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index da82b164ad..55357fae11 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -215,12 +215,15 @@ mail_shell_view_folder_tree_selection_done_cb (EMailShellView *mail_shell_view,
* a hidden implementation detail, and we want to explicitly get
* the folder URI from the message list here. */
folder = MESSAGE_LIST (message_list)->folder;
- list_uri = e_mail_folder_uri_from_folder (folder);
+ if (folder)
+ list_uri = e_mail_folder_uri_from_folder (folder);
+ else
+ list_uri = NULL;
tree_uri = em_folder_tree_get_selected_uri (folder_tree);
/* If the folder tree and message list disagree on the current
* folder, reset the folder tree to match the message list. */
- if (g_strcmp0 (tree_uri, list_uri) != 0)
+ if (list_uri && g_strcmp0 (tree_uri, list_uri) != 0)
em_folder_tree_set_selected (folder_tree, list_uri, FALSE);
g_free (list_uri);