From b1e3226ae4dda35c31f8118a6bd7851c7829e5e4 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 7 Sep 2015 10:34:15 +0200 Subject: [PATCH] Another change of name and namespace. --- .gitignore | 4 +- Makefile.am | 4 +- autogen.sh | 4 +- configure.ac | 4 +- libzakauth.pc.in => libzakauthe.pc.in | 2 +- src/Makefile.am | 10 +-- src/aute.c | 116 +++++++++++++------------- src/libzakauth.h | 65 --------------- src/libzakauthe.h | 65 +++++++++++++++ 9 files changed, 137 insertions(+), 137 deletions(-) rename libzakauth.pc.in => libzakauthe.pc.in (89%) delete mode 100644 src/libzakauth.h create mode 100644 src/libzakauthe.h diff --git a/.gitignore b/.gitignore index 7adca8c..3abb6e9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ depcomp version.xml gtk-doc.make install-sh -libzakauth.pc +libzakauthe.pc libtool ltmain.sh missing @@ -31,4 +31,4 @@ stamp-h1 docs/reference/html/ docs/reference/xml/ compile -gtk-doc.m4 \ No newline at end of file +gtk-doc.m4 diff --git a/Makefile.am b/Makefile.am index 6858f8d..393a3fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc SUBDIRS = src docs data -EXTRA_DIST = libzakauth.pc.in +EXTRA_DIST = libzakauthe.pc.in pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libzakauth.pc +pkgconfig_DATA = libzakauthe.pc diff --git a/autogen.sh b/autogen.sh index 5439334..e05e7db 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,11 +4,11 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -PKG_NAME="libzakauth" +PKG_NAME="libzakauthe" (test -f $srcdir/configure.ac \ && test -d $srcdir/src \ - && test -f $srcdir/src/libzakauth.h) || { + && test -f $srcdir/src/libzakauthe.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 43c5e5f..b0c3c23 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([libzakauth], [0.5.0], [azagli@libero.it]) +AC_INIT([libzakauthe], [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([ - libzakauth.pc + libzakauthe.pc Makefile src/Makefile data/Makefile diff --git a/libzakauth.pc.in b/libzakauthe.pc.in similarity index 89% rename from libzakauth.pc.in rename to libzakauthe.pc.in index 5aef5c7..e761b75 100644 --- a/libzakauth.pc.in +++ b/libzakauthe.pc.in @@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@ Description: Library to manage authentication through plugins Version: @PACKAGE_VERSION@ Requires: glib-2.0 @PKGCONFIG_DEPEND@ -Libs: -L${libdir} -lzakauth +Libs: -L${libdir} -lzakauthe Cflags: -I${includedir} diff --git a/src/Makefile.am b/src/Makefile.am index 8b62c85..3d5ddc7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,14 +1,14 @@ AM_CPPFLAGS = $(LIBAUTE_CFLAGS) \ $(LIBCONFI_CFLAGS) \ - -DLIB_ZAK_AUTH_PLUGINS_DIR=\""$(libdir)/libzakauth/plugins"\" + -DLIB_ZAK_AUTHE_PLUGINS_DIR=\""$(libdir)/libzakauthe/plugins"\" LIBS = $(LIBAUTE_LIBS) \ $(LIBCONFI_LIBS) -lib_LTLIBRARIES = libzakauth.la +lib_LTLIBRARIES = libzakauthe.la -libzakauth_la_SOURCES = aute.c +libzakauthe_la_SOURCES = aute.c -libzakauth_la_LDFLAGS = -no-undefined +libzakauthe_la_LDFLAGS = -no-undefined -include_HEADERS = libzakauth.h +include_HEADERS = libzakauthe.h diff --git a/src/aute.c b/src/aute.c index ea029d2..7de798a 100644 --- a/src/aute.c +++ b/src/aute.c @@ -23,27 +23,27 @@ #include #include -#include "libzakauth.h" +#include "libzakauthe.h" -static void zak_auth_class_init (ZakAuthClass *class); -static void zak_auth_init (ZakAuth *form); +static void zak_authe_class_init (ZakAutheClass *class); +static void zak_authe_init (ZakAuthe *form); -static void zak_auth_set_property (GObject *object, +static void zak_authe_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); -static void zak_auth_get_property (GObject *object, +static void zak_authe_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); -static void zak_auth_finalize (GObject *object); +static void zak_authe_finalize (GObject *object); -GModule *zak_auth_get_module_from_confi (ZakAuth *aute); +GModule *zak_authe_get_module_from_confi (ZakAuthe *aute); -#define ZAK_AUTH_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_TYPE_AUTH, ZakAuthPrivate)) +#define ZAK_AUTHE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_TYPE_AUTHE, ZakAuthePrivate)) -typedef struct _ZakAuthPrivate ZakAuthPrivate; -struct _ZakAuthPrivate +typedef struct _ZakAuthePrivate ZakAuthePrivate; +struct _ZakAuthePrivate { GModule *module; @@ -54,24 +54,24 @@ struct _ZakAuthPrivate #endif }; -G_DEFINE_TYPE (ZakAuth, zak_auth, G_TYPE_OBJECT) +G_DEFINE_TYPE (ZakAuthe, zak_authe, G_TYPE_OBJECT) static void -zak_auth_class_init (ZakAuthClass *class) +zak_authe_class_init (ZakAutheClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->set_property = zak_auth_set_property; - object_class->get_property = zak_auth_get_property; - object_class->finalize = zak_auth_finalize; + object_class->set_property = zak_authe_set_property; + object_class->get_property = zak_authe_get_property; + object_class->finalize = zak_authe_finalize; - g_type_class_add_private (object_class, sizeof (ZakAuthPrivate)); + g_type_class_add_private (object_class, sizeof (ZakAuthePrivate)); } static void -zak_auth_init (ZakAuth *form) +zak_authe_init (ZakAuthe *form) { - ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (form); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (form); priv->module = NULL; priv->parameters = NULL; @@ -82,28 +82,28 @@ zak_auth_init (ZakAuth *form) } /** - * zak_auth_new: + * zak_authe_new: * - * Returns: the newly created #ZakAuth object. + * Returns: the newly created #ZakAuthe object. */ -ZakAuth -*zak_auth_new () +ZakAuthe +*zak_authe_new () { - return ZAK_AUTH (g_object_new (zak_auth_get_type (), NULL)); + return ZAK_AUTHE (g_object_new (zak_authe_get_type (), NULL)); } /* - * zak_auth_set_config: - * @aute: an #ZakAuth object. + * zak_authe_set_config: + * @aute: an #ZakAuthe object. * @parameters: a #GSList of config parameters. * */ gboolean -zak_auth_set_config (ZakAuth *aute, GSList *parameters) +zak_authe_set_config (ZakAuthe *aute, GSList *parameters) { gchar *module_name; - ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); g_return_val_if_fail (parameters != NULL && parameters->data != NULL, FALSE); @@ -118,7 +118,7 @@ zak_auth_set_config (ZakAuth *aute, GSList *parameters) if (IS_CONFI (priv->parameters->data)) { priv->confi = CONFI (priv->parameters->data); - module_name = zak_auth_get_module_from_confi (aute); + module_name = zak_authe_get_module_from_confi (aute); } #endif @@ -147,19 +147,19 @@ zak_auth_set_config (ZakAuth *aute, GSList *parameters) } /** - * zak_auth_auth: + * zak_authe_authe: * @aute: * * Returns: il nome utente se l'autenticazione va a buon fine; * stringa vuota ("") se viene premuto "Annulla"; NULL in caso di errore. */ gchar -*zak_auth_auth (ZakAuth *aute) +*zak_authe_authe (ZakAuthe *aute) { gchar *(*autentica) (GSList *parameters); gchar *ret; - ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); g_return_val_if_fail (priv->module != NULL, NULL); @@ -180,7 +180,7 @@ gchar } /** - * zak_auth_get_password: + * zak_authe_get_password: * @aute: * @password: * @@ -189,47 +189,47 @@ gchar * Nel parametro @password ritorna la password inserita. */ gchar -*zak_auth_get_password (ZakAuth *aute, gchar **password) +*zak_authe_get_password (ZakAuthe *aute, gchar **password) { - gchar *(*zak_auth_plg_get_password) (GSList *parameters, gchar **password); + gchar *(*zak_authe_plg_get_password) (GSList *parameters, gchar **password); gchar *ret; - ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); g_return_val_if_fail (priv->module != NULL, NULL); ret = NULL; /* loading the function */ - if (!g_module_symbol (priv->module, "zak_auth_plg_get_password", (gpointer *)&zak_auth_plg_get_password)) + if (!g_module_symbol (priv->module, "zak_authe_plg_get_password", (gpointer *)&zak_authe_plg_get_password)) { /* TO DO */ - g_warning ("Error g_module_symbol: zak_auth_plg_get_password.\n"); + g_warning ("Error g_module_symbol: zak_authe_plg_get_password.\n"); - /* try zak_auth_auth */ - ret = zak_auth_auth (aute); + /* try zak_authe_authe */ + ret = zak_authe_authe (aute); } else { /* calling plugin's function */ - ret = (*zak_auth_plg_get_password) (priv->parameters, password); + ret = (*zak_authe_plg_get_password) (priv->parameters, password); } return ret; } /** - * zak_auth_get_management_gui: + * zak_authe_get_management_gui: * @aute: * */ GtkWidget -*zak_auth_get_management_gui (ZakAuth *aute) +*zak_authe_get_management_gui (ZakAuthe *aute) { GtkWidget *(*get_management_gui) (GSList *parameters); GtkWidget *ret; - ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); g_return_val_if_fail (priv->module != NULL, NULL); @@ -252,14 +252,14 @@ GtkWidget /* PRIVATE */ static void -zak_auth_set_property (GObject *object, +zak_authe_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - ZakAuth *aute = (ZakAuth *)object; + ZakAuthe *aute = (ZakAuthe *)object; - ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); switch (property_id) { @@ -270,14 +270,14 @@ zak_auth_set_property (GObject *object, } static void -zak_auth_get_property (GObject *object, +zak_authe_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - ZakAuth *aute = (ZakAuth *)object; + ZakAuthe *aute = (ZakAuthe *)object; - ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); switch (property_id) { @@ -288,11 +288,11 @@ zak_auth_get_property (GObject *object, } static void -zak_auth_finalize (GObject *object) +zak_authe_finalize (GObject *object) { - ZakAuth *aute = ZAK_AUTH (object); + ZakAuthe *aute = ZAK_AUTHE (object); - ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); /* closing the library */ if (priv->module != NULL) @@ -308,23 +308,23 @@ zak_auth_finalize (GObject *object) } /* Chain up to the parent class */ - G_OBJECT_CLASS (zak_auth_parent_class)->finalize (object); + G_OBJECT_CLASS (zak_authe_parent_class)->finalize (object); } #ifdef HAVE_LIBCONFI /** - * zak_auth_get_plugin_module: - * @aute: un oggetto #ZakAuth. + * zak_authe_get_plugin_module: + * @aute: un oggetto #ZakAuthe. * * Returns: il nome, con il percorso, del plugin. * Returns: il nome, con il percorso, del plugin. */ gchar -*zak_auth_get_module_from_confi (ZakAuth *aute) +*zak_authe_get_module_from_confi (ZakAuthe *aute) { gchar *libname; - ZakAuthPrivate *priv = ZAK_AUTH_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); g_return_val_if_fail (IS_CONFI (priv->confi), NULL); @@ -335,7 +335,7 @@ gchar g_warning ("Valore nullo della configurazione per il plugin."); return NULL; } - libname = g_strconcat (LIB_ZAK_AUTH_PLUGINS_DIR "/", libname, NULL); + libname = g_strconcat (LIB_ZAK_AUTHE_PLUGINS_DIR "/", libname, NULL); return libname; } diff --git a/src/libzakauth.h b/src/libzakauth.h deleted file mode 100644 index 3c21b10..0000000 --- a/src/libzakauth.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2005-2015 Andrea Zagli - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * 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 -#include -#include -#include - -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__ */ diff --git a/src/libzakauthe.h b/src/libzakauthe.h new file mode 100644 index 0000000..6de4f98 --- /dev/null +++ b/src/libzakauthe.h @@ -0,0 +1,65 @@ +/* + * Copyright 2005-2015 Andrea Zagli + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 __ZAKAUTHE_H__ + +#include +#include +#include +#include + +G_BEGIN_DECLS + +#define ZAK_TYPE_AUTHE (zak_authe_get_type ()) +#define ZAK_AUTHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_TYPE_AUTHE, ZakAuthe)) +#define ZAK_AUTHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_TYPE_AUTHE, ZakAutheClass)) +#define ZAK_IS_AUTHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_TYPE_AUTHE)) +#define ZAK_IS_AUTHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_TYPE_AUTHE)) +#define ZAKAUTHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_TYPE_AUTHE, ZakAutheClass)) + + +typedef struct _ZakAuthe ZakAuthe; +typedef struct _ZakAutheClass ZakAutheClass; + +struct _ZakAuthe + { + GObject parent; + }; + +struct _ZakAutheClass + { + GObjectClass parent_class; + }; + +GType zak_authe_get_type (void) G_GNUC_CONST; + +ZakAuthe *zak_authe_new (void); + +gboolean zak_authe_set_config (ZakAuthe *zakauthe, GSList *parameters); + +gchar *zak_authe_authe (ZakAuthe *zakauthe); +gchar *zak_authe_get_password (ZakAuthe *zakauthe, gchar **password); + +GtkWidget *zak_authe_get_management_gui (ZakAuthe *zakauthe); + + +G_END_DECLS + + +#endif /* __ZAKAUTHE_H__ */ -- 2.49.0