From c2f7e4696607690c26faac9f6db4d0719d2f946d Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 13 Sep 2016 16:18:30 +0200 Subject: [PATCH] Added introspection. --- .gitignore | 2 ++ Makefile.am | 2 +- configure.ac | 2 ++ src/Makefile.am | 32 ++++++++++++++++++++++++++++++++ src/aute.c | 34 +++++++++++++++++++--------------- 5 files changed, 56 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 3abb6e9..bfec2e2 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ docs/reference/html/ docs/reference/xml/ compile gtk-doc.m4 +*.gir +*.typelib diff --git a/Makefile.am b/Makefile.am index 393a3fa..eaba737 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection SUBDIRS = src docs data diff --git a/configure.ac b/configure.ac index 9e25ee1..ca60420 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,8 @@ AC_PROG_LIBTOOL GTK_DOC_CHECK +GOBJECT_INTROSPECTION_CHECK([1.30.0]) + # Checks for libraries. have_libconfi=no diff --git a/src/Makefile.am b/src/Makefile.am index c92dc0a..368a805 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,9 @@ +if HAVE_LIBZAKCONFI + ZAKCONFI_GIR=ZakConfi-1.0 +else + ZAKCONFI_GIR= +endif + AM_CPPFLAGS = $(LIBZAKAUTHE_CFLAGS) \ $(LIBZAKCONFI_CFLAGS) \ -DLIB_ZAK_AUTHE_PLUGINS_DIR=\""$(libdir)/$(PACKAGE)/plugins"\" @@ -17,3 +23,29 @@ libzakauthe_includedir = $(includedir)/$(PACKAGE) libzakauthe_include_HEADERS = libzakauthe.h \ authe.h \ authepluggable.h + +CLEANFILES = + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) + +if HAVE_INTROSPECTION +introspection_sources = $(libzakauthe_la_SOURCES) $(libzakauthe_include_HEADERS) + +ZakAuthe-1.0.gir: libzakauthe.la +ZakAuthe_1_0_gir_INCLUDES = GObject-2.0 Peas-1.0 Gtk-3.0 $(ZAKCONFI_GIR) +ZakAuthe_1_0_gir_CFLAGS = $(AM_CPPFLAGS) +ZakAuthe_1_0_gir_LIBS = libzakauthe.la +ZakAuthe_1_0_gir_FILES = $(introspection_sources) +INTROSPECTION_GIRS += ZakAuthe-1.0.gir + +girdir = $(datadir)/gir-1.0 +gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif diff --git a/src/aute.c b/src/aute.c index bd5a966..25405a6 100644 --- a/src/aute.c +++ b/src/aute.c @@ -97,17 +97,21 @@ zak_authe_init (ZakAuthe *form) ZakAuthe *zak_authe_new () { - return ZAK_AUTHE (g_object_new (zak_authe_get_type (), NULL)); + ZakAuthe *zakauthe; + + zakauthe = ZAK_AUTHE (g_object_new (zak_authe_get_type (), NULL)); + + return zakauthe; } /* * zak_authe_set_config: - * @aute: an #ZakAuthe object. + * @zakauthe: an #ZakAuthe object. * @parameters: a #GSList of config parameters. * */ gboolean -zak_authe_set_config (ZakAuthe *aute, GSList *parameters) +zak_authe_set_config (ZakAuthe *zakauthe, GSList *parameters) { gboolean ret; @@ -117,7 +121,7 @@ zak_authe_set_config (ZakAuthe *aute, GSList *parameters) const GList *lst_plugins; - ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (zakauthe); g_return_val_if_fail (parameters != NULL && parameters->data != NULL, FALSE); @@ -132,7 +136,7 @@ zak_authe_set_config (ZakAuthe *aute, GSList *parameters) if (ZAK_IS_CONFI ((ZakConfi *)g_slist_nth_data (priv->parameters, 1))) { priv->confi = ZAK_CONFI ((ZakConfi *)g_slist_nth_data (priv->parameters, 1)); - module_name = zak_authe_get_pluggable_from_confi (aute); + module_name = zak_authe_get_pluggable_from_confi (zakauthe); } } #endif @@ -194,17 +198,17 @@ zak_authe_set_config (ZakAuthe *aute, GSList *parameters) /** * zak_authe_authe: - * @aute: + * @zakauthe: * * Returns: the user name if authentication is successfull; * empty string ("") if it is clicked the "Cancel" button; #NULL on error. */ gchar -*zak_authe_authe (ZakAuthe *aute) +*zak_authe_authe (ZakAuthe *zakauthe) { gchar *ret; - ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (zakauthe); g_return_val_if_fail (priv->pluggable != NULL, NULL); @@ -218,7 +222,7 @@ gchar /** * zak_authe_get_password: - * @aute: + * @zakauthe: * @password: * * Returns: il nome utente se l'autenticazione va a buon fine; @@ -226,11 +230,11 @@ gchar * Nel parametro @password ritorna la password inserita. */ gchar -*zak_authe_get_password (ZakAuthe *aute, gchar **password) +*zak_authe_get_password (ZakAuthe *zakauthe, gchar **password) { gchar *ret; - ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (zakauthe); g_return_val_if_fail (priv->pluggable != NULL, NULL); @@ -244,7 +248,7 @@ gchar /** * zak_authe_authe_nogui: - * @zakaute: + * @zakauthe: * @username: * @password: * @new_password: @@ -268,15 +272,15 @@ zak_authe_authe_nogui (ZakAuthe *zakauthe, const gchar *username, const gchar *p /** * zak_authe_get_management_gui: - * @aute: + * @zakauthe: * */ GtkWidget -*zak_authe_get_management_gui (ZakAuthe *aute) +*zak_authe_get_management_gui (ZakAuthe *zakauthe) { GtkWidget *ret; - ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (aute); + ZakAuthePrivate *priv = ZAK_AUTHE_GET_PRIVATE (zakauthe); g_return_val_if_fail (priv->pluggable != NULL, NULL); -- 2.49.0