summaryrefslogtreecommitdiffstats
path: root/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff')
-rw-r--r--source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff49
1 files changed, 49 insertions, 0 deletions
diff --git a/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff b/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
new file mode 100644
index 000000000..9c54cf9a7
--- /dev/null
+++ b/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
@@ -0,0 +1,49 @@
+From 51ee1e872e8671bf439e5d391b86432904cbc5ef Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Sun, 6 Mar 2011 23:55:35 -0600
+Subject: [PATCH] xfsm-compat-kde.c: Start KDE4 services instead of KDE3
+
+---
+ 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;
+ }
+--
+1.7.4.1
+