more sync with sylpheed 0.6.2cvs5

diff --git a/ChangeLog b/ChangeLog
index 15bd0dc1ebf72b674db81d5b200b67cda909c56c..d750ad7d31900a6bf62729e9cd1f7bdbcc6233f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-26
+
+       * src/summaryview.c: modified the layout of popup menu.
+
 2001-09-25
 
        * src/folder.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index f93936a5030a7e2d6cee647221929d5296315c12..b51039d636d33f232f431946234bb0bd5a322351 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,7 @@
+2001-09-26
+
+       * src/summaryview.c: ¥Ý¥Ã¥×¥¢¥Ã¥×¥á¥Ë¥å¡¼¤Î¹½À®¤òÊѹ¹¡£
+
 2001-09-25
 
        * src/folder.c

diff --git a/src/codeconv.h b/src/codeconv.h
index fd237559e113893ebbb382110fa5c662c287bdc1..c44a4cb1b8276a0f1d57bd131cc1063935d05438 100644 (file)
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/summaryview.c b/src/summaryview.c
index 5c3ccd3bf539d9c11fb40b61fb17c4e095f01505..deb805b9bc16fda3c810e7ad26dac16ccb10253d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -389,9 +389,11 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Add sender to address _book"),
                                        NULL, summary_add_address_cb,           0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/Open in new _window"),    NULL, summary_open_msg, 0, NULL},
-       {N_("/View so_urce"),           NULL, summary_view_source, 0, NULL},
-       {N_("/Show all _header"),       NULL, summary_show_all_header_cb, 0, NULL},
+       {N_("/_View"),                  NULL, NULL,             0, "<Branch>"},
+       {N_("/_View/Open in new _window"),
+                                       NULL, summary_open_msg, 0, NULL},
+       {N_("/_View/_Source"),          NULL, summary_view_source, 0, NULL},
+       {N_("/_View/All _header"),      NULL, summary_show_all_header_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Save as..."),            NULL, summary_save_as,  0, NULL},
        {N_("/_Print..."),              NULL, summary_print,    0, NULL},
@@ -1067,9 +1069,10 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 
        menu_set_sensitive(ifactory, "/Add sender to address book", sens);
 
-       menu_set_sensitive(ifactory, "/Open in new window", sens);
-       menu_set_sensitive(ifactory, "/View source", sens);
-       menu_set_sensitive(ifactory, "/Show all header", sens);
+       menu_set_sensitive(ifactory, "/View", sens);
+       menu_set_sensitive(ifactory, "/View/Open in new window", sens);
+       menu_set_sensitive(ifactory, "/View/Source", sens);
+       menu_set_sensitive(ifactory, "/View/All header", sens);
        if ((summaryview->folder_item->stype == F_DRAFT) ||
            (summaryview->folder_item->stype == F_OUTBOX) ||
            (summaryview->folder_item->stype == F_QUEUE))