From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 23 Jan 2006 15:52:41 +0000 (+0000)
Subject: 2006-01-23 [paul]	1.9.100cvs181
X-Git-Tag: rel_2_0_0~22
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c00963e41f180a13f1dfd3adec13976d7d6f9e4f;hp=26238fe30c6f36dd7f3ee114f0a6d75827fbdd2b

2006-01-23 [paul]	1.9.100cvs181

	* manual/dist/html/Makefile.am
	* manual/dist/pdf/Makefile.am
	* manual/dist/ps/Makefile.am
	* manual/dist/txt/Makefile.am
	* src/mainwindow.c
		re-enable manual
		Thanks to Colin
---

diff --git a/ChangeLog b/ChangeLog
index 8c555f569..1e82e396b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-23 [paul]	1.9.100cvs181
+
+	* manual/dist/html/Makefile.am
+	* manual/dist/pdf/Makefile.am
+	* manual/dist/ps/Makefile.am
+	* manual/dist/txt/Makefile.am
+	* src/mainwindow.c
+		re-enable manual
+		Thanks to Colin
+
 2006-01-22 [colin]	1.9.100cvs180
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index bf0d1b8c9..fbb637af1 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1164,3 +1164,4 @@
 ( cvs diff -u -r 1.3.2.37 -r 1.3.2.38 src/prefs_themes.c;  ) > 1.9.100cvs178.patchset
 ( cvs diff -u -r 1.15.2.21 -r 1.15.2.22 src/summary_search.c;  ) > 1.9.100cvs179.patchset
 ( cvs diff -u -r 1.382.2.228 -r 1.382.2.229 src/compose.c;  cvs diff -u -r 1.9.2.35 -r 1.9.2.36 src/gtk/gtkaspell.c;  ) > 1.9.100cvs180.patchset
+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/dist/html/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/dist/ps/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/dist/txt/Makefile.am;  cvs diff -u -r 1.274.2.91 -r 1.274.2.92 src/mainwindow.c;  ) > 1.9.100cvs181.patchset
diff --git a/configure.ac b/configure.ac
index 8d87ba60f..fb9aa32fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=180
+EXTRA_VERSION=181
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/manual/dist/html/Makefile.am b/manual/dist/html/Makefile.am
index 477a4fe06..f1afa9af4 100644
--- a/manual/dist/html/Makefile.am
+++ b/manual/dist/html/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST=sylpheed-claws-manual.html
-manual_DATA=sylpheed-claws-manual.html
+manualen_DATA=sylpheed-claws-manual.html
+manualendir=$(manualdir)/en
 
 sylpheed-claws-manual.html:
 	-docbook2html -u -o . ../../sylpheed-claws-manual.xml
diff --git a/manual/dist/pdf/Makefile.am b/manual/dist/pdf/Makefile.am
index 9e735d357..1ac0ba434 100644
--- a/manual/dist/pdf/Makefile.am
+++ b/manual/dist/pdf/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST=sylpheed-claws-manual.pdf
-manual_DATA=sylpheed-claws-manual.pdf
+manualen_DATA=sylpheed-claws-manual.pdf
+manualendir=$(manualdir)/en
 
 sylpheed-claws-manual.pdf:
 	-docbook2pdf -d ../../dtd/manual.dsl -o . ../../sylpheed-claws-manual.xml
diff --git a/manual/dist/ps/Makefile.am b/manual/dist/ps/Makefile.am
index 1250c6be1..bcdf73012 100644
--- a/manual/dist/ps/Makefile.am
+++ b/manual/dist/ps/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST=sylpheed-claws-manual.ps
-manual_DATA=sylpheed-claws-manual.ps
+manualen_DATA=sylpheed-claws-manual.ps
+manualendir=$(manualdir)/en
 
 sylpheed-claws-manual.ps:
 	-docbook2ps -o . ../../sylpheed-claws-manual.xml
diff --git a/manual/dist/txt/Makefile.am b/manual/dist/txt/Makefile.am
index 949071b0c..354b5b548 100644
--- a/manual/dist/txt/Makefile.am
+++ b/manual/dist/txt/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST=sylpheed-claws-manual.txt
-manual_DATA=sylpheed-claws-manual.txt
+manualen_DATA=sylpheed-claws-manual.txt
+manualendir=$(manualdir)/en
 
 sylpheed-claws-manual.txt:
 	-docbook2txt -o . ../../sylpheed-claws-manual.xml
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 0fa721bb7..b9a038ec4 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -796,9 +796,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
 	{N_("/_Configuration/Plu_gins..."),  	NULL, plugins_open_cb, 0, NULL},
 
 	{N_("/_Help"),				NULL, NULL, 0, "<Branch>"},
-#if 0 /* waiting for the new manual to be finished */
 	{N_("/_Help/_Manual"),			NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
-#endif
 	{N_("/_Help/_Online User-contributed FAQ"),	
 						NULL, manual_open_cb, MANUAL_FAQ_CLAWS, NULL},
 	{N_("/_Help/Icon _Legend"),		NULL, legend_open_cb, 0, NULL},
@@ -904,9 +902,7 @@ MainWindow *main_window_create(SeparateType type)
 	gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
 	ifactory = gtk_item_factory_from_widget(menubar);
 
-#if 0 /* waiting for the new manual to be finished */
 	menu_set_sensitive(ifactory, "/Help/Manual", manual_available(MANUAL_MANUAL_LOCAL));
-#endif
 
 	if (prefs_common.toolbar_detachable) {
 		handlebox = gtk_handle_box_new();