From: Andrea Zagli <a.zagli@comune.scandicci.fi.it>
Date: Wed, 8 Jun 2011 09:22:09 +0000 (+0200)
Subject: Migrato a libgdaex 0.3.0.
X-Git-Tag: gtk3~26
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=80e440e286ba6cb2ac62ccfd32ac2788f9fadb0c;p=solipa%2Fterritorio

Migrato a libgdaex 0.3.0.

Aggiunta la compilazione silenziosa.
---

diff --git a/.project b/.project
index bb569c3..f295a15 100644
--- a/.project
+++ b/.project
@@ -70,7 +70,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1288854571030</id>
+			<id>1307524070148</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
@@ -79,7 +79,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1288854571040</id>
+			<id>1307524070162</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
@@ -88,7 +88,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1288854571050</id>
+			<id>1307524070176</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
@@ -96,5 +96,41 @@
 				<arguments>1.0-name-matches-false-false-Makefile</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1307524070191</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-Makefile.in</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1307524070205</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.exe</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1307524070222</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.la</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1307524070237</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.lo</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>
diff --git a/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/.settings/org.eclipse.cdt.managedbuilder.core.prefs
new file mode 100644
index 0000000..f33fc7b
--- /dev/null
+++ b/.settings/org.eclipse.cdt.managedbuilder.core.prefs
@@ -0,0 +1,14 @@
+#Thu Oct 21 08:11:42 CEST 2010
+eclipse.preferences.version=1
+environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/CPATH/delimiter=;
+environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/CPATH/operation=remove
+environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/CPLUS_INCLUDE_PATH/delimiter=;
+environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/CPLUS_INCLUDE_PATH/operation=remove
+environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/C_INCLUDE_PATH/delimiter=;
+environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/C_INCLUDE_PATH/operation=remove
+environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/append=true
+environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/appendContributed=true
+environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/LIBRARY_PATH/delimiter=;
+environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/LIBRARY_PATH/operation=remove
+environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/append=true
+environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.mingw.base.439600550/appendContributed=true
diff --git a/configure.ac b/configure.ac
index 821bf5f..73bf331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,10 @@ AC_INIT([territorio], [0.0.1], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(-Wall)
+
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 AM_MAINTAINER_MODE
 
 AC_CANONICAL_SYSTEM
@@ -23,6 +26,7 @@ AC_PROG_RANLIB
 # Checks for libraries.
 PKG_CHECK_MODULES(TERRITORIO, [gio-2.0 >= 2.20
                           gtk+-2.0 >= 2.16
+                          libgdaex >= 0.3.0
                           libgtkform >= 0.1.3
                           libaute >= 0.0.2
                           libautoz >= 0.0.1])
diff --git a/src/aggregazioneterritoriale.h b/src/aggregazioneterritoriale.h
index 46a6a0f..2809c37 100644
--- a/src/aggregazioneterritoriale.h
+++ b/src/aggregazioneterritoriale.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/aggregazioniterritoriali.h b/src/aggregazioniterritoriali.h
index 079ea6a..61fa836 100644
--- a/src/aggregazioniterritoriali.h
+++ b/src/aggregazioniterritoriali.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/commons.h b/src/commons.h
index f48abb4..18b0031 100644
--- a/src/commons.h
+++ b/src/commons.h
@@ -25,7 +25,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libgdaex.h>
+#include <libgdaex/libgdaex.h>
 #include <libautoz/autoz.h>
 #include <libautoz/role_interface.h>
 
diff --git a/src/comune.h b/src/comune.h
index 1150489..df8fd27 100644
--- a/src/comune.h
+++ b/src/comune.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/comuni.h b/src/comuni.h
index 01db750..c86eeb4 100644
--- a/src/comuni.h
+++ b/src/comuni.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/importacapcomuniitaliani.h b/src/importacapcomuniitaliani.h
index b3f56ee..2488a88 100644
--- a/src/importacapcomuniitaliani.h
+++ b/src/importacapcomuniitaliani.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/importacomuniistat.h b/src/importacomuniistat.h
index c3a9da6..11d1d08 100644
--- a/src/importacomuniistat.h
+++ b/src/importacomuniistat.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/importaregioniprovinceistat.h b/src/importaregioniprovinceistat.h
index b5079cc..6d55c36 100644
--- a/src/importaregioniprovinceistat.h
+++ b/src/importaregioniprovinceistat.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/main.c b/src/main.c
index 67bf146..c26806a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Andrea Zagli <a.zagli@comune.scandicci.fi.it>
+ * Copyright (C) 2010-2011 Andrea Zagli <a.zagli@comune.scandicci.fi.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libgdaex.h>
+#include <libgdaex/libgdaex.h>
 #include <libaute.h>
 #include <libautoz/autoz.h>
 
@@ -285,7 +285,8 @@ main (int argc, char *argv[])
 	cnc_string = g_key_file_get_value (config, "AUTOZ", "cnc_string", &error);
 	if (cnc_string == NULL)
 		{
-			g_warning ("Impossibile leggere la stringa di connessione per libautoz dal file di configurazione: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio");
+			g_warning ("Impossibile leggere la stringa di connessione per libautoz dal file di configurazione: %s.",
+			           error != NULL && error->message != NULL ? error->message : "nessun dettaglio");
 			return 0;
 		}
 
@@ -293,7 +294,8 @@ main (int argc, char *argv[])
 	gdacon = gda_connection_open_from_string (NULL, cnc_string, NULL, 0, &error);
 	if (gdacon == NULL)
 		{
-			g_warning ("Impossibile creare la connessione al db per libautoz: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio");
+			g_warning ("Impossibile creare la connessione al db per libautoz: %s.",
+			           error != NULL && error->message != NULL ? error->message : "nessun dettaglio");
 			return 0;
 		}
 
@@ -328,10 +330,6 @@ main (int argc, char *argv[])
 	    && (g_ascii_strcasecmp (p + 1, "src") == 0
 	        || g_ascii_strcasecmp (p + 1, ".libs") == 0))
 		{
-			/*
-			*p = '\0';
-			commons->guidir = g_build_filename (moddir, "data", PACKAGE, "gui", NULL);
-			commons->formdir = g_build_filename (moddir, "data", PACKAGE, "form", NULL);*/
 			commons->guidir = g_strdup (GUIDIR);
 			commons->formdir = g_strdup (FORMDIR);
 		}
