Changed library name and namespace.

diff --git a/.gitignore b/.gitignore
index a5dd5a57deb850984a0d7474df08edda34b657cc..7adca8cc7ee81d1135243791acb0852a45920160 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ depcomp
 version.xml
 gtk-doc.make
 install-sh
-libaute.pc
+libzakauth.pc
 libtool
 ltmain.sh
 missing
@@ -30,3 +30,5 @@ stamp-h1
 *.tar.gz
 docs/reference/html/
 docs/reference/xml/
+compile
+gtk-doc.m4
\ No newline at end of file

diff --git a/Makefile.am b/Makefile.am
index bdec81736be3b82fbe7c64fa7517020d099327f8..6858f8d855d934bd80ff5f7db11af9eafbcfe2c0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 SUBDIRS = src docs data
 
-EXTRA_DIST = libaute.pc.in
+EXTRA_DIST = libzakauth.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libaute.pc
+pkgconfig_DATA = libzakauth.pc

diff --git a/autogen.sh b/autogen.sh
index 13b33e79267221f7de9f6cb37648826efc9b4b99..543933476c937cf62d8883d9cf86a1abc6434d54 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,11 +4,11 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="libaute"
+PKG_NAME="libzakauth"
 
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/src \
-  && test -f $srcdir/src/libaute.h) || {
+  && test -f $srcdir/src/libzakauth.h) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level libaute directory"
     exit 1

