Changes to install widget in glade 3.14.

diff --git a/configure.ac b/configure.ac
index cddb7d3a70346546e2f80d6c6225b0268e4a5cb4..ee62498295b436225df6874384168ee8f6679b3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 AM_GLIB_GNU_GETTEXT
 
 # Checks for libraries.
-PKG_CHECK_EXISTS(gladeui-1.0 >= 3.2.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no])
+PKG_CHECK_EXISTS(gladeui-2.0 >= 3.14.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no])
 
 AM_CONDITIONAL(GLADEUI, test $GLADEUI_FOUND = yes)
 

diff --git a/libgtkformui/glade/Makefile.am b/libgtkformui/glade/Makefile.am
index be8b7223c8a25df0361a7e7fa4fb63fe04add10d..4dcb31f9078e063ca56f89f6db51c5cdd427a0dc 100644 (file)
--- a/libgtkformui/glade/Makefile.am
+++ b/libgtkformui/glade/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = icons
 
-glademodulesdir = `pkg-config --variable=moduledir gladeui-1.0`
+glademodulesdir = `pkg-config --variable=moduledir gladeui-2.0`
 
-gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-1.0`
+gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-2.0`
 
 gladecatalogs_DATA = gtkformui.xml
 

diff --git a/libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am b/libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am
index 6e77a259e78b701118408c43ab59141d25958859..b67f788f23766baf9249198021db09bc6f6b3880 100644 (file)
--- a/libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am
+++ b/libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am
@@ -1,4 +1,4 @@
-gladeiconsdir = $(shell pkg-config --variable=pixmapdir gladeui-1.0)
+gladeiconsdir = $(shell pkg-config --variable=pixmapdir gladeui-2.0)
 iconsdir = $(gladeiconsdir)/hicolor/16x16/actions
 
 icons_DATA = widget-gtkformui-gtkformdecoder.png

diff --git a/libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am b/libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am
index d350ee8ca6bb9af92690894556e236ca4e9f4c97..e217b8086975d8f517ddf806233bf94ad1409525 100644 (file)
--- a/libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am
+++ b/libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am
@@ -1,4 +1,4 @@
-gladeiconsdir = $(shell pkg-config --variable=pixmapdir gladeui-1.0)
+gladeiconsdir = $(shell pkg-config --variable=pixmapdir gladeui-2.0)
 iconsdir = $(gladeiconsdir)/hicolor/22x22/actions
 
 icons_DATA = widget-gtkformui-gtkformdecoder.png