You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.4 KiB
47 lines
1.4 KiB
12 years ago
|
From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001
|
||
|
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||
|
Date: Sun, 6 May 2012 22:40:47 -0400
|
||
|
Subject: [PATCH] Version glade documentation
|
||
|
|
||
|
Rename gnome help files to prevent collision with other versions.
|
||
|
|
||
|
Avoid loading glade-3.8's devhelp files.
|
||
|
---
|
||
|
help/Makefile.am | 5 ++++-
|
||
|
src/glade-window.c | 2 +-
|
||
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
||
|
diff --git a/help/Makefile.am b/help/Makefile.am
|
||
|
index 70836e3..dd769c3 100644
|
||
|
--- a/help/Makefile.am
|
||
|
+++ b/help/Makefile.am
|
||
|
@@ -2,8 +2,11 @@
|
||
|
include $(top_srcdir)/gnome-doc-utils.make
|
||
|
dist-hook: doc-dist-hook
|
||
|
|
||
|
-DOC_MODULE = glade
|
||
|
+DOC_MODULE = glade-@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@
|
||
|
DOC_INCLUDES = legal.xml
|
||
|
DOC_FIGURES = figures/main-window.png
|
||
|
|
||
|
DOC_LINGUAS = bg ca cs de el en_GB es eu fr gl hi it ja oc pt_BR ru sl sv uk zh_CN
|
||
|
+
|
||
|
+C/$(DOC_MODULE).xml: $(top_srcdir)/help/C/glade.xml
|
||
|
+ cp -p $(top_srcdir)/help/C/glade.xml C/$(DOC_MODULE).xml
|
||
|
diff --git a/src/glade-window.c b/src/glade-window.c
|
||
|
index 89a4549..4eb8be5 100644
|
||
|
--- a/src/glade-window.c
|
||
|
+++ b/src/glade-window.c
|
||
|
@@ -2041,7 +2041,7 @@ show_developer_manual_cb (GtkAction * action, GladeWindow * window)
|
||
|
{
|
||
|
if (glade_util_have_devhelp ())
|
||
|
{
|
||
|
- glade_util_search_devhelp ("gladeui", NULL, NULL);
|
||
|
+ glade_util_search_devhelp ("gladeui-2", NULL, NULL);
|
||
|
return;
|
||
|
}
|
||
|
|
||
|
--
|
||
|
1.7.8.6
|
||
|
|