Merge lp:~mardy/signon-keyring-extension/lp1172710 into lp:signon-keyring-extension

[Alberto Mardegan]

* Remove record when signond asks to remove the data for all authentication
  methods (LP: #1172710)
* Build with Qt5 by default

* Remove record when signond asks to remove the data for all authentication
  methods (LP: #1172710)
* Build with Qt5 by default

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:24
http://jenkins.qa.ubuntu.com/job/signon-keyring-extension-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/signon-keyring-extension-raring-amd64-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-keyring-extension-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/signon-keyring-extension-autolanding/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/signon-keyring-extension-raring-amd64-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/signon-keyring-extension-autolanding/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/signon-keyring-extension-raring-amd64-autolanding/2/console

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

This has lagged too long and now has conflicts. The autolanding failure was due to parts of the stack pulling in qt4 deps, which has since been resolved. I've cleaned up the conflicts and resubmitted at https://code.launchpad.net/~ken-vandine/signon-keyring-extension/0.5.1/+merge/167074

review: Disapprove

Unmerged revisions

=== modified file 'common-vars.pri'
--- common-vars.pri	2012-08-14 13:27:04 +0000
+++ common-vars.pri	2013-04-26 11:34:28 +0000
@@ -14,7 +14,7 @@
 # Project version
 # remember to update debian/* files if you changes this
 #-----------------------------------------------------------------------------
-PROJECT_VERSION = 0.4
+PROJECT_VERSION = 0.5
 
 # End of File
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-06 05:01:02 +0000
+++ debian/changelog	2013-04-26 11:34:28 +0000
@@ -1,3 +1,11 @@
+signon-keyring-extension (0.5-0ubuntu1) UNRELEASED; urgency=low
+
+  * Remove record when signond asks to remove the data for all authentication
+    methods (LP: #1172710)
+  * Build with Qt5 by default
+
+ -- Alberto Mardegan <[e-mail]>  Fri, 26 Apr 2013 14:28:04 +0300
+
 signon-keyring-extension (0.4daily12.12.06-0ubuntu1) raring; urgency=low
 
   * Automatic snapshot from revision 22

=== modified file 'debian/control'
--- debian/control	2012-11-21 18:52:27 +0000
+++ debian/control	2013-04-26 11:34:28 +0000
@@ -4,6 +4,7 @@
 Build-Depends: debhelper (>= 9),
                libgnome-keyring-dev,
                pkg-config,
+               qt5-default,
                signond-dev,
 Standards-Version: 3.9.3
 Section: gnome

=== modified file 'src/secrets-storage.cpp'
--- src/secrets-storage.cpp	2012-11-06 10:41:11 +0000
+++ src/secrets-storage.cpp	2013-04-26 11:34:28 +0000
@@ -147,7 +147,9 @@
 
 bool SecretsStorage::removeData(quint32 id, quint32 method)
 {
-    return removeSecrets(Data, id, method, IdField | MethodField | TypeField);
+    return (method != 0) ?
+        removeSecrets(Data, id, method, IdField | MethodField | TypeField) :
+        removeCredentials(id);
 }
 
 bool SecretsStorage::storeSecret(SignonSecretType type,