From: Andrea Zagli <azagli@libero.it>
Date: Sun, 23 Oct 2011 08:25:37 +0000 (+0200)
Subject: Merge 'master'.
X-Git-Tag: 0.5.0~24
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=d3bd20bae867991874aa8fb28ab78a6d70e3287f;p=libgdaex

Merge 'master'.
---

d3bd20bae867991874aa8fb28ab78a6d70e3287f
diff --cc .gitignore
index 219890f,34ed456..97f9e2f
--- a/.gitignore
+++ b/.gitignore
@@@ -33,6 -39,7 +39,7 @@@ po/libgdaex.po
  *.bak
  libgdaex*tar*
  tests/test_prefix*
 +tests/query_editor
  tests/grid
 -tests/grid.exe
 +tests/*.exe
+ tests/select
 -tests/select.exe
diff --cc configure.ac
index 0d53505,6f13e15..ea19e72
--- a/configure.ac
+++ b/configure.ac
@@@ -25,9 -25,18 +25,19 @@@ AC_PROG_INSTAL
  AC_PROG_LN_S
  AC_PROG_MAKE_SET
  AC_PROG_LIBTOOL
 +AC_PROG_RANLIB
  
  GTK_DOC_CHECK(1.0)
+ IT_PROG_INTLTOOL
+ 
+ dnl ******************************
+ dnl Translations
+ dnl ******************************
+ GETTEXT_PACKAGE=libgdaex
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+                    [The prefix for our gettext translation domains.])
+ AM_GLIB_GNU_GETTEXT
  
  # Checks for libraries.
  PKG_CHECK_MODULES(GDAEX, [libgda-4.0 >= 4
diff --cc src/Makefile.am
index 55c1b66,2f23eaf..bc65d20
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,8 -1,6 +1,9 @@@
 +guidir = $(datadir)/$(PACKAGE)/gui
 +
  AM_CPPFLAGS = -I$(top_srcdir) \
                $(GDAEX_CFLAGS) \
 +              -DGUIDIR=\""$(guidir)"\" \
+               -DLOCALEDIR=\"$(localedir)\" \
                -DG_LOG_DOMAIN=\"GdaEx\"
  
  LIBS = $(GDAEX_LIBS)
diff --cc src/gdaex.c
index e03ece5,aaa931d..40a5844
--- a/src/gdaex.c
+++ b/src/gdaex.c
@@@ -137,7 -138,9 +142,10 @@@ static GdaE
  
  	GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
  
+ 	setlocale (LC_ALL, "");
+ 	gda_locale_changed ();
+ 
 +	/* gui */
  #ifdef G_OS_WIN32
  
  	gchar *moddir;
@@@ -150,23 -153,28 +158,35 @@@
  	    && (g_ascii_strcasecmp (p + 1, "src") == 0
  	        || g_ascii_strcasecmp (p + 1, ".libs") == 0))
  		{
 +			priv->guidir = g_strdup (GUIDIR);
+ 			localedir = g_strdup (LOCALEDIR);
  		}
  	else
  		{
 +			priv->guidir = g_build_filename (moddir, "share", PACKAGE, "gui", NULL);
+ 			localedir = g_build_filename (moddir, "share", "locale", NULL);
  		}
  
+ 	g_free (moddir);
+ 	g_free (p);
+ 
  #else
  
 +	priv->guidir = g_strdup (GUIDIR);
+ 	localedir = g_strdup (LOCALEDIR);
  
  #endif
  
 +	priv->guifile = g_build_filename (priv->guidir, "libgdaex.ui", NULL);
- 
 +	priv->gtkbuilder = gtk_builder_new ();
 +
++
+ 	bindtextdomain (GETTEXT_PACKAGE, localedir);
+ 	textdomain (GETTEXT_PACKAGE);
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 
+ 	g_free (localedir);
+ 
  	return gdaex;
  }
  
diff --cc tests/Makefile.am
index 1176785,8d70a92..325b705
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -5,9 -5,9 +5,10 @@@ AM_CPPFLAGS = $(GDAEX_CFLAGS) 
                -I$(top_srcdir)/src \
                -DTESTSDIR="\"@abs_builddir@\""
  
- noinst_PROGRAMS = test_prefix \
+ noinst_PROGRAMS = grid \
 +                  query_editor \
-                   grid
+                   select \
+                   test_prefix
  
  LDADD = $(top_builddir)/src/libgdaex.la