[gnote] Port to new documentation infrastructure



commit 5c4d826581e4634bdb2c1df77eab0ca30952c340
Author: Oliver Propst <oliver propst gmail com>
Date:   Thu Sep 6 23:04:01 2012 +0300

    Port to new documentation infrastructure
    
    Closes #683372

 .gitignore       |   11 +++++++++--
 configure.ac     |    2 +-
 help/Makefile.am |   12 +++++-------
 src/utils.cpp    |    2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cf1464c..b432f40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,27 +23,35 @@ autom4te.cache
 autogen.err
 stamp-*
 aclocal.m4
-gnome-doc-utils.make
 Makefile
 Makefile.in
 help/cs/*.mo
 help/cs/*.page
+help/cs/*.stamp
 help/da/*.mo
 help/da/*.page
+help/da/*.stamp
 help/de/*.mo
 help/de/*.page
+help/de/*.stamp
 help/es/*.mo
 help/es/*.page
+help/es/*.stamp
 help/fr/*.mo
 help/fr/*.page
+help/fr/*.stamp
 help/lt/*.mo
 help/lt/*.page
+help/lt/*.stamp
 help/ru/*.mo
 help/ru/*.page
+help/ru/*.stamp
 help/sl/*.mo
 help/sl/*.page
+help/sl/*.stamp
 help/zh_CN/*.mo
 help/zh_CN/*.page
+help/zh_CN/*.stamp
 data/org.gnome.gnote.gschema.valid
 data/org.gnome.gnote.gschema.xml
 data/org.gnome.gnote.panel-applet
@@ -72,7 +80,6 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
-m4/gnome-doc-utils.m4
 po/.intltool-merge-cache
 po/Makefile.in.in
 po/POTFILES
diff --git a/configure.ac b/configure.ac
index aee69d5..82e9eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
 
 GNOME_COMMON_INIT
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR(m4)
diff --git a/help/Makefile.am b/help/Makefile.am
index 4bdf995..2b66cbc 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,7 @@
+ YELP_HELP_RULES@
 
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_ID = gnote
-DOC_FIGURES = \
+HELP_ID = gnote
+HELP_MEDIA = \
 	figures/add-notebook-search.png \
 	figures/add-to-notebook.png \
 	figures/delete-notebook.png \
@@ -24,7 +22,7 @@ DOC_FIGURES = \
 	figures/new-notebook.png \
 	figures/notebook-icon.png \
 	figures/note-template.png
-DOC_PAGES = \
+HELP_FILES = \
 	gnote-addin-bugzillalink.page \
 	gnote-addin-fixedwidth.page \
 	gnote-addin-html.page \
@@ -51,4 +49,4 @@ DOC_PAGES = \
 	gnote-template-notes.page \
 	gnote-working-with-notebooks.page \
 	index.page
-DOC_LINGUAS = cs da de es fr lt ru sl zh_CN
+HELP_LINGUAS = cs da de es fr lt ru sl zh_CN
diff --git a/src/utils.cpp b/src/utils.cpp
index a4b273f..dfc04df 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -119,7 +119,7 @@ namespace gnote {
     void show_help(const std::string & filename, const std::string & link_id,
                    GdkScreen *screen, Gtk::Window *parent)
     {
-      std::string uri = "ghelp:" + filename;
+      std::string uri = "help:" + filename;
       if(!link_id.empty()) {
         uri += "#" + link_id;
       }



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