[libgda] Fixed Glade integration. Added GdauiGrid object to Glade catalog.

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 85724bfc66e2e9bf824d1cfd00db09bfa050b044
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Apr 18 05:38:03 2013 -0500

    Fixed Glade integration. Added GdauiGrid object to Glade catalog.

 configure.ac                               |   4 ++--
 libgda-ui/Makefile.am                      |   9 +++++++--
 libgda-ui/glade/Makefile.am                |  15 +++++++++++----
 libgda-ui/glade/gdaui-catalog.xml          |   6 +++---
 libgda-ui/glade/widget-gdaui-gdauigrid.png | Bin 0 -> 258 bytes
 5 files changed, 23 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 482540a..0a61cef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,8 +256,8 @@ then
        PKG_CHECK_MODULES(GLADE, "gladeui-2.0", [
                        AC_DEFINE(HAVE_GLADE, [1], [Install Glade Catalog])
                        have_glade=yes
-                       GLADE_CATALOG=`$PKG_CONFIG --variable=catalogdir`
-                       GLADE_PIXMAP=`$PKG_CONFIG --variable=pixmapdir`], [have_glade=no])
+                       GLADE_CATALOG=`$PKG_CONFIG --variable=catalogdir gladeui-2.0`
+                       GLADE_PIXMAP=`$PKG_CONFIG --variable=pixmapdir gladeui-2.0`], [have_glade=no])
 fi
 
 AM_CONDITIONAL(HAVE_GDKPIXBUF, test x"$have_gdkpixbuf" = "xyes")
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index e66331b..90b72c2 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -2,7 +2,11 @@ QUIET_GEN = $(Q:@= echo ' GEN '$@;)
 
 lib_LTLIBRARIES = libgda-ui-5.0.la
 
-SUBDIRS = marshallers data-entries internal data . data-entries/plugins demos
+if HAVE_GLADE
+    GLADECATALOG = . glade
+endif
+
+SUBDIRS = marshallers data-entries internal data . data-entries/plugins demos $(GLADECATALOG)
 
 GLOBAL_CFLAGS = \
        -I$(top_builddir)/libgda-ui \
@@ -176,7 +180,8 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
                              --add-include-path=$(top_builddir)/libgda \
                              --add-include-path=$(top_builddir)/libgda-ui \
                              --namespace Gdaui \
-                            --warn-all
+                             --warn-all \
+                             --c-include=libgda-ui/libgda-ui.h
 ui_data_entries_sources = \
        data-entries/gdaui-data-cell-renderer-bin.h \
        data-entries/gdaui-data-cell-renderer-boolean.h \
diff --git a/libgda-ui/glade/Makefile.am b/libgda-ui/glade/Makefile.am
index af440a9..c2b6339 100644
--- a/libgda-ui/glade/Makefile.am
+++ b/libgda-ui/glade/Makefile.am
@@ -1,4 +1,11 @@
-ifdef HAVE_GLADE
-glade_DATA = gdaui-catalog.xml
-gladedir = 
-endif
\ No newline at end of file
+glade_catalog_DATA = gdaui-catalog.xml
+glade_catalogdir = $(GLADE_CATALOG)
+
+glade_pixmap_DATA = \
+       widget-gdaui-gdauigrid.png
+
+glade_pixmapdir = $(GLADE_PIXMAP)
+
+EXTRA_DIST = \
+       $(glade_catalog_DATA) \
+       $(glade_pixmap_DATA)
diff --git a/libgda-ui/glade/gdaui-catalog.xml b/libgda-ui/glade/gdaui-catalog.xml
index 3fb9ee5..3429854 100644
--- a/libgda-ui/glade/gdaui-catalog.xml
+++ b/libgda-ui/glade/gdaui-catalog.xml
@@ -1,9 +1,9 @@
-<glade-catalog name="Gdaui" library="libgdaui-5.0" depends="gtk+">
+<glade-catalog name="gdaui" library="libgda-ui-5.0.so" depends="gtk+">
   <init-function>gdaui_init</init-function>
   <glade-widget-classes>
-    <glade-widget-class name="GdauiGrid" generic-name="grid" title="Grid"/>
+    <glade-widget-class name="GdauiGrid" generic-name="gdauigrid" title="Grid"/>
   </glade-widget-classes>
   <glade-widget-group name="Gdaui" title="GNOME Data Access Widgets">
     <glade-widget-class-ref name="GdauiGrid"/>
   </glade-widget-group>
-</glade-catalog>
\ No newline at end of file
+</glade-catalog>
diff --git a/libgda-ui/glade/widget-gdaui-gdauigrid.png b/libgda-ui/glade/widget-gdaui-gdauigrid.png
new file mode 100644
index 0000000..4edc744
Binary files /dev/null and b/libgda-ui/glade/widget-gdaui-gdauigrid.png differ