[frogr] Switch to yelp-tools from gnome-doc-utils
- From: Jeremy Bicha <jbicha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [frogr] Switch to yelp-tools from gnome-doc-utils
- Date: Sun, 21 Jul 2013 22:44:15 +0000 (UTC)
commit 4e1ee84ffd88fbc4fc2c093fe74462fbcbaf2d23
Author: Jeremy Bicha <jbicha ubuntu com>
Date: Sat Jul 20 21:22:51 2013 -0400
Switch to yelp-tools from gnome-doc-utils
https://bugzilla.gnome.org/show_bug.cgi?id=704628
autogen.sh | 1 -
configure.ac | 2 +-
help/Makefile.am | 11 +++++------
src/frogr-main-view.c | 2 +-
src/frogr-util.c | 4 ++--
5 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index b245a17..b5a739b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,6 @@ mkdir -p m4
aclocal
autoconf --force
autoheader --force
-gnome-doc-prepare --force
automake --add-missing --copy --force-missing --foreign
glib-gettextize --force --copy
intltoolize --copy --force --automake
diff --git a/configure.ac b/configure.ac
index a520f60..389b153 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PROG_CC
AC_PROG_RANLIB
AC_CONFIG_HEADERS([config.h])
IT_PROG_INTLTOOL([0.35.0])
-GNOME_DOC_INIT([0.10.13])
+YELP_HELP_INIT([3.1.1])
# Support silent build rules, requires at least automake-1.11. Disable
# by either passing --disable-silent-rules to configure or passing V=1
diff --git a/help/Makefile.am b/help/Makefile.am
index f6b408c..3a4d2da 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -10,10 +10,10 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
-DOC_ID = frogr
-DOC_FIGURES = \
+HELP_ID = frogr
+HELP_MEDIA = \
figures/add-tags-dialog.png \
figures/add-to-groups.png \
figures/add-to-sets.png \
@@ -26,7 +26,7 @@ DOC_FIGURES = \
figures/preferences-general.png \
figures/preferences-misc.png
-DOC_PAGES = \
+HELP_FILES = \
add-pictures.page \
group-pictures.page \
preferences.page \
@@ -43,5 +43,4 @@ DOC_PAGES = \
pictures.page \
upload-pictures.page
-DOC_LINGUAS = cs es de en_GB fr gl ru sl
-dist-hook: doc-dist-hook
+HELP_LINGUAS = cs es de en_GB fr gl ru sl
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index 30660aa..0b9438f 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -666,7 +666,7 @@ _on_menu_item_activated (GSimpleAction *action, GVariant *parameter, gpointer da
else if (!g_strcmp0 (action_name, ACTION_ABOUT))
frogr_controller_show_about_dialog (priv->controller);
else if (!g_strcmp0 (action_name, ACTION_HELP))
- frogr_util_open_uri ("ghelp:frogr");
+ frogr_util_open_uri ("help:frogr");
else if (!g_strcmp0 (action_name, ACTION_QUIT))
_quit_application (self);
else
diff --git a/src/frogr-util.c b/src/frogr-util.c
index d10bd98..0b0603c 100644
--- a/src/frogr-util.c
+++ b/src/frogr-util.c
@@ -191,8 +191,8 @@ frogr_util_open_uri (const gchar *uri)
app_info = g_app_info_get_default_for_uri_scheme ("http");
/* Supported help URIs */
- if (g_str_has_prefix (uri, "ghelp:"))
- app_info = g_app_info_get_default_for_uri_scheme ("ghelp");
+ if (g_str_has_prefix (uri, "help:"))
+ app_info = g_app_info_get_default_for_uri_scheme ("help");
#endif
uris_list = g_list_append (uris_list, g_strdup (uri));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]