Changed name.

diff --git a/.gitignore b/.gitignore
index 92fb8b94bf87f23687fb3d661f23f3329fe25007..7c42fa0e7de8bbadfc2939aed667d50f1cc6e4d2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ config.h
 stamp-h1
 tests/test
 tools/aute-db-mkpwd
+compile

diff --git a/autogen.sh b/autogen.sh
index a2f1aba27335883d817b427c9004846195be0690..076750640e9d9acc51227ba1cfd18ad93914b1c9 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,13 +4,13 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="libaute-ldap"
+PKG_NAME="libzakautheldap"
 
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/src \
   && test -f $srcdir/src/aute_ldap.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level libauteldap directory"
+    echo " top-level libzakautheldap directory"
     exit 1
 }
 

diff --git a/configure.ac b/configure.ac
index 2441086f96617a9f80f26bde2d7a315e3224965a..7126a6125c2c79ed1716a6f99e518d01ad3d5a22 100644 (file)
--- 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-ldap], [0.0.1], [azagli@libero.it])
+AC_INIT([libzakautheldap], [0.5.0], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/aute_ldap.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -18,11 +18,11 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 
 # Checks for libraries.
-PKG_CHECK_MODULES(LIBAUTELDAP, [gtk+-2.0 >= 2.16.0
-                              libaute >= 0.0.2])
+PKG_CHECK_MODULES(LIBZAKAUTHELDAP, [gtk+-3.0 >= 3.0.00
+                                    libzakauthe >= 0.5.0])
 
-AC_SUBST(LIBAUTELDAP_CFLAGS)
-AC_SUBST(LIBAUTELDAP_LIBS)
+AC_SUBST(LIBZAKAUTHELDAP_CFLAGS)
+AC_SUBST(LIBZAKAUTHELDAP_LIBS)
 
 with_ldap=no
 AC_CHECK_LIB([ldap], [ldap_initialize], with_ldap=yes)
@@ -32,11 +32,11 @@ then
        AC_SUBST(LIBLDAP_LIBS, [" -lldap"])
 fi
 
-PKG_CHECK_MODULES(LIBCONFI, [libconfi >= 0.0.2], [AC_DEFINE(HAVE_LIBCONFI, [1], [libconfi is present]), have_libconfi=yes], have_libconfi=no)
+PKG_CHECK_MODULES(LIBZAKCONFI, [libzakconfi >= 0.10.0], [AC_DEFINE(HAVE_LIBZAKCONFI, [1], [libzakconfi is present]), have_libzakconfi=yes], have_libzakconfi=no)
 
-AM_CONDITIONAL(HAVE_LIBCONFI, test x"$have_libconfi" = "xyes")
-AC_SUBST(LIBCONFI_CFLAGS)
-AC_SUBST(LIBCONFI_LIBS)
+AM_CONDITIONAL(HAVE_LIBZAKCONFI, test x"$have_libzakconfi" = "xyes")
+AC_SUBST(LIBZAKCONFI_CFLAGS)
+AC_SUBST(LIBZAKCONFI_LIBS)
 
 # Checks for header files.
 
@@ -50,7 +50,7 @@ AC_CONFIG_FILES([
   src/Makefile
   tests/Makefile
   data/Makefile
-  data/libauteldap/Makefile
-  data/libauteldap/gui/Makefile
+  data/libzakautheldap/Makefile
+  data/libzakautheldap/gui/Makefile
 ])
 AC_OUTPUT

diff --git a/data/Makefile.am b/data/Makefile.am
index f4a0be3bb44910c5fbecf693efcc1f42e8aa8f50..50c8b15bf71866a4b1554d9ecc2a4cda9ef8991a 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = libauteldap
+SUBDIRS = libzakautheldap
 
-EXTRA_DIST = auteldap_confi_schema.xml
+EXTRA_DIST = zakautheldap_confi_schema.xml

diff --git a/data/auteldap_confi_schema.xml b/data/auteldap_confi_schema.xml
deleted file mode 100644 (file)
index 0c1b4e4..0000000
--- a/data/auteldap_confi_schema.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" ?>
-<gconfi-key>
-       <name>aute-ldap</name>
-       <description>Plugin di libaute di autenticazione su ldap</description>
-
-       <gconfi-key>
-               <name>ldap</name>
-               <description>Parametri per la connessione al server ldap</description>
-
-               <gconfi-key>
-                       <name>host</name>
-                       <description>Host address</description>
-               </gconfi-key>
-               <gconfi-key>
-                       <name>base_dn</name>
-                       <description>Base DN</description>
-               </gconfi-key>
-               <gconfi-key>
-                       <name>user_field</name>
-                       <description>User name field</description>
-               </gconfi-key>
-       </gconfi-key>
-</gconfi-key>

diff --git a/data/libauteldap/Makefile.am b/data/libauteldap/Makefile.am
deleted file mode 100644 (file)
index 13c2b3d..0000000
--- a/data/libauteldap/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = gui

diff --git a/data/libauteldap/gui/Makefile.am b/data/libauteldap/gui/Makefile.am
deleted file mode 100644 (file)
index 3f0a988..0000000
--- a/data/libauteldap/gui/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-guidir = $(datadir)/libauteldap/gui
-
-gui_DATA = auteldap.gui
-
-EXTRA_DIST = $(gui_DATA)

diff --git a/data/libauteldap/gui/auteldap.gui b/data/libauteldap/gui/auteldap.gui
deleted file mode 100644 (file)
index d68387e..0000000
--- a/data/libauteldap/gui/auteldap.gui
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- 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>
-        <property name="orientation">vertical</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">5</property>
-            <property name="row_spacing">5</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">5</property>
-                    <property name="row_spacing">5</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/data/libzakautheldap/Makefile.am b/data/libzakautheldap/Makefile.am
new file mode 100644 (file)
index 0000000..13c2b3d
--- /dev/null
+++ b/data/libzakautheldap/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = gui

diff --git a/data/libzakautheldap/gui/Makefile.am b/data/libzakautheldap/gui/Makefile.am
new file mode 100644 (file)
index 0000000..1278c6a
--- /dev/null
+++ b/data/libzakautheldap/gui/Makefile.am
@@ -0,0 +1,5 @@
+guidir = $(datadir)/$(PACKAGE)/gui
+
+gui_DATA = zakautheldap.gui
+
+EXTRA_DIST = $(gui_DATA)

diff --git a/data/libzakautheldap/gui/zakautheldap.gui b/data/libzakautheldap/gui/zakautheldap.gui
new file mode 100644 (file)
index 0000000..d68387e
--- /dev/null
+++ b/data/libzakautheldap/gui/zakautheldap.gui
@@ -0,0 +1,208 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- 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>
+        <property name="orientation">vertical</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">5</property>
+            <property name="row_spacing">5</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">5</property>
+                    <property name="row_spacing">5</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/data/zakautheldap_confi_schema.xml b/data/zakautheldap_confi_schema.xml
new file mode 100644 (file)
index 0000000..0c1b4e4
--- /dev/null
+++ b/data/zakautheldap_confi_schema.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<gconfi-key>
+       <name>aute-ldap</name>
+       <description>Plugin di libaute di autenticazione su ldap</description>
+
+       <gconfi-key>
+               <name>ldap</name>
+               <description>Parametri per la connessione al server ldap</description>
+
+               <gconfi-key>
+                       <name>host</name>
+                       <description>Host address</description>
+               </gconfi-key>
+               <gconfi-key>
+                       <name>base_dn</name>
+                       <description>Base DN</description>
+               </gconfi-key>
+               <gconfi-key>
+                       <name>user_field</name>
+                       <description>User name field</description>
+               </gconfi-key>
+       </gconfi-key>
+</gconfi-key>

diff --git a/src/Makefile.am b/src/Makefile.am
index 1de72504e9afcf4c953ab80f4916efb978617ec4..51ae4836f60b36e837f3d6d7243b846d2772dc5e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,17 @@
-guidir = $(datadir)/libauteldap/gui
+guidir = $(datadir)/$(PACKAGE)/gui
 
-AM_CPPFLAGS = $(LIBAUTELDAP_CFLAGS) \
+AM_CPPFLAGS = $(LIBZAKAUTHELDAP_CFLAGS) \
               $(LIBLDAP_CFLAGS) \
-              $(LIBCONFI_CFLAGS) \
+              $(LIBZAKCONFI_CFLAGS) \
               -DGUIDIR=\""$(guidir)"\"
 
-LIBS = $(LIBAUTELDAP_LIBS) \
+LIBS = $(LIBZAKAUTHELDAP_LIBS) \
        $(LIBLDAP_LIBS) \
-       $(LIBCONFI_LIBS)
+       $(LIBZAKCONFI_LIBS)
 
-libaute_pluginsdir = $(libdir)/libaute/plugins
-libaute_plugins_LTLIBRARIES = libaute-ldap.la
+libzakauthe_pluginsdir = $(libdir)/libzakauthe/plugins
+libzakauthe_plugins_LTLIBRARIES = libzakautheldap.la
 
-libaute_ldap_la_SOURCES = aute_ldap.c
+libzakautheldap_la_SOURCES = aute_ldap.c
 
-libaute_ldap_la_LDFLAGS = -no-undefined
+libzakautheldap_la_LDFLAGS = -no-undefined

diff --git a/src/aute_ldap.c b/src/aute_ldap.c
index c9c397dcdad2f09a1ee84defe13d98d2061c79af..072a3e2cb6cdab2c9d8e10f442497e1a76ac7bcc 100644 (file)
--- a/src/aute_ldap.c
+++ b/src/aute_ldap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2005-2016 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
@@ -19,12 +19,12 @@
 #ifdef HAVE_CONFIG_H
        #include "config.h"
 #endif
-  
+
 #include <gtk/gtk.h>
 #include <ldap.h>
 
-#ifdef HAVE_LIBCONFI
-       #include <libconfi.h>
+#ifdef HAVE_LIBZAKCONFI
+       #include <libzakconfi/libzakconfi.h>
 #endif
 
 static GtkWidget *txt_utente;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 10f47f9475425db46410051bb3f198be7797242f..fdb1d3ca27f5d4d464094645ebd1c657f59696db 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,13 +1,12 @@
 AM_CPPFLAGS = $(WARN_CFLAGS) \
               $(DISABLE_DEPRECATED_CFLAGS) \
-              $(LIBAUTELDAP_CFLAGS) \
+              $(LIBZAKAUTHELDAP_CFLAGS) \
               $(LIBLDAP_CFLAGS) \
               -I../src
 
-LIBS = $(GTK_LIBS) \
-       $(LIBAUTELDAP_LIBS) \
+LIBS = $(LIBZAKAUTHELDAP_LIBS) \
        $(LIBLDAP_LIBS)
 
-LDADD = ../src/libaute-ldap.la
+LDADD = ../src/libzakautheldap.la
 
 noinst_PROGRAMS = test

diff --git a/tests/test.c b/tests/test.c
index c5328119bc328711cec4794d6a25e4fb2c8a3b61..0ab8fd52db0e74e0b781d74870da7dbdb3fd43b1 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2016 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
@@ -18,26 +18,27 @@
 
 #include <gtk/gtk.h>
 
-#include <libaute.h>
+#include <libzakauthe.h>
 
 int
 main (int argc, char **argv)
 {
-       Aute *aute;
+       ZakAuthe *aute;
        GSList *params;
 
        gtk_init (&argc, &argv);
 
-       aute = aute_new ();
+       aute = zak_authe_new ();
 
+       params = NULL;
        params = g_slist_append (params, argv[1]);
        params = g_slist_append (params, argv[2]);
        params = g_slist_append (params, argv[3]);
        params = g_slist_append (params, argv[4]);
 
-       aute_set_config (aute, params);
+       zak_authe_set_config (aute, params);
 
-       g_fprintf (stderr, "Utente %s\n", aute_autentica (aute));
+       g_warning ("User %s\n", zak_authe_authe (aute));
 
        return 0;
 }