Reverse OpenSync patch as it causes a build failure on Debian

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 8 deletions

diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index 5dda30bfe..d981599bd 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -24,7 +24,7 @@
 #include "memberinfo.h"
 #include "syncprocessmanager.h"
 
-#include <libqopensync/pluginenv.h>
+#include <libqopensync/environment.h>
 
 #include <kdialog.h>
 #include <kglobal.h>
@@ -77,14 +77,12 @@ void PluginPicker::updatePluginList()
 {
   mPluginList->clear();
 
-  const QSync::PluginEnv *env = SyncProcessManager::self()->pluginEnv();
-
-  for ( int i = 0; i < env->pluginCount(); ++i ) {
-    QSync::Plugin plugin = env->pluginAt( i );
-
-    if ( plugin.isValid() )
-      mPluginList->appendItem( new PluginItem( mPluginList, plugin ) );
+  QSync::Environment *env = SyncProcessManager::self()->environment();
 
+  QSync::Environment::PluginIterator it( env->pluginBegin() );
+  for( ; it != env->pluginEnd(); ++it ) {
+    QSync::Plugin plugin = *it;
+    mPluginList->appendItem( new PluginItem( mPluginList, plugin ) );
   }
 }