diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-18 00:00:40 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-18 00:00:40 +0000 |
| commit | de256596b00f55deb43c9d6d885eaae6ff6d828d (patch) | |
| tree | ab8d8745a03d603b04881ac2d1fc3a3ee7cce85a | |
| parent | 7b4acf8163518c610cdc10d2023f4f910182f633 (diff) | |
| download | tde-guidance-de256596.tar.gz tde-guidance-de256596.zip | |
Fix kde-guidance FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-guidance@1247896 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | displayconfig/40guidance-displayconfig_restore | 2 | ||||
| -rw-r--r-- | displayconfig/ScanPCI.py | 2 | ||||
| -rw-r--r-- | wineconfig/kcm_wineconfig.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/displayconfig/40guidance-displayconfig_restore b/displayconfig/40guidance-displayconfig_restore index 27f35a1..0f8ae9c 100644 --- a/displayconfig/40guidance-displayconfig_restore +++ b/displayconfig/40guidance-displayconfig_restore @@ -8,4 +8,4 @@ # This file is sourced by Xsession(5), not executed. # The "|| true" is to ensure that the Xsession script does not terminate # and stop the login if something fails in the Python program. -/opt/kde3/bin/displayconfig-restore || true +/opt/trinity/bin/displayconfig-restore || true diff --git a/displayconfig/ScanPCI.py b/displayconfig/ScanPCI.py index ec63b55..031a4e9 100644 --- a/displayconfig/ScanPCI.py +++ b/displayconfig/ScanPCI.py @@ -165,7 +165,7 @@ class PCIBus(object): def _resolveDevicesWithLdetect(self): # Scan the PCI database. #fhandle = open(os.path.join(self.data_file_dir,"pcitable"),"r") - fhandle = open(os.path.join("/opt/kde3/share/apps/guidance/","pcitable"),"r") + fhandle = open(os.path.join("/opt/trinity/share/apps/guidance/","pcitable"),"r") # This class is just for skipping comment lines in the database file. # This whole class is just an iterator wrapper that we put around our file iterator. diff --git a/wineconfig/kcm_wineconfig.cpp b/wineconfig/kcm_wineconfig.cpp index bfd9217..b3c210a 100644 --- a/wineconfig/kcm_wineconfig.cpp +++ b/wineconfig/kcm_wineconfig.cpp @@ -18,10 +18,10 @@ #include <qstring.h> #include <sip.h> -#define MODULE_DIR "/opt/kde3/share/apps/guidance" -#define EXTRA_MODULE_DIR "/opt/kde3/share/python-support/kde-guidance-kde3" -#define EXTRA_MODULE_DIR_TWO "/opt/kde3/share/python-support/guidance-backends-kde3" -#define EXTRA_MODULE_DIR_THREE "/opt/kde3/share/python-support/kde-guidance-powermanager-kde3" +#define MODULE_DIR "/opt/trinity/share/apps/guidance" +#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/kde-guidance-trinity" +#define EXTRA_MODULE_DIR_TWO "/opt/trinity/share/python-support/guidance-backends-trinity" +#define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/kde-guidance-powermanager-trinity" #define MODULE_NAME "wineconfig" #define FACTORY "create_wineconfig" #define CPP_FACTORY create_wineconfig |