|
[-]
[+]
|
Changed |
_service:tar_git:flatpak-runner-0.9.1.tar.bz2/src/main.cpp
^
|
| @@ -129,9 +129,9 @@
}
else
std::cerr << "Wayland socket: " << socket.toStdString() << "\n";
- QmlCompositor compositor(view.data(), socket.toStdString().c_str());
- QObject::connect(view.data(), SIGNAL(afterRendering()), &compositor, SLOT(sendCallbacks()));
- view->rootContext()->setContextProperty("compositor", &compositor);
+ QmlCompositor *compositor = new QmlCompositor(view.data(), socket.toStdString().c_str());
+ QObject::connect(view.data(), SIGNAL(afterRendering()), compositor, SLOT(sendCallbacks()));
+ view->rootContext()->setContextProperty("compositor", compositor);
// application settings
AppSettings settings;
@@ -145,9 +145,9 @@
DBusContainerState dbuscontainer(view.data(), &keyheight);
// runner
- Runner runner(program, flatpak_options, program_options, socket,
- dbuscontainer.address(), settings);
- view->rootContext()->setContextProperty("runner", &runner);
+ Runner *runner = new Runner(program, flatpak_options, program_options, socket,
+ dbuscontainer.address(), settings, app.data());
+ view->rootContext()->setContextProperty("runner", runner);
// image converter
ImageConverter imageconv;
@@ -172,8 +172,8 @@
view->setSource(SailfishApp::pathTo("qml/main.qml"));
view->create();
QObject *firstPage = view->rootObject()->findChild<QObject*>("mainPage");
- QObject::connect(&compositor, SIGNAL(windowAdded(QVariant)), firstPage, SLOT(windowAdded(QVariant)));
- QObject::connect(&compositor, SIGNAL(windowResized(QVariant)), firstPage, SLOT(windowResized(QVariant)));
+ QObject::connect(compositor, SIGNAL(windowAdded(QVariant)), firstPage, SLOT(windowAdded(QVariant)));
+ QObject::connect(compositor, SIGNAL(windowResized(QVariant)), firstPage, SLOT(windowResized(QVariant)));
view->show();
app->processEvents();
|
| @@ -40,6 +40,7 @@
#include <QProcessEnvironment>
#include <iostream>
+#include <unistd.h>
#include "runner.h"
@@ -47,8 +48,8 @@
Runner::Runner(QString program, QStringList flatpak_options, QStringList program_options,
- QString wayland_socket, QString dbusaddress, AppSettings &appsettings):
- m_crashed(false), m_exitCode(0)
+ QString wayland_socket, QString dbusaddress, AppSettings &appsettings, QObject *parent):
+ QObject(parent), m_crashed(false), m_exitCode(0)
{
if (program.isEmpty())
return; // nothing to do
@@ -92,6 +93,9 @@
if (QFileInfo::exists(fs))
fo << QStringLiteral("--filesystem=%1:ro").arg(fs);
+ // add support for maliit connection via private dbus
+ fo << QStringLiteral("--filesystem=/run/user/%1/maliit-server").arg(getuid());
+
// devices
fo << "--device=all";
|
