summaryrefslogtreecommitdiffstats
path: root/kdesktop
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 /kdesktop
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 'kdesktop')
-rw-r--r--kdesktop/init/My_Documents14
-rw-r--r--kdesktop/kdesktop.kcfg4
2 files changed, 13 insertions, 5 deletions
diff --git a/kdesktop/init/My_Documents b/kdesktop/init/My_Documents
index 5db3e561a..aba639823 100644
--- a/kdesktop/init/My_Documents
+++ b/kdesktop/init/My_Documents
@@ -1,8 +1,16 @@
[Desktop Entry]
Encoding=UTF-8
+Comment=
+Comment[en_US]=
+Exec=kfmclient openURL `kde-config --userpath document`
Icon=folder_wordprocessing
+MimeType=
Name=My Documents
Name[en_US]=My Documents
-OnlyShowIn=KDE;
-Type=Link
-URL=$HOME/Documents
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username= \ No newline at end of file
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index b0dd4f003..a2f23dfaf 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -196,14 +196,14 @@
</group>
<group name="Media">
<entry name="MediaEnabled" key="enabled" type="Bool">
- <default>false</default>
+ <default>true</default>
<label></label>
<whatsthis></whatsthis>
<!-- kdiconview.cc:258 -->
<!-- m_enableMedia=config->readBoolEntry("enabled",false); -->
</entry>
<entry key="exclude" type="String">
- <default>media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted,media/builtin-mydocuments,media/builtin-mycomputer,media/builtin-mynetworkplaces,media/builtin-printers,media/builtin-trash,media/builtin-webbrowser</default>
+ <default>media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted</default>
<label>Device Types to exclude</label>
<whatsthis>The device types which you do not want to see on the desktop.</whatsthis>
<!-- kdiconview.cc:261 -->