[gnome-system-log] Port to new documentation infrastructure



commit e0963e001cceb6f0628e0be628f869793868db80
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Aug 17 01:42:01 2012 +0900

    Port to new documentation infrastructure
    
    Use yelp-tools instead gnome-doc-utils

 autogen.sh                   |    2 +-
 configure.ac                 |    3 ++-
 help/Makefile.am             |    9 ++++-----
 help/gnome-system-log.omf.in |    9 ---------
 src/logview-app.c            |    2 +-
 5 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 2897a9b..354f05c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index b0c021d..f4694ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,8 @@ AC_CACHE_SAVE
 
 GLIB_GSETTINGS
 
-GNOME_DOC_INIT
+# User documentation
+YELP_HELP_INIT
 
 AC_ARG_ENABLE([zlib],
               [AS_HELP_STRING([--disable-zlib],[disable zlib support])])
diff --git a/help/Makefile.am b/help/Makefile.am
index a4aac4b..455fe52 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,14 +1,13 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
 # Module name
-DOC_ID = gnome-system-log
+HELP_ID = gnome-system-log
 
 # List of figures to be included
 DOC_FIGURES = figures/log-viewer-main.png
 
 # List of pages
-DOC_PAGES = \
+HELP_FILES = \
 	index.page \
 	introduction.page \
 	log-close.page \
@@ -19,4 +18,4 @@ DOC_PAGES = \
 	pref-font-size.page
 
 # List of translations
-DOC_LINGUAS = ca cs de el en_GB es eu fi fr gl hu id it ja ko oc ru sl sv uk zh_CN
+HELP_LINGUAS = ca cs de el en_GB es eu fi fr gl hu id it ja ko oc ru sl sv uk zh_CN
diff --git a/src/logview-app.c b/src/logview-app.c
index 1a1927a..900e2eb 100644
--- a/src/logview-app.c
+++ b/src/logview-app.c
@@ -280,7 +280,7 @@ action_help (GSimpleAction *action,
   GError *error = NULL;
 
   gtk_show_uri (gtk_widget_get_screen (app->priv->window),
-                "ghelp:gnome-system-log", gtk_get_current_event_time (),
+                "help:gnome-system-log", gtk_get_current_event_time (),
                 &error);
 
   if (error) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]