From 399b6639de98180dfa415676823c88dd2e629892 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Thu, 30 Aug 2007 15:00:50 +0000
Subject: [PATCH] take over cosmetic fix from upstream.

2007-08-30  Michael Natterer  <mitch@gimp.org>

	* app/gui/sync-menu.c: take over cosmetic fix from upstream.

	* configure.in: add HAVE_CARBON as AM_CONDITIONAL

	* menus/image-menu.xml.in: add the Help menu to the image menu.

	* menus/Makefile.am
	* menus/menus.xsl: filter it away if we are not on carbon.

	* app/menus/menus.c: added the "help" action group to the image UI
	manager.


svn path=/trunk/; revision=23412
---
 ChangeLog               | 14 ++++++++++++++
 app/gui/sync-menu.c     |  3 ++-
 app/menus/menus.c       |  1 +
 configure.in            |  1 +
 menus/Makefile.am       |  8 ++++++--
 menus/image-menu.xml.in |  8 ++++++++
 menus/menus.xsl         |  8 +++++++-
 7 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1734f13a8..5e37ede151 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-08-30  Michael Natterer  <mitch@gimp.org>
+
+	* app/gui/sync-menu.c: take over cosmetic fix from upstream.
+
+	* configure.in: add HAVE_CARBON as AM_CONDITIONAL
+
+	* menus/image-menu.xml.in: add the Help menu to the image menu.
+
+	* menus/Makefile.am
+	* menus/menus.xsl: filter it away if we are not on carbon.
+
+	* app/menus/menus.c: added the "help" action group to the image UI
+	manager.
+
 2007-08-30  Simon Budig  <simon@gimp.org>
 
 	* plug-ins/script-fu/scheme-wrapper.c
diff --git a/app/gui/sync-menu.c b/app/gui/sync-menu.c
index a39583b64c..bcc6dd092a 100644
--- a/app/gui/sync-menu.c
+++ b/app/gui/sync-menu.c
@@ -624,7 +624,8 @@ sync_menu_shell (GtkMenuShell *menu_shell,
       if (GTK_IS_TEAROFF_MENU_ITEM (menu_item))
 	continue;
 
-      if (toplevel && g_object_get_data (G_OBJECT (menu_item), "gtk-empty-menu-item"))
+      if (toplevel && g_object_get_data (G_OBJECT (menu_item),
+					 "gtk-empty-menu-item"))
 	continue;
 
       carbon_item = carbon_menu_item_get (menu_item);
diff --git a/app/menus/menus.c b/app/menus/menus.c
index 0e7adee445..9bd3ad5d43 100644
--- a/app/menus/menus.c
+++ b/app/menus/menus.c
@@ -96,6 +96,7 @@ menus_init (Gimp              *gimp,
   gimp_menu_factory_manager_register (global_menu_factory, "<Image>",
                                       "file",
                                       "context",
+                                      "help",
                                       "edit",
                                       "select",
                                       "view",
diff --git a/configure.in b/configure.in
index b13a01083b..9babc5b653 100644
--- a/configure.in
+++ b/configure.in
@@ -1660,6 +1660,7 @@ if test "x$carbon_ok" = "xyes"; then
   CARBON_LDFLAGS="-framework Carbon"
   AC_SUBST(CARBON_LDFLAGS)
 fi
+AM_CONDITIONAL(HAVE_CARBON, test "x$carbon_ok" = "xyes")
 
 
 ##########################################################
diff --git a/menus/Makefile.am b/menus/Makefile.am
index 63d358f502..dd0df2159a 100644
--- a/menus/Makefile.am
+++ b/menus/Makefile.am
@@ -49,12 +49,16 @@ MAINTAINERCLEANFILES = $(menudata_built_files)
 
 
 if GIMP_UNSTABLE
-XSLTPARAMS = --stringparam debug-menu yes
+DEBUG_MENU_PARAMS = --stringparam debug-menu yes
+endif
+
+if HAVE_CARBON
+HELP_MENU_PARAMS = --stringparam help-menu yes
 endif
 
 %.xml: %.xml.in $(srcdir)/menus.xsl dialogs-menuitems.xml
 if HAVE_XSLTPROC
-	$(XSLTPROC) --xinclude $(XSLTPARAMS) $(srcdir)/menus.xsl $< > $(@) || rm -f $(@)
+	$(XSLTPROC) --xinclude $(DEBUG_MENU_PARAMS) $(HELP_MENU_PARAMS) $(srcdir)/menus.xsl $< > $(@) || rm -f $(@)
 else
 	@echo "*** xsltproc is required to build the menus XML files ***"; exit 1;
 endif
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 31fbd50768..343ce9944b 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -589,6 +589,14 @@
       <separator />
     </menu>
 
+    <menu action="help-menu" name="Help">
+      <menuitem action="help-help" />
+      <menuitem action="help-context-help" />
+      <menuitem action="dialogs-tips" />
+      <menuitem action="dialogs-about" />
+      <separator />
+    </menu>
+
   </menubar-and-popup>
 
 </ui>
diff --git a/menus/menus.xsl b/menus/menus.xsl
index 9d80a33258..8e26d10523 100644
--- a/menus/menus.xsl
+++ b/menus/menus.xsl
@@ -9,6 +9,7 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:param name="debug-menu" />
+  <xsl:param name="help-menu" />
 
   <xsl:output method="xml"
               version="1.0"
@@ -22,7 +23,6 @@
   </xsl:template>
 
   <xsl:template match="menubar-and-popup">
-
     <menubar>
       <xsl:attribute name="action"><xsl:value-of select="@action-name"/>-menubar</xsl:attribute>
       <xsl:apply-templates />
@@ -45,6 +45,12 @@
     </xsl:if>
   </xsl:template>
 
+  <xsl:template match="menubar-and-popup/menu[@action='help-menu']">
+    <xsl:if test="$help-menu='yes'">
+      <xsl:call-template name="identity" />
+    </xsl:if>
+  </xsl:template>
+
   <!-- need to strip the XInclude namespace declaration from the ui element -->
   <xsl:template match="ui">
     <ui>