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

[Alberto Mardegan]

Merge from upstream:

- Introspection: mark ACL and realms as string lists (LP: #1439695)

Merge from upstream:

- Introspection: mark ACL and realms as string lists (LP: #1439695)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-amd64-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-i386-ci/2

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:153
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-vivid-i386-ci/4

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

review: Needs Fixing (continuous-integration)

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

152. By Alberto Mardegan on 2015-04-10

Merge from upstream:

- Introspection: mark ACL and realms as string lists (LP: #1439695)

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-09 13:48:27 +0000
+++ debian/changelog	2015-04-10 07:30:42 +0000
@@ -1,3 +1,10 @@
+libsignon-glib (1.12+15.04.20141209-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge from upstream:
+    - Introspection: mark ACL and realms as string lists (LP: #1439695)
+
+ -- Alberto Mardegan <[e-mail]>  Thu, 02 Apr 2015 16:28:45 +0300
+
 libsignon-glib (1.12+15.04.20141209-0ubuntu1) vivid; urgency=medium
 
   [ Alberto Mardegan ]

=== modified file 'libsignon-glib/signon-identity-info.c'
--- libsignon-glib/signon-identity-info.c	2012-08-02 10:25:48 +0000
+++ libsignon-glib/signon-identity-info.c	2015-04-10 07:30:42 +0000
@@ -480,7 +480,7 @@
  * signon_identity_info_set_method:
  * @info: the #SignonIdentityInfo.
  * @method: an authentication method.
- * @mechanisms: a %NULL-termianted list of mechanisms.
+ * @mechanisms: (transfer none) (type GStrv): a %NULL-termianted list of mechanisms.
  *
  * Adds a method to the list of allowed methods. If this method is not called
  * even once, then all methods are allowed.
@@ -518,7 +518,7 @@
 /**
  * signon_identity_info_set_realms:
  * @info: the #SignonIdentityInfo.
- * @realms: a %NULL-terminated list of realms.
+ * @realms: (transfer none) (type GStrv): a %NULL-terminated list of realms.
  *
  * Specify what realms this identity can be used in.
  */
@@ -535,7 +535,8 @@
 /**
  * signon_identity_info_set_access_control_list:
  * @info: the #SignonIdentityInfo.
- * @access_control_list: a %NULL-terminated list of ACL security domains.
+ * @access_control_list: (transfer none) (type GStrv): a %NULL-terminated list
+ * of ACL security domains.
  *
  * Specifies the ACL for this identity. The actual meaning of the ACL depends
  * on the security framework used by signond.

=== modified file 'libsignon-glib/signon-identity.c'
--- libsignon-glib/signon-identity.c	2013-04-15 09:48:50 +0000
+++ libsignon-glib/signon-identity.c	2015-04-10 07:30:42 +0000
@@ -722,8 +722,8 @@
  * @store_secret: whether signond should store the password.
  * @methods: (transfer none) (element-type utf8 GStrv): methods.
  * @caption: caption.
- * @realms: realms.
- * @access_control_list: access control list.
+ * @realms: (transfer none) (type GStrv): realms.
+ * @access_control_list: (transfer none) (type GStrv): access control list.
  * @type: the type of the identity.
  * @cb: (scope async): callback.
  * @user_data: user_data.

=== modified file 'libsignon-glib/signon.vapi'
--- libsignon-glib/signon.vapi	2014-12-05 07:15:03 +0000
+++ libsignon-glib/signon.vapi	2015-04-10 07:30:42 +0000
@@ -59,11 +59,11 @@
 		public bool get_storing_secret ();
 		public unowned string get_username ();
 		public void remove_method (string method);
-		public void set_access_control_list (string access_control_list);
+		public void set_access_control_list ([CCode (array_length = false, array_null_terminated = true)] string[] access_control_list);
 		public void set_caption (string caption);
 		public void set_identity_type (Signon.IdentityType type);
-		public void set_method (string method, string mechanisms);
-		public void set_realms (string realms);
+		public void set_method (string method, [CCode (array_length = false, array_null_terminated = true)] string[] mechanisms);
+		public void set_realms ([CCode (array_length = false, array_null_terminated = true)] string[] realms);
 		public void set_secret (string secret, bool store_secret);
 		public void set_username (string username);
 	}

=== modified file 'tests/signon-glib-test.sh'
--- tests/signon-glib-test.sh	2012-11-29 12:00:52 +0000
+++ tests/signon-glib-test.sh	2015-04-10 07:30:42 +0000
@@ -18,7 +18,7 @@
 # session
 if command -v dbus-test-runner > /dev/null ; then
     echo "Using dbus-test-runner"
-    dbus-test-runner -m 180 -t signond \
+    dbus-test-runner -m 180 -t signond -r \
         -t "$TEST_APP" -f com.google.code.AccountsSSO.SingleSignOn
 else
     echo "Using existing D-Bus session"