Argh my last patch broke plugins. So revert 818988 and do it properly, for real this...

KPluginFactory can take the catalog name as second argument, this is the best fix.
CCMAIL: Chusslove Illich <caslav.ilic@gmx.net>

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd13c4b91a609a55e6c8112e12086f9d33163880..d138a22903e3ca478bffc1bc0462f0f3d1d9928c 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(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin)
+install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart)
 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 ##########################################

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index a6a64c283c3ec9e932e5f1f9d648c6404d132587..0f8c7245338d69a94c2cf738863bff311afd699a 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -49,7 +49,7 @@
 #include <QClipboard>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
-K_EXPORT_PLUGIN(DolphinPartFactory("dolphin"))
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)