From: David Faure Date: Tue, 10 Jun 2008 09:15:19 +0000 (+0000) Subject: Argh my last patch broke plugins. So revert 818988 and do it properly, for real this... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/162436801d3fc51808dd9225e27d41e0333e4f60 Argh my last patch broke plugins. So revert 818988 and do it properly, for real this time :) KPluginFactory can take the catalog name as second argument, this is the best fix. CCMAIL: Chusslove Illich svn path=/trunk/KDE/kdebase/apps/; revision=818989 --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bd13c4b91..d138a2290 100644 --- 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 a6a64c283..0f8c72453 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -49,7 +49,7 @@ #include K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin();) -K_EXPORT_PLUGIN(DolphinPartFactory("dolphin")) +K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin")) DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args) : KParts::ReadOnlyPart(parent)