[ghex] Use yelp-tools instead gnome-doc-utils



commit 0a3980c33bbfdaa888f45a08f0d594ca32d4f077
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Dec 11 13:51:30 2012 +0900

    Use yelp-tools instead gnome-doc-utils

 Makefile.am                        |    3 ---
 configure.ac                       |    3 +--
 help/C/{ghex.xml => index.docbook} |    2 +-
 help/C/legal.xml                   |    4 ++--
 help/Makefile.am                   |   20 ++++++++++----------
 help/ghex.omf.in                   |    9 ---------
 src/preferences.c                  |    2 +-
 src/ui.c                           |    9 ++++++---
 8 files changed, 21 insertions(+), 31 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9edcfdb..4a3a954 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,9 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-
 SUBDIRS = data po help src icons
 
 EXTRA_DIST =			\
-	gnome-doc-utils.make	\
 	COPYING-DOCS		\
 	HACKING
 
diff --git a/configure.ac b/configure.ac
index 0155157..17f7834 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,8 +74,7 @@ GNOME_COMPILE_WARNINGS([maximum])
 AC_ARG_ENABLE(debug,
               [  --enable-debug      Enables extra debugging output], AC_DEFINE(ENABLE_DEBUG, 1, [Should verbose debugging output be enabled.]))
 
-GNOME_DOC_INIT([0.9.0],,
-  [AC_MSG_WARN([[gnome-doc-utils not found: documentation will not be built.]])])
+YELP_HELP_INIT
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/help/C/ghex.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/ghex.xml
rename to help/C/index.docbook
index c71bf06..32daa94 100644
--- a/help/C/ghex.xml
+++ b/help/C/index.docbook
@@ -155,7 +155,7 @@
     </releaseinfo> 
     <legalnotice> 
       <title>Feedback</title> 
-      <para>To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>. 
+      <para>To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the <ulink url="help:gnome-feedback" type="help">GNOME Feedback Page</ulink>. 
       </para>
 <!-- Translators may also add here feedback address for translations -->
     </legalnotice> 
diff --git a/help/C/legal.xml b/help/C/legal.xml
index d6906f9..e1c4a93 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -6,7 +6,7 @@
            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
+           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
@@ -73,4 +73,4 @@
            </orderedlist>
          </para>
    </legalnotice>
- 
\ No newline at end of file
+ 
diff --git a/help/Makefile.am b/help/Makefile.am
index daabb03..9969d34 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,15 +1,15 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = ghex
-DOC_ENTITIES =
-DOC_INCLUDES = legal.xml
-DOC_H_FILE = ghex-docs.h
-DOC_H_DOCS = C/ghex.xml
-DOC_FIGURES =	\
+ YELP_HELP_RULES@
+
+HELP_ID = ghex
+
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA = \
 	figures/ghex_window_empty.png	\
 	figures/ghex_window_open.png
 
-DOC_LINGUAS = cs de es fr id it ja ko oc sl sv th zh_CN zh_TW
+HELP_LINGUAS = cs de es fr id it ja ko oc sl sv th zh_CN zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/src/preferences.c b/src/preferences.c
index 3849ade..053bb43 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -439,7 +439,7 @@ prefs_response_cb(GtkDialog *dlg, gint response, PropertyUI *pui)
 
 	switch(response) {
 	case GTK_RESPONSE_HELP:
-		gtk_show_uri (NULL, "ghelp:ghex?ghex-prefs",  gtk_get_current_event_time (), &error);
+		gtk_show_uri (NULL, "help:ghex/ghex-prefs",  gtk_get_current_event_time (), &error);
 		if(NULL != error) {
 			GtkWidget *dialog;
 			dialog = gtk_message_dialog_new
diff --git a/src/ui.c b/src/ui.c
index 3f714f5..39fd603 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -143,8 +143,11 @@ about_cb (GtkAction  *action,
 		NULL
 	};
 
-	/* For documentation_credits */
-	#include "../help/ghex-docs.h"
+	const gchar *documentation_credits[] = {
+		"Jaka Mo\304\215nik",
+		"Sun GNOME Documentation Team",
+		NULL
+	};
 
 	const gchar *license[] = {
 		N_("This program is free software; you can redistribute it and/or modify "
@@ -196,7 +199,7 @@ help_cb (GtkAction  *action,
 	GError *error = NULL;
 
 	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)),
-	              "ghelp:ghex",
+	              "help:ghex",
 	              gtk_get_current_event_time (),
 	              &error);
 



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