[rkward/work/frameworks-Mac] rkward: Re-enable auto-starting of dbus session bus (but without the "-w" option).

[Thomas Friedrichsmeier]

Git commit 41ab77d056280b511ce5a478eafe5fe85b404fe4 by Thomas Friedrichsmeier.
Committed on 21/06/2017 at 18:54.
Pushed by tfry into branch 'work/frameworks-Mac'.

Re-enable auto-starting of dbus session bus (but without the "-w" option).

See also https://mail.kde.org/pipermail/kde-mac/2017-June/005277.html

M  +2    -2    rkward/main.cpp

https://commits.kde.org/rkward/41ab77d056280b511ce5a478eafe5fe85b404fe4

diff --git a/rkward/main.cpp b/rkward/main.cpp
index 79d78707..65c45476 100644
--- a/rkward/main.cpp
+++ b/rkward/main.cpp
@@ -249,8 +249,8 @@ int main (int argc, char *argv[]) {
 	}
 	// ensure that RKWard finds its own packages
 	qputenv ("R_LIBS", R_LIBS);
-    // do not auto(re)launch the session DBus (or at least not with the -w option!!)
-// 	QProcess::execute ("launchctl", QStringList () << "load" << INSTALL_PATH "/Library/LaunchAgents/org.freedesktop.dbus-session.plist");
+    // try to ensure that DBus is running before trying to connect
+	QProcess::execute ("launchctl", QStringList () << "load" << "/Library/LaunchAgents/org.freedesktop.dbus-session.plist");
 #endif
 
 	// Handle --reuse option, by placing a dbus-call to existing RKWard process (if any) and exiting