chris/harbour-sailfin
chris/harbour-sailfin
1
0
Fork 0
mirror of https://github.com/HenkKalkwater/harbour-sailfin.git synced 2024-11-22 09:15:18 +00:00
Code Issues Releases Wiki Activity

Make sandboxing the default, remove the cli-option

Browse source 
SailfishOS 4.0.1 has been out for over half a year now, sandboxing
should have wide support by now.
This commit is contained in:
Chris Josten 2021-08-22 14:48:22 +02:00
parent 2bd9d66841
commit 7f39da0b95
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sailfish/harbour-sailfin.desktop
View file

@ -1,10 +1,9 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Version=1.1 Version=1.1
X-Nemo-Application-Type=silica-qt5 # X-Nemo-Application-Type=silica-qt5
Icon=harbour-sailfin Icon=harbour-sailfin
Exec=harbour-sailfin --no-attempt-sandbox Exec=/usr/bin/sailjail -p harbour-sailfin.desktop /usr/bin/harbour-sailfin
Name=Sailfin Name=Sailfin
# translation example: # translation example:

15
sailfish/src/harbour-sailfin.cpp
View file

@ -56,29 +56,14 @@ int main(int argc, char *argv[]) {
//: Application display name //: Application display name
app->setApplicationDisplayName(QObject::tr("Sailfin")); app->setApplicationDisplayName(QObject::tr("Sailfin"));
bool canSanbox = QFile::exists(SANDBOX_PROGRAM);
QCommandLineParser cmdParser; QCommandLineParser cmdParser;
cmdParser.addHelpOption(); cmdParser.addHelpOption();
cmdParser.addVersionOption(); cmdParser.addVersionOption();
QCommandLineOption sandboxOption("no-attempt-sandbox", app->translate("Command line argument description", "Try to not start with FireJail."));
if (canSanbox) {
cmdParser.addOption(sandboxOption);
}
cmdParser.process(*app);
if (canSanbox && !cmdParser.isSet(sandboxOption)) {
qDebug() << "Restarting in sandbox mode";
QProcess::execute(QString(SANDBOX_PROGRAM),
QStringList() << "-p" << "harbour-sailfin.desktop" << "harbour-sailfin");
return 0;
}
Jellyfin::registerTypes(); Jellyfin::registerTypes();
QQuickView *view = SailfishApp::createView(); QQuickView *view = SailfishApp::createView();
view->setSource(SailfishApp::pathToMainQml()); view->setSource(SailfishApp::pathToMainQml());
view->show(); view->show();
qDebug() << "QML import paths: " << view->engine()->importPathList();
return app->exec(); return app->exec();
} }