From 1be55d05c9d0fabc42a7b9e063cc4f0f27a6e1ce Mon Sep 17 00:00:00 2001 From: Philip Van Hoof Date: Wed, 11 Jul 2007 14:53:03 +0000 Subject: [PATCH] Moving some code pmo-trunk-r2703 --- src/modest-mail-operation.c | 8 -------- src/modest-ui-actions.c | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 009b11e..26c8c94 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -55,8 +55,6 @@ #include "modest-marshal.h" #include "modest-error.h" #include "modest-mail-operation.h" -#include "widgets/modest-header-view.h" -#include "widgets/modest-main-window.h" #define KB 1024 #define GET_SIZE_BUFFER_SIZE 128 @@ -1758,10 +1756,6 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, } else { TnyFolderStore *into; - ModestHeaderView *v = (ModestHeaderView *) modest_main_window_get_child_widget ( - (ModestMainWindow *)modest_window_mgr_get_main_window ( - modest_runtime_get_window_mgr ()), MODEST_WIDGET_TYPE_HEADER_VIEW); - /* Create the helper */ helper = g_slice_new0 (XFerMsgAsyncHelper); helper->mail_op = g_object_ref(self); @@ -1770,8 +1764,6 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, helper->user_callback = NULL; helper->user_data = NULL; - modest_header_view_clear (v); - /* Rename. Camel handles folder subscription/unsubscription */ into = tny_folder_get_folder_store (folder); tny_folder_copy_async (folder, into, name, TRUE, diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index bfd986d..ee2d2aa 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -2315,6 +2315,9 @@ modest_ui_actions_on_rename_folder (GtkAction *action, modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), TNY_FOLDER(folder), TRUE); + + modest_header_view_clear ((ModestHeaderView *) header_view); + modest_mail_operation_rename_folder (mail_op, TNY_FOLDER (folder), (const gchar *) folder_name); -- 1.7.9.5