Changed name.

diff --git a/.gitignore b/.gitignore
index e4759582db24bb18d775ec0edf6d6c60826f8996..741e2105a026ccea4d4b56fc6fa7597388686098 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *.o
 *~
 *.in
-src/utenti
+src/zak-authe-gui
 COPYING
 INSTALL
 Makefile

diff --git a/autogen.sh b/autogen.sh
index c945f634bbc6d0299faa46e0adfdf7458d6a5eaf..ef1d5c79f94efbe9ee24017e24bcc91a0cb55dba 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,13 +4,13 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="utenti"
+PKG_NAME="zak-authe-gui"
 
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/src \
   && test -f $srcdir/src/main.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level utenti directory"
+    echo " top-level zak-authe-gui directory"
     exit 1
 }
 

diff --git a/configure.ac b/configure.ac
index ffe2e8a44ff3879f522fd2febf3260195202944f..bf009164edfad213927c0285d84973cbc9270130 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.65])
-AC_INIT([utenti], [0.0.3], [azagli@libero.it])
+AC_INIT([zak-authe-gui], [0.0.3], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -19,11 +19,11 @@ AC_PROG_CC
 AC_PROG_CXX
 
 # Checks for libraries.
-PKG_CHECK_MODULES(UTENTI, [gtk+-3.0 >= 3.0.0
+PKG_CHECK_MODULES(ZAK_AUTHE_GUI, [gtk+-3.0 >= 3.0.0
                            libzakauthe >= 0.5.0])
 
-AC_SUBST(UTENTI_CFLAGS)
-AC_SUBST(UTENTI_LIBS)
+AC_SUBST(ZAK_AUTHE_GUI_CFLAGS)
+AC_SUBST(ZAK_AUTHE_GUI_LIBS)
 
 # Checks for header files.
 
@@ -36,10 +36,10 @@ AC_CONFIG_FILES([
   Makefile
   src/Makefile
   data/Makefile
-  data/utenti/Makefile
-  data/utenti/gui/Makefile
+  data/zak-authe-gui/Makefile
+  data/zak-authe-gui/gui/Makefile
   doc/Makefile
-  doc/utenti/Makefile
-  doc/utenti/examples/Makefile
+  doc/zak-authe-gui/Makefile
+  doc/zak-authe-gui/examples/Makefile
 ])
 AC_OUTPUT

diff --git a/data/Makefile.am b/data/Makefile.am
index cd93d4bddeefbed1b291cf92a2b601e22d8fa07c..ff601be65f50394a6955f5606ee4dd06d09440ca 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = utenti
+SUBDIRS = zak-authe-gui

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

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

diff --git a/data/utenti/gui/utenti.gui b/data/utenti/gui/utenti.gui
deleted file mode 100644 (file)
index 76f9504..0000000
--- a/data/utenti/gui/utenti.gui
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="w_main">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">Gestione Utenti - SOLIPA</property>
-    <property name="window_position">center</property>
-    <property name="default_width">600</property>
-    <property name="default_height">400</property>
-    <signal name="delete_event" handler="gtk_main_quit"/>
-    <child>
-      <object class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkMenuBar" id="menubar1">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkMenuItem" id="menuitem1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Utenti</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu1">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem5">
-                        <property name="label">gtk-quit</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="gtk_main_quit"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="menuitem4">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">A_iuto</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu3">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem10">
-                        <property name="label">gtk-about</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="utenti_on_mnu_help_about_activate"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkVBox" id="vbx_body">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkAboutDialog" id="dlg_about">
-    <property name="visible">True</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">normal</property>
-    <property name="program_name">Gestione Utenti - SOLIPA</property>
-    <property name="copyright" translatable="yes">Copyright (C) 2010 Andrea Zagli</property>
-    <property name="license" translatable="yes">Gestione Utenti SOLIPA &#xE8; software libero; &#xE8; possibile ridistribuirlo e/o
-modificarlo secondo i termini della licenza GNU General Public License,
-come pubblicata dalla Free Software Foundation; versione 2 della
-licenza, o (a scelta) una versione pi&#xF9; recente.
-
-Gestione Utenti SOLIPA &#xE8; distribuito nella speranza che possa
-risultare utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia
-implicita di COMMERCIABILIT&#xC0; o APPLICABILIT&#xC0; PER UNO SCOPO
-PARTICOLARE. Per maggiori dettagli consultare la GNU General Public
-License.
-
-Una copia della GNU General Public License dovrebbe essere stata
-fornita con Nautilus. In caso contrario scrivere a:
-  Free Software Foundation, Inc.
-  59 Temple Place, Suite 330, Boston, MA
-  02111-1307  USA</property>
-    <property name="authors">Andrea Zagli &lt;azagli@libero.it&gt;</property>
-    <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1"/>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

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

diff --git a/data/zak-authe-gui/gui/Makefile.am b/data/zak-authe-gui/gui/Makefile.am
new file mode 100644 (file)
index 0000000..de68775
--- /dev/null
+++ b/data/zak-authe-gui/gui/Makefile.am
@@ -0,0 +1,5 @@
+guidir = $(datadir)/$(PKGNAME)/gui
+
+gui_DATA = zak-authe-gui.ui
+
+EXTRA_DIST = $(gui_DATA)

diff --git a/data/zak-authe-gui/gui/zak-authe-gui.ui b/data/zak-authe-gui/gui/zak-authe-gui.ui
new file mode 100644 (file)
index 0000000..76f9504
--- /dev/null
+++ b/data/zak-authe-gui/gui/zak-authe-gui.ui
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="w_main">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Gestione Utenti - SOLIPA</property>
+    <property name="window_position">center</property>
+    <property name="default_width">600</property>
+    <property name="default_height">400</property>
+    <signal name="delete_event" handler="gtk_main_quit"/>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkMenuBar" id="menubar1">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkMenuItem" id="menuitem1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Utenti</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu1">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="imagemenuitem5">
+                        <property name="label">gtk-quit</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="gtk_main_quit"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">A_iuto</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu3">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="imagemenuitem10">
+                        <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="utenti_on_mnu_help_about_activate"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbx_body">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkAboutDialog" id="dlg_about">
+    <property name="visible">True</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">normal</property>
+    <property name="program_name">Gestione Utenti - SOLIPA</property>
+    <property name="copyright" translatable="yes">Copyright (C) 2010 Andrea Zagli</property>
+    <property name="license" translatable="yes">Gestione Utenti SOLIPA &#xE8; software libero; &#xE8; possibile ridistribuirlo e/o
+modificarlo secondo i termini della licenza GNU General Public License,
+come pubblicata dalla Free Software Foundation; versione 2 della
+licenza, o (a scelta) una versione pi&#xF9; recente.
+
+Gestione Utenti SOLIPA &#xE8; distribuito nella speranza che possa
+risultare utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia
+implicita di COMMERCIABILIT&#xC0; o APPLICABILIT&#xC0; PER UNO SCOPO
+PARTICOLARE. Per maggiori dettagli consultare la GNU General Public
+License.
+
+Una copia della GNU General Public License dovrebbe essere stata
+fornita con Nautilus. In caso contrario scrivere a:
+  Free Software Foundation, Inc.
+  59 Temple Place, Suite 330, Boston, MA
+  02111-1307  USA</property>
+    <property name="authors">Andrea Zagli &lt;azagli@libero.it&gt;</property>
+    <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1"/>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index cd93d4bddeefbed1b291cf92a2b601e22d8fa07c..ff601be65f50394a6955f5606ee4dd06d09440ca 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1 @@
-SUBDIRS = utenti
+SUBDIRS = zak-authe-gui

diff --git a/doc/utenti/Makefile.am b/doc/utenti/Makefile.am
deleted file mode 100644 (file)
index aee2d7b..0000000
--- a/doc/utenti/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = examples

diff --git a/doc/utenti/examples/Makefile.am b/doc/utenti/examples/Makefile.am
deleted file mode 100644 (file)
index cc33176..0000000
--- a/doc/utenti/examples/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-utenti_examplesdir = $(docdir)/examples
-
-utenti_examples_DATA = \
-                         utenti.conf
-
-EXTRA_DIST = $(utenti_examples_DATA)

diff --git a/doc/utenti/examples/utenti.conf b/doc/utenti/examples/utenti.conf
deleted file mode 100644 (file)
index 9923c83..0000000
--- a/doc/utenti/examples/utenti.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[AUTE]
-plugin=/usr/local/lib/libaute/plugins/libaute-db
-cnc_string=PostgreSQL://postgres:postgres@HOST=localhost;PORT=5432;DB_NAME=autedb

diff --git a/doc/utenti/examples/utenti_ldap.conf b/doc/utenti/examples/utenti_ldap.conf
deleted file mode 100644 (file)
index e5b6c99..0000000
--- a/doc/utenti/examples/utenti_ldap.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[AUTE]
-plugin=/usr/local/lib/libaute/plugins/libaute-smbldap
-host=ldap://10.0.0.102/
-base_dn=dc=nodomain
-users_ou=ou=Users
-groups_ou=ou=Groups
-user_field=uid

diff --git a/doc/zak-authe-gui/Makefile.am b/doc/zak-authe-gui/Makefile.am
new file mode 100644 (file)
index 0000000..aee2d7b
--- /dev/null
+++ b/doc/zak-authe-gui/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = examples

diff --git a/doc/zak-authe-gui/examples/Makefile.am b/doc/zak-authe-gui/examples/Makefile.am
new file mode 100644 (file)
index 0000000..c9c7bd9
--- /dev/null
+++ b/doc/zak-authe-gui/examples/Makefile.am
@@ -0,0 +1,7 @@
+zak_authe_gui_examplesdir = $(docdir)/examples
+
+zak_authe_gui_examples_DATA = \
+                         zak-authe-gui.conf \
+                         zak-authe-gui_ldap.conf
+
+EXTRA_DIST = $(zak_authe_gui_examples_DATA)

diff --git a/doc/zak-authe-gui/examples/zak-authe-gui.conf b/doc/zak-authe-gui/examples/zak-authe-gui.conf
new file mode 100644 (file)
index 0000000..9923c83
--- /dev/null
+++ b/doc/zak-authe-gui/examples/zak-authe-gui.conf
@@ -0,0 +1,3 @@
+[AUTE]
+plugin=/usr/local/lib/libaute/plugins/libaute-db
+cnc_string=PostgreSQL://postgres:postgres@HOST=localhost;PORT=5432;DB_NAME=autedb

diff --git a/doc/zak-authe-gui/examples/zak-authe-gui_ldap.conf b/doc/zak-authe-gui/examples/zak-authe-gui_ldap.conf
new file mode 100644 (file)
index 0000000..e5b6c99
--- /dev/null
+++ b/doc/zak-authe-gui/examples/zak-authe-gui_ldap.conf
@@ -0,0 +1,7 @@
+[AUTE]
+plugin=/usr/local/lib/libaute/plugins/libaute-smbldap
+host=ldap://10.0.0.102/
+base_dn=dc=nodomain
+users_ou=ou=Users
+groups_ou=ou=Groups
+user_field=uid

diff --git a/src/Makefile.am b/src/Makefile.am
index b0551baec55ee41ce3394f0c503f9ccd6923100d..7f60acc3a0ce581dd3bc57f7e0838ac6b62097b8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,14 @@
-guidir = $(datadir)/utenti/gui
-formdir = $(datadir)/utenti/form
+guidir = $(datadir)/$(PKGNAME)/gui
+formdir = $(datadir)/$(PKGNAME)/form
 
 AM_CPPFLAGS = -I.. \
-              $(UTENTI_CFLAGS) \
+              $(ZAK_AUTHE_GUI_CFLAGS) \
               -DGUIDIR=\""$(guidir)"\" \
               -DFORMDIR=\""$(formdir)"\"
 
-LIBS = $(UTENTI_LIBS) \
+LIBS = $(ZAK_AUTHE_GUI_LIBS) \
        -export-dynamic
 
-bin_PROGRAMS = utenti
+bin_PROGRAMS = zak-authe-gui
 
-utenti_SOURCES = main.c
+zak_authe_gui_SOURCES = main.c