From eac7424f22a70f39c7b57d2beeb87c4a7cd7e93d Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 17 Sep 2010 21:11:18 +0000
Subject: Bugfix batch 2/2

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176512 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kxkb/extension.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'kxkb')

diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index 6946ab54f..3817a8c4c 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);
 }
-- 
cgit v1.2.1