Merge lp:~online-accounts/signon/packaging into lp:signon

Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: no longer in the source branch.
Merged at revision: 626
Proposed branch: lp:~online-accounts/signon/packaging
Merge into: lp:signon
Diff against target: 86 lines (+15/-6)
5 files modified
debian/changelog (+9/-0)
lib/SignOn/authsession.h (+2/-1)
lib/SignOn/authsessionimpl.cpp (+2/-0)
lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp (+1/-0)
src/signond/signondaemon.cpp (+1/-5)
To merge this branch: bzr merge lp:~online-accounts/signon/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+257252@code.launchpad.net

Commit message

* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)

Description of the change

* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~online-accounts/signon/packaging updated
626. By Alberto Mardegan on 2015-06-16

* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)
 Fixes: #1415492
Approved by: PS Jenkins bot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-02-04 10:39:42 +0000
3+++ debian/changelog 2015-06-12 11:22:36 +0000
4@@ -1,3 +1,12 @@
5+signon (8.57+15.04.20150204.1-0ubuntu3) UNRELEASED; urgency=medium
6+
7+ * Merge from upstream
8+ - lib: reset the DBus proxy when registration failed
9+ - Fix build with Qt 5.5 (LP: #1447175)
10+ - Remove obsolete warning about not running as root
11+
12+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Fri, 12 Jun 2015 14:17:06 +0300
13+
14 signon (8.57+15.04.20150204.1-0ubuntu1) vivid; urgency=medium
15
16 [ Alberto Mardegan ]
17
18=== modified file 'lib/SignOn/authsession.h'
19--- lib/SignOn/authsession.h 2013-08-20 08:01:44 +0000
20+++ lib/SignOn/authsession.h 2015-06-12 11:22:36 +0000
21@@ -2,6 +2,7 @@
22 * This file is part of signon
23 *
24 * Copyright (C) 2009-2010 Nokia Corporation.
25+ * Copyright (C) 2011-2015 Canonical Ltd.
26 *
27 * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
28 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
29@@ -40,7 +41,7 @@
30
31 namespace SignOnTests {
32 class AccessControlTest;
33-};
34+}
35
36 namespace SignOn {
37
38
39=== modified file 'lib/SignOn/authsessionimpl.cpp'
40--- lib/SignOn/authsessionimpl.cpp 2013-07-29 11:42:18 +0000
41+++ lib/SignOn/authsessionimpl.cpp 2015-06-12 11:22:36 +0000
42@@ -247,6 +247,8 @@
43 m_isAuthInProcessing = false;
44
45 m_dbusProxy.setError(err);
46+ // Forces a reinitialization of the proxy
47+ m_dbusProxy.setObjectPath(QDBusObjectPath());
48 return;
49 }
50
51
52=== modified file 'lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp'
53--- lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp 2014-04-10 10:31:10 +0000
54+++ lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp 2015-06-12 11:22:36 +0000
55@@ -25,6 +25,7 @@
56
57 #include <QDBusArgument>
58 #include <QBuffer>
59+#include <QDataStream>
60 #include <QDebug>
61
62 #include "SignOn/signonplugincommon.h"
63
64=== modified file 'src/signond/signondaemon.cpp'
65--- src/signond/signondaemon.cpp 2015-02-04 09:37:26 +0000
66+++ src/signond/signondaemon.cpp 2015-06-12 11:22:36 +0000
67@@ -2,7 +2,7 @@
68 * This file is part of signon
69 *
70 * Copyright (C) 2009-2010 Nokia Corporation.
71- * Copyright (C) 2013 Canonical Ltd.
72+ * Copyright (C) 2013-2015 Canonical Ltd.
73 *
74 * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
75 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
76@@ -386,10 +386,6 @@
77
78 m_configuration->load();
79
80- if (getuid() != 0) {
81- BLAME() << "Failed to SUID root. Secure storage will not be available.";
82- }
83-
84 QCoreApplication *app = QCoreApplication::instance();
85 if (!app)
86 qFatal("SignonDaemon requires a QCoreApplication instance to be "

Subscribers

No one subscribed via source and target branches