From a20c11e817c55d30ac7dcaf904aece3abf4ae3ff Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Fri, 1 Sep 2017 16:15:58 +0200 Subject: [PATCH] Rimossa la dipendenza da libgda-ui. --- configure.ac | 1 - libterritorio.pc.in | 2 +- po/Makefile.in.in | 2 +- src/importaviecivilia.c | 13 +++---------- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index f5df983..a9fc350 100644 --- 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 c8837cd..cd742a3 100644 --- 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 e6c32cb..027f656 100644 --- 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 a442602..efab1cc 100644 --- a/src/importaviecivilia.c +++ b/src/importaviecivilia.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2016 Andrea Zagli + * Copyright (C) 2011-2017 Andrea Zagli * * 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 #include #include @@ -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) { -- 2.49.0