From: Andrea Zagli <azagli@libero.it>
Date: Fri, 12 Feb 2010 11:56:04 +0000 (+0100)
Subject: Inizio migrazione a libgdaex e senza la dipendenza di libconfi.
X-Git-Tag: 0.0.2~4
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=79554857722e7302f8a6074792079cd97fe1214d;p=zakauthe%2Fplugins%2Fdb
Inizio migrazione a libgdaex e senza la dipendenza di libconfi.
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..08f49ef
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+COPYING
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+version.xml
+gtk-doc.make
+install-sh
+libaute.pc
+libtool
+ltmain.sh
+missing
+.deps
+.libs
+*.lo
+*.o
+*.la
+*~
diff --git a/autogen.sh b/autogen.sh
index c8462f7..2b9d0ee 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,98 +1,23 @@
-#!/bin/sh
+#!/bin/bash
# Run this to generate all the initial makefiles, etc.
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=libautedb
-TEST_TYPE=-f
-FILE=configure.ac
+PKG_NAME="libaute-db"
-DIE=0
-
-have_libtool=false
-if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
- libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- case $libtool_version in
- 1.4*|1.5*)
- have_libtool=true
- ;;
- esac
-fi
-if $have_libtool ; then : ; else
- echo
- echo "You must have libtool 1.4 installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
- DIE=1
-fi
-
-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have gtk-doc installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
- DIE=1
+(test -f $srcdir/configure.ac \
+ && test -d $srcdir/src \
+ && test -f $srcdir/src/aute_db.c) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level libaute directory"
+ exit 1
}
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have autoconf installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
- DIE=1
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from GNOME and make"
+ echo "sure the gnome-autogen.sh script is in your \$PATH."
+ exit 1
}
-if automake --version < /dev/null > /dev/null 2>&1 ; then
- AUTOMAKE=automake
- ACLOCAL=aclocal
-else
- echo
- echo "You must have automake 1.7.x installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
- DIE=1
-fi
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-test $TEST_TYPE $FILE || {
- echo "You must run this script in the top-level $PROJECT directory"
- exit 1
-}
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
- if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
- fi
-fi
-
-rm -rf autom4te.cache
-
-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
-
-$ACLOCAL || exit $?
-
-libtoolize --force || exit $?
-gtkdocize || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
- $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-
- echo
- echo "Now type 'make' to compile $PROJECT."
-fi
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/config.h.in b/config.h.in
index 0e1824b..95d491c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -6,6 +6,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* libconfi is present */
+#undef HAVE_LIBCONFI
+
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
@@ -30,6 +33,10 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
@@ -45,6 +52,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff --git a/configure.ac b/configure.ac
index dddfc04..ef11dcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([libaute-db], [0.0.1], [azagli@libero.it])
+AC_INIT([libaute-db], [0.0.2], [azagli@libero.it])
AC_CONFIG_SRCDIR([src/aute_db.c])
AC_CONFIG_HEADER([config.h])
@@ -18,14 +18,19 @@ AC_PROG_CC
AC_PROG_LIBTOOL
# Checks for libraries.
-PKG_CHECK_MODULES(LIBAUTEDB, [gtk+-2.0 >= 2.8.0
- libglade-2.0 >= 2.6.0
- libgdaobj >= 0.0.2
- libaute >= 0.0.1])
+PKG_CHECK_MODULES(LIBAUTEDB, [gtk+-2.0 >= 2.16.0
+ libgdaex >= 0.1.0
+ libaute >= 0.0.2])
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)
+
+AM_CONDITIONAL(HAVE_LIBCONFI, test x"$have_libconfi" = "xyes")
+AC_SUBST(LIBCONFI_CFLAGS)
+AC_SUBST(LIBCONFI_LIBS)
+
AM_PATH_LIBGCRYPT(1.2.1, :, [AC_MSG_ERROR([libgcrypt >= 1.2.1 not found.])])
AC_SUBST(LIBGCRYPT_CFLAGS)
diff --git a/data/libautedb/glade/autedb.glade b/data/libautedb/glade/autedb.glade
index 1eb9497..382a861 100644
--- a/data/libautedb/glade/autedb.glade
+++ b/data/libautedb/glade/autedb.glade
@@ -1,336 +1,207 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="diag_main">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Autenticazione</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">True</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="cancelbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="okbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkTable" id="table1">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">3</property>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Utente</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Password</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="txt_utente">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="txt_password">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">False</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkExpander" id="exp_cambio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkTable" id="table2">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">3</property>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Nuova</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Conferma</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="txt_password_nuova">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">False</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="txt_password_conferma">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">False</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Cambia password</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
+<?xml version="1.0"?>
+<interface>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy project-wide -->
+ <object class="GtkDialog" id="diag_main">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Autenticazione</property>
+ <property name="modal">True</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">3</property>
+ <property name="row_spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Utente</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Password</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="txt_utente">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="txt_password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="exp_cambio">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">3</property>
+ <property name="row_spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Nuova</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Conferma</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="txt_password_nuova">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="txt_password_conferma">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Cambia password</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton1">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton1">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancelbutton1</action-widget>
+ <action-widget response="-5">okbutton1</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/src/Makefile.am b/src/Makefile.am
index ea52079..e887b68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,10 +2,12 @@ gladedir = $(datadir)/libaute-db/glade
AM_CPPFLAGS = $(LIBAUTEDB_CFLAGS) \
$(LIBGCRYPT_CFLAGS) \
+ $(LIBCONFI_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\"
LIBS = $(LIBAUTEDB_LIBS) \
- $(LIBGCRYPT_LIBS)
+ $(LIBGCRYPT_LIBS) \
+ $(LIBCONFI_LIBS)
libaute_pluginsdir = $(libdir)/libaute/plugins
libaute_plugins_LTLIBRARIES = libaute-db.la
diff --git a/src/aute_db.c b/src/aute_db.c
index 811b9f6..31e0f68 100644
--- a/src/aute_db.c
+++ b/src/aute_db.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2006 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2005-2010 Andrea Zagli <azagli@libero.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
@@ -17,28 +17,29 @@
*/
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <gcrypt.h>
-#include <libconfi.h>
-#include <libgdaobj.h>
+#include <libgdaex.h>
-static GtkWidget *txt_utente,
- *txt_password,
- *exp_cambio,
- *txt_password_nuova,
- *txt_password_conferma;
+#ifdef HAVE_LIBCONFI
+ #include <libconfi.h>
+#endif
+
+static GtkWidget *txt_utente;
+static GtkWidget *txt_password;
+static GtkWidget *exp_cambio;
+static GtkWidget *txt_password_nuova;
+static GtkWidget *txt_password_conferma;
/* PRIVATE */
+#ifdef HAVE_LIBCONFI
static gboolean
-get_connection_parameters (Confi *confi, gchar **provider_id, gchar **cnc_string)
+get_connection_parameters_from_confi (Confi *confi, gchar **cnc_string)
{
gboolean ret = TRUE;
- *provider_id = confi_path_get_value (confi, "aute/aute-db/db/provider_id");
*cnc_string = confi_path_get_value (confi, "aute/aute-db/db/cnc_string");
- if (*provider_id == NULL || *cnc_string == NULL
- || strcmp (g_strstrip (*provider_id), "") == 0
+ if (*cnc_string == NULL
|| strcmp (g_strstrip (*cnc_string), "") == 0)
{
ret = FALSE;
@@ -46,6 +47,7 @@ get_connection_parameters (Confi *confi, gchar **provider_id, gchar **cnc_string
return ret;
}
+#endif
/**
* cifra_password:
@@ -74,41 +76,72 @@ static gchar
}
static gchar
-*controllo (Confi *confi)
+*controllo (GSList *parameters)
{
gchar *sql;
gchar *utente = "";
gchar *password;
gchar *password_nuova;
- gchar *provider_id;
gchar *cnc_string;
- GdaO *gdao;
+ GdaEx *gdaex;
GdaDataModel *dm;
utente = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_utente))));
password = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_password))));
+ cnc_string = NULL;
+
+#ifdef HAVE_LIBCONFI
+ /* the first and only parameters must be a Confi object */
/* leggo i parametri di connessione dalla configurazione */
- if (!get_connection_parameters (confi, &provider_id, &cnc_string)) return NULL;
+ if (IS_CONFI (parameters->data))
+ {
+ if (!get_connection_parameters_from_confi (CONFI (parameters->data), &cnc_string))
+ {
+ cnc_string = NULL;
+ }
+ }
+#endif
- /* creo un oggetto GdaO */
- gdao = gdao_new_from_string (NULL, provider_id, cnc_string);
- if (gdao == NULL) return NULL;
+ if (cnc_string == NULL)
+ {
+ GSList *param;
+
+ param = g_slist_next (parameters);
+ if (param != NULL && param->data != NULL)
+ {
+ cnc_string = g_strdup ((gchar *)param->data);
+ cnc_string = g_strstrip (cnc_string);
+ if (g_strcmp0 (cnc_string, "") == 0)
+ {
+ cnc_string = NULL;
+ }
+ }
+ }
+
+ if (cnc_string == NULL)
+ {
+ return NULL;
+ }
+
+ /* creo un oggetto GdaEx */
+ gdaex = gdaex_new_from_string (cnc_string);
+ if (gdaex == NULL) return NULL;
sql = g_strdup_printf ("SELECT codice FROM utenti "
"WHERE codice = '%s' AND "
"password = '%s' AND "
"status <> 'E'",
- gdao_strescape (utente, NULL),
- gdao_strescape (cifra_password (password), NULL));
- dm = gdao_query (gdao, sql);
+ gdaex_strescape (utente, NULL),
+ gdaex_strescape (cifra_password (password), NULL));
+ dm = gdaex_query (gdaex, sql);
if (dm == NULL || gda_data_model_get_n_rows (dm) <= 0)
{
g_warning ("Utente o password non validi.");
return NULL;
}
- utente = g_strstrip (g_strdup (gdao_data_model_get_field_value_stringify_at (dm, 0, "codice")));
+ utente = g_strstrip (g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, 0, "codice")));
if (strcmp (utente, "") != 0
&& gtk_expander_get_expanded (GTK_EXPANDER (exp_cambio)))
@@ -130,9 +163,9 @@ static gchar
sql = g_strdup_printf ("UPDATE utenti "
"SET password = '%s' "
"WHERE codice = '%s'",
- gdao_strescape (cifra_password (password_nuova), NULL),
- gdao_strescape (utente, NULL));
- if (gdao_execute (gdao, sql) == -1)
+ gdaex_strescape (cifra_password (password_nuova), NULL),
+ gdaex_strescape (utente, NULL));
+ if (gdaex_execute (gdao, sql) == -1)
{
/* TO DO */
g_warning ("Errore durante la modifica della password.");
@@ -146,18 +179,26 @@ static gchar
/* PUBLIC */
gchar
-*autentica (Confi *confi)
+*autentica (GSList *parameters)
{
+ GError *error;
gchar *ret = NULL;
- GladeXML *gla_main = glade_xml_new (GLADEDIR "/autedb.glade", NULL, NULL);
- GtkWidget *diag = glade_xml_get_widget (gla_main, "diag_main");
+ error = NULL;
+
+ GtkBuilder *gtkbuilder = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (gtkbuilder, GLADEDIR "/autedb.glade", &error))
+ {
+ return NULL;
+ }
+
+ GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "diag_main"));
- txt_utente = glade_xml_get_widget (gla_main, "txt_utente");
- txt_password = glade_xml_get_widget (gla_main, "txt_password");
- exp_cambio = glade_xml_get_widget (gla_main, "exp_cambio");
- txt_password_nuova = glade_xml_get_widget (gla_main, "txt_password_nuova");
- txt_password_conferma = glade_xml_get_widget (gla_main, "txt_password_conferma");
+ txt_utente = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txt_utente"));
+ txt_password = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txt_password"));
+ exp_cambio = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "exp_cambio"));
+ txt_password_nuova = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txt_password_nuova"));
+ txt_password_conferma = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txt_password_conferma"));
/* imposto di default l'utente corrente della sessione */
gtk_entry_set_text (GTK_ENTRY (txt_utente), g_get_user_name ());
@@ -167,7 +208,7 @@ gchar
{
case GTK_RESPONSE_OK:
/* controllo dell'utente e della password */
- ret = controllo (confi);
+ ret = controllo (parameters);
break;
case GTK_RESPONSE_CANCEL:
@@ -179,34 +220,27 @@ gchar
}
gtk_widget_destroy (diag);
- g_object_unref (gla_main);
+ g_object_unref (gtkbuilder);
return ret;
}
/**
* crea_utente:
- * @confi:
+ * @parameters:
* @codice:
* @password:
*/
gboolean
-crea_utente (Confi *confi, const gchar *codice, const gchar *password)
+crea_utente (GSList *parameters, const gchar *codice, const gchar *password)
{
gchar *codice_;
gchar *password_;
- gchar *provider_id;
gchar *cnc_string;
gchar *sql;
- GdaO *gdao;
+ GdaEx *gdaex;
GdaDataModel *dm;
- if (!IS_CONFI (confi))
- {
- g_warning ("confi non è un oggetto Confi valido.");
- return FALSE;
- }
-
if (codice == FALSE || password == NULL)
{
g_warning ("codice o password nulli.");
@@ -222,58 +256,83 @@ crea_utente (Confi *confi, const gchar *codice, const gchar *password)
return FALSE;
}
+ cnc_string = NULL;
+
+#ifdef HAVE_LIBCONFI
+ /* the first and only parameters must be a Confi object */
/* leggo i parametri di connessione dalla configurazione */
- if (!get_connection_parameters (confi, &provider_id, &cnc_string)) return FALSE;
+ if (IS_CONFI (parameters->data))
+ {
+ if (!get_connection_parameters_from_confi (CONFI (parameters->data), &cnc_string))
+ {
+ cnc_string = NULL;
+ }
+ }
+#endif
+
+ if (cnc_string == NULL)
+ {
+ GSList *param;
+
+ param = g_slist_next (parameters);
+ if (param != NULL && param->data != NULL)
+ {
+ cnc_string = g_strdup ((gchar *)param->data);
+ cnc_string = g_strstrip (cnc_string);
+ if (g_strcmp0 (cnc_string, "") == 0)
+ {
+ cnc_string = NULL;
+ }
+ }
+ }
+
+ if (cnc_string == NULL)
+ {
+ return FALSE;
+ }
/* creo un oggetto GdaO */
- gdao = gdao_new_from_string (NULL, provider_id, cnc_string);
- if (gdao == NULL) return FALSE;
+ gdaex = gdaex_new_from_string (cnc_string);
+ if (gdaex == NULL) return FALSE;
/* controllo se esiste gia' */
- sql = g_strdup_printf ("SELECT codice FROM utenti WHERE codice = '%s'",
- gdao_strescape (codice_, NULL));
- dm = gdao_query (gdao, sql);
+ sql = g_strdup_printf ("SELECT codice FROM utenti WHERE codice = '%s'",
+ gdaex_strescape (codice_, NULL));
+ dm = gdaex_query (gdaex, sql);
if (dm != NULL && gda_data_model_get_n_rows (dm) > 0)
{
/* aggiorno l'utente */
sql = g_strdup_printf ("UPDATE utenti SET password = '%s' WHERE codice = '%s'",
- gdao_strescape (cifra_password (password_), NULL),
- gdao_strescape (codice_, NULL));
+ gdaex_strescape (cifra_password (password_), NULL),
+ gdaex_strescape (codice_, NULL));
}
else
{
/* creo l'utente */
sql = g_strdup_printf ("INSERT INTO utenti VALUES ('%s', '%s', '')",
- gdao_strescape (codice_, NULL),
- gdao_strescape (cifra_password (password_), NULL));
+ gdaex_strescape (codice_, NULL),
+ gdaex_strescape (cifra_password (password_), NULL));
}
- return (gdao_execute (gdao, sql) >= 0);
+ return (gdaex_execute (gdaex, sql) >= 0);
}
/**
* modifice_utente:
- * @confi:
+ * @parameters:
* @codice:
* @password:
*/
gboolean
-modifica_utente (Confi *confi, const gchar *codice, const gchar *password)
+modifica_utente (GSList *parameters, const gchar *codice, const gchar *password)
{
gchar *codice_;
gchar *password_;
- gchar *provider_id;
gchar *cnc_string;
gchar *sql;
- GdaO *gdao;
+ GdaEx *gdaex;
GdaDataModel *dm;
- if (!IS_CONFI (confi))
- {
- g_warning ("confi non è un oggetto Confi valido.");
- return FALSE;
- }
-
if (codice == FALSE || password == NULL)
{
g_warning ("codice o password nulli.");
@@ -289,54 +348,77 @@ modifica_utente (Confi *confi, const gchar *codice, const gchar *password)
return FALSE;
}
+#ifdef HAVE_LIBCONFI
+ /* the first and only parameters must be a Confi object */
/* leggo i parametri di connessione dalla configurazione */
- if (!get_connection_parameters (confi, &provider_id, &cnc_string)) return FALSE;
+ if (IS_CONFI (parameters->data))
+ {
+ if (!get_connection_parameters_from_confi (CONFI (parameters->data), &cnc_string))
+ {
+ cnc_string = NULL;
+ }
+ }
+#endif
- /* creo un oggetto GdaO */
- gdao = gdao_new_from_string (NULL, provider_id, cnc_string);
- if (gdao == NULL) return FALSE;
+ if (cnc_string == NULL)
+ {
+ GSList *param;
+
+ param = g_slist_next (parameters);
+ if (param != NULL && param->data != NULL)
+ {
+ cnc_string = g_strdup ((gchar *)param->data);
+ cnc_string = g_strstrip (cnc_string);
+ if (g_strcmp0 (cnc_string, "") == 0)
+ {
+ cnc_string = NULL;
+ }
+ }
+ }
+
+ if (cnc_string == NULL)
+ {
+ return FALSE;
+ }
+
+ /* creo un oggetto GdaEx */
+ gdaex = gdaex_new_from_string (cnc_string);
+ if (gdaex == NULL) return FALSE;
/* controllo se non esiste */
- sql = g_strdup_printf ("SELECT codice FROM utenti WHERE codice = '%s'",
- gdao_strescape (codice_, NULL));
- dm = gdao_query (gdao, sql);
+ sql = g_strdup_printf ("SELECT codice FROM utenti WHERE codice = '%s'",
+ gdaex_strescape (codice_, NULL));
+ dm = gdaex_query (gdaex, sql);
if (dm == NULL || gda_data_model_get_n_rows (dm) <= 0)
{
/* creo l'utente */
sql = g_strdup_printf ("INSERT INTO utenti VALUES ('%s', '%s', '')",
- gdao_strescape (codice_, NULL),
- gdao_strescape (cifra_password (password_), NULL));
+ gdaex_strescape (codice_, NULL),
+ gdaex_strescape (cifra_password (password_), NULL));
}
else
{
/* aggiorno l'utente */
sql = g_strdup_printf ("UPDATE utenti SET password = '%s' WHERE codice = '%s'",
- gdao_strescape (cifra_password (password_), NULL),
- gdao_strescape (codice_, NULL));
+ gdaex_strescape (cifra_password (password_), NULL),
+ gdaex_strescape (codice_, NULL));
}
- return (gdao_execute (gdao, sql) >= 0);
+ return (gdaex_execute (gdaex, sql) >= 0);
}
/**
* elimina_utente:
- * @confi:
+ * @parameters:
* @codice:
*/
gboolean
-elimina_utente (Confi *confi, const gchar *codice)
+elimina_utente (GSList *parameters, const gchar *codice)
{
gchar *codice_;
- gchar *provider_id;
gchar *cnc_string;
gchar *sql;
- GdaO *gdao;
-
- if (!IS_CONFI (confi))
- {
- g_warning ("confi non è un oggetto Confi valido.");
- return FALSE;
- }
+ GdaEx *gdaex;
if (codice == FALSE)
{
@@ -352,16 +434,46 @@ elimina_utente (Confi *confi, const gchar *codice)
return FALSE;
}
+#ifdef HAVE_LIBCONFI
+ /* the first and only parameters must be a Confi object */
/* leggo i parametri di connessione dalla configurazione */
- if (!get_connection_parameters (confi, &provider_id, &cnc_string)) return FALSE;
+ if (IS_CONFI (parameters->data))
+ {
+ if (!get_connection_parameters_from_confi (CONFI (parameters->data), &cnc_string))
+ {
+ cnc_string = NULL;
+ }
+ }
+#endif
- /* creo un oggetto GdaO */
- gdao = gdao_new_from_string (NULL, provider_id, cnc_string);
- if (gdao == NULL) return FALSE;
+ if (cnc_string == NULL)
+ {
+ GSList *param;
+
+ param = g_slist_next (parameters);
+ if (param != NULL && param->data != NULL)
+ {
+ cnc_string = g_strdup ((gchar *)param->data);
+ cnc_string = g_strstrip (cnc_string);
+ if (g_strcmp0 (cnc_string, "") == 0)
+ {
+ cnc_string = NULL;
+ }
+ }
+ }
+
+ if (cnc_string == NULL)
+ {
+ return FALSE;
+ }
+
+ /* creo un oggetto GdaEx */
+ gdaex = gdaex_new_from_string (cnc_string);
+ if (gdaex == NULL) return FALSE;
/* elimino _logicamente_ l'utente */
- sql = g_strdup_printf ("UPDATE utenti SET status = 'E' WHERE codice = '%s'",
- gdao_strescape (codice_, NULL));
+ sql = g_strdup_printf ("UPDATE utenti SET status = 'E' WHERE codice = '%s'",
+ gdaex_strescape (codice_, NULL));
- return (gdao_execute (gdao, sql) >= 0);
+ return (gdaex_execute (gdaex, sql) >= 0);
}