Merge lp:~aacid/unity8/complainRegisterServiceFails into lp:unity8

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2839
Merged at revision: 2861
Proposed branch: lp:~aacid/unity8/complainRegisterServiceFails
Merge into: lp:unity8
Diff against target: 29 lines (+5/-2)
1 file modified
plugins/Utils/URLDispatcher.cpp (+5/-2)
To merge this branch: bzr merge lp:~aacid/unity8/complainRegisterServiceFails
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+318633@code.launchpad.net

Commit message

Add warning if registerService fails

Coverity argues we do that in the rest of calls so be consistent

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
N/A

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2838
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3250/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4267
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2541
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2541
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4295
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4129/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4129/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4129/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4129/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4129/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4129/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3250/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM, CI passing too

review: Approve
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

"""
- * Copyright (C) 2016 Canonical, Ltd.
+ * Copyright (C) 2017 Canonical, Ltd.
"""

Shouldn't it be "2016-2017" instead of just "2017"?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/Utils/URLDispatcher.cpp'
--- plugins/Utils/URLDispatcher.cpp 2016-07-18 20:42:57 +0000
+++ plugins/Utils/URLDispatcher.cpp 2017-03-02 09:01:07 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2016 Canonical, Ltd.2 * Copyright (C) 2016-2017 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
17#include "URLDispatcher.h"17#include "URLDispatcher.h"
1818
19#include <QDBusConnection>19#include <QDBusConnection>
20#include <QDebug>
2021
21class URLDispatcherInterface : public QObject22class URLDispatcherInterface : public QObject
22{23{
@@ -63,7 +64,9 @@
63 connection.registerObject(QStringLiteral("/com/canonical/URLDispatcher"),64 connection.registerObject(QStringLiteral("/com/canonical/URLDispatcher"),
64 dispatcher,65 dispatcher,
65 QDBusConnection::ExportScriptableContents);66 QDBusConnection::ExportScriptableContents);
66 connection.registerService(QStringLiteral("com.canonical.URLDispatcher"));67 if (!connection.registerService(QStringLiteral("com.canonical.URLDispatcher"))) {
68 qWarning() << "Unable to register DBus service com.canonical.URLDispatcher";
69 }
67 m_dispatcher = dispatcher;70 m_dispatcher = dispatcher;
68 } else {71 } else {
69 connection.unregisterService(QStringLiteral("com.canonical.URLDispatcher"));72 connection.unregisterService(QStringLiteral("com.canonical.URLDispatcher"));

Subscribers

People subscribed via source and target branches