summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-16 21:59:35 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-16 21:59:35 +0000
commit0c5e3c36fae9beb3124851977b289779f65451dd (patch)
treecb1b631678e04ad2a332544e5e7667dfa8e09a65
parent8e999fffbf54cc74d4158993c1a7436ebd259271 (diff)
downloadtdebase-0c5e3c36fae9beb3124851977b289779f65451dd.tar.gz
tdebase-0c5e3c36fae9beb3124851977b289779f65451dd.zip
* Remove Ubuntu specific code
* Change default launch feedback to KDE3.5.10 style git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176186 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kdesktop/klaunch.kcfg4
-rw-r--r--kxkb/extension.cpp8
2 files changed, 6 insertions, 6 deletions
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 @@
<!-- blinking = c.readBoolEntry( "Blinking", false ); -->
</entry>
<entry key="Bouncing" type="Bool">
- <default>true</default>
+ <default>false</default>
<label></label>
<whatsthis></whatsthis>
<!-- startupid.cpp:60 -->
@@ -31,7 +31,7 @@
</group>
<group name="FeedbackStyle">
<entry key="BusyCursor" type="Bool">
- <default>true</default>
+ <default>false</default>
<label></label>
<whatsthis></whatsthis>
</entry>
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);
}