[Xfce4-commits] <xfce4-session:xfce-4.8> xfsm-compat-kde.c: Start KDE4 services instead of KDE3

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to e49147c7c7ba346bb4e09b0d75573f8795dad6f3 (commit)
       from 4a2a3538e04589da04ddae2343b6ec08c3c74540 (commit)

commit e49147c7c7ba346bb4e09b0d75573f8795dad6f3
Author: Robby Workman <rworkman at slackware.com>
Date:   Sun Mar 6 23:55:35 2011 -0600

    xfsm-compat-kde.c: Start KDE4 services instead of KDE3
    
    (cherry picked from commit 51ee1e872e8671bf439e5d391b86432904cbc5ef)

 xfce4-session/xfsm-compat-kde.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/xfce4-session/xfsm-compat-kde.c b/xfce4-session/xfsm-compat-kde.c
index ced6ece..b51387e 100644
--- a/xfce4-session/xfsm-compat-kde.c
+++ b/xfce4-session/xfsm-compat-kde.c
@@ -123,10 +123,10 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash)
   if (G_LIKELY (splash != NULL))
     xfsm_splash_screen_next (splash, _("Starting KDE services"));
 
-  run ("kdeinit");
+  run ("kdeinit4");
 
   /* tell klauncher about the session manager */
-  g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv "
+  g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv "
                             "SESSION_MANAGER \"%s\"",
                             g_getenv ("SESSION_MANAGER"));
   run (command);
@@ -134,7 +134,7 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash)
   /* tell kde if we are running multi-head */
   if (gdk_display_get_n_screens (gdk_display_get_default ()) > 1)
     {
-      g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv "
+      g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv "
                                 "KDE_MULTIHEAD \"true\"");
       run (command);
     }
@@ -150,9 +150,7 @@ xfsm_compat_kde_shutdown (void)
     return;
 
   /* shutdown KDE services */
-  run ("kdeinit_shutdown");
-  run ("dcopserver_shutdown");
-  run ("artsshell -q terminate");
+  run ("kdeinit4_shutdown");
 
   kde_compat_started = FALSE;
 }