summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-08-28 23:02:07 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-08-28 23:03:09 +0900
commitbb2ac0e0f3da92610ff1a1f66e5518848dda99ed (patch)
treee4c0a8530b672e7ac13277f6147bff79d264f928
parent8715e3546bbff7e62c8f10e038c2f5e0acb309c2 (diff)
downloadtdebase-bb2ac0e0f3da92610ff1a1f66e5518848dda99ed.tar.gz
tdebase-bb2ac0e0f3da92610ff1a1f66e5518848dda99ed.zip
Removed hard-coded reference to /opt/trinity. This resolves bug 680.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit bcbc3ba665a4c27a0426b6b373a8b674fd0e7a31)
-rw-r--r--kxkb/extension.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index 29435e620..616167944 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -180,9 +180,10 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
p.start(TDEProcess::Block);
// reload system-wide hotkey-setup keycode -> keysym maps
- if ( TQFile::exists( "/opt/trinity/share/apps/kxkb/system.xmodmap" ) ) {
+ TQString modmapFileName = TDEGlobal::dirs()->findResource( "data", "kxkb/system.xmodmap" );
+ if ( TQFile::exists( modmapFileName ) ) {
TDEProcess pXmodmap;
- pXmodmap << "xmodmap" << "/opt/trinity/share/apps/kxkb/system.xmodmap";
+ pXmodmap << "xmodmap" << modmapFileName;
pXmodmap.start(TDEProcess::Block);
}