@@ -355,14 +353,8 @@ main (int argc, char *argv[])
 	cnc_string = g_key_file_get_value (config, "DB", "cnc_string", &error);
 	if (cnc_string == NULL)
 		{
-			if (error != NULL)
-				{
-					g_error ("Impossibile leggere la stringa di connessione dal file di configurazione: %s", error->message);
-				}
-			else
-				{
-					g_error ("Impossibile leggere la stringa di connessione dal file di configurazione.");
-				}
+			g_error ("Impossibile leggere la stringa di connessione dal file di configurazione: %s.",
+			         error != NULL && error->message != NULL ? error->message : "nessun dettaglio");
 		}
 
 	commons->gdaex = gdaex_new_from_string (cnc_string);
diff --git a/src/province.h b/src/province.h
index 674c35e..3b9ad60 100644
--- a/src/province.h
+++ b/src/province.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/provincia.h b/src/provincia.h
index 916eab5..ee21fe2 100644
--- a/src/provincia.h
+++ b/src/provincia.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/regione.h b/src/regione.h
index 7f53934..b2e558b 100644
--- a/src/regione.h
+++ b/src/regione.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/regioni.h b/src/regioni.h
index 9fd9843..f542e0c 100644
--- a/src/regioni.h
+++ b/src/regioni.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/ricercacomuni.h b/src/ricercacomuni.h
index 484078b..f722ed3 100644
--- a/src/ricercacomuni.h
+++ b/src/ricercacomuni.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/ricercaprovince.h b/src/ricercaprovince.h
index a2d0689..3a0f2e4 100644
--- a/src/ricercaprovince.h
+++ b/src/ricercaprovince.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/ricercavie.h b/src/ricercavie.h
index 5087615..20152ad 100644
--- a/src/ricercavie.h
+++ b/src/ricercavie.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/stati.h b/src/stati.h
index 32cea0a..3732040 100644
--- a/src/stati.h
+++ b/src/stati.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/stato.h b/src/stato.h
index 95dbd47..13d3ab0 100644
--- a/src/stato.h
+++ b/src/stato.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/tipiaggregazioneterritoriale.h b/src/tipiaggregazioneterritoriale.h
index d080097..5b4a2c4 100644
--- a/src/tipiaggregazioneterritoriale.h
+++ b/src/tipiaggregazioneterritoriale.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/tipoaggregazioneterritoriale.h b/src/tipoaggregazioneterritoriale.h
index 0d51f31..42b6fda 100644
--- a/src/tipoaggregazioneterritoriale.h
+++ b/src/tipoaggregazioneterritoriale.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/via.h b/src/via.h
index 33bfb4a..935bba2 100644
--- a/src/via.h
+++ b/src/via.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"
 
diff --git a/src/vie.h b/src/vie.h
index 8a39f2b..38b467a 100644
--- a/src/vie.h
+++ b/src/vie.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
-#include <libgdaex.h>
 
 #include "commons.h"