Fix Documents launching problem from system menu

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1178041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 15 insertions, 83 deletions

diff --git a/kioslave/system/entries/Makefile.am b/kioslave/system/entries/Makefile.am
index 1e356badb..5a666650f 100644
--- a/kioslave/system/entries/Makefile.am
+++ b/kioslave/system/entries/Makefile.am
@@ -1,5 +1,3 @@
 systemviewdir = $(kde_datadir)/systemview
 systemview_DATA = home.desktop documents.desktop users.desktop media.desktop remote.desktop trash.desktop
 
-bin_SCRIPTS = kio_system_documenthelper
-
diff --git a/kioslave/system/entries/documents.desktop b/kioslave/system/entries/documents.desktop
index a2c0fe528..ca461a586 100644
--- a/kioslave/system/entries/documents.desktop
+++ b/kioslave/system/entries/documents.desktop
@@ -1,68 +1,16 @@
 [Desktop Entry]
-Type=Link
-Path[$e]=$( kio_system_documenthelper )
-Icon=folder_man
-Name=Documents Folder
-Name[af]=Dokument Gids
-Name[ar]=مستنداتي
-Name[be]=Тэчка для дакументаў
-Name[bg]=Директория с документи
-Name[bn]=ডকুমেন্ট ফোল্ডার
-Name[br]=Renkell an teulioù
-Name[bs]=Direktorij dokumenata
-Name[ca]=Carpeta de documents
-Name[cs]=Složka s dokumenty
-Name[csb]=Katalog dokùmentów
-Name[da]=Dokumentmappe
-Name[de]=Dokumente
-Name[el]=Φάκελος εγγράφων
-Name[eo]=Dokumenta dosierujo
-Name[es]=Carpeta de documentos
-Name[et]=Dokumentide kataloog
-Name[eu]=Dokumentuen karpeta
-Name[fa]=پوشۀ مستندات
-Name[fi]=Asiakirjakansio
-Name[fr]=Dossier des documents
-Name[fy]=Ofkeppele kamera
-Name[ga]=Fillteán na gCáipéisí
-Name[gl]=Cartafol de Documentos
-Name[he]=תיקיית מסמכים
-Name[hr]=Mapa dokumenata
-Name[hu]=Dokumentumok könyvtár
-Name[is]=Skjalamappa
-Name[it]=Cartella documenti
-Name[ja]=ドキュメントフォルダ
-Name[ka]=დოკუმენტების დასტა
-Name[kk]=Құжаттар қапшығы
-Name[km]=ថត​ឯកសារ
-Name[ko]=문서 탐색기
-Name[lt]=Dokumentų aplankai
-Name[mk]=Папка со документи
-Name[nb]=Dokumentmappe
-Name[nds]=Dokmenten-Orner
-Name[ne]=कागजात फोल्डर
-Name[nl]=Documenten
-Name[nn]=Dokumentmappe
-Name[pa]=ਦਸਤਾਵੇਜ਼ ਫੋਲਡਰ
-Name[pl]=Katalog dokumentów
-Name[pt]=Pasta de Documentos
-Name[pt_BR]=Pasta de Documentos
-Name[ro]=Folder documente
-Name[ru]=Документы
-Name[se]=Dokumeantamáhppa
-Name[sk]=Priečinok dokumentov
-Name[sl]=Mapa z dokumenti
-Name[sr]=Фасцикла са документима
-Name[sr@Latn]=Fascikla sa dokumentima
-Name[sv]=Dokumentkatalog
-Name[te]=పత్రాల ఫొల్డర్
-Name[tg]=Ҳуҷҷатҳо
-Name[th]=โฟลเดอร์เอกสาร
-Name[tr]=Belgeler Dizini
-Name[uk]=Тека документів
-Name[uz]=Hujjatlar jildi
-Name[uz@cyrillic]=Ҳужжатлар жилди
-Name[vi]=Thư mục Tài liệu
-Name[wa]=Ridant documints
-Name[zh_CN]=文档文件夹
-Name[zh_TW]=文件目錄
+Encoding=UTF-8
+Comment=
+Comment[en_US]=
+Exec=kxdglauncher --xdgname DOCUMENTS
+Icon=folder_wordprocessing
+MimeType=
+Name=My Documents
+Name[en_US]=My Documents
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/kioslave/system/entries/kio_system_documenthelper b/kioslave/system/entries/kio_system_documenthelper
deleted file mode 100755
index 7cc2c2b2d..000000000
--- a/kioslave/system/entries/kio_system_documenthelper
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Script used by by the document.desktop entry to determine if it must be
-# shown or not
-#
-# Copyright GPL v2 by Kevin Ottens <ervin ipsquad net>
-#
-
-document_path=`kde-config --userpath document | sed "s/\/\$//"`
-home_path=`echo $HOME | sed "s/\/\$//"`
-
-if test "$document_path" != "$home_path" ; then
-  echo $document_path
-fi
-