[gnome-system-monitor] Use new documentation infrastructure

[Chris KÃhl <chriskuehl src gnome org>]

commit 4229819e71d6cd3308a3b4e64c48b143368f5d3d
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sun Aug 19 23:59:08 2012 -0400

    Use new documentation infrastructure
    
    https://live.gnome.org/GnomeGoals/NewDocumentationInfrastructure
    
    https://bugzilla.gnome.org/show_bug.cgi?id=682223

 Makefile.am                                        |    2 -
 configure.ac                                       |    2 +-
 help/C/{gnome-system-monitor.xml => index.docbook} |    0
 help/Makefile.am                                   |   41 ++++++++++---------
 help/gnome-system-monitor.omf.in                   |    9 ----
 omf-install/Makefile.am                            |   33 ----------------
 src/callbacks.cpp                                  |    2 +-
 src/procdialogs.cpp                                |    2 +-
 8 files changed, 25 insertions(+), 66 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fc9dca6..50ad1c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,13 +12,11 @@ ui_DATA = data/preferences.ui \
 
 EXTRA_DIST = \
 	$(ui_DATA) \
-	gnome-doc-utils.make \
 	gnome-system-monitor.desktop.in \
 	gnome-system-monitor.doap \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
-	omf.make \
 	xmldocs.make
 
 Applicationsdir = $(datadir)/applications
diff --git a/configure.ac b/configure.ac
index cddc837..8feb9e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
                    [The gettext catalog name])
 
 # Documentation
-GNOME_DOC_INIT([0.20])
+YELP_HELP_INIT
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/help/C/gnome-system-monitor.xml b/help/C/index.docbook
similarity index 100%
rename from help/C/gnome-system-monitor.xml
rename to help/C/index.docbook
diff --git a/help/Makefile.am b/help/Makefile.am
index cdf87c0..5d48cbf 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,22 +1,25 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = gnome-system-monitor
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/addColumn.png \
-	      figures/changePriority.png \
-	      figures/colorPanel.png \
-  	      figures/columnContextMenu.png \
-	      figures/gnome-system-monitor_window.png \
-	      figures/memoryMaps.png \
-	      figures/moreInfo.png \
-	      figures/processListing.png \
-	      figures/sortButton.png \
-	      figures/sortMenu2.png \
-	      figures/sortMenu.png \
-	      figures/systemMonitor.png \
-	      figures/viewMenu.png
+HELP_ID = gnome-system-monitor
 
-DOC_LINGUAS = ar bg ca cs da de el es eu fr gl oc pa ru sl sv zh_CN
+HELP_FILES =			\
+		index.docbook	\
+		legal.xml
+
+HELP_MEDIA = 					\
+		figures/addColumn.png		\
+		figures/changePriority.png	\
+		figures/colorPanel.png		\
+		figures/columnContextMenu.png	\
+		figures/gnome-system-monitor_window.png \
+		figures/memoryMaps.png		\
+		figures/moreInfo.png		\
+		figures/processListing.png	\
+		figures/sortButton.png		\
+		figures/sortMenu2.png		\
+		figures/sortMenu.png		\
+		figures/systemMonitor.png	\
+		figures/viewMenu.png
+
+HELP_LINGUAS = ar bg ca cs da de el es eu fr gl oc pa ru sl sv zh_CN
 
diff --git a/src/callbacks.cpp b/src/callbacks.cpp
index 4f228be..77580e3 100644
--- a/src/callbacks.cpp
+++ b/src/callbacks.cpp
@@ -204,7 +204,7 @@ void
 cb_help_contents (GtkAction *action, gpointer data)
 {
     GError* error = 0;
-    if (!g_app_info_launch_default_for_uri("ghelp:gnome-system-monitor", NULL, &error)) {
+    if (!g_app_info_launch_default_for_uri("help:gnome-system-monitor", NULL, &error)) {
         g_warning("Could not display help : %s", error->message);
         g_error_free(error);
     }
diff --git a/src/procdialogs.cpp b/src/procdialogs.cpp
index 904b24e..4910ff7 100644
--- a/src/procdialogs.cpp
+++ b/src/procdialogs.cpp
@@ -217,7 +217,7 @@ prefs_dialog_button_pressed (GtkDialog *dialog, gint id, gpointer data)
     if (id == GTK_RESPONSE_HELP)
     {
         GError* error = 0;
-        if (!g_app_info_launch_default_for_uri("ghelp:gnome-system-monitor#gnome-system-monitor-prefs", NULL, &error))
+        if (!g_app_info_launch_default_for_uri("help:gnome-system-monitor/gnome-system-monitor-prefs", NULL, &error))
         {
             g_warning("Could not display preferences help : %s", error->message);
             g_error_free(error);