gnac/trunk/yelp-tools.patch

   1 diff --git a/Makefile.am b/Makefile.am
   2 index 4809bd5..6043fbf 100644
   3 --- a/Makefile.am
   4 +++ b/Makefile.am
   5 @@ -14,11 +14,9 @@ INTLTOOL_BUILT = \
   6         intltool-update
   7
   8  EXTRA_DIST = \
   9 -       autogen.sh \
  10 -       gnome-doc-utils.make
  11 +       autogen.sh
  12
  13  DISTCLEANFILES = \
  14 -       gnome-doc-utils.make \
  15         po/.intltool-merge-cache \
  16         $(INTLTOOL_BUILT)
  17
  18 diff --git a/configure.ac b/configure.ac
  19 index b2c5605..20a2081 100644
  20 --- a/configure.ac
  21 +++ b/configure.ac
  22 @@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT
  23  dnl Check for GSettings macros
  24  GLIB_GSETTINGS
  25
  26 -GNOME_DOC_INIT([0.17.2])
  27 +YELP_HELP_INIT
  28  GNOME_DEBUG_CHECK
  29  GNOME_COMPILE_WARNINGS([maximum])
  30  GNOME_CXX_WARNINGS([yes])
  31 diff --git a/help/Makefile.am b/help/Makefile.am
  32 index dff2f18..760fc92 100644
  33 --- a/help/Makefile.am
  34 +++ b/help/Makefile.am
  35 @@ -1,15 +1,14 @@
  36 -include $(top_srcdir)/gnome-doc-utils.make
  37 -dist-hook: doc-dist-hook
  38 +@YELP_HELP_RULES@
  39
  40 -DOC_ID = gnac
  41 +HELP_ID = gnac
  42
  43 -DOC_FIGURES = \
  44 +HELP_MEDIA = \
  45         figures/gnac-logo.png \
  46         figures/gnac-main-window.png
  47
  48 -DOC_PAGES = \
  49 +HELP_FILES = \
  50         index.page \
  51         intro.page \
  52         license.page
  53
  54 -DOC_LINGUAS = cs da de es fr ro ru sl te
  55 +HELP_LINGUAS = cs da de es fr ro ru sl te
  56 diff --git a/src/gnac-ui.c b/src/gnac-ui.c
  57 index 76f6401..200c7db 100644
  58 --- a/src/gnac-ui.c
  59 +++ b/src/gnac-ui.c
  60 @@ -855,7 +855,7 @@ gnac_ui_on_help_cb(GtkAction *action,
  61    GError *error = NULL;
  62
  63    ret = gtk_show_uri(gtk_widget_get_screen(gnac_ui_get_widget("main_window")),
  64 -      "ghelp:gnac", gtk_get_current_event_time(), &error);
  65 +      "help:gnac", gtk_get_current_event_time(), &error);
  66    if (!ret && error) {
  67      g_printerr("%s: %s\n", _("Could not display help"), error->message);
  68      g_clear_error(&error);