yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use KWIN_DBUS_SERVICE_SUFFIX for multi-head service name wrangling

Browse source 
Adjust the KWIN_DBUS_SERVICE_SUFFIX env variable in a multi-head
scenario instead of adjusting the "org.kde.kwin" DBus service which
we actually don't use in 5.x any more.

REVIEW: 122217
This commit is contained in:
Martin Gräßlin 2015-01-23 09:48:55 +01:00
parent 861e7a5739
commit 8cb78b7df6
4 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
main.cpp
View file

@ -298,18 +298,6 @@ void Application::processCommandLine(QCommandLineParser *parser)
Application::setCrashCount(parser->value(s_crashesOption).toInt()); Application::setCrashCount(parser->value(s_crashesOption).toInt());
} }
void Application::registerDBusService()
{
QString appname;
if (x11ScreenNumber() == 0)
appname = QStringLiteral("org.kde.kwin");
else
appname.sprintf("org.kde.kwin-screen-%d", KWin::Application::x11ScreenNumber());
QDBusConnection::sessionBus().interface()->registerService(
appname, QDBusConnectionInterface::DontQueueService);
}
void Application::setupTranslator() void Application::setupTranslator()
{ {
QTranslator *qtTranslator = new QTranslator(qApp); QTranslator *qtTranslator = new QTranslator(qApp);

2
main.h
View file

@ -82,8 +82,6 @@ public:
void setupCommandLine(QCommandLineParser *parser); void setupCommandLine(QCommandLineParser *parser);
void processCommandLine(QCommandLineParser *parser); void processCommandLine(QCommandLineParser *parser);
void registerDBusService();
static void setCrashCount(int count); static void setCrashCount(int count);
static bool wasCrash(); static bool wasCrash();

3
main_wayland.cpp
View file

@ -270,8 +270,5 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
a.start(); a.start();
// TODO: is this still needed?
a.registerDBusService();
return a.exec(); return a.exec();
} }

9
main_x11.cpp
View file

@ -224,6 +224,12 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
// acts exactly as previously // acts exactly as previously
if (i != KWin::Application::x11ScreenNumber() && fork() == 0) { if (i != KWin::Application::x11ScreenNumber() && fork() == 0) {
KWin::Application::setX11ScreenNumber(i); KWin::Application::setX11ScreenNumber(i);
QByteArray dBusSuffix = qgetenv("KWIN_DBUS_SERVICE_SUFFIX");
if (!dBusSuffix.isNull()) {
dBusSuffix.append(".");
}
dBusSuffix.append(QByteArrayLiteral("head-")).append(QByteArray::number(i));
qputenv("KWIN_DBUS_SERVICE_SUFFIX", dBusSuffix);
// Break here because we are the child process, we don't // Break here because we are the child process, we don't
// want to fork() anymore // want to fork() anymore
break; break;
@ -288,8 +294,5 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
#endif #endif
KWin::SessionSaveDoneHelper helper; KWin::SessionSaveDoneHelper helper;
// TODO: is this still needed?
a.registerDBusService();
return a.exec(); return a.exec();
} }