[xchat-gnome] Bug 683405 - Use-new-documentation-infrastructure

[Ritesh Khadgaray <rkhadgaray src gnome org>]

commit 58ced47b53fb9e1d8e353726b8d96bd6af245f96
Author: Oliver Propst <oliver propst gmail com>
Date:   Thu Jun 12 18:39:35 2014 +0530

    Bug 683405 - Use-new-documentation-infrastructure

 .bzrignore                                |    2 -
 Makefile.am                               |    4 +-
 configure.ac                              |    4 +-
 help/C/{xchat-gnome.xml => index.docbook} |    0
 help/C/legal.xml                          |    2 +-
 help/Makefile.am                          |   15 +++--
 help/omf.make                             |   55 -----------------
 help/xchat-gnome.omf.in                   |    9 ---
 help/xmldocs.make                         |   92 -----------------------------
 src/fe-gnome/main-window.c                |    2 +-
 10 files changed, 13 insertions(+), 172 deletions(-)
---
diff --git a/.bzrignore b/.bzrignore
index 3418678..c33615c 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -16,7 +16,6 @@ config.status
 config.sub
 configure
 depcomp
-gnome-doc-utils.make
 install-sh
 intltool-*
 libtool
@@ -28,7 +27,6 @@ stamp-h1
 *.gladep*
 data/xchat-gnome.desktop
 data/xchat-gnome.desktop.in
-help/xchat-gnome-C.omf
 src/fe-gnome/stamp-xg-marshal*
 src/fe-gnome/xg-marshal*
 src/fe-gnome/xchat-gnome
diff --git a/Makefile.am b/Makefile.am
index 1e2cfbc..4b4e040 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 EXTRA_DIST =                   \
        autogen.sh              \
-       gnome-doc-utils.make    \
        ChangeLog.pre-git
 
-DISTCLEANFILES =               \
-       gnome-doc-utils.make
+DISTCLEANFILES =       
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --disable-scrollkeeper  \
diff --git a/configure.ac b/configure.ac
index 9cb7a06..dcc2ddd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,8 +55,8 @@ GNOME_COMPILE_WARNINGS([maximum])
 
 PKG_PROG_PKG_CONFIG
 
-# Set up gnome-doc-utils
-GNOME_DOC_INIT
+# User Documentation
+YELP_HELP_INIT
 
 # Hard dependencies
 PKG_CHECK_MODULES([DEPENDENCIES], [\
diff --git a/help/C/xchat-gnome.xml b/help/C/index.docbook
similarity index 100%
rename from help/C/xchat-gnome.xml
rename to help/C/index.docbook
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 70d0183..6f41d74 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -5,7 +5,7 @@
          License (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 type="help" url="ghelp:fdl">link</ulink> or in the file 
COPYING-DOCS
+         a copy of the GFDL at this <ulink type="help" 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/help/Makefile.am b/help/Makefile.am
index b0126b0..938aec5 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,8 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = xchat-gnome
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/xchat-gnome_main_window.png
-DOC_LINGUAS = ca cs da de el es fr it oc pt_BR sl sv th zh_CN
+HELP_ID = xchat-gnome
+HELP_FILES = \
+               index.docbook \
+               legal.xml
+HELP_EXTRA =
+HELP_MEDIA = figures/xchat-gnome_main_window.png
+HELP_LINGUAS = ca cs da de es fr it oc pt_BR sl sv th zh_CN
diff --git a/src/fe-gnome/main-window.c b/src/fe-gnome/main-window.c
index 1776a53..fcbf7b0 100644
--- a/src/fe-gnome/main-window.c
+++ b/src/fe-gnome/main-window.c
@@ -527,7 +527,7 @@ on_help_contents_activate (GtkAction *action, gpointer data)
        GError *error = NULL;
 
        gtk_show_uri (gtk_widget_get_screen (gui.main_window),
-                     "ghelp:xchat-gnome",
+                     "help:xchat-gnome",
                      gtk_get_current_event_time (), &error);
        if (error) {
                error_dialog (_("Error showing help"), error->message);