[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=0c136f4

The following commit has been merged in the master branch:
commit 0c136f431e8b195a4ee4df4cc161acdd788aef0e
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Apr 16 17:53:05 2013 +0200

    Support importing Kopete logs for Novell GroupWise protocol
    
    REVIEW: 110045
    BUG: 318436
    FIXED-IN: 0.6.1
---
 KTp/logs-importer-private.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/KTp/logs-importer-private.cpp b/KTp/logs-importer-private.cpp
index 0aafe18..3680c9e 100644
--- a/KTp/logs-importer-private.cpp
+++ b/KTp/logs-importer-private.cpp
@@ -101,10 +101,11 @@ QString LogsImporter::Private::accountIdToProtocol(const QString &accountId) con
     } else if (accountId.startsWith(QLatin1String("sunshine/gadugadu/")) ||
                accountId.startsWith(QLatin1String("haze/gadugadu/"))) {
         return QLatin1String("GaduProtocol");
+    } else if (accountId.startsWith(QLatin1String("haze/groupwise"))) {
+        return QLatin1String("GroupWiseProtocol");
     } else {
         /* We don't support these Kopete protocols:
          *         Bonjour - unable to reliably map Telepathy account to Kopete
-         *         GroupWise - no support in Telepathy
          *         Meanwhile - no support in Telepathy
          *         QQ - no support in Telepathy
          *         SMS - no support in Telepathy

-- 
ktp-common-internals packaging