Revert 818910 and do it properly (patch by dfaure).

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f03ffc4390cc696d8a9ef3ff431c9c21f462b489..bd13c4b91a609a55e6c8112e12086f9d33163880 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,7 +82,7 @@ target_link_libraries(dolphinpart dolphinprivate konq)
 
 install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
 install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} )
 

-install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart )
+install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin)

 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 ##########################################
 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 ##########################################

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index c566a46918042711bfc138e5c58e98d9a96af243..a6a64c283c3ec9e932e5f1f9d648c6404d132587 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -49,9 +49,7 @@
 #include <QClipboard>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 #include <QClipboard>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)

-// The componentdata name must be dolphinpart so that dolphinpart.rc is found
-// Alternatively we would have to install it as dolphin/dolphinpart.rc
-K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart"))
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphin"))

 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)