From 6e0ed95f0118e1954676abdade7dc00d4b7cb2fd Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Mon, 26 Jan 2009 11:00:03 +0000 Subject: [PATCH] * Fixes NB#99264, replaced the move to logical id pmo-trunk-r7289 --- src/hildon2/modest-folder-window.c | 2 +- src/hildon2/modest-header-window.c | 2 +- src/modest-ui-actions.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index f587eda..e782b9d 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -282,7 +282,7 @@ modest_folder_window_new (TnyFolderStoreQuery *query) modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE, _("mcen_ti_edit_move_folder"), - _("mcen_me_move"), + _HL("wdgt_bd_move"), GTK_TREE_VIEW (priv->folder_view), GTK_SELECTION_SINGLE, EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to)); diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index aec3079..a78ffa0 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -436,7 +436,7 @@ modest_header_window_new (TnyFolder *folder) GTK_SELECTION_MULTIPLE, EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_message)); modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE, - _("mcen_ti_edit_move"), _("mcen_me_move"), + _("mcen_ti_edit_move"), _HL("wdgt_bd_move"), GTK_TREE_VIEW (priv->header_view), GTK_SELECTION_MULTIPLE, EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to)); diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index e5ed944..ffc10d4 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -1458,7 +1458,7 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind GtkWidget *header_view = NULL; OpenMsgHelper *helper; ModestWindow *window; - + g_return_if_fail (header != NULL && rowref != NULL); mgr = modest_runtime_get_window_mgr (); @@ -1475,7 +1475,7 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind window = NULL; found = modest_window_mgr_find_registered_header (mgr, header, &window); - + /* Do not open again the message and present the window to the user */ if (found) { -- 1.7.9.5