From b7f98663c1593f5c22c17274adb8f161854f8187 Mon Sep 17 00:00:00 2001 From: Vivek Sekar Date: Tue, 19 Aug 2008 09:51:01 +0000 Subject: [PATCH] Merged fix for bug 86213 from trunk. pmo-diablo-r5324 --- src/modest-default-connection-policy.c | 1 - src/modest-ui-actions.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/modest-default-connection-policy.c b/src/modest-default-connection-policy.c index e72d478..778ca0e 100644 --- a/src/modest-default-connection-policy.c +++ b/src/modest-default-connection-policy.c @@ -65,7 +65,6 @@ modest_default_connection_policy_on_connection_broken (TnyConnectionPolicy *self static void modest_default_connection_policy_on_disconnect (TnyConnectionPolicy *self, TnyAccount *account) { - tny_account_cancel (account); return; } diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 2b95f55..e3511e8 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -2388,7 +2388,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, if (TNY_IS_FOLDER (folder_store) && selected) { TnyAccount *account; const gchar *account_name = NULL; - gboolean refresh; /* Update the active account */ account = modest_tny_folder_get_account (TNY_FOLDER (folder_store)); @@ -2406,8 +2405,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); - refresh = !modest_account_mgr_account_is_busy (modest_runtime_get_account_mgr (), account_name); - /* Set folder on header view. This function will call tny_folder_refresh_async so we pass a callback that will be called when @@ -2415,7 +2412,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, empty view if there are no messages */ modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), TNY_FOLDER (folder_store), - refresh, + TRUE, folder_refreshed_cb, main_window); -- 1.7.9.5