diff options
| author | Robby Workman <rworkman@slackware.com> | 2011-03-06 23:55:35 -0600 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2011-09-12 21:14:32 +0200 |
| commit | e49147c7c7ba346bb4e09b0d75573f8795dad6f3 (patch) | |
| tree | eb30af378d0f1f239675d3aabbabfa9530c68f87 | |
| parent | 4a2a3538e04589da04ddae2343b6ec08c3c74540 (diff) | |
| download | xfce4-session-e49147c7c7ba346bb4e09b0d75573f8795dad6f3.tar.gz | |
xfsm-compat-kde.c: Start KDE4 services instead of KDE3
(cherry picked from commit 51ee1e872e8671bf439e5d391b86432904cbc5ef)
| -rw-r--r-- | 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 ced6eceb..b51387eb 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; } |