| 1 |
dilfridge 14/05/01 22:07:19 |
| 2 |
|
| 3 |
Added: kdm-4.11.9-desktopnamescrash.patch |
| 4 |
Log: |
| 5 |
Fix crash for non-kde logins, bug 509158 |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/kdm/files/kdm-4.11.9-desktopnamescrash.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/files/kdm-4.11.9-desktopnamescrash.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/files/kdm-4.11.9-desktopnamescrash.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: kdm-4.11.9-desktopnamescrash.patch |
| 16 |
=================================================================== |
| 17 |
From 2a5a6a02f5df0a6acf480f3c8118afd9f457369b Mon Sep 17 00:00:00 2001 |
| 18 |
From: "Andreas K. Huettel (dilfridge)" <dilfridge@g.o> |
| 19 |
Date: Thu, 1 May 2014 23:55:22 +0200 |
| 20 |
Subject: [PATCH] Revert "kdm: read DesktopNames from session file and export |
| 21 |
XDG_CURRENT_DESKTOP from it" |
| 22 |
|
| 23 |
This reverts commit e7ce8adc506068491c8545a1990992267598bd33. |
| 24 |
--- |
| 25 |
kdm/backend/client.c | 7 ------- |
| 26 |
1 file changed, 7 deletions(-) |
| 27 |
|
| 28 |
diff --git a/kdm/backend/client.c b/kdm/backend/client.c |
| 29 |
index 335cc3e..26bb0b4 100644 |
| 30 |
--- a/kdm/backend/client.c |
| 31 |
+++ b/kdm/backend/client.c |
| 32 |
@@ -1809,13 +1809,6 @@ startClient(volatile int *pid) |
| 33 |
if (!strCmp(iniEntry(str, "Desktop Entry", "Hidden", 0), "true") || |
| 34 |
!(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0))) |
| 35 |
sessargs = ""; |
| 36 |
- buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0); |
| 37 |
- for (buf2 = buf; *buf2; ++buf2) { |
| 38 |
- if (*buf2 == ';') |
| 39 |
- *buf2 = ':'; |
| 40 |
- } |
| 41 |
- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf); |
| 42 |
- free(buf); |
| 43 |
free(str); |
| 44 |
free(fname); |
| 45 |
goto gotit; |
| 46 |
-- |
| 47 |
1.9.2 |
Archives