Merge lp:~online-accounts/libsignon-glib/packaging into lp:libsignon-glib

[Alberto Mardegan]

New upstream release

- Introspection: fix transfer type of some methods
- Update VALA bindings (bug 1382843)

New upstream release

- Introspection: fix transfer type of some methods
- Update VALA bindings (bug 1382843)

[David Barth (dbarth)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-amd64-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libsignon-glib-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[lp:~online-accounts/libsignon-glib/packaging]

150. By Alberto Mardegan on 2014-12-09

New upstream release

- Introspection: fix transfer type of some methods
- Update VALA bindings (bug 1382843)

Approved by: David Barth

=== modified file 'NEWS'
--- NEWS	2013-06-05 11:28:59 +0000
+++ NEWS	2014-12-09 13:40:34 +0000
@@ -1,5 +1,19 @@
 libsignon-glib NEWS
 
+Version 1.12
+------------
+
+* Introspection: fix transfer type of some methods
+* Update VALA bindings
+
+Version 1.11
+------------
+
+* Disconnect from signals when the remote AuthSession dies
+  http://code.google.com/p/accounts-sso/issues/detail?id=229
+* Avoid unreferencing a NULL GVariant
+* Fix the linking problem when using check
+
 Version 1.10
 ------------
 
 
=== modified file 'configure.ac'
--- configure.ac	2013-06-21 14:46:21 +0000
+++ configure.ac	2014-12-09 13:40:34 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.64])
 AC_INIT([libsignon-glib],
-        [1.10],
+        [1.12],
         [http://code.google.com/p/accounts-sso/issues/entry],
         [libsignon-glib],
         [http://code.google.com/p/accounts-sso/])
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-06-25 04:31:09 +0000
+++ debian/changelog	2014-12-09 13:40:34 +0000
@@ -1,3 +1,17 @@
+libsignon-glib (1.12-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Introspection: fix transfer type of some methods
+    - Update VALA bindings (LP: #1382843)
+
+ -- Alberto Mardegan <[e-mail]>  Tue, 09 Dec 2014 11:21:44 +0200
+
+libsignon-glib (1.10daily13.06.25-0ubuntu2) trusty; urgency=medium
+
+  * Rebuild to drop files installed into /usr/share/pyshared.
+
+ -- Matthias Klose <[e-mail]>  Sun, 23 Feb 2014 13:48:19 +0000
+
 libsignon-glib (1.10daily13.06.25-0ubuntu1) saucy; urgency=low
 
   [ Jeremy Bicha ]
 
=== modified file 'libsignon-glib/signon-auth-service.c'
--- libsignon-glib/signon-auth-service.c	2012-11-29 12:00:52 +0000
+++ libsignon-glib/signon-auth-service.c	2014-12-09 13:40:34 +0000
@@ -176,7 +176,7 @@
 /**
  * SignonQueryMethodsCb:
  * @auth_service: the #SignonAuthService.
- * @methods: (transfer full) (type GStrv): list of available methods.
+ * @methods: (transfer none) (type GStrv): list of available methods.
  * @error: a #GError if an error occurred, %NULL otherwise.
  * @user_data: the user data that was passed when installing this callback.
  *
@@ -218,7 +218,7 @@
  * SignonQueryMechanismCb:
  * @auth_service: the #SignonAuthService.
  * @method: the authentication method being inspected.
- * @mechanisms: (transfer full) (type GStrv): list of available mechanisms.
+ * @mechanisms: (transfer none) (type GStrv): list of available mechanisms.
  * @error: a #GError if an error occurred, %NULL otherwise.
  * @user_data: the user data that was passed when installing this callback.
  *
 
=== modified file 'libsignon-glib/signon-auth-session.c'
--- libsignon-glib/signon-auth-session.c	2013-02-05 14:23:39 +0000
+++ libsignon-glib/signon-auth-session.c	2014-12-09 13:40:34 +0000
@@ -244,13 +244,25 @@
         if (reply != NULL)
             g_hash_table_unref (reply);
     }
-    g_variant_unref (v_reply);
+
+    if (v_reply != NULL)
+        g_variant_unref (v_reply);
 
     g_slice_free (AuthSessionProcessCbData, cb_data);
     g_clear_error (&error);
     g_object_unref (res);
 }
 
+static void
+destroy_proxy (SignonAuthSessionPrivate *priv)
+{
+    g_signal_handler_disconnect (priv->proxy, priv->signal_state_changed);
+    g_signal_handler_disconnect (priv->proxy, priv->signal_unregistered);
+    g_object_unref (priv->proxy);
+
+    priv->proxy = NULL;
+}
+
 static GQuark
 auth_session_object_quark ()
 {
@@ -288,13 +300,7 @@
     }
 
     if (priv->proxy)
-    {
-        g_signal_handler_disconnect (priv->proxy, priv->signal_state_changed);
-        g_signal_handler_disconnect (priv->proxy, priv->signal_unregistered);
-        g_object_unref (priv->proxy);
-
-        priv->proxy = NULL;
-    }
+        destroy_proxy (priv);
 
     if (priv->auth_service_proxy)
     {
@@ -503,7 +509,7 @@
 /**
  * SignonAuthSessionProcessCb:
  * @self: the #SignonAuthSession.
- * @session_data: (transfer full) (element-type utf8 GValue): a dictionary with
+ * @session_data: (transfer none) (element-type utf8 GValue): a dictionary with
  * the response.
  * @error: a #GError if an error occurred, %NULL otherwise.
  * @user_data: the user data that was passed when installing this callback.
@@ -763,19 +769,8 @@
     DEBUG ("remote object unregistered");
 
     if (priv->proxy)
-    {
-        g_object_unref (priv->proxy);
-        priv->proxy = NULL;
-    }
+        destroy_proxy (priv);
 
-    /*
-     * as remote object is destroyed only
-     * when the session core is destroyed,
-     * so there should not be any processes
-     * running
-     * */
-    priv->busy = FALSE;
-    priv->canceled = FALSE;
     _signon_object_not_ready(self);
 }
 
 
=== modified file 'libsignon-glib/signon-identity.h'
--- libsignon-glib/signon-identity.h	2012-01-27 10:24:27 +0000
+++ libsignon-glib/signon-identity.h	2014-12-09 13:40:34 +0000
@@ -165,7 +165,7 @@
 /**
  * SignonIdentityInfoCb:
  * @self: the #SignonIdentity.
- * @info: the #SignonIdentityInfo for @self.
+ * @info: (transfer none): the #SignonIdentityInfo for @self.
  * @error: a #GError if an error occurred, or %NULL otherwise.
  * @user_data: the user data that was passed when installing this callback.
  *
 
=== modified file 'libsignon-glib/signon.vapi'
--- libsignon-glib/signon.vapi	2012-07-16 12:29:34 +0000
+++ libsignon-glib/signon.vapi	2014-12-09 13:40:34 +0000
@@ -6,8 +6,8 @@
 	public class AuthService : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public AuthService ();
-		public void query_mechanisms (string method, Signon.QueryMechanismCb cb);
-		public void query_methods (Signon.QueryMethodsCb cb);
+		public void query_mechanisms (string method, [CCode (scope = "async")] owned Signon.QueryMechanismCb cb);
+		public void query_methods ([CCode (scope = "async")] owned Signon.QueryMethodsCb cb);
 	}
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", type_id = "signon_auth_session_get_type ()")]
 	public class AuthSession : GLib.Object {
@@ -15,9 +15,11 @@
 		public AuthSession (uint id, string method_name) throws GLib.Error;
 		public void cancel ();
 		public unowned string get_method ();
-		public void process (GLib.HashTable<string,GLib.Value?> session_data, string mechanism, Signon.AuthSessionProcessCb cb);
-		public void query_available_mechanisms (string wanted_mechanisms, Signon.AuthSessionQueryAvailableMechanismsCb cb);
-		public signal void state_changed (int object, string p0);
+		[Deprecated (since = "1.8")]
+		public void process (GLib.HashTable<string,GLib.Value?> session_data, string mechanism, [CCode (scope = "async")] owned Signon.AuthSessionProcessCb cb);
+		public async GLib.Variant process_async (GLib.Variant session_data, string mechanism, GLib.Cancellable? cancellable) throws GLib.Error;
+		public void query_available_mechanisms (string wanted_mechanisms, [CCode (scope = "async")] owned Signon.AuthSessionQueryAvailableMechanismsCb cb);
+		public signal void state_changed (int state, string message);
 	}
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", type_id = "signon_identity_get_type ()")]
 	public class Identity : GLib.Object {
@@ -28,12 +30,12 @@
 		[CCode (has_construct_function = false)]
 		public Identity.from_db (uint32 id);
 		public unowned GLib.Error get_last_error ();
-		public void query_info (Signon.IdentityInfoCb cb);
-		public void remove (Signon.IdentityRemovedCb cb, void* user_data);
+		public void query_info ([CCode (scope = "async")] owned Signon.IdentityInfoCb cb);
+		public void remove ([CCode (scope = "async")] owned Signon.IdentityRemovedCb cb, void* user_data);
 		public void remove_reference (string reference, Signon.IdentityReferenceRemovedCb cb, void* user_data);
-		public void store_credentials_with_args (string username, string secret, bool store_secret, GLib.HashTable<string,string[]> methods, string caption, string realms, string access_control_list, Signon.IdentityType type, Signon.IdentityStoreCredentialsCb cb);
-		public void store_credentials_with_info (Signon.IdentityInfo info, Signon.IdentityStoreCredentialsCb cb);
-		public void verify_secret (string secret, Signon.IdentityVerifyCb cb);
+		public void store_credentials_with_args (string username, string secret, bool store_secret, GLib.HashTable<string,string[]> methods, string caption, string realms, string access_control_list, Signon.IdentityType type, [CCode (scope = "async")] owned Signon.IdentityStoreCredentialsCb cb);
+		public void store_credentials_with_info (Signon.IdentityInfo info, [CCode (scope = "async")] owned Signon.IdentityStoreCredentialsCb cb);
+		public void verify_secret (string secret, [CCode (scope = "async")] owned Signon.IdentityVerifyCb cb);
 		[NoAccessorMethod]
 		public uint id { get; set; }
 		[HasEmitter]
@@ -65,7 +67,7 @@
 		public void set_secret (string secret, bool store_secret);
 		public void set_username (string username);
 	}
-	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", cprefix = "SIGNON_IDENTITY_TYPE_")]
+	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", cprefix = "SIGNON_IDENTITY_TYPE_", type_id = "signon_identity_type_get_type ()")]
 	[Flags]
 	public enum IdentityType {
 		OTHER,
@@ -73,7 +75,7 @@
 		WEB,
 		NETWORK
 	}
-	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", cprefix = "SIGNON_POLICY_")]
+	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", cprefix = "SIGNON_POLICY_", type_id = "signon_session_data_ui_policy_get_type ()")]
 	public enum SessionDataUiPolicy {
 		DEFAULT,
 		REQUEST_PASSWORD,
@@ -120,7 +122,7 @@
 		public static GLib.Quark quark ();
 	}
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
-	public delegate void AuthSessionProcessCb (Signon.AuthSession self, owned GLib.HashTable<string,GLib.Value?> session_data, GLib.Error error);
+	public delegate void AuthSessionProcessCb (Signon.AuthSession self, GLib.HashTable<string,GLib.Value?> session_data, GLib.Error error);
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
 	public delegate void AuthSessionQueryAvailableMechanismsCb (Signon.AuthSession self, [CCode (array_length = false, array_null_terminated = true)] owned string[] mechanisms, GLib.Error error);
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
@@ -142,9 +144,9 @@
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 2.9)]
 	public delegate void IdentityVoidCb (Signon.Identity self, GLib.Error error);
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 4.9)]
-	public delegate void QueryMechanismCb (Signon.AuthService auth_service, string method, [CCode (array_length = false, array_null_terminated = true)] owned string[] mechanisms, GLib.Error error);
+	public delegate void QueryMechanismCb (Signon.AuthService auth_service, string method, [CCode (array_length = false, array_null_terminated = true)] string[] mechanisms, GLib.Error error);
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
-	public delegate void QueryMethodsCb (Signon.AuthService auth_service, [CCode (array_length = false, array_null_terminated = true)] owned string[] methods, GLib.Error error);
+	public delegate void QueryMethodsCb (Signon.AuthService auth_service, [CCode (array_length = false, array_null_terminated = true)] string[] methods, GLib.Error error);
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_CAPTION")]
 	public const string SESSION_DATA_CAPTION;
 	[CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_PROXY")]
 
=== modified file 'tests/check_signon.c'
--- tests/check_signon.c	2013-06-05 07:34:33 +0000
+++ tests/check_signon.c	2014-12-09 13:40:34 +0000
@@ -648,6 +648,7 @@
 {
     SignonIdentityInfo *info;
     SignonIdentity *identity;
+    const gchar *const acl[] = { "*", NULL };
 
     g_debug("%s", G_STRFUNC);
 
@@ -659,6 +660,7 @@
 
     info = signon_identity_info_new ();
     signon_identity_info_set_username (info, "Nice user");
+    signon_identity_info_set_access_control_list (info, acl);
 
     signon_identity_store_credentials_with_info (identity,
                                                  info,
@@ -716,6 +718,7 @@
 {
     SignonIdentity *identity;
     GHashTable *methods;
+    const gchar *const acl[] = { "*", NULL };
     guint id = 0;
 
     identity = signon_identity_new(NULL, NULL);
@@ -728,7 +731,7 @@
                                                  methods,
                                                  "caption",
                                                  NULL,
-                                                 NULL,
+                                                 acl,
                                                  0,
                                                  new_identity_store_credentials_cb,
                                                  &id);
@@ -788,7 +791,8 @@
     fail_unless (error != NULL);
 
     fail_unless (error->domain == SIGNON_ERROR);
-    fail_unless (error->code == SIGNON_ERROR_IDENTITY_NOT_FOUND);
+    fail_unless (error->code == SIGNON_ERROR_IDENTITY_NOT_FOUND ||
+                 error->code == SIGNON_ERROR_PERMISSION_DENIED);
 
     end_test ();
 }
@@ -880,6 +884,8 @@
 
 START_TEST(test_verify_secret_identity)
 {
+    const gchar *const acl[] = { "*", NULL };
+
     g_debug("%s", G_STRFUNC);
     SignonIdentity *idty = signon_identity_new(NULL, NULL);
     fail_unless (idty != NULL);
@@ -899,7 +905,7 @@
                                                  methods,
                                                  caption,
                                                  NULL,
-                                                 NULL,
+                                                 acl,
                                                  0,
                                                  store_credentials_identity_cb,
                                                  NULL);
@@ -1069,6 +1075,7 @@
 
 static SignonIdentityInfo *create_standard_info()
 {
+    const gchar *const acl[] = { "*", NULL };
     g_debug("%s", G_STRFUNC);
     SignonIdentityInfo *info = signon_identity_info_new ();
     signon_identity_info_set_username (info, "James Bond");
@@ -1085,12 +1092,15 @@
     signon_identity_info_set_method (info, "method1", (const gchar **)mechanisms);
     signon_identity_info_set_method (info, "method2", (const gchar **)mechanisms);
     signon_identity_info_set_method (info, "method3", (const gchar **)mechanisms);
+    signon_identity_info_set_access_control_list (info, acl);
 
     return info;
 }
 
 START_TEST(test_info_identity)
 {
+    const gchar *const acl[] = { "*", NULL };
+
     g_debug("%s", G_STRFUNC);
     SignonIdentity *idty = signon_identity_new();
     fail_unless (idty != NULL);
@@ -1114,7 +1124,7 @@
                                                  methods,
                                                  "caption",
                                                  NULL,
-                                                 NULL,
+                                                 acl,
                                                  0,
                                                  store_credentials_identity_cb,
                                                  NULL);