diff --git a/configure.ac b/configure.ac
index 79da4c779d3afeaf8ce1e356f3dea2d7418cfcac..43c5e5f1f216156715f3e87df74758f95f663540 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], [0.2.0], [azagli@libero.it])
+AC_INIT([libzakauth], [0.5.0], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/aute.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -51,7 +51,7 @@ AC_C_CONST
 AC_FUNC_MALLOC
 
 AC_CONFIG_FILES([
-  libaute.pc
+  libzakauth.pc
   Makefile
   src/Makefile
   data/Makefile

diff --git a/libaute.pc.in b/libaute.pc.in
deleted file mode 100644 (file)
index 61cc1c0..0000000
--- a/libaute.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: @PACKAGE_NAME@
-Description: Libreria per la gestione dell'autenticazione attraverso plugin
-Version: @PACKAGE_VERSION@
-Requires: glib-2.0 @PKGCONFIG_DEPEND@
-Libs: -L${libdir} -laute
-Cflags: -I${includedir}

diff --git a/libzakauth.pc.in b/libzakauth.pc.in
new file mode 100644 (file)
index 0000000..5aef5c7
--- /dev/null
+++ b/libzakauth.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: Library to manage authentication through plugins
+Version: @PACKAGE_VERSION@
+Requires: glib-2.0 @PKGCONFIG_DEPEND@
+Libs: -L${libdir} -lzakauth
+Cflags: -I${includedir}

diff --git a/src/Makefile.am b/src/Makefile.am
index 3894f4531719c84d2c8541247734eae8c3004c67..8b62c859cde459a858709b05b10e5efff170e462 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,14 @@
 AM_CPPFLAGS = $(LIBAUTE_CFLAGS) \
               $(LIBCONFI_CFLAGS) \
-              -DLIBAUTE_PLUGINS_DIR=\""$(libdir)/libaute/plugins"\"
+              -DLIB_ZAK_AUTH_PLUGINS_DIR=\""$(libdir)/libzakauth/plugins"\"
 
 LIBS = $(LIBAUTE_LIBS) \
        $(LIBCONFI_LIBS)
 
-lib_LTLIBRARIES = libaute.la
+lib_LTLIBRARIES = libzakauth.la
 
-libaute_la_SOURCES = aute.c
+libzakauth_la_SOURCES = aute.c
 
-libaute_la_LDFLAGS = -no-undefined
+libzakauth_la_LDFLAGS = -no-undefined
 
-include_HEADERS = libaute.h
+include_HEADERS = libzakauth.h

diff --git a/src/aute.c b/src/aute.c
index 2c4d3288dd36522530f089e6a2644ecfb8b85fd4..ea029d213c8ca9d7263f561a6f132137eedaddde 100644 (file)
--- a/src/aute.c
+++ b/src/aute.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2005-2015 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
@@ -21,28 +21,29 @@
 #endif
 
 #include <stdio.h>
+#include <glib/gprintf.h>
 
-#include "libaute.h"
+#include "libzakauth.h"
 
-static void aute_class_init (AuteClass *class);
-static void aute_init (Aute *form);
+static void zak_auth_class_init (ZakAuthClass *class);
+static void zak_auth_init (ZakAuth *form);
 
-static void aute_set_property (GObject *object,
+static void zak_auth_set_property (GObject *object,
                                guint property_id,
                                const GValue *value,
                                GParamSpec *pspec);
-static void aute_get_property (GObject *object,
+static void zak_auth_get_property (GObject *object,
                                guint property_id,
                                GValue *value,
                                GParamSpec *pspec);
-static void aute_finalize (GObject *object);
+static void zak_auth_finalize (GObject *object);
 
-GModule *aute_get_module_from_confi (Aute *aute);
+GModule *zak_auth_get_module_from_confi (ZakAuth *aute);
 
-#define AUTE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_AUTE, AutePrivate))
+#define ZAK_AUTH_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_TYPE_AUTH, ZakAuthPrivate))
 
-typedef struct _AutePrivate AutePrivate;
-struct _AutePrivate
+typedef struct _ZakAuthPrivate ZakAuthPrivate;
+struct _ZakAuthPrivate
        {
                GModule *module;
 
@@ -53,24 +54,24 @@ struct _AutePrivate
 #endif
        };
 
-G_DEFINE_TYPE (Aute, aute, G_TYPE_OBJECT)
+G_DEFINE_TYPE (ZakAuth, zak_auth, G_TYPE_OBJECT)
 
 static void
-aute_class_init (AuteClass *class)
+zak_auth_class_init (ZakAuthClass *class)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-       object_class->set_property = aute_set_property;
-       object_class->get_property = aute_get_property;
-       object_class->finalize = aute_finalize;
+       object_class->set_property = zak_auth_set_property;
+       object_class->get_property = zak_auth_get_property;
+       object_class->finalize = zak_auth_finalize;
 
-       g_type_class_add_private (object_class, sizeof (AutePrivate));
+       g_type_class_add_private (object_class, sizeof (ZakAuthPrivate));
 }
 
 static void
-aute_init (Aute *form)
+zak_auth_init (ZakAuth *form)
 {
-       AutePrivate *priv = AUTE_GET_PRIVATE (form);
+       ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (form);
 
        priv->module = NULL;
        priv->parameters = NULL;
@@ -81,28 +82,28 @@ aute_init (Aute *form)
 }
 
 /**
- * aute_new:
+ * zak_auth_new:
  *
- * Returns: the newly created #Aute object.
+ * Returns: the newly created #ZakAuth object.
  */
-Aute
-*aute_new ()
+ZakAuth
+*zak_auth_new ()
 {
-       return AUTE (g_object_new (aute_get_type (), NULL));
+       return ZAK_AUTH (g_object_new (zak_auth_get_type (), NULL));
 }
 
 /*
- * aute_set_config:
- * @aute: an #Aute object.
+ * zak_auth_set_config:
+ * @aute: an #ZakAuth object.
  * @parameters: a #GSList of config parameters.
  *
  */
 gboolean
-aute_set_config (Aute *aute, GSList *parameters)
+zak_auth_set_config (ZakAuth *aute, GSList *parameters)
 {
        gchar *module_name;
 
-       AutePrivate *priv = AUTE_GET_PRIVATE (aute);
+       ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute);
 
        g_return_val_if_fail (parameters != NULL && parameters->data != NULL, FALSE);
 
@@ -117,7 +118,7 @@ aute_set_config (Aute *aute, GSList *parameters)
        if (IS_CONFI (priv->parameters->data))
                {
                        priv->confi = CONFI (priv->parameters->data);
-                       module_name = aute_get_module_from_confi (aute);
+                       module_name = zak_auth_get_module_from_confi (aute);
                }
 #endif
 
@@ -146,19 +147,19 @@ aute_set_config (Aute *aute, GSList *parameters)
 }
 
 /**
- * aute_autentica:
- * @aute: 
+ * zak_auth_auth:
+ * @aute:
  *
- * Returns: il nome utente se l'autenticazione va a buon fine; 
+ * Returns: il nome utente se l'autenticazione va a buon fine;
  * stringa vuota ("") se viene premuto "Annulla"; NULL in caso di errore.
  */
 gchar
-*aute_autentica (Aute *aute)
+*zak_auth_auth (ZakAuth *aute)
 {
        gchar *(*autentica) (GSList *parameters);
        gchar *ret;
 
-       AutePrivate *priv = AUTE_GET_PRIVATE (aute);
+       ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute);
 
        g_return_val_if_fail (priv->module != NULL, NULL);
 
@@ -179,56 +180,56 @@ gchar
 }
 
 /**
- * aute_autentica_get_password:
- * @aute: 
+ * zak_auth_get_password:
+ * @aute:
  * @password:
  *
- * Returns: il nome utente se l'autenticazione va a buon fine; 
+ * Returns: il nome utente se l'autenticazione va a buon fine;
  * stringa vuota ("") se viene premuto "Annulla"; NULL in caso di errore.
  * Nel parametro @password ritorna la password inserita.
  */
 gchar
-*aute_autentica_get_password (Aute *aute, gchar **password)
+*zak_auth_get_password (ZakAuth *aute, gchar **password)
 {
-       gchar *(*autentica_get_password) (GSList *parameters, gchar **password);
+       gchar *(*zak_auth_plg_get_password) (GSList *parameters, gchar **password);
        gchar *ret;
 
-       AutePrivate *priv = AUTE_GET_PRIVATE (aute);
+       ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute);
 
        g_return_val_if_fail (priv->module != NULL, NULL);
 
        ret = NULL;
 
        /* loading the function */
-       if (!g_module_symbol (priv->module, "autentica_get_password", (gpointer *)&autentica_get_password))
+       if (!g_module_symbol (priv->module, "zak_auth_plg_get_password", (gpointer *)&zak_auth_plg_get_password))
                {
                        /* TO DO */
-                       g_warning ("Error g_module_symbol: autentica_get_password.\n");
+                       g_warning ("Error g_module_symbol: zak_auth_plg_get_password.\n");
 
-                       /* try aute_autentica */
-                       ret = aute_autentica (aute);
+                       /* try zak_auth_auth */
+                       ret = zak_auth_auth (aute);
                }
        else
                {
                        /* calling plugin's function */
-                       ret = (*autentica_get_password) (priv->parameters, password);
+                       ret = (*zak_auth_plg_get_password) (priv->parameters, password);
                }
 
        return ret;
 }
 
 /**
- * aute_autentica:
- * @aute: 
+ * zak_auth_get_management_gui:
+ * @aute:
  *
  */
 GtkWidget
-*aute_get_management_gui (Aute *aute)
+*zak_auth_get_management_gui (ZakAuth *aute)
 {
        GtkWidget *(*get_management_gui) (GSList *parameters);
        GtkWidget *ret;
 
-       AutePrivate *priv = AUTE_GET_PRIVATE (aute);
+       ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute);
 
        g_return_val_if_fail (priv->module != NULL, NULL);
 
@@ -251,14 +252,14 @@ GtkWidget
 
 /* PRIVATE */
 static void
-aute_set_property (GObject *object,
+zak_auth_set_property (GObject *object,
                    guint property_id,
                    const GValue *value,
                    GParamSpec *pspec)
 {
-       Aute *aute = (Aute *)object;
+       ZakAuth *aute = (ZakAuth *)object;
 
-       AutePrivate *priv = AUTE_GET_PRIVATE (aute);
+       ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute);
 
        switch (property_id)
                {
@@ -269,14 +270,14 @@ aute_set_property (GObject *object,
 }
 
 static void
-aute_get_property (GObject *object,
+zak_auth_get_property (GObject *object,
                    guint property_id,
                    GValue *value,
                    GParamSpec *pspec)
 {
-       Aute *aute = (Aute *)object;
+       ZakAuth *aute = (ZakAuth *)object;
 
-       AutePrivate *priv = AUTE_GET_PRIVATE (aute);
+       ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute);
 
        switch (property_id)
                {
@@ -287,11 +288,11 @@ aute_get_property (GObject *object,
 }
 
 static void
-aute_finalize (GObject *object)
+zak_auth_finalize (GObject *object)
 {
-       Aute *aute = AUTE (object);
+       ZakAuth *aute = ZAK_AUTH (object);
 
-       AutePrivate *priv = AUTE_GET_PRIVATE (aute);
+       ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute);
 
        /* closing the library */
        if (priv->module != NULL)
@@ -307,23 +308,23 @@ aute_finalize (GObject *object)
                }
 
        /* Chain up to the parent class */
-       G_OBJECT_CLASS (aute_parent_class)->finalize (object);
+       G_OBJECT_CLASS (zak_auth_parent_class)->finalize (object);
 }
 
 #ifdef HAVE_LIBCONFI
 /**
- * aute_get_plugin_module:
- * @aute: un oggetto #Aute.
+ * zak_auth_get_plugin_module:
+ * @aute: un oggetto #ZakAuth.
  *
  * Returns: il nome, con il percorso, del plugin.
  * Returns: il nome, con il percorso, del plugin.
  */
 gchar
-*aute_get_module_from_confi (Aute *aute)
+*zak_auth_get_module_from_confi (ZakAuth *aute)
 {
        gchar *libname;
 
-       AutePrivate *priv = AUTE_GET_PRIVATE (aute);
+       ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute);
 
        g_return_val_if_fail (IS_CONFI (priv->confi), NULL);
 
@@ -334,7 +335,7 @@ gchar
                        g_warning ("Valore nullo della configurazione per il plugin.");
                        return NULL;
                }
-       libname = g_strconcat (LIBAUTE_PLUGINS_DIR "/", libname, NULL);
+       libname = g_strconcat (LIB_ZAK_AUTH_PLUGINS_DIR "/", libname, NULL);
 
        return libname;
 }

diff --git a/src/libaute.h b/src/libaute.h
deleted file mode 100644 (file)
index 7de5cc7..0000000
--- a/src/libaute.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2005-2013 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
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __AUTE_H__
-#define __AUTE_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gmodule.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define TYPE_AUTE                 (aute_get_type ())
-#define AUTE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_AUTE, Aute))
-#define AUTE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_AUTE, AuteClass))
-#define IS_AUTE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_AUTE))
-#define IS_AUTE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_AUTE))
-#define AUTE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_AUTE, AuteClass))
-
-
-typedef struct _Aute Aute;
-typedef struct _AuteClass AuteClass;
-
-struct _Aute
-       {
-               GObject parent;
-       };
-
-struct _AuteClass
-       {
-               GObjectClass parent_class;
-       };
-
-GType aute_get_type (void) G_GNUC_CONST;
-
-Aute *aute_new (void);
-
-gboolean aute_set_config (Aute *aute, GSList *parameters);
-
-gchar *aute_autentica (Aute *aute);
-gchar *aute_autentica_get_password (Aute *aute, gchar **password);
-
-GtkWidget *aute_get_management_gui (Aute *aute);
-
-
-G_END_DECLS
-
-
-#endif /* __AUTE_H__ */

diff --git a/src/libzakauth.h b/src/libzakauth.h
new file mode 100644 (file)
index 0000000..3c21b10
--- /dev/null
+++ b/src/libzakauth.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2005-2015 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __ZAKAUTH_H__
+#define __ZAKAUTH_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gmodule.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define ZAK_TYPE_AUTH                 (zak_auth_get_type ())
+#define ZAK_AUTH(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_TYPE_AUTH, ZakAuth))
+#define ZAK_AUTH_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_TYPE_AUTH, ZakAuthClass))
+#define ZAK_IS_AUTH(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_TYPE_AUTH))
+#define ZAK_IS_AUTH_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_TYPE_AUTH))
+#define ZAKAUTH_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_TYPE_AUTH, ZakAuthClass))
+
+
+typedef struct _ZakAuth ZakAuth;
+typedef struct _ZakAuthClass ZakAuthClass;
+
+struct _ZakAuth
+       {
+               GObject parent;
+       };
+
+struct _ZakAuthClass
+       {
+               GObjectClass parent_class;
+       };
+
+GType zak_auth_get_type (void) G_GNUC_CONST;
+
+ZakAuth *zak_auth_new (void);
+
+gboolean zak_auth_set_config (ZakAuth *zakauth, GSList *parameters);
+
+gchar *zak_auth_auth (ZakAuth *zakauth);
+gchar *zak_auth_get_password (ZakAuth *zakauth, gchar **password);
+
+GtkWidget *zak_auth_get_management_gui (ZakAuth *zakauth);
+
+
+G_END_DECLS
+
+
+#endif /* __ZAKAUTH_H__ */