talons

commit c5c28413402aa84a607d87172f854720327f9009
parent 4bcbb1b6de51aa1c6bdb10377ece129d75bd64b9
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Thu,  6 Nov 2008 07:56:56 +0000

2008-11-06 [mones]	3.6.1cvs19

	* src/mainwindow.c
		Fix missing "About" in Help menu
	* tools/claws.i18n.status.pl
		Fix header

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
2
++
M
tools/claws.i18n.status.pl
 | 
3
++-

5 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-06 [mones]	3.6.1cvs19
+
+	* src/mainwindow.c
+		Fix missing "About" in Help menu
+	* tools/claws.i18n.status.pl
+		Fix header
+
 2008-11-05 [colin]	3.6.1cvs18
 
 	* src/action.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3600,3 +3600,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/common/w32_reg.c;  ) > 3.6.1cvs16.patchset
 ( cvs diff -u -r 1.274.2.286 -r 1.274.2.287 src/mainwindow.c;  ) > 3.6.1cvs17.patchset
 ( cvs diff -u -r 1.12.2.54 -r 1.12.2.55 src/action.c;  cvs diff -u -r 1.115.2.214 -r 1.115.2.215 src/main.c;  cvs diff -u -r 1.274.2.287 -r 1.274.2.288 src/mainwindow.c;  cvs diff -u -r 1.13.2.40 -r 1.13.2.41 src/common/socket.c;  cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/common/socket.h;  cvs diff -u -r 1.5.2.84 -r 1.5.2.85 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.46 -r 1.4.2.47 src/gtk/gtkutils.h;  ) > 3.6.1cvs18.patchset
+( cvs diff -u -r 1.274.2.288 -r 1.274.2.289 src/mainwindow.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 tools/claws.i18n.status.pl;  ) > 3.6.1cvs19.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -1936,8 +1936,10 @@ MainWindow *main_window_create()
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Help", "Manual", "Help/Manual", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Help", "FAQ", "Help/FAQ", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Help", "IconLegend", "Help/IconLegend", GTK_UI_MANAGER_MENUITEM)
+#ifdef G_OS_WIN32
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Help", "Separator1", "Help/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Help", "SetDefault", "Help/SetDefault", GTK_UI_MANAGER_MENUITEM)
+#endif
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Help", "Separator2", "Help/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Help", "About", "Help/About", GTK_UI_MANAGER_MENUITEM)
 
diff --git a/tools/claws.i18n.status.pl b/tools/claws.i18n.status.pl
@@ -2,7 +2,8 @@
 #
 # claws.i18n.stats.pl - Generate statistics for Claws Mail po directory.
 # 
-# (c) 2003 by Ricardo Mones Lastra <mones@aic.uniovi.es>
+# Copyright (C) 2003-2008 by Ricardo Mones <ricardo@mones.org>, 
+#                            Paul Mangan <paul@claws-mail.org>
 # This program is released under the GNU General Public License.
 #
 # constants -----------------------------------------------------------------