Kolab Groupware OBS

kolab-utils.spec Changed

debian.changelog Changed

kolab-utils-3.1.3.tar.gz/lib/jobs/findkolabfoldersjob.cpp -> kolab-utils.3.1.4.tar.gz/lib/jobs/findkolabfoldersjob.cpp Changed

@@ -26,12 +26,12 @@
 #include <kolabdefinitions.h>
 #include <errorhandler.h>
 
-FindKolabFoldersJob::FindKolabFoldersJob(const QStringList &serverCapabilities, const QList<KIMAP::MailBoxDescriptor> &pN, const QList<KIMAP::MailBoxDescriptor> &excluded, KIMAP::Session* session, QObject* parent)
+FindKolabFoldersJob::FindKolabFoldersJob(const QStringList &serverCapabilities, const QList<KIMAP::MailBoxDescriptor> &fetchedNamespaces, const QList<KIMAP::MailBoxDescriptor> &excluded, KIMAP::Session* session, QObject* parent)
 : KJob(parent),
 m_session(session),
 m_metadataRetrieveJobs(0),
 m_mailBoxReceiveDone(false),
-m_personalNamespaces(pN),
+m_fetchedNamespaces(fetchedNamespaces),
 m_serverCapabilities(serverCapabilities)
 {
     foreach (const KIMAP::MailBoxDescriptor &desc, excluded) {
@@ -47,7 +47,7 @@
 //     }
     KIMAP::ListJob *fullListJob = new KIMAP::ListJob( m_session );
     fullListJob->setOption( KIMAP::ListJob::IncludeUnsubscribed );
-    fullListJob->setQueriedNamespaces( m_personalNamespaces );
+    fullListJob->setQueriedNamespaces( m_fetchedNamespaces );
     connect( fullListJob, SIGNAL(mailBoxesReceived(QList<KIMAP::MailBoxDescriptor>,QList<QList<QByteArray> >)),
              this, SLOT(onMailBoxesReceived(QList<KIMAP::MailBoxDescriptor>,QList<QList<QByteArray> >)) );
     connect( fullListJob, SIGNAL(result(KJob*)), SLOT(onMailBoxesReceiveDone(KJob*)) );

kolab-utils-3.1.3.tar.gz/lib/jobs/findkolabfoldersjob.h -> kolab-utils.3.1.4.tar.gz/lib/jobs/findkolabfoldersjob.h Changed

kolab-utils-3.1.3.tar.gz/lib/jobs/probeimapserverjob.cpp -> kolab-utils.3.1.4.tar.gz/lib/jobs/probeimapserverjob.cpp Changed

kolab-utils-3.1.3.tar.gz/lib/jobs/probeimapserverjob.h -> kolab-utils.3.1.4.tar.gz/lib/jobs/probeimapserverjob.h Changed

kolab-utils-3.1.3.tar.gz/lib/jobs/probekolabserverjob.cpp -> kolab-utils.3.1.4.tar.gz/lib/jobs/probekolabserverjob.cpp Changed

@@ -40,6 +40,11 @@
     probeJob->start();
 }
 
+void ProbeKolabServerJob::fetchSharedFolders(bool fetch)
+{
+    mFetchSharedFolders = fetch;
+}
+
 void ProbeKolabServerJob::onProbeJobDone(KJob* job)
 {
     if (job->error()) {
@@ -52,7 +57,13 @@
     mCapabilities =  probeJob->capabilities();
     mPersonalNamespace = probeJob->personalNamespace();
     mExcludedNamespace = probeJob->excludedNamespaces();
-    FindKolabFoldersJob *findJob = new FindKolabFoldersJob(mCapabilities, mPersonalNamespace, mExcludedNamespace, mSession, this);
+    QList<KIMAP::MailBoxDescriptor> sharedNamespaces = probeJob->sharedNamespaces();
+    FindKolabFoldersJob *findJob;
+    if (mFetchSharedFolders) {
+        findJob = new FindKolabFoldersJob(mCapabilities, probeJob->sharedNamespaces(), QList<KIMAP::MailBoxDescriptor>(), mSession, this);
+    } else {
+        findJob = new FindKolabFoldersJob(mCapabilities, probeJob->personalNamespace(), mExcludedNamespace, mSession, this);
+    }
     connect(findJob, SIGNAL(result(KJob*)), this, SLOT(findKolabFoldersDone(KJob*)));
     findJob->start();
 }

kolab-utils-3.1.3.tar.gz/lib/jobs/probekolabserverjob.h -> kolab-utils.3.1.4.tar.gz/lib/jobs/probekolabserverjob.h Changed

kolab-utils-3.1.3.tar.gz/upgradetool/imapupgradejob.cpp -> kolab-utils.3.1.4.tar.gz/upgradetool/imapupgradejob.cpp Changed

kolab-utils-3.1.3.tar.gz/upgradetool/upgradetool.cpp -> kolab-utils.3.1.4.tar.gz/upgradetool/upgradetool.cpp Changed

@@ -21,8 +21,8 @@
 #include <QtCore/QDir>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kapplication.h>
 #include <kcmdlineargs.h>
+#include <kcomponentdata.h>
 #include <errorhandler.h>
 
 #include "upgradeutilities.h"
@@ -46,6 +46,7 @@
 
 int main(int argc, char *argv[])
 {
+    KComponentData componentData("upgradetool");
     KCmdLineArgs::init(argc, argv, "upgradetool", "upgradetool",ki18n("upgradetool"),  KOLABUTILS_VERSION);
     
     KCmdLineOptions options;
@@ -66,12 +67,13 @@
 
     options.add("validate", ki18n("Validate all kolab-objects and mails, and delete the ones that are invalid."));
     options.add("delete", ki18n("Delete invalid objects from the server. Applies to validate mode."));
+    options.add("shared", ki18n("Validate shared folders (This requires login with an admin account). Applies to validate mode."));
     options.add("save-to <folder>", ki18n("Store invalid objects under the given path. Applies to validate mode."));
 
     options.add("+[server/file]", ki18n("IMAP Server/File"));
     KCmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
-    
+    QCoreApplication app(argc, argv);
+
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
     Kolab::ObjectType overrideType = Kolab::InvalidObject;
@@ -120,6 +122,13 @@
         kDebug() << "Running in delete mode.";
         upgradeOptions.noDelete = false;
     }
+    if (!args->isSet("shared")) {
+        kDebug() << "Fetching user folders.";
+        upgradeOptions.fetchSharedFolders = false;
+    } else {
+        kDebug() << "Fetching shared folders.";
+        upgradeOptions.fetchSharedFolders = true;
+    }
 
     if (args->isSet("save-to")) {
         kDebug() << "Saving faulty messages to: " << args->getOption("save-to");

kolab-utils-3.1.3.tar.gz/upgradetool/upgradeutilities.h -> kolab-utils.3.1.4.tar.gz/upgradetool/upgradeutilities.h Changed

kolab-utils.dsc Changed

Changes of Revision 25