[file-roller] ported to the new documentation infrastructure

[Paolo Bacchilega <paobac src gnome org>]

commit 085cc96a03b1f881941785b29fdfc25fd1ed10e7
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu May 31 21:07:37 2012 +0200

    ported to the new documentation infrastructure

 Makefile.am      |    6 ++----
 configure.ac     |    2 +-
 help/Makefile.am |   11 +++++------
 src/gtk-utils.c  |    2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d2a8b33..9f4a640 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,11 +29,9 @@ EXTRA_DIST = 			\
 	file-roller.spec.in	\
 	intltool-merge.in	\
 	intltool-update.in	\
-	intltool-extract.in	\
-	gnome-doc-utils.make
-
+	intltool-extract.in
+	
 DISTCLEANFILES =                        \
-	gnome-doc-utils.make		\
 	po/.intltool-merge-cache        \
 	intltool-extract                \
 	intltool-merge                  \
diff --git a/configure.ac b/configure.ac
index 385ca15..c260934 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,7 +168,7 @@ fi
 
 dnl ******************************
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 dnl ******************************
 
diff --git a/help/Makefile.am b/help/Makefile.am
index 84f3f03..40c4524 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,16 +1,15 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
 # Module name
-DOC_ID = file-roller
+HELP_ID = file-roller
 
 # List of figures to be included
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/file-roller-main-window.png \
 	figures/file-roller-open-recent.png
 
 # List of pages
-DOC_PAGES = \
+HELP_FILES = \
 	archive-create.page \
 	archive-edit.page \
 	archive-extract.page \
@@ -26,6 +25,6 @@ DOC_PAGES = \
 	troubleshooting-archive-open.page \
 	troubleshooting-password.page
 
-DOC_LINGUAS = bg ca cs da de el en_GB es eu fi fr gl hu it ja oc nl ru sl sv te vi uk zh_CN zh_HK zh_TW
+HELP_LINGUAS = bg ca cs da de el en_GB es eu fi fr gl hu it ja oc nl ru sl sv te vi uk zh_CN zh_HK zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index 7d78bef..2de78ea 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -741,7 +741,7 @@ show_help_dialog (GtkWindow  *parent,
 	char   *uri;
 	GError *error = NULL;
 
-	uri = g_strconcat ("ghelp:file-roller", section ? "?" : NULL, section, NULL);
+	uri = g_strconcat ("help:file-roller", section ? "?" : NULL, section, NULL);
 	if (! show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) {
   		GtkWidget *dialog;