From e18e0ead4e1101f9b664c7b45b680b61fc439b22 Mon Sep 17 00:00:00 2001
From: Eric Koegel <eric.koegel@gmail.com>
Date: Wed, 1 Jun 2016 09:51:47 +0300
Subject: [PATCH] Export the glade catalog for Gtk3

Build and export the XfceTitledDialog in the glade catalog for
Gtk3 Applications as well.
---
 configure.ac.in   | 31 +++++++++++++++++++++++++++++++
 glade/Makefile.am | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 92f587e..99aa079 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -187,6 +187,8 @@ dnl *** Optional support for the Glade Interface Designer ***
 dnl *********************************************************
 XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-1.0],
                            [3.5.0], [gladeui], [glade interface designer])
+XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI2], [gladeui-2.0],
+                           [3.5.0], [gladeui2], [glade interface designer])
 AC_ARG_WITH([gladeui-catalogdir],
             [AC_HELP_STRING([--with-gladeui-catalogdir=PATH],
                             [Specify where to install glade designer catalog files (default=autodetect)])],
@@ -220,6 +222,27 @@ AC_SUBST([GLADEUI_CATALOGDIR])
 AC_SUBST([GLADEUI_MODULEDIR])
 AC_SUBST([GLADEUI_PIXMAPDIR])
 
+if test x"$GLADEUI2_FOUND" = x"yes"; then
+  if test x"$gladeui2_catalogdir" = x""; then
+    GLADEUI2_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-2.0"`
+  else
+    GLADEUI2_CATALOGDIR="$gladeui_catalogdir"
+  fi
+  if test x"$gladeui2_moduledir" = x""; then
+    GLADEUI2_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-2.0"`
+  else
+    GLADEUI2_MODULEDIR="$gladeui_moduledir"
+  fi
+  if test x"$gladeui2_pixmapdir" = x""; then
+    GLADEUI2_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-2.0"`
+  else
+    GLADEUI2_PIXMAPDIR="$gladeui_pixmapdir"
+  fi
+fi
+AC_SUBST([GLADEUI2_CATALOGDIR])
+AC_SUBST([GLADEUI2_MODULEDIR])
+AC_SUBST([GLADEUI2_PIXMAPDIR])
+
 dnl *************************
 dnl *** Check for gtk-doc ***
 dnl *************************
@@ -331,6 +354,14 @@ echo "  - Pixmap directory:        $GLADEUI_PIXMAPDIR"
 else
 echo "* Glade Interface Designer:  no"
 fi
+if test x"$GLADEUI2_FOUND" = x"yes"; then
+echo "* Glade 3.0 Interface Designer:  yes"
+echo "  - Catalog directory:       $GLADEUI2_CATALOGDIR"
+echo "  - Module directory:        $GLADEUI2_MODULEDIR"
+echo "  - Pixmap directory:        $GLADEUI2_PIXMAPDIR"
+else
+echo "* Glade 3.0 Interface Designer:  no"
+fi
 if test x"$enable_keyboard_library" = x"yes"; then
 echo "* Keyboard library support:  yes"
 else
diff --git a/glade/Makefile.am b/glade/Makefile.am
index 58746df..b1ac4c8 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -46,10 +46,52 @@ gladecatalog_DATA = \
 @INTLTOOL_XML_NOMERGE_RULE@
 endif
 
+if HAVE_GLADEUI2
+##
+## Glade module
+##
+glademoduledir = \
+	$(GLADEUI2_MODULEDIR)
+
+glademodule_LTLIBRARIES = \
+	libxfce4uiglade2.la
+
+libxfce4uiglade2_la_SOURCES  = \
+	libxfce4ui-glade.c
+
+libxfce4uiglade2_la_CFLAGS = \
+	$(GLADEUI2_CFLAGS) \
+	$(LIBXFCE4UTIL_CFLAGS) \
+	$(PLATFORM_CFLAGS)
+
+libxfce4uiglade2_la_LDFLAGS = \
+	-no-undefined \
+	-avoid-version \
+	-module \
+	$(PLATFORM_LDFLAGS)
+
+libxfce4uiglade2_la_LIBADD = \
+	$(top_builddir)/libxfce4ui/libxfce4ui-2.la \
+	$(LIBXFCE4UTIL_LIBS) \
+	$(GLADEUI2_LIBS)
+
+##
+## Glade catalog xml file
+##
+gladecatalogdir = \
+	$(GLADEUI2_CATALOGDIR)
+gladecatalog_DATA = \
+	libxfce4ui-2.xml \
+	libxfce4ui-2.xml.in
+@INTLTOOL_XML_NOMERGE_RULE@
+endif
+
 CLEANFILES = \
-	libxfce4ui.xml
+	libxfce4ui.xml	\
+	libxfce4ui-2.xml
 
 EXTRA_DIST = \
-	libxfce4ui.xml.in
+	libxfce4ui.xml.in	\
+	libxfce4ui-2.xml.in
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
-- 
2.8.3