From 896ee459af10c73d20d0ae093b4c02348ffedb18 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 6 Nov 2009 15:43:08 +0000 Subject: * enable the loading of version control plugins (thanks to Aaron for the hint) * Don't terminate the thread that receives the item states when changing a view. Instead let the thread get finished and ignore the result. svn path=/trunk/KDE/kdebase/apps/; revision=1045674 --- src/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0c3416c1e..4bac99705 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,7 +46,8 @@ set(dolphinprivate_LIB_SRCS tooltips/ktooltip.cpp tooltips/ktooltipwindow.cpp tooltips/tooltipmanager.cpp - versioncontrolobserver.cpp + versioncontrol/updateitemstatesthread.cpp + versioncontrol/versioncontrolobserver.cpp viewextensionsfactory.cpp viewproperties.cpp zoomlevelinfo.cpp @@ -92,7 +93,7 @@ set(dolphinpart_SRCS ) set(fileviewsvnplugin_SRCS - fileviewsvnplugin.cpp + versioncontrol/fileviewsvnplugin.cpp ) kde4_add_plugin(dolphinpart ${dolphinpart_SRCS}) @@ -106,8 +107,8 @@ install(TARGETS fileviewsvnplugin DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart) install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES fileviewsvnplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES versioncontrol/fileviewsvnplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) ########################################## -- cgit v1.3.1