From 755e518111fd7a392184651487338811efa47d14 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Tue, 13 Jan 2009 12:30:24 +0000 Subject: [PATCH] * Fixes NB#97865, replaced the rename folder logical id pmo-trunk-r7123 --- src/hildon2/modest-folder-window.c | 2 +- src/hildon2/modest-main-window-ui.h | 2 +- src/hildon2/modest-main-window.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index 5bf6be3..e04fada 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -343,7 +343,7 @@ static void setup_menu (ModestFolderWindow *self) modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_folder"), NULL, APP_MENU_CALLBACK (modest_ui_actions_on_new_folder), NULL); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_user_renamefolder"), NULL, + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_rename_folder"), NULL, APP_MENU_CALLBACK (set_rename_edit_mode), NULL); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL, diff --git a/src/hildon2/modest-main-window-ui.h b/src/hildon2/modest-main-window-ui.h index 96e0f4a..5f940f9 100644 --- a/src/hildon2/modest-main-window-ui.h +++ b/src/hildon2/modest-main-window-ui.h @@ -65,7 +65,7 @@ static const GtkActionEntry modest_action_entries [] = { { "EmailReply", NULL, N_("mcen_me_inbox_reply"), "R", NULL, G_CALLBACK (modest_ui_actions_on_reply) }, { "EmailReplyAll", NULL, N_("mcen_me_inbox_replytoall"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_reply_all) }, { "EmailForward", NULL, N_("mcen_me_inbox_forward"), "D", NULL, G_CALLBACK (modest_ui_actions_on_forward) }, - { "EmailRenameFolder", NULL, N_("mcen_me_user_renamefolder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, + { "EmailRenameFolder", NULL, N_("mcen_me_rename_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, { "EmailDelete", NULL, N_("mcen_me_inbox_delete"), "BackSpace", NULL, G_CALLBACK (modest_ui_actions_on_delete_message_or_folder) }, { "EmailContents", NULL, N_("mcen_me_inbox_retrieve_contents"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_retrieve_msg_contents) }, { "EmailDetails", NULL, N_("mcen_me_inbox_messagedetails"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_details) }, diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c index efd2150..801324a 100644 --- a/src/hildon2/modest-main-window.c +++ b/src/hildon2/modest-main-window.c @@ -263,7 +263,7 @@ static const GtkActionEntry modest_folder_view_action_entries [] = { /* Folder View CSM actions */ { "FolderViewCSMNewFolder", NULL, N_("mcen_ti_new_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) }, - { "FolderViewCSMRenameFolder", NULL, N_("mcen_me_user_renamefolder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, + { "FolderViewCSMRenameFolder", NULL, N_("mcen_me_rename_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_paste)}, { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) }, }; -- 1.7.9.5