From 56bfba9cf6915b3921db9ab846297bdc564bd50f Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Wed, 26 Sep 2001 10:32:31 +0000
Subject: [PATCH] more sync with sylpheed 0.6.2cvs5

---
 ChangeLog         |  4 ++++
 ChangeLog.jp      |  4 ++++
 src/codeconv.h    |  2 +-
 src/summaryview.c | 15 +++++++++------
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 15bd0dc1e..d750ad7d3 100644
--- 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 f93936a50..b51039d63 100644
--- 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 fd237559e..c44a4cb1b 100644
--- 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 5c3ccd3bf..deb805b9b 100644
--- 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))
-- 
2.25.1