summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--amarok/src/engine/xine/xine-engine.cpp2
-rwxr-xr-xamarok/src/scripts/amarok_live/amarok_live.py12
2 files changed, 7 insertions, 7 deletions
diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp
index 815f6370..581923be 100644
--- a/amarok/src/engine/xine/xine-engine.cpp
+++ b/amarok/src/engine/xine/xine-engine.cpp
@@ -61,7 +61,7 @@ namespace Log
}
///returns the configuration we will use. there is no KInstance, so using this hacked up method.
-//static inline TQCString configPath() { return TQFile::encodeName(KStandardDirs().localkdedir() + KStandardDirs::kde_default("data") + "amarok/xine-config"); }
+//static inline TQCString configPath() { return TQFile::encodeName(KStandardDirs().localtdedir() + KStandardDirs::kde_default("data") + "amarok/xine-config"); }
static inline TQCString configPath() { return TQFile::encodeName(locate( "data", "amarok/") + "xine-config" ); }
static Fader *s_fader = 0;
static OutFader *s_outfader = 0;
diff --git a/amarok/src/scripts/amarok_live/amarok_live.py b/amarok/src/scripts/amarok_live/amarok_live.py
index 5b3db7e3..df856f4f 100755
--- a/amarok/src/scripts/amarok_live/amarok_live.py
+++ b/amarok/src/scripts/amarok_live/amarok_live.py
@@ -139,9 +139,9 @@ class ConfigDialog ( QDialog ):
# now the fun part, we run part 1
fd = os.popen("kde-config --prefix", "r")
- kdedir = fd.readline()
- kdedir = kdedir.strip()
- scriptdir = kdedir + "/share/apps/amarok/scripts/amarok_live"
+ tdedir = fd.readline()
+ tdedir = tdedir.strip()
+ scriptdir = tdedir + "/share/apps/amarok/scripts/amarok_live"
fd.close()
path, iso = self.readConfig()
@@ -372,9 +372,9 @@ class Remasterer( QApplication ):
os.system("kdialog --sorry 'You have not configured Amarok live! Please run configure.")
fd = os.popen("kde-config --prefix", "r")
- kdedir = fd.readline()
- kdedir = kdedir.strip()
- scriptdir = kdedir + "/share/apps/amarok/scripts/amarok_live"
+ tdedir = fd.readline()
+ tdedir = tdedir.strip()
+ scriptdir = tdedir + "/share/apps/amarok/scripts/amarok_live"
fd.close()
os.system("tdesu sh %s/amarok.live.remaster.part2.sh %s" % (scriptdir, path))