diff --git a/kdesktop/klaunch.kcfg b/kdesktop/klaunch.kcfg index 29418f827..8f7800e92 100644 --- a/kdesktop/klaunch.kcfg +++ b/kdesktop/klaunch.kcfg @@ -22,7 +22,7 @@ - true + false @@ -31,7 +31,7 @@ - true + false diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp index 5e9d58ea3..e9c72728f 100644 --- a/kxkb/extension.cpp +++ b/kxkb/extension.cpp @@ -179,14 +179,14 @@ bool XKBExtension::setLayoutInternal(const TQString& model, p.start(KProcess::Block); - // reload ubuntu hotkey-setup keycode -> keysym maps + // reload system-wide hotkey-setup keycode -> keysym maps KProcess pXmodmap; - pXmodmap << "/usr/bin/xmodmap" << "/usr/share/apps/kxkb/ubuntu.xmodmap"; + pXmodmap << "xmodmap" << "/opt/trinity/share/apps/kxkb/system.xmodmap"; pXmodmap.start(KProcess::Block); KProcess pXmodmapHome; - pXmodmapHome << "/usr/bin/xmodmap" << TQDir::home().path() + "/.Xmodmap"; - pXmodmapHome.start(KProcess::Block); + pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap"; + pXmodmapHome.start(KProcess::Block); return p.normalExit() && (p.exitStatus() == 0); }