Originally it was intended to move the SVN plugin from Dolphin to kdevplatform, but kdevplatform most probably won't get released with KDE 4.4. So for KDE 4.4 Dolphin will temporary contain the plugin in it's own codebase. As soon as kdevplatform will get released the SVN plugin will get moved to kdevplatform.

Still open: KServiceTypeTrader::query does not find the "FileViewVersionControlPlugin", I could not find the root cause for this yet (old cache?)

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

1 files changed, 11 insertions, 4 deletions

diff --git a/src/versioncontrolobserver.cpp b/src/versioncontrolobserver.cpp
index 03bba9f02..b20db9951 100644
--- a/src/versioncontrolobserver.cpp
+++ b/src/versioncontrolobserver.cpp
@@ -20,10 +20,12 @@
 #include "versioncontrolobserver.h"
 
 #include "dolphinmodel.h"
-#include "kversioncontrolplugin.h"
 
 #include <kdirlister.h>
 #include <klocale.h>
+#include <kservice.h>
+#include <kservicetypetrader.h>
+#include <kversioncontrolplugin.h>
 
 #include <QAbstractProxyModel>
 #include <QAbstractItemView>
@@ -189,9 +191,14 @@ void VersionControlObserver::verifyDirectory()
         return;
     }
 
-    if (m_plugin == 0) {
-        // TODO: just for testing purposes. A plugin approach will be used later.
-        m_plugin = new SubversionPlugin();
+     if (m_plugin == 0) {
+        // TODO: does not work yet
+        const KService::List plugins = KServiceTypeTrader::self()->query("FileViewVersionControlPlugin");
+        for (KService::List::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) {
+            // kDebug() << "plugin: " << (*it)->desktopEntryName();
+        }
+        return;
+
         connect(m_plugin, SIGNAL(infoMessage(const QString&)),
                 this, SIGNAL(infoMessage(const QString&)));
         connect(m_plugin, SIGNAL(errorMessage(const QString&)),