summaryrefslogtreecommitdiff
path: root/extra/kdebase-workspace/kdm-desktopnames.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/kdebase-workspace/kdm-desktopnames.patch')
-rw-r--r--extra/kdebase-workspace/kdm-desktopnames.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/extra/kdebase-workspace/kdm-desktopnames.patch b/extra/kdebase-workspace/kdm-desktopnames.patch
new file mode 100644
index 000000000..d6d6a961c
--- /dev/null
+++ b/extra/kdebase-workspace/kdm-desktopnames.patch
@@ -0,0 +1,35 @@
+From: David Faure <faure@kde.org>
+Date: Fri, 02 May 2014 08:26:38 +0000
+Subject: Fix crash when DesktopNames isn't set
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f
+---
+Fix crash when DesktopNames isn't set
+
+BUG: 334159
+FIXED-IN: 4.11.10
+---
+
+
+--- a/kdm/backend/client.c
++++ b/kdm/backend/client.c
+@@ -1810,12 +1810,14 @@
+ !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
+ sessargs = "";
+ buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
+- for (buf2 = buf; *buf2; ++buf2) {
+- if (*buf2 == ';')
+- *buf2 = ':';
++ if (buf) {
++ for (buf2 = buf; *buf2; ++buf2) {
++ if (*buf2 == ';')
++ *buf2 = ':';
++ }
++ userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
++ free(buf);
+ }
+- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
+- free(buf);
+ free(str);
+ free(fname);
+ goto gotit;
+