[gnome-commander] Use yelp documentation infrastructure

[Uwe Scholz <uwescholz src gnome org>]

commit 25e4300736826c9bd94e5584f0928460f8dda0a2
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Thu Feb 2 22:09:54 2017 +0100

    Use yelp documentation infrastructure

 Makefile.am                                  |    1 -
 doc/C/{gnome-commander.xml => index.docbook} |    4 ++--
 doc/C/legal.xml                              |    2 +-
 doc/Makefile.am                              |   18 +++++++++---------
 src/utils.h                                  |   12 +++++++++++-
 5 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c29f7d1..4883bfb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,6 @@ EXTRA_DIST =                \
        xmldocs.make            \
        omf.make                \
        m4                      \
-       gnome-doc-utils.make    \
        AUTHORS                 \
        ChangeLog               \
        INSTALL                 \
diff --git a/doc/C/gnome-commander.xml b/doc/C/index.docbook
similarity index 99%
rename from doc/C/gnome-commander.xml
rename to doc/C/index.docbook
index 08a7372..223b44f 100644
--- a/doc/C/gnome-commander.xml
+++ b/doc/C/index.docbook
@@ -413,7 +413,7 @@
     <legalnotice>
       <title>Feedback</title>
       <para>To report a bug or make a suggestion regarding the &app; application or
-      this manual, follow the directions in the <ulink type="help" url="ghelp:gnome-feedback">GNOME Feedback 
Page</ulink>.
+      this manual, follow the directions in the <ulink type="help" url="help:gnome-feedback">GNOME Feedback 
Page</ulink>.
       </para>
 
 
@@ -7713,7 +7713,7 @@
       General Public license as published by the Free Software
       Foundation; either version 2 of the License, or (at your option)
       any later version. A copy of this license can be found at this
-      <ulink type="help" url="ghelp:gpl">link</ulink>, or in the file
+      <ulink type="help" url="help:gpl">link</ulink>, or in the file
       COPYING included with the source code of this program.</para>
     </sect2>
   </sect1>
diff --git a/doc/C/legal.xml b/doc/C/legal.xml
index ac97e1d..899282c 100644
--- a/doc/C/legal.xml
+++ b/doc/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
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 192f759..d68d613 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,14 +7,14 @@ EXTRA_DIST = \
        internal_viewer_hacking.txt \
        $(man1_MANS)
 
-
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = gnome-commander
-DOC_ENTITIES =
-DOC_INCLUDES = legal.xml releases.xml
-DOC_FIGURES = \
+@YELP_HELP_RULES@
+
+HELP_ID = gnome-commander
+HELP_FILES = \
+       index.docbook \
+       legal.xml \
+       releases.xml
+HELP_MEDIA = \
        figures/create_archive.png                              \
        figures/dev_cd.png                                      \
        figures/extract_archive.png                             \
@@ -41,7 +41,7 @@ DOC_FIGURES = \
        figures/gnome-commander_simple_plugins_example.png      \
        figures/mounting.png
 
-DOC_LINGUAS = cs de el es fr ru sl
+HELP_LINGUAS = cs de el es fr ru sl
 
 
 -include $(top_srcdir)/git.mk
diff --git a/src/utils.h b/src/utils.h
index af9415c..b68dc9d 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 
+#include <config.h>
 #include <libgnome/gnome-help.h>
 
 #include "gnome-cmd-file.h"
@@ -280,8 +281,17 @@ inline void gnome_cmd_show_message (GtkWindow *parent, std::string message, cons
 inline void gnome_cmd_help_display (const gchar *file_name, const gchar *link_id=NULL)
 {
     GError *error = NULL;
+    gchar help_uri[256] = "help:";
 
-    gnome_help_display (file_name, link_id, &error);
+    strcat(help_uri, PACKAGE_NAME);
+
+    if (link_id != NULL)
+    {
+        strcat(help_uri, "/");
+        strcat(help_uri, link_id);
+    }
+
+    gtk_show_uri (NULL, help_uri,  gtk_get_current_event_time (), &error);
 
     if (error != NULL)
         gnome_cmd_error_message (_("There was an error displaying help."), error);