diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-03-13 15:14:23 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-03-13 15:14:23 -0500 |
commit | 628ce684b973d8f8ed6ce04049bae393d2ac71a7 (patch) | |
tree | 898058f8bc08cf006c4b6b0e70b4d0e2cfec76bc | |
parent | 018767abe95240e2f31e797c4823d79804d69667 (diff) | |
download | tdelibs-628ce684b973d8f8ed6ce04049bae393d2ac71a7.tar.gz tdelibs-628ce684b973d8f8ed6ce04049bae393d2ac71a7.zip |
Fix references of /var/tmp/kdecache -> /var/tmp/tdecache to avoid potential conflicts with KDE4.
Fix docbook references of /tmp/kde-$USER -> /tmp/tde-$USER.
This partially resolves bug report 813.
-rw-r--r-- | doc/tdelibs/man-kbuildsycoca.8.docbook | 2 | ||||
-rw-r--r-- | kinit/lnusertemp.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/tdelibs/man-kbuildsycoca.8.docbook b/doc/tdelibs/man-kbuildsycoca.8.docbook index 0957a9549..d3658d5fa 100644 --- a/doc/tdelibs/man-kbuildsycoca.8.docbook +++ b/doc/tdelibs/man-kbuildsycoca.8.docbook @@ -178,7 +178,7 @@ command at the prompt <variablelist> <varlistentry> -<term><filename>/tmp/kde-$USER/ksyscoca</filename></term> +<term><filename>/tmp/tde-$USER/ksyscoca</filename></term> <listitem> <para>...</para> </listitem> diff --git a/kinit/lnusertemp.c b/kinit/lnusertemp.c index ba79e62a7..171107041 100644 --- a/kinit/lnusertemp.c +++ b/kinit/lnusertemp.c @@ -257,9 +257,9 @@ int main(int argc, char **argv) if (strcmp(argv[1], "tmp") == 0) { - tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/kde-")+1); + tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/tde-")+1); strcpy(tmp_prefix, tmp); - strcat(tmp_prefix, "/kde-"); + strcat(tmp_prefix, "/tde-"); kde_prefix = "/tmp-"; } @@ -277,9 +277,9 @@ int main(int argc, char **argv) if (!tmp || !tmp[0]) tmp = "/var/tmp"; - tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/kdecache-")+1); + tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/tdecache-")+1); strcpy(tmp_prefix, tmp ); - strcat(tmp_prefix, "/kdecache-" ); + strcat(tmp_prefix, "/tdecache-" ); kde_prefix = "/cache-"; } |