1.1 --- a/main.cpp Mon Nov 16 09:47:10 2009 +0000
1.2 +++ b/main.cpp Tue Nov 17 08:24:59 2009 +0000
1.3 @@ -26,6 +26,7 @@
1.4 QString vymVersion;
1.5 QString vymBuildDate;
1.6 QString vymCodeName;
1.7 +QString vymInstanceName;
1.8
1.9 Main *mainWindow; // used in BranchObj::select()
1.10
1.11 @@ -70,6 +71,7 @@
1.12 options.add ("debug", Option::Switch, "d", "debug");
1.13 options.add ("version", Option::Switch, "v","version");
1.14 options.add ("local", Option::Switch, "l", "local");
1.15 + options.add ("name", Option::Switch, "n", "name");
1.16 options.add ("help", Option::Switch, "h", "help");
1.17 options.add ("quit", Option::Switch, "q", "quit");
1.18 options.add ("run", Option::String, "r", "run");
1.19 @@ -101,7 +103,13 @@
1.20
1.21 // Register for DBUS
1.22 if (debug) cout << "PID="<<getpid()<<endl;
1.23 - dbusConnection.registerService (QString ("org.insilmaril.vym-%1").arg(getpid()));
1.24 + QString pidString=QString ("%1").arg(getpid());
1.25 + dbusConnection.registerService ("org.insilmaril.vym-"+pidString);
1.26 + if (options.isOn ("name"))
1.27 + vymInstanceName=options.getArg ("name");
1.28 + else
1.29 + vymInstanceName=pidString;
1.30 +
1.31
1.32 // Use /usr/share/vym or /usr/local/share/vym or . ?
1.33 // First try options