Merge lp:~bigon/ubuntu-sso-client/gnome3-gnome-keyring into lp:ubuntu-sso-client

[Laurent Bigonville]

[dobey (dobey)]

This is a separate issue from the CreateItem bug. Your patch also breaks compatibility with gnome-keyring 2.x, which we need to maintain. And you will need to sign the Canonical Contributor Agreement as detailed on http://www.canonical.com/contributors .

Thanks.

review: Needs Fixing

Unmerged revisions

712. By Laurent Bigonville on 2011-05-02

Further fixes for new secret-service D-Bus API (LP: #745540)

=== modified file 'ubuntu_sso/utils/txsecrets.py'
--- ubuntu_sso/utils/txsecrets.py	2011-04-15 19:56:34 +0000
+++ ubuntu_sso/utils/txsecrets.py	2011-05-02 08:38:22 +0000
@@ -46,7 +46,9 @@
 ALGORITHM = "plain"
 ALGORITHM_PARAMS = ""
 LABEL_PROPERTY = "Label"
-ATTRIBUTES_PROPERTY = "Attributes"
+LABEL_ITEM_PROPERTY = "org.freedesktop.Secret.Item.Label"
+LABEL_COLLECTION_PROPERTY = "org.freedesktop.Secret.Collection.Label"
+ATTRIBUTES_PROPERTY = "org.freedesktop.Secret.Item.Attributes"
 COLLECTIONS_PROPERTY = "Collections"
 DEFAULT_LABEL = "default"
 
@@ -163,8 +165,8 @@
             else:
                 d.callback(collection)
 
-        properties = {LABEL_PROPERTY: dbus.String(label, variant_level=1)}
-        self.service.CreateCollection(properties,
+        properties = {LABEL_COLLECTION_PROPERTY: dbus.String(label, variant_level=1)}
+        self.service.CreateCollection(properties, "default",
                                       reply_handler=createcollection_handler,
                                       error_handler=d.errback)
 
@@ -295,7 +297,7 @@
                                              error_handler=d.errback)
 
         properties = dbus.Dictionary(signature="sv")
-        properties[LABEL_PROPERTY] = label
+        properties[LABEL_ITEM_PROPERTY] = label
         attributes = dbus.Dictionary(attr, signature="ss")
         properties[ATTRIBUTES_PROPERTY] = attributes
         parameters = dbus.ByteArray(ALGORITHM_PARAMS)