[vinagre] Switch help to build with yelp-tools, bug 657669

[David King <davidk src gnome org>]

commit a1c4a15a63de78616d4c45312c693ef8e10f1dd5
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Tue Aug 30 02:54:29 2011 -0400

    Switch help to build with yelp-tools, bug 657669

 Makefile.am                |    1 -
 autogen.sh                 |    2 +-
 configure.ac               |    2 +-
 help/Makefile.am           |   11 +++++------
 vinagre/vinagre-utils.vala |    4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ead2efb..c9df7d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -305,7 +305,6 @@ MAINTAINERCLEANFILES = \
 	build-aux/config.guess \
 	build-aux/config.sub \
 	build-aux/depcomp \
-	build-aux/gnome-doc-utils.make \
 	build-aux/install-sh \
 	build-aux/ltmain.sh \
 	build-aux/missing \
diff --git a/autogen.sh b/autogen.sh
index 053cb11..62e5daf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS" USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS" USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 941a420..d28fe12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,7 +215,7 @@ AS_IF([test "x$ac_cv_header_ifaddrs_h" = "xyes"],
   [AS_IF([test "x$have_sockaddr_storage" = "xyes"],
     [AC_DEFINE([RFC2553], [], [Define if RFC2553 is followed])])])
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 GLIB_GSETTINGS
 
diff --git a/help/Makefile.am b/help/Makefile.am
index e3a32bc..7a2ee09 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,8 @@
-include $(top_srcdir)/build-aux/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_ID = vinagre
+HELP_ID = vinagre
 
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/vinagre-auth-needed.png	\
 	figures/vinagre-connect-dialog.png \
 	figures/vinagre-connected.png \
@@ -13,7 +12,7 @@ DOC_FIGURES = \
 	figures/vinagre-reverse-connections.png \
 	figures/vinagre-scaling.png
 
-DOC_PAGES = \
+HELP_FILES = \
 	connect.page \
 	connect-file.page \
 	fullscreen.page \
@@ -25,4 +24,4 @@ DOC_PAGES = \
 	take-screenshot.page \
 	view-only.page
 
-DOC_LINGUAS = de es eu gl hu sl
\ No newline at end of file
+HELP_LINGUAS = de es eu gl hu sl
diff --git a/vinagre/vinagre-utils.vala b/vinagre/vinagre-utils.vala
index 45cd69f..c98fa7c 100644
--- a/vinagre/vinagre-utils.vala
+++ b/vinagre/vinagre-utils.vala
@@ -184,9 +184,9 @@ namespace Vinagre.Utils {
     {
         string uri;
         if (page != null)
-            uri = "ghelp:" + Vinagre.Config.PACKAGE_TARNAME + "?" + page;
+            uri = "help:" + Vinagre.Config.PACKAGE_TARNAME + "?" + page;
         else
-            uri = "ghelp:" + Vinagre.Config.PACKAGE_TARNAME;
+            uri = "help:" + Vinagre.Config.PACKAGE_TARNAME;
 
         try {
             show_uri (window.get_screen (), uri, Gdk.CURRENT_TIME);