From edb2d2f4c1ae9de525205eeaf2c0647f93a14b70 Mon Sep 17 00:00:00 2001 From: Jussi Laako Date: Mon, 3 Jun 2013 17:31:00 +0300 Subject: [PATCH] Fix GObject introspection --- libgsignon-glib/Makefile.am | 16 +++++++++------- libgsignon-glib/signon-identity.c | 9 +++++++++ libgsignon-glib/signon-identity.h | 10 ++++++++++ libgsignon-glib/signon-security-context.c | 8 ++++++-- libgsignon-glib/signon-security-context.h | 3 +++ packaging/archive.sh | 6 ++++++ 6 files changed, 43 insertions(+), 9 deletions(-) create mode 100755 packaging/archive.sh diff --git a/libgsignon-glib/Makefile.am b/libgsignon-glib/Makefile.am index 49b724f..39a408b 100644 --- a/libgsignon-glib/Makefile.am +++ b/libgsignon-glib/Makefile.am @@ -171,6 +171,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION introspection_sources = \ + signon-security-context.c \ + signon-security-context.h \ signon-auth-service.c \ signon-auth-service.h \ signon-auth-session.c \ @@ -184,19 +186,19 @@ introspection_sources = \ signon-identity.c \ signon-identity.h -Signon-1.0.gir: libgsignon-glib.la -Signon_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 -Signon_1_0_gir_SCANNERFLAGS = \ +gSignon-1.0.gir: libgsignon-glib.la +gSignon_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 +gSignon_1_0_gir_SCANNERFLAGS = \ --identifier-prefix=Signon \ --symbol-prefix=signon \ --c-include="libgsignon-glib/signon-glib.h" \ --warn-all -Signon_1_0_gir_CFLAGS = \ +gSignon_1_0_gir_CFLAGS = \ -I$(top_srcdir) \ $(DEPS_CFLAGS) -Signon_1_0_gir_LIBS = libgsignon-glib.la -Signon_1_0_gir_FILES = $(introspection_sources) -INTROSPECTION_GIRS += Signon-1.0.gir +gSignon_1_0_gir_LIBS = libgsignon-glib.la +gSignon_1_0_gir_FILES = $(introspection_sources) +INTROSPECTION_GIRS += gSignon-1.0.gir girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) diff --git a/libgsignon-glib/signon-identity.c b/libgsignon-glib/signon-identity.c index ade93c2..d3899db 100644 --- a/libgsignon-glib/signon-identity.c +++ b/libgsignon-glib/signon-identity.c @@ -1615,6 +1615,15 @@ identity_session_object_destroyed_cb(gpointer data, g_object_unref (self); } +/** + * signon_identity_get_auth_session: + * @self: the #SignonIdentity. + * @session: the #SignonAuthSession object to get the remote object for. + * @method: method name for the session. + * @cb: (scope async): completion callback. + * + * Obtain a remote object for a local session object. + */ void signon_identity_get_auth_session (SignonIdentity *self, SignonAuthSession *session, const gchar *method, diff --git a/libgsignon-glib/signon-identity.h b/libgsignon-glib/signon-identity.h index 14c4ff1..18c0d4b 100644 --- a/libgsignon-glib/signon-identity.h +++ b/libgsignon-glib/signon-identity.h @@ -202,6 +202,16 @@ void signon_identity_remove_reference(SignonIdentity *self, SignonIdentityReferenceRemovedCb cb, gpointer user_data); +/** + * SignonIdentitySessionReadyCb: + * @self: the #SignonAuthSession. + * @error: a #GError if an error occurred, or %NULL otherwise. + * @connection: a #GDBusConnection for the session. + * @bus_name: a D-Bus bus name for the session. + * @object_path: a D-Bus object path for the session. + * + * Callback to be passed to signon_identity_get_auth_session(). + */ typedef void (*SignonIdentitySessionReadyCb) (SignonAuthSession *self, GError *error, GDBusConnection *connection, diff --git a/libgsignon-glib/signon-security-context.c b/libgsignon-glib/signon-security-context.c index 737db18..4e85f44 100644 --- a/libgsignon-glib/signon-security-context.c +++ b/libgsignon-glib/signon-security-context.c @@ -24,6 +24,10 @@ #include "signon-security-context.h" +G_DEFINE_BOXED_TYPE (SignonSecurityContext, signon_security_context, + (GBoxedCopyFunc) signon_security_context_copy, + (GBoxedFreeFunc) signon_security_context_free); + static void _security_context_free (gpointer ptr) { @@ -265,7 +269,7 @@ signon_security_context_list_build_variant ( * Builds a GList of #SignonSecurityContext items from a GVariant of type * "a(ss)". * - * Returns: (transfer full) #SignonSecurityContextList item. + * Returns: (transfer full): #SignonSecurityContextList item. */ SignonSecurityContextList * signon_security_context_list_deconstruct_variant (GVariant *variant) @@ -293,7 +297,7 @@ signon_security_context_list_deconstruct_variant (GVariant *variant) * * Copies a GList of #SignonSecurityContext items. * - * Returns: (transfer full) #SignonSecurityContextList item. + * Returns: (transfer full): #SignonSecurityContextList item. */ SignonSecurityContextList * signon_security_context_list_copy (const SignonSecurityContextList *src_list) diff --git a/libgsignon-glib/signon-security-context.h b/libgsignon-glib/signon-security-context.h index a91cd7b..057b1b9 100644 --- a/libgsignon-glib/signon-security-context.h +++ b/libgsignon-glib/signon-security-context.h @@ -26,6 +26,7 @@ #define _SIGNON_SECURITY_CONTEXT_H_ #include +#include G_BEGIN_DECLS @@ -49,6 +50,8 @@ typedef struct _SignonSecurityContext */ typedef GList SignonSecurityContextList; +GType signon_security_context_get_type (void) G_GNUC_CONST; + SignonSecurityContext * signon_security_context_new (); SignonSecurityContext * signon_security_context_new_from_values ( const gchar *system_context, diff --git a/packaging/archive.sh b/packaging/archive.sh new file mode 100755 index 0000000..3fdf34c --- /dev/null +++ b/packaging/archive.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# +git archive --format=tar --prefix=libgsignon-glib-2.0.0/ -o ../libgsignon-glib-2.0.0.tar master +bzip2 ../libgsignon-glib-2.0.0.tar +mv ../libgsignon-glib-2.0.0.tar.bz2 ~/rpmbuild/SOURCES/ + -- 2.34.1