[gitg] Added glade catalog file

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 9e748ca981b1c4160292990043fba84d933e4590
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date:   Sun Mar 27 15:50:17 2011 +0200

    Added glade catalog file

 configure.ac        |   21 +++++++++++++++++++++
 data/Makefile.am    |    5 +++++
 gitg/gitg-window.ui |    2 +-
 3 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cd76a2f..3271b24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,26 @@ AC_SUBST(PACKAGE_LIBS)
 
 GLIB_GSETTINGS
 
+GLADE_UI_REQUIRED=3.2
+
+AC_ARG_ENABLE([glade-catalog],
+              [AS_HELP_STRING([--enable-glade-catalog[=@<:@no/auto/yes@:>@]],
+                              [Install a glade catalog file [default=auto]])],
+                              [glade_catalog=$enableval],
+                              [glade_catalog="auto"])
+
+if test "x$glade_catalog" = "xauto"; then
+	PKG_CHECK_EXISTS([gladeui-1.0 >= $GLADE_UI_REQUIRED], \
+	                 glade_catalog="yes", glade_catalog="no")
+fi
+
+AM_CONDITIONAL([GLADE_CATALOG], [test "x$glade_catalog" = xyes])
+
+AS_IF([test "x$glade_catalog" = xyes],
+	[PKG_CHECK_MODULES(GLADE, [gladeui-1.0 >= $GLADE_UI_REQUIRED])
+	 GLADE_CATALOGDIR=`$PKG_CONFIG --variable=catalogdir gladeui-1.0 2>&AS_MESSAGE_LOG_FD`
+	 AC_SUBST(GLADE_CATALOGDIR)])
+
 AC_CONFIG_FILES([
 Makefile
 libgitg-1.0.pc
@@ -169,4 +189,5 @@ Configuration:
 	Source code location:	${srcdir}
 	Compiler:		${CC}
 	gtk+ version:           ${gtkversion}
+	Glade catalog:          ${glade_catalog}
 "
diff --git a/data/Makefile.am b/data/Makefile.am
index e7127fe..96b8537 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,6 +15,11 @@ gitgstyles_DATA = gitgstyle.xml
 
 gsettings_SCHEMAS = org.gnome.gitg.gschema.xml
 
+if GLADE_CATALOG
+catalogdir = $(GLADE_CATALOGDIR)
+dist_catalog_DATA = gitg-glade.xml
+endif
+
 @INTLTOOL_XML_NOMERGE_RULE@
 
 @GSETTINGS_RULES@
diff --git a/gitg/gitg-window.ui b/gitg/gitg-window.ui
index c1bd798..e77af64 100644
--- a/gitg/gitg-window.ui
+++ b/gitg/gitg-window.ui
@@ -2,7 +2,7 @@
 <interface>
   <!-- interface-requires gtk+ 2.18 -->
   <!-- interface-requires gitg 0.0.6 -->
-  <!-- interface-requires sourceview2 0.0 -->
+  <!-- interface-requires sourceview -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment_context">
     <property name="value">3</property>