[rkward/work/frameworks-Mac] rkward: assume DBus is running + update variable name

[R.J.V. Bertin]

Git commit 4e0ac7cd2ae828b602a1cc475cf6d039254a4b97 by R.J.V. Bertin.
Committed on 17/05/2017 at 17:58.
Pushed by rjvbb into branch 'work/frameworks-Mac'.

assume DBus is running + update variable name

M  +4    -3    rkward/main.cpp

https://commits.kde.org/rkward/4e0ac7cd2ae828b602a1cc475cf6d039254a4b97

diff --git a/rkward/main.cpp b/rkward/main.cpp
index 1a6a0d02..4fd5d892 100644
--- a/rkward/main.cpp
+++ b/rkward/main.cpp
@@ -225,16 +225,17 @@ int main (int argc, char *argv[]) {
 	RKGlobals::startup_options["backend-debugger"] = parser.value ("backend-debugger");
 
 	// MacOS may need some path adjustments, first
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 	QString oldpath = qgetenv ("PATH");
 	if (!oldpath.contains (INSTALL_PATH)) {
 		//ensure that PATH is set to include what we deliver with the bundle
 		qputenv ("PATH", QString ("%1/bin:%1/sbin:%2").arg (INSTALL_PATH).arg (oldpath).toLocal8Bit ());
-		if (debug_level > 3) qDebug ("Adjusting system path to %s", qPrintable (qgetenv ("PATH")));
+		if (RK_Debug_Level > 3) qDebug ("Adjusting system path to %s", qPrintable (qgetenv ("PATH")));
 	}
 	// ensure that RKWard finds its own packages
 	qputenv ("R_LIBS", R_LIBS);
-	QProcess::execute ("launchctl", QStringList () << "load" << "-w" << INSTALL_PATH "/Library/LaunchAgents/org.freedesktop.dbus-session.plist");
+    // 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");
 #endif
 
 	// Handle --reuse option, by placing a dbus-call to existing RKWard process (if any) and exiting