From 51e4bce4621e8b5b56ceae4fc54ee3a618c7fced Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Tue, 13 Mar 2012 15:06:20 -0500
Subject: Fix references of /tmp/kde- -> /tmp/tde- to avoid potential conflicts
 with KDE4. This partially resolves bug report 813.

Fix docbook references of /tmp/kde-$USER -> /tmp/tde-$USER.
---
 doc/userguide/kde-for-admins.docbook | 4 ++--
 ksmserver/shutdowndlg.cpp            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook
index 6bf03c0db..63a34af40 100644
--- a/doc/userguide/kde-for-admins.docbook
+++ b/doc/userguide/kde-for-admins.docbook
@@ -420,7 +420,7 @@ class="directory">/tmp/kde-$<envar>USER</envar>/</filename>, this is used for te
 <varlistentry>
 <term><filename>$<envar>TDEHOME</envar>/cache-$<envar>HOSTNAME</envar></filename></term>
 <listitem><para>Usually <filename
-class="directory">/var/tmp/kdecache-$<envar>USER</envar>/</filename>,
+class="directory">/var/tmp/tdecache-$<envar>USER</envar>/</filename>,
 this is used for cached files.</para>
 </listitem>
 </varlistentry>
@@ -1826,7 +1826,7 @@ information about all available applications. You can rebuild the
 database with
 <userinput><command>kbuildsycoca</command></userinput>. The database
 which is built lives in <filename
-class="directory">/var/tmp/kdecache-${<envar>USER</envar>}/ksycoca</filename>.
+class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/ksycoca</filename>.
 It is automatically updated by <application>KDED</application>,
 checked during &tde; login, and <application>KDED</application>
 watches for changes while logged in.</para>
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index cf2985ade..e6f4fcb5a 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -536,7 +536,7 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
 		// The shared pixmap is 24 bits, but we are 32 bits
 		// Therefore our only option is to use a 24-bit Xorg application to dump the shared pixmap in a common (png) format for loading later
 		TQString filename = getenv("USER");
-		filename.prepend("/tmp/kde-");
+		filename.prepend("/tmp/tde-");
 		filename.append("/krootbacking.png");
 		remove(filename.ascii());
 		system("krootbacking &");
@@ -594,7 +594,7 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 	}
 	if (TQPaintDevice::x11AppDepth() == 32) {
 		TQString filename = getenv("USER");
-		filename.prepend("/tmp/kde-");
+		filename.prepend("/tmp/tde-");
 		filename.append("/krootbacking.png");
 		bool success = pm.load(filename, "PNG");
 		if (!success) {
-- 
cgit v1.2.1