use system-file-manager icon instead of custom Dolphin icon

svn path=/trunk/KDE/kdebase/apps/; revision=704545

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4e27c95cb4645b0bbcc5209d445a2942b5ac524b..8122e52413cfed1119e2f5ee8a1d3f52e628da2e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -125,5 +125,3 @@ install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_columnmodesettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
-
-kde4_install_icons( ${ICON_INSTALL_DIR} )

diff --git a/src/dolphin.desktop b/src/dolphin.desktop
index cfcf99e48a258d86f7a1a95e66226a0ff0b5c231..c561db32cbebdbfe9d8bc333ba4386cc9aa63e23 100644 (file)
--- a/src/dolphin.desktop
+++ b/src/dolphin.desktop
@@ -9,7 +9,7 @@ Name[sr@latin]=Делфин
 Name[uk]=Дельфін
 Name[x-test]=xxDolphinxx
 Exec=dolphin %i %m -caption "%c"
-Icon=dolphin
+Icon=system-file-manager
 Type=Application
 DocPath=dolphin/dolphin.html
 Categories=Qt;KDE;System;FileManager;