← Back to branch summary

~jonas-drange/ubuntu-system-settings/snapd-paths2

« back to all changes in this revision

Viewing changes to plugins/security-privacy/trust-store-model.cpp

  • Committer: jonas-drange
  • Date: 2016-09-15 21:40:40 UTC
  • mfrom: (1712.1.1 snap2)
  • Revision ID: jonas.drange@canonical.com-20160915214040-771sermr8hvl7tsb
migrate more paths to work on a snappy system

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/security-privacy/trust-store-model.cpp
24
24
#include <QIcon>
25
25
#include <QList>
26
26
#include <QMap>
 
27
#include <QtGlobal>
27
28
#include <QSet>
28
29
#include <QStandardPaths>
29
30
 
104
105
 
105
106
        /* try system location as well, that's at least needed for unity8-dash
106
107
         * which is not a click (yet) and doesn't have a .local entry */
107
 
        QString usrDesktopFilename(QString("/usr/share/applications/%1.desktop").arg(id));
 
108
        QString fileName = QString("/usr/share/applications/%1.desktop").arg(id);
 
109
        QString usrDesktopFilename(qgetenv("SNAP").append(fileName));
108
110
        if (QFile(usrDesktopFilename).exists())
109
111
            return usrDesktopFilename;
110
112