[Commits] [SCM] claws branch, master, updated. 3.13.2-194-gab032e2
claws at claws-mail.org
claws at claws-mail.org
Fri Jul 22 18:56:24 CEST 2016
The branch, master has been updated
via ab032e23e834eed2a2f0fe72e6626154b0af5b03 (commit)
from ef0eeb2d41c31a2eec0163f8bb3a06e83a088db1 (commit)
Summary of changes:
src/mainwindow.c | 4 ++--
src/messageview.c | 4 ++--
src/prefs_other.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
- Log -----------------------------------------------------------------
commit ab032e23e834eed2a2f0fe72e6626154b0af5b03
Author: Paul <paul at claws-mail.org>
Date: Fri Jul 22 17:56:20 2016 +0100
Remove unneeded 'Other' from View/Go to/Other folder...
diff --git a/src/mainwindow.c b/src/mainwindow.c
index f81f512..2dc592f 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -594,7 +594,7 @@ static GtkActionEntry mainwin_entries[] =
{"View/Goto/ParentMessage", NULL, N_("Parent message"), "<control>Up", NULL, G_CALLBACK(parent_cb) },
/* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
{"View/Goto/NextUnreadFolder", NULL, N_("Next unread _folder"), "<shift>G", NULL, G_CALLBACK(goto_unread_folder_cb) },
- {"View/Goto/OtherFolder", NULL, N_("_Other folder..."), "G", NULL, G_CALLBACK(goto_folder_cb) },
+ {"View/Goto/Folder", NULL, N_("F_older..."), "G", NULL, G_CALLBACK(goto_folder_cb) },
/* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
{"View/Goto/NextPart", NULL, N_("Next part"), "A", NULL, G_CALLBACK(goto_next_part_cb) },
{"View/Goto/PrevPart", NULL, N_("Previous part"), "Z", NULL, G_CALLBACK(goto_prev_part_cb) },
@@ -1638,7 +1638,7 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "ParentMessage", "View/Goto/ParentMessage", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator7", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextUnreadFolder", "View/Goto/NextUnreadFolder", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "OtherFolder", "View/Goto/OtherFolder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Folder", "View/Goto/Folder", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator8", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextPart", "View/Goto/NextPart", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "PrevPart", "View/Goto/PrevPart", GTK_UI_MANAGER_MENUITEM)
diff --git a/src/messageview.c b/src/messageview.c
index e25edc0..fc69035 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -250,7 +250,7 @@ static GtkActionEntry msgview_entries[] =
{"View/Goto/ParentMessage", NULL, N_("Parent message"), "<control>Up", NULL, G_CALLBACK(parent_cb) },
/* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
{"View/Goto/NextUnreadFolder", NULL, N_("Next unread _folder"), "<shift>G", NULL, G_CALLBACK(goto_unread_folder_cb) },
- {"View/Goto/OtherFolder", NULL, N_("_Other folder..."), "G", NULL, G_CALLBACK(goto_folder_cb) },
+ {"View/Goto/Folder", NULL, N_("F_older..."), "G", NULL, G_CALLBACK(goto_folder_cb) },
/* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
{"View/Goto/NextPart", NULL, N_("Next part"), "A", NULL, G_CALLBACK(goto_next_part_cb) },
{"View/Goto/PrevPart", NULL, N_("Previous part"), "Z", NULL, G_CALLBACK(goto_prev_part_cb) },
@@ -526,7 +526,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "ParentMessage", "View/Goto/ParentMessage", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator7", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextUnreadFolder", "View/Goto/NextUnreadFolder", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "OtherFolder", "View/Goto/OtherFolder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Folder", "View/Goto/Folder", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator8", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextPart", "View/Goto/NextPart", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevPart", "View/Goto/PrevPart", GTK_UI_MANAGER_MENUITEM)
diff --git a/src/prefs_other.c b/src/prefs_other.c
index 9497bf7..3a24e9c 100644
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -240,7 +240,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
{"<Actions>/Menu/View/Goto/Next", "N"},
{"<Actions>/Menu/View/Goto/PrevUnread", "<shift>P"},
{"<Actions>/Menu/View/Goto/NextUnread", "<shift>N"},
- {"<Actions>/Menu/View/Goto/OtherFolder", "G"},
+ {"<Actions>/Menu/View/Goto/Folder", "G"},
{"<Actions>/Menu/View/OpenNewWindow", "<control><alt>N"},
{"<Actions>/Menu/View/MessageSource", "<control>U"},
{"<Actions>/Menu/View/AllHeaders", "<control>H"},
@@ -320,7 +320,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
{"<Actions>/Menu/View/Goto/Next", "N"},
{"<Actions>/Menu/View/Goto/PrevUnread", "<shift>P"},
{"<Actions>/Menu/View/Goto/NextUnread", "<shift>N"},
- {"<Actions>/Menu/View/Goto/OtherFolder", "G"},
+ {"<Actions>/Menu/View/Goto/Folder", "G"},
{"<Actions>/Menu/View/OpenNewWindow", "<control><alt>N"},
{"<Actions>/Menu/View/MessageSource", "<control>U"},
{"<Actions>/Menu/View/AllHeaders", "<shift>H"},
@@ -376,7 +376,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
{"<Actions>/Menu/View/Goto/Next", "J"}, /* next-entry */
{"<Actions>/Menu/View/Goto/PrevUnread", "<alt>U"}, /* <esc>Tab: previous-new-then-unread */
{"<Actions>/Menu/View/Goto/NextUnread", "U"}, /* Tab: next-new-then-unread */
- {"<Actions>/Menu/View/Goto/OtherFolder", "C"}, /* change-folder */
+ {"<Actions>/Menu/View/Goto/Folder", "C"}, /* change-folder */
{"<Actions>/Menu/View/OpenNewWindow", "<control><alt>N"}, /* - */
{"<Actions>/Menu/View/MessageSource", "E"}, /* edit the raw message */
{"<Actions>/Menu/View/AllHeaders", "H"}, /* display-toggle-weed */
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list