From 282701a518017e2e6ba3f7910e045c2bbe052190 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 May 2011 19:07:06 -0400 Subject: Add em_folder_tree_get_selected_account(). Comes in handy for a few EMailShellView actions. --- modules/mail/e-mail-shell-view.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/mail/e-mail-shell-view.c') diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 7655fba835..4af7de5a1b 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -844,7 +844,7 @@ mail_shell_view_update_actions (EShellView *shell_view) EMailBackend *backend; EMailSession *session; EMailView *mail_view; - EAccount *account = NULL; + EAccount *account; GtkAction *action; GList *list; const gchar *label; @@ -902,6 +902,8 @@ mail_shell_view_update_actions (EShellView *shell_view) (state & E_MAIL_SIDEBAR_STORE_SUPPORTS_SUBSCRIPTIONS); uri = em_folder_tree_get_selected_uri (folder_tree); + account = em_folder_tree_get_selected_account (folder_tree); + if (uri != NULL) { GtkTreeRowReference *reference; EMFolderTreeModel *model; @@ -919,8 +921,6 @@ mail_shell_view_update_actions (EShellView *shell_view) folder_tree_and_message_list_agree = (g_strcmp0 (uri, folder_uri) == 0); - account = e_get_account_by_source_url (uri); - /* FIXME This belongs in a GroupWise plugin. */ account_is_groupwise = (g_strrstr (uri, "groupwise://") != NULL) && -- cgit v1.2.3