summaryrefslogtreecommitdiffstats
path: root/kxkb
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-17 21:11:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-17 21:11:18 +0000
commiteac7424f22a70f39c7b57d2beeb87c4a7cd7e93d (patch)
tree83c19a10f22521290c48d2f39e39b5b7d0316dfc /kxkb
parent543cc6312fbb723545f97ab7a8426be7ddd0d673 (diff)
downloadtdebase-eac7424f22a70f39c7b57d2beeb87c4a7cd7e93d.tar.gz
tdebase-eac7424f22a70f39c7b57d2beeb87c4a7cd7e93d.zip
Bugfix batch 2/2
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176512 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kxkb')
-rw-r--r--kxkb/extension.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index 6946ab54..3817a8c4 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -180,13 +180,17 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
p.start(KProcess::Block);
// reload system-wide hotkey-setup keycode -> keysym maps
- KProcess pXmodmap;
- pXmodmap << "xmodmap" << "/opt/trinity/share/apps/kxkb/system.xmodmap &> /dev/null";
- pXmodmap.start(KProcess::Block);
+ if ( TQFile::exists( "/opt/trinity/share/apps/kxkb/system.xmodmap" ) ) {
+ KProcess pXmodmap;
+ pXmodmap << "xmodmap" << "/opt/trinity/share/apps/kxkb/system.xmodmap";
+ pXmodmap.start(KProcess::Block);
+ }
- KProcess pXmodmapHome;
- pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap &> /dev/null";
- pXmodmapHome.start(KProcess::Block);
+ if ( TQFile::exists( TQDir::home().path() + "/.Xmodmap" ) ) {
+ KProcess pXmodmapHome;
+ pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap";
+ pXmodmapHome.start(KProcess::Block);
+ }
return p.normalExit() && (p.exitStatus() == 0);
}