Merge lp:~seb128/ubuntu-system-settings/location-desktop-usr into lp:ubuntu-system-settings

[Sebastien Bacher]

[security-privacy] use the system location as well to look for trust store
items, that's needed at least for unity8-dash which is not
distributed as a click and doesn't a .local entry

[security-privacy] use the system location as well to look for trust store
items, that's needed at least for unity8-dash which is not
distributed as a click and doesn't a .local entry

[Paweł Stołowski (stolowski)]

Doesn't compile, you need to declare usrDesktopFilename.

review: Needs Fixing

[lp:~seb128/ubuntu-system-settings/location-desktop-usr]

1539. By Sebastien Bacher on 2015-09-29

correctly define the variable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1538
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2416/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4399/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/600/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4396/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2416/rebuild

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

Yeah, works and looks fine. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1539
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2417/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/601
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4405
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4405/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23755

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2417/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

And bonus points for fixing bug #1501428.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1539
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2421/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/605
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4446
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4446/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23837

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2421/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/security-privacy/trust-store-model.cpp'
--- plugins/security-privacy/trust-store-model.cpp	2015-03-16 13:51:36 +0000
+++ plugins/security-privacy/trust-store-model.cpp	2015-09-29 11:40:07 +0000
@@ -102,6 +102,12 @@
             }
         }
 
+        /* try system location as well, that's at least needed for unity8-dash
+         * which is not a click (yet) and doesn't have a .local entry */
+        QString usrDesktopFilename(QString("/usr/share/applications/%1.desktop").arg(id));
+        if (QFile(usrDesktopFilename).exists())
+            return usrDesktopFilename;
+
         qWarning() << "No desktop file found for app id: " << id;
         return QString();
     }