Merge lp:~ken-vandine/signon-keyring-extension/0.5.1 into lp:signon-keyring-extension

Proposed by Ken VanDine on 2013-06-03
Status: Merged
Approved by: Alberto Mardegan on 2013-06-04
Approved revision: 28
Merged at revision: 28
Proposed branch: lp:~ken-vandine/signon-keyring-extension/0.5.1
Merge into: lp:signon-keyring-extension
Diff against target: 47 lines (+16/-2)
3 files modified
common-vars.pri (+1/-1)
debian/changelog (+12/-0)
src/secrets-storage.cpp (+3/-1)
To merge this branch: bzr merge lp:~ken-vandine/signon-keyring-extension/0.5.1
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2013-06-03 Approve on 2013-06-04
PS Jenkins bot (community) continuous-integration Approve on 2013-06-03
Review via email: mp+167074@code.launchpad.net

Commit message

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

Description of the change

This is a resubmission of a previous branch that hadn't been merged in a while and has since developed conflicts. To clean up the debian versioning I also bumped the version to 0.5.1. Previous merge proposal: https://code.launchpad.net/~mardy/signon-keyring-extension/lp1172710/+merge/161097

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

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Alberto Mardegan (mardy) wrote :

Ops, forgot about it. Thanks a lot for taking care of this!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common-vars.pri'
2--- common-vars.pri 2012-08-14 13:27:04 +0000
3+++ common-vars.pri 2013-06-03 15:36:31 +0000
4@@ -14,7 +14,7 @@
5 # Project version
6 # remember to update debian/* files if you changes this
7 #-----------------------------------------------------------------------------
8-PROJECT_VERSION = 0.4
9+PROJECT_VERSION = 0.5.1
10
11 # End of File
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-05-02 07:36:47 +0000
16+++ debian/changelog 2013-06-03 15:36:31 +0000
17@@ -1,3 +1,15 @@
18+signon-keyring-extension (0.5.1-0ubuntu1) UNRELEASED; urgency=low
19+
20+ [ Ken VanDine ]
21+ * New upstream version
22+
23+ [ Alberto Mardegan ]
24+ * Remove record when signond asks to remove the data for all authentication
25+ methods (LP: #1172710)
26+ * Build with Qt5 by default
27+
28+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 03 Jun 2013 11:25:39 -0400
29+
30 signon-keyring-extension (0.5bzr13.04.26daily13.05.02ubuntu.unity.next-0ubuntu1) raring; urgency=low
31
32 [ Ɓukasz 'sil2100' Zemczak ]
33
34=== modified file 'src/secrets-storage.cpp'
35--- src/secrets-storage.cpp 2012-11-06 10:41:11 +0000
36+++ src/secrets-storage.cpp 2013-06-03 15:36:31 +0000
37@@ -147,7 +147,9 @@
38
39 bool SecretsStorage::removeData(quint32 id, quint32 method)
40 {
41- return removeSecrets(Data, id, method, IdField | MethodField | TypeField);
42+ return (method != 0) ?
43+ removeSecrets(Data, id, method, IdField | MethodField | TypeField) :
44+ removeCredentials(id);
45 }
46
47 bool SecretsStorage::storeSecret(SignonSecretType type,

Subscribers

People subscribed via source and target branches