Rename ksocket and kcache

8 files changed, 16 insertions, 16 deletions

diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook
index 8ef76e97e..fc8b094dd 100644
--- a/doc/faq/install.docbook
+++ b/doc/faq/install.docbook
@@ -662,7 +662,7 @@ These are usually to be found in the following locations:</para>
 <listitem><para><filename>~/.kde/tmp-<replaceable>hostname</replaceable></filename> which is normally a symlink to the next file:</para></listitem>
 <listitem><para><filename>/tmp/tmp-kde-<replaceable>USER</replaceable></filename></para></listitem>
 <listitem><para><filename>~/.kde/socket-<replaceable>hostname</replaceable></filename> which is also normally a symlink to:</para></listitem>
-<listitem><para><filename>/tmp/ksocket-<replaceable>USER</replaceable></filename></para></listitem>
+<listitem><para><filename>/tmp/tdesocket-<replaceable>USER</replaceable></filename></para></listitem>
 </itemizedlist>
 
 <para>If the symlinks get broken, usually because a
diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook
index 5fb497f95..a31323a1d 100644
--- a/doc/userguide/kde-for-admins.docbook
+++ b/doc/userguide/kde-for-admins.docbook
@@ -420,7 +420,7 @@ the following symlinks and directories will be created using the
 <varlistentry>
 <term><filename>$<envar>TDEHOME</envar>/socket-$<envar>HOSTNAME</envar></filename></term>
 <listitem><para>Usually <filename
-class="directory">/tmp/ksocket-$<envar>USER</envar>/</filename>, this
+class="directory">/tmp/tdesocket-$<envar>USER</envar>/</filename>, this
 is used for various &UNIX; sockets.</para>
 </listitem>
 </varlistentry>
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index 8be44e57c..3a7e3db12 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -33,9 +33,9 @@ struct GreeterPluginHandle {
     kgreeterplugin_info *info;
 };
 
-#define FIFO_DIR "/tmp/ksocket-global"
-#define FIFO_FILE "/tmp/ksocket-global/kdesktoplockcontrol"
-#define FIFO_FILE_OUT "/tmp/ksocket-global/kdesktoplockcontrol_out"
+#define FIFO_DIR "/tmp/tdesocket-global"
+#define FIFO_FILE "/tmp/tdesocket-global/kdesktoplockcontrol"
+#define FIFO_FILE_OUT "/tmp/tdesocket-global/kdesktoplockcontrol_out"
 #define PIPE_CHECK_INTERVAL 50
 
 //===========================================================================
diff --git a/starttde b/starttde
index 92c5c0af2..7fbfa1d2d 100644
--- a/starttde
+++ b/starttde
@@ -458,7 +458,7 @@ fi
 # Link "tmp" "socket" and "cache" resources to directory in /tmp
 # Creates:
 # - a directory /tmp/kde-$USER and links $TDEHOME/tmp-$HOSTNAME to it.
-# - a directory /tmp/ksocket-$USER and links $TDEHOME/socket-$HOSTNAME to it.
+# - a directory /tmp/tdesocket-$USER and links $TDEHOME/socket-$HOSTNAME to it.
 # - a directory /var/tmp/kdecache-$USER and links $TDEHOME/cache-$HOSTNAME to it.
 # Note: temporary locations can be overriden through the KDETMP and KDEVARTMP
 # environment variables.
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index ee1bf3e72..30685a865 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -86,9 +86,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <X11/Xlib.h>
 
-#define FIFO_DIR "/tmp/ksocket-global/tdm"
-#define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1"
-#define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1"
+#define FIFO_DIR "/tmp/tdesocket-global/tdm"
+#define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1"
+#define FIFO_SAK_FILE "/tmp/tdesocket-global/tdm/tdmctl-sak-%1"
 
 class UserListView : public KListView {
   public:
diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc
index 396fa1627..c1da24d6e 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cc
@@ -73,9 +73,9 @@
 # define AF_LOCAL	AF_UNIX
 #endif
 
-#define FIFO_DIR "/tmp/ksocket-global/tdm"
-#define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1"
-#define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1"
+#define FIFO_DIR "/tmp/tdesocket-global/tdm"
+#define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1"
+#define FIFO_SAK_FILE "/tmp/tdesocket-global/tdm/tdmctl-sak-%1"
 
 bool trinity_desktop_lock_use_system_modal_dialogs = TRUE;
 extern bool trinity_desktop_lock_use_sak;
diff --git a/tdmlib/tdmtsak.cpp b/tdmlib/tdmtsak.cpp
index 18acd05d2..a7cc802f9 100644
--- a/tdmlib/tdmtsak.cpp
+++ b/tdmlib/tdmtsak.cpp
@@ -22,7 +22,7 @@
 
 #include <tqstringlist.h>
 
-#define FIFO_FILE "/tmp/ksocket-global/tsak"
+#define FIFO_FILE "/tmp/tdesocket-global/tsak"
 
 TQString exec(const char * cmd) {
 	FILE* pipe = popen(cmd, "r");
diff --git a/tsak/main.cpp b/tsak/main.cpp
index 3cbc3d81a..8397ea261 100644
--- a/tsak/main.cpp
+++ b/tsak/main.cpp
@@ -38,9 +38,9 @@ License along with tsak. If not, see http://www.gnu.org/licenses/.
 #include <libudev.h>
 #include <libgen.h>
 
-#define FIFO_DIR "/tmp/ksocket-global"
-#define FIFO_FILE_OUT "/tmp/ksocket-global/tsak"
-#define FIFO_LOCKFILE_OUT "/tmp/ksocket-global/tsak.lock"
+#define FIFO_DIR "/tmp/tdesocket-global"
+#define FIFO_FILE_OUT "/tmp/tdesocket-global/tsak"
+#define FIFO_LOCKFILE_OUT "/tmp/tdesocket-global/tsak.lock"
 
 #define MAX_KEYBOARDS 64
 #define MAX_INPUT_NODE 128