summaryrefslogtreecommitdiffstats
path: root/ksmserver/startup.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-04 18:12:45 -0600
committerTimothy Pearson <[email protected]>2012-02-04 18:12:45 -0600
commit4546adf40c34f1ad89a8924e81cf94a5af768093 (patch)
tree897ed37b8aa2d15d68a14b80c590d22f439675fa /ksmserver/startup.cpp
parentb5d92fb45b0796f0140c2917c238fd0b6a192300 (diff)
downloadtdebase-4546adf40c34f1ad89a8924e81cf94a5af768093.tar.gz
tdebase-4546adf40c34f1ad89a8924e81cf94a5af768093.zip
Initial attempt at adding third part WM support to TDE
Diffstat (limited to 'ksmserver/startup.cpp')
-rw-r--r--ksmserver/startup.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index b53ae3d18..eaee5f20c 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -180,7 +180,15 @@ void KSMServer::startDefaultSession()
"autoStart1Done()", true);
connectDCOPSignal( launcher, launcher, "autoStart2Done()",
"autoStart2Done()", true);
- startApplication( wm );
+ if (!wmAddArgs.isEmpty()) {
+ TQStringList wmstartupcommand;
+ wmstartupcommand.split(" ", wmAddArgs);
+ wmstartupcommand.prepend(wm);
+ startApplication( wmstartupcommand );
+ }
+ else {
+ startApplication( wm );
+ }
if ((showFancyLogin) && (!startupNotifierIPDlg)) {
startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
}