From c39526472eb7b79d5c8ee6c5c2ec7beef5c00c63 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Mon, 14 Dec 2009 14:07:50 +0100 Subject: [PATCH] Reenable move to and delete in headers window --- src/modest-ui-actions.c | 7 +++---- src/widgets/modest-header-window.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 9d26c9f..dda39fe 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -382,7 +382,6 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) gint response; ModestWindowMgr *mgr; gboolean retval = TRUE; - GtkWindow *toplevel; g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE); @@ -413,8 +412,8 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) tny_list_get_length(header_list)), desc); /* Confirmation dialog */ - toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win); - response = modest_platform_run_confirmation_dialog (toplevel, message); + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (win))), + message); if (response == GTK_RESPONSE_OK) { GtkTreeSelection *sel = NULL; @@ -5922,7 +5921,7 @@ modest_ui_actions_check_for_active_account (ModestWindow *self, if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) { gint response; - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (self)), + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))), _("emev_nc_disconnect_account")); if (response == GTK_RESPONSE_OK) { retval = TRUE; diff --git a/src/widgets/modest-header-window.c b/src/widgets/modest-header-window.c index adb1019..0809147 100644 --- a/src/widgets/modest-header-window.c +++ b/src/widgets/modest-header-window.c @@ -926,6 +926,18 @@ static void setup_menu (ModestHeaderWindow *self) modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_messages"), NULL, MODEST_WINDOW_MENU_CALLBACK (set_delete_edit_mode), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete)); +#else + modest_window_add_to_menu (MODEST_WINDOW (self), + dngettext(GETTEXT_PACKAGE, + "mcen_me_move_message", + "mcen_me_move_messages", + 2), + NULL, + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_move_to), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to)); + modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_messages"), NULL, + MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_delete_message), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete)); #endif modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_folder_details"), NULL, MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_details), -- 1.7.9.5