[gnome-panel] Port to new documentation infrastruture

[Javier JardÃn <jjardon src gnome org>]

commit 515d89b7ef83f1f8d8938de0ff84d4424797f478
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Sep 4 05:47:03 2012 +0900

    Port to new documentation infrastruture
    
    Use yelp-tools instead gnome-doc-utils

 Makefile.am                               |    7 +------
 applets/clock/clock-utils.c               |    4 ++--
 applets/fish/fish.c                       |    4 ++--
 configure.ac                              |    4 ++--
 gnome-panel/panel.c                       |    1 +
 help/clock/C/{clock.xml => index.docbook} |    2 +-
 help/clock/C/legal.xml                    |    2 +-
 help/clock/Makefile.am                    |   14 +++++++++-----
 help/clock/clock.omf.in                   |   11 -----------
 help/fish/C/{fish.xml => index.docbook}   |    2 +-
 help/fish/C/legal.xml                     |    4 ++--
 help/fish/Makefile.am                     |   14 +++++++++-----
 help/fish/fish.omf.in                     |   11 -----------
 13 files changed, 31 insertions(+), 49 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8d10381..23e1543 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,11 +16,7 @@ EXTRA_DIST = \
 	COPYING-DOCS		\
 	HACKING			\
 	MAINTAINERS		\
-	ChangeLog.pre-git	\
-	gnome-doc-utils.make
-
-DISTCLEANFILES =		\
-	gnome-doc-utils.make
+	ChangeLog.pre-git
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
@@ -37,7 +33,6 @@ MAINTAINERCLEANFILES = \
 	`find "$(srcdir)" -type f -name Makefile.in -print` \
 	$(srcdir)/configure \
 	$(srcdir)/gtk-doc.make \
-	$(srcdir)/m4/gnome-doc-utils.m4 \
 	$(srcdir)/m4/gtk-doc.m4 \
 	$(srcdir)/m4/intltool.m4 \
 	$(srcdir)/m4/libtool.m4 \
diff --git a/applets/clock/clock-utils.c b/applets/clock/clock-utils.c
index 45c00e9..8799194 100644
--- a/applets/clock/clock-utils.c
+++ b/applets/clock/clock-utils.c
@@ -71,9 +71,9 @@ clock_utils_display_help (GtkWidget  *widget,
 	char   *uri;
 
 	if (link_id)
-		uri = g_strdup_printf ("ghelp:%s?%s", doc_id, link_id);
+		uri = g_strdup_printf ("help:%s/%s", doc_id, link_id);
 	else
-		uri = g_strdup_printf ("ghelp:%s", doc_id);
+		uri = g_strdup_printf ("help:%s", doc_id);
 
 	gtk_show_uri (gtk_widget_get_screen (widget), uri,
 		      gtk_get_current_event_time (), &error);
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 55173da..57fee0b 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -144,9 +144,9 @@ show_help (FishApplet *fish, const char *link_id)
 #define FISH_HELP_DOC "fish"
 
 	if (link_id)
-		uri = g_strdup_printf ("ghelp:%s?%s", FISH_HELP_DOC, link_id);
+		uri = g_strdup_printf ("help:%s/%s", FISH_HELP_DOC, link_id);
 	else
-		uri = g_strdup_printf ("ghelp:%s", FISH_HELP_DOC);
+		uri = g_strdup_printf ("help:%s", FISH_HELP_DOC);
 
 	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (fish)), uri,
 		      gtk_get_current_event_time (), &error);
diff --git a/configure.ac b/configure.ac
index b160de9..1c14939 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,9 +289,9 @@ dnl gtk-doc stuff
 
 GTK_DOC_CHECK([1.0])
 
