From: Andrea Zagli Date: Fri, 12 Feb 2010 14:57:46 +0000 (+0100) Subject: Correzioni varie. X-Git-Tag: 0.0.2~3 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=54496a074a4a2556e72ce80bf2ca98eeab24694c;p=zakauthe%2Fplugins%2Fdb Correzioni varie. Testata senza l'utlizzo di libconfi. --- diff --git a/.gitignore b/.gitignore index 08f49ef..48688c9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,7 @@ missing *.o *.la *~ +config.h +stamp-h1 +tests/test +tools/aute-db-mkpwd diff --git a/configure.ac b/configure.ac index ef11dcc..d53ff4f 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ PKG_CHECK_MODULES(LIBAUTEDB, [gtk+-2.0 >= 2.16.0 AC_SUBST(LIBAUTEDB_CFLAGS) AC_SUBST(LIBAUTEDB_LIBS) -PKG_CHECK_MODULES(LIBCONFI, [libconfi >= 0.0.2], AC_DEFINE(HAVE_LIBCONFI, [1], [libconfi is present]), have_libconfi=yes) +PKG_CHECK_MODULES(LIBCONFI, [libconfi >= 0.0.2], [AC_DEFINE(HAVE_LIBCONFI, [1], [libconfi is present]), have_libconfi=yes], have_libconfi=no) AM_CONDITIONAL(HAVE_LIBCONFI, test x"$have_libconfi" = "xyes") AC_SUBST(LIBCONFI_CFLAGS) diff --git a/data/Makefile.am b/data/Makefile.am index f327fab..cffdde5 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = libautedb +SUBDIRS = libaute-db EXTRA_DIST = autedb_confi_schema.xml \ autedb.sql diff --git a/data/libaute-db/Makefile.am b/data/libaute-db/Makefile.am new file mode 100644 index 0000000..21cc77b --- /dev/null +++ b/data/libaute-db/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = glade diff --git a/data/libaute-db/glade/Makefile.am b/data/libaute-db/glade/Makefile.am new file mode 100644 index 0000000..3c3e458 --- /dev/null +++ b/data/libaute-db/glade/Makefile.am @@ -0,0 +1,5 @@ +gladedir = $(datadir)/libaute-db/glade + +glade_DATA = autedb.glade + +EXTRA_DIST = $(glade_DATA) diff --git a/data/libaute-db/glade/autedb.glade b/data/libaute-db/glade/autedb.glade new file mode 100644 index 0000000..382a861 --- /dev/null +++ b/data/libaute-db/glade/autedb.glade @@ -0,0 +1,207 @@ + + + + + + True + Autenticazione + True + dialog + + + True + + + True + 5 + 3 + 2 + 3 + 3 + + + True + 0 + Utente + + + GTK_FILL + + + + + + True + 0 + Password + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + + + 1 + 2 + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + True + 5 + 2 + 2 + 3 + 3 + + + True + 0 + Nuova + + + GTK_FILL + + + + + + True + 0 + Conferma + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + True + + + 1 + 2 + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + + + True + _Cambia password + True + + + + + 2 + 2 + 3 + GTK_FILL + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + okbutton1 + + + diff --git a/data/libautedb/Makefile.am b/data/libautedb/Makefile.am deleted file mode 100644 index 21cc77b..0000000 --- a/data/libautedb/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = glade diff --git a/data/libautedb/glade/Makefile.am b/data/libautedb/glade/Makefile.am deleted file mode 100644 index 3c3e458..0000000 --- a/data/libautedb/glade/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -gladedir = $(datadir)/libaute-db/glade - -glade_DATA = autedb.glade - -EXTRA_DIST = $(glade_DATA) diff --git a/data/libautedb/glade/autedb.glade b/data/libautedb/glade/autedb.glade deleted file mode 100644 index 382a861..0000000 --- a/data/libautedb/glade/autedb.glade +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - True - Autenticazione - True - dialog - - - True - - - True - 5 - 3 - 2 - 3 - 3 - - - True - 0 - Utente - - - GTK_FILL - - - - - - True - 0 - Password - - - 1 - 2 - GTK_FILL - - - - - - True - True - True - - - 1 - 2 - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - True - 5 - 2 - 2 - 3 - 3 - - - True - 0 - Nuova - - - GTK_FILL - - - - - - True - 0 - Conferma - - - 1 - 2 - GTK_FILL - - - - - - True - True - False - True - - - 1 - 2 - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - - - True - _Cambia password - True - - - - - 2 - 2 - 3 - GTK_FILL - - - - - 2 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - cancelbutton1 - okbutton1 - - - diff --git a/src/aute_db.c b/src/aute_db.c index 31e0f68..85a38b5 100644 --- a/src/aute_db.c +++ b/src/aute_db.c @@ -165,7 +165,7 @@ static gchar "WHERE codice = '%s'", gdaex_strescape (cifra_password (password_nuova), NULL), gdaex_strescape (utente, NULL)); - if (gdaex_execute (gdao, sql) == -1) + if (gdaex_execute (gdaex, sql) == -1) { /* TO DO */ g_warning ("Errore durante la modifica della password."); diff --git a/tests/test.c b/tests/test.c index a2ec033..46d470d 100644 --- a/tests/test.c +++ b/tests/test.c @@ -1,5 +1,5 @@ /* - * Copyright (C)2005 Andrea Zagli + * Copyright (C) 2010 Andrea Zagli * * 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 @@ -23,9 +23,19 @@ int main (int argc, char **argv) { - gtk_init (&argc, &argv); + Aute *aute; + GSList *params; - g_fprintf (stderr, "Utente %s\n", aute_autentica (NULL)); + gtk_init (&argc, &argv); - return 0; + aute = aute_new (); + + params = g_slist_append (params, argv[1]); + params = g_slist_append (params, argv[2]); + + aute_set_config (aute, params); + + g_fprintf (stderr, "Utente %s\n", aute_autentica (aute)); + + return 0; }