Use yelp-tools instead of mate-doc-utils

16 files changed, 36 insertions, 54 deletions

diff --git a/Makefile.am b/Makefile.am
index aeb373fb..6aa5c924 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,11 +15,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-introspection --disable-s
 
 EXTRA_DIST = \
 	COPYING-DOCS		\
-	HACKING			\
-	mate-doc-utils.make
-
-DISTCLEANFILES =		\
-	mate-doc-utils.make
+	HACKING
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
@@ -36,7 +32,6 @@ MAINTAINERCLEANFILES = \
 	`find "$(srcdir)" -type f -name Makefile.in -print` \
 	$(srcdir)/configure \
 	$(srcdir)/gtk-doc.make \
-	$(srcdir)/m4/mate-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 e6e46fa5..16dbcb9a 100644
--- a/applets/clock/clock-utils.c
+++ b/applets/clock/clock-utils.c
@@ -67,9 +67,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 3d2c727c..01b9ed6c 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -147,9 +147,9 @@ static void 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/applets/notification_area/main.c b/applets/notification_area/main.c
index 38832a7f..f752ca02 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -66,7 +66,7 @@ static void help_cb(GtkAction* action, AppletData* data)
 	char* uri;
 	#define NA_HELP_DOC "user-guide"
 
-	uri = g_strdup_printf("ghelp:%s?%s", NA_HELP_DOC, "panels-notification-area");
+	uri = g_strdup_printf("help:%s?%s", NA_HELP_DOC, "panels-notification-area");
 
 	gtk_show_uri(gtk_widget_get_screen(GTK_WIDGET(data->applet)), uri, gtk_get_current_event_time(), &error);
 
diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c
index 2b530c5f..819a1518 100644
--- a/applets/wncklet/wncklet.c
+++ b/applets/wncklet/wncklet.c
@@ -45,9 +45,9 @@ void wncklet_display_help(GtkWidget* widget, const char* doc_id, const char* lin
 	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/configure.ac b/configure.ac
index 5aace91c..7071640c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,9 +258,9 @@ dnl gtk-doc stuff
 
 GTK_DOC_CHECK([1.0])
 
-dnl mate-doc-utils stuff
+dnl yelp-tools stuff
 
-MATE_DOC_INIT
+YELP_HELP_INIT
 
 GLIB_GSETTINGS
 
diff --git a/help/clock/C/mate-applet-clock.xml b/help/clock/C/index.docbook
index 416018c5..4152c33d 100644
--- a/help/clock/C/mate-applet-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:mate-feedback" type="help">MATE 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:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
 
 	 </legalnotice>
 	 <abstract role="description">
diff --git a/help/clock/C/legal.xml b/help/clock/C/legal.xml
index 16b471c2..999af980 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 658d88cd..80e31873 100644
--- a/help/clock/Makefile.am
+++ b/help/clock/Makefile.am
@@ -1,9 +1,13 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = mate-applet-clock
-DOC_INCLUDES = legal.xml
+HELP_ID = clock
 
-DOC_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ja ko nl oc pa pt pt_BR ru sr sv 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 it ja ko nl oc pa pt pt_BR ru sr sv th uk zh_CN zh_HK zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/help/clock/mate-applet-clock.omf.in b/help/clock/mate-applet-clock.omf.in
deleted file mode 100644
index 5540289e..00000000
--- a/help/clock/mate-applet-clock.omf.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omf>
-  <resource>
-    <subject category="GNOME|Applets|Accessories"/>
-    <type>
-      user's guide
-    </type>
-    <relation seriesid="dc1bc4d4-40e7-11d6-8b82-b4eda00d7b63"/>
-    <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>
-   </resource>        
-</omf>
diff --git a/help/fish/C/mate-applet-fish.xml b/help/fish/C/index.docbook
index 0760a6f8..4d340e0d 100644
--- a/help/fish/C/mate-applet-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:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
+		  <ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
 
 	 </legalnotice>
 	 <abstract role="description">
diff --git a/help/fish/C/legal.xml b/help/fish/C/legal.xml
index 29f07269..ba4807ba 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 MATE 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 1c4694cb..380b96c5 100644
--- a/help/fish/Makefile.am
+++ b/help/fish/Makefile.am
@@ -1,9 +1,13 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = mate-applet-fish
-DOC_INCLUDES = legal.xml
+HELP_ID = fish
 
-DOC_LINGUAS = ca cs de el en_GB es eu fi fr it ja ko oc ru sv th uk zh_CN
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA =
+
+HELP_LINGUAS = ca cs de el en_GB es eu fi fr it ja ko oc ru sv th uk zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/help/fish/mate-applet-fish.omf.in b/help/fish/mate-applet-fish.omf.in
deleted file mode 100644
index 1a815f55..00000000
--- a/help/fish/mate-applet-fish.omf.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omf>

-  <resource>

-    <subject category="GNOME|Applets|Amusement"/>

-    <type>

-      user's guide

-    </type>

-    <relation seriesid="e9efbc8c-40e7-11d6-815d-e721de25f633"/>

-    <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>

-  </resource>

-</omf>
diff --git a/mate-panel/libpanel-util/panel-show.c b/mate-panel/libpanel-util/panel-show.c
index 0795b837..51167874 100644
--- a/mate-panel/libpanel-util/panel-show.c
+++ b/mate-panel/libpanel-util/panel-show.c
@@ -271,9 +271,9 @@ panel_show_help (GdkScreen    *screen,
 	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
 	if (link)
-		uri = g_strdup_printf ("ghelp:%s?%s", doc, link);
+		uri = g_strdup_printf ("help:%s?%s", doc, link);
 	else
-		uri = g_strdup_printf ("ghelp:%s", doc);
+		uri = g_strdup_printf ("help:%s", doc);
 
 	gtk_show_uri (screen, uri, gtk_get_current_event_time (), &local_error);
 
diff --git a/mate-panel/panel.c b/mate-panel/panel.c
index c3a5a8ab..2b9929d3 100644
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -608,6 +608,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 ("ghelp:")) == 0 ||
 		    g_ascii_strncasecmp (uri, "man:", strlen ("man:")) == 0 ||
 		    g_ascii_strncasecmp (uri, "info:", strlen ("info:")) == 0) {
 			/* FIXME: probably do this only on link,