-dnl gnome-doc-utils stuff
+dnl yelp-tools stuff
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 AM_GCONF_SOURCE_2
 
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index b236e27..9b618e6 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -700,6 +700,7 @@ drop_urilist (PanelWidget         *panel,
 		    g_ascii_strncasecmp (uri, "ftp:", strlen ("ftp:")) == 0 ||
 		    g_ascii_strncasecmp (uri, "gopher:", strlen ("gopher:")) == 0 ||
 		    g_ascii_strncasecmp (uri, "ghelp:", strlen ("ghelp:")) == 0 ||
+		    g_ascii_strncasecmp (uri, "help:", strlen ("help:")) == 0 ||
 		    g_ascii_strncasecmp (uri, "man:", strlen ("man:")) == 0 ||
 		    g_ascii_strncasecmp (uri, "info:", strlen ("info:")) == 0) {
 			/* FIXME: probably do this only on link,
diff --git a/help/clock/C/clock.xml b/help/clock/C/index.docbook
similarity index 99%
rename from help/clock/C/clock.xml
rename to help/clock/C/index.docbook
index b9058a0..11e7374 100644
--- a/help/clock/C/clock.xml
+++ b/help/clock/C/index.docbook
@@ -178,7 +178,7 @@
 		</releaseinfo> 
 	 <legalnotice> 
 		<title>Feedback</title> 
-		<para> To report a bug or make a suggestion regarding the &applet; applet or this manual, follow the directions in the <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>. </para>
+		<para> To report a bug or make a suggestion regarding the &applet; applet or this manual, follow the directions in the <ulink url="help:gnome-feedback" type="help">GNOME Feedback Page</ulink>. </para>
 		
 	 </legalnotice> 
 	 <abstract role="description">
diff --git a/help/clock/C/legal.xml b/help/clock/C/legal.xml
index a9f7b31..2f89f6b 100644
--- a/help/clock/C/legal.xml
+++ b/help/clock/C/legal.xml
@@ -6,7 +6,7 @@ terms of the GNU Free DocumentationLicense (GFDL), Version 1.1 or any later
 version published by the Free Software Foundation with no Invariant Sections, 	  no Front-Cover Texts, and
 no Back-Cover Texts. You can find a copy of the GFDL at this 
 
-		<ulink url="ghelp:fdl" type="help">link</ulink> 
+		<ulink url="help:fdl" type="help">link</ulink> 
 
 or in the file COPYING-DOCS distributed with this manual.</para>
 <para> 
diff --git a/help/clock/Makefile.am b/help/clock/Makefile.am
index 88d4c73..d300c28 100644
--- a/help/clock/Makefile.am
+++ b/help/clock/Makefile.am
@@ -1,9 +1,13 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = clock
-DOC_INCLUDES = legal.xml
+HELP_ID = clock
 
-DOC_LINGUAS = ar ca cs da de el en_GB es eu fi fr id it ja ko nl oc pa pt pt_BR ru sr sl sv te th uk zh_CN zh_HK zh_TW
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA =
+
+HELP_LINGUAS = ar ca cs da de el en_GB es eu fi fr id it ja ko nl oc pa pt pt_BR ru sr sl sv te th uk zh_CN zh_HK zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/help/fish/C/fish.xml b/help/fish/C/index.docbook
similarity index 99%
rename from help/fish/C/fish.xml
rename to help/fish/C/index.docbook
index 8399e96..041a76c 100644
--- a/help/fish/C/fish.xml
+++ b/help/fish/C/index.docbook
@@ -150,7 +150,7 @@
 		<title>Feedback</title> 
 		<para> To report a bug or make a suggestion regarding the &applet; applet or this
 		  manual, follow the directions in the 
-		  <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>. </para>
+		  <ulink url="help:gnome-feedback" type="help">GNOME Feedback Page</ulink>. </para>
 		
 	 </legalnotice> 
 	 <abstract role="description">
diff --git a/help/fish/C/legal.xml b/help/fish/C/legal.xml
index d6906f9..e1c4a93 100644
--- a/help/fish/C/legal.xml
+++ b/help/fish/C/legal.xml
@@ -6,7 +6,7 @@
            by the Free Software Foundation with no Invariant Sections,
            no Front-Cover Texts, and no Back-Cover Texts.  You can find
            a copy of the GFDL at this <ulink type="help"
-           url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+           url="help:fdl">link</ulink> or in the file COPYING-DOCS
            distributed with this manual.
           </para>
           <para> This manual is part of a collection of GNOME manuals
@@ -73,4 +73,4 @@
            </orderedlist>
          </para>
    </legalnotice>
- 
\ No newline at end of file
+ 
diff --git a/help/fish/Makefile.am b/help/fish/Makefile.am
index 3c98051..b2a8306 100644
--- a/help/fish/Makefile.am
+++ b/help/fish/Makefile.am
@@ -1,9 +1,13 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = fish
-DOC_INCLUDES = legal.xml
+HELP_ID = fish
 
-DOC_LINGUAS = ca cs da de el en_GB es eu fi fr it ja ko oc ru sl sv th uk zh_CN
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA =
+
+HELP_LINGUAS = ca cs da de el en_GB es eu fi fr it ja ko oc ru sl sv th uk zh_CN
 
 -include $(top_srcdir)/git.mk