Rimossa la dipendenza da libgda-ui.

diff --git a/configure.ac b/configure.ac
index f5df98335868016dabd749caec27f0ef1b9b06d4..a9fc35016bc23b03bed165872b978c02e1dbc01c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ AM_GLIB_GNU_GETTEXT
 
 # Checks for libraries.
 PKG_CHECK_MODULES(TERRITORIO, [gio-2.0 >= 2.36
-                               libgda-ui-5.0 >= 5.0.0
                                libgdaex >= 0.5.0
                                libgdaexgrid
                                libzakconfi >= 0.10.0

diff --git a/libterritorio.pc.in b/libterritorio.pc.in
index c8837cd7e95297102e9e02afd9f2aaa93d0927ce..cd742a34a4f4dd976dfd4d3555025d885bb89458 100644 (file)
--- a/libterritorio.pc.in
+++ b/libterritorio.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@
 Description: Libreria con l'interfaccia per la gestione del territorio.
 Version: @PACKAGE_VERSION@
-Requires: libgdaex >= 0.5.0 libgtkform >= 0.5.0 libgtkformui >= 0.5.0 libzakauthe >= 0.2.0 libzakautho >= 0.0.5 libsolipa >= 0.5.0 libgda-ui-5.0 >= 5.0.0 libzakconfi >= 0.10.0
+Requires: libgdaex >= 0.5.0 libgtkform >= 0.5.0 libgtkformui >= 0.5.0 libzakauthe >= 0.2.0 libzakautho >= 0.0.5 libsolipa >= 0.5.0 libzakconfi >= 0.10.0
 Libs: -L${libdir} -lterritorio
 Cflags: -I${includedir}

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index e6c32cba781cc38f8b19155f2858c70342367a56..027f656e89ca287ae338635c67544b94f9d178f8 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -93,7 +93,7 @@ all-yes: $(CATALOGS)
 all-no:
 
 $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-       $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) \
+       $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --from-code=UTF-8 \
          --msgid-bugs-address='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general' \
          --add-comments --keyword=_ --keyword=N_ \
          --keyword=C_:1c,2 \

diff --git a/src/importaviecivilia.c b/src/importaviecivilia.c
index a442602f307dca3db0c1c598707c5667e3714158..efab1ccec8c6646106697025c7da4ead0d07899c 100644 (file)
--- a/src/importaviecivilia.c
+++ b/src/importaviecivilia.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2016 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2017 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,6 @@
  *
  */
 
-#include <libgda-ui/libgda-ui.h>
 #include <libzakutils/libzakutils.h>
 #include <libsolipa/libsolipa.h>
 
@@ -91,8 +90,6 @@ TerritorioImportaVieCivilia
 
        GdaDataModel *dm_territorio;
 
-       const GdaDsnInfo *dsn;
-
        GString *tmp;
 
        guint id_vie;
@@ -104,8 +101,6 @@ TerritorioImportaVieCivilia
 
        TerritorioImportaVieCiviliaPrivate *priv = TERRITORIO_IMPORTA_VIECIVILIA_GET_PRIVATE (a);
 
-       gdaui_init ();
-
        priv->commons = commons;
 
        w_main = GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main"));
@@ -119,15 +114,13 @@ TerritorioImportaVieCivilia
 
        carea = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-       connection = gdaui_login_new (NULL);
-       gdaui_login_set_mode (GDAUI_LOGIN (connection), GDA_UI_LOGIN_HIDE_DSN_SELECTION_MODE);
+       connection = gtk_entry_new ();
        gtk_container_add (GTK_CONTAINER (carea), connection);
        gtk_widget_show (connection);
 
        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
                {
-                       dsn = gdaui_login_get_connection_information (GDAUI_LOGIN (connection));
-                       gdaex = gdaex_new_from_string (g_strdup_printf ("%s://%s;%s", dsn->provider, dsn->cnc_string, dsn->auth_string));
+                       gdaex = gdaex_new_from_string (gtk_entry_get_text (GTK_ENTRY (connection)));
                        gtk_widget_destroy (dialog);
                        if (gdaex == NULL)
                                {