[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=1b34e90

The following commit has been merged in the master branch:
commit 1b34e90747548c296f5b4483568fd0ff52e413f6
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Dec 15 15:03:02 2014 +0100

    Port away from KMimeType
---
 KTp/actions.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/KTp/actions.cpp b/KTp/actions.cpp
index 5c8cf63..efb6647 100644
--- a/KTp/actions.cpp
+++ b/KTp/actions.cpp
@@ -25,7 +25,7 @@
 #include <TelepathyQt/PendingFailure>
 #include <TelepathyQt/ReferencedHandles>
 
-#include <KMimeType>
+#include <QMimeType>
 #include <KToolInvocation>
 #include <KDebug>
 #include <KLocalizedString>
@@ -170,8 +170,9 @@ Tp::PendingChannelRequest* Actions::startFileTransfer(const Tp::AccountPtr &acco
 
         QString fileName = fileInfo.fileName().append(QLatin1String("_"));
 
+        QMimeDatabase db;
         fileTransferProperties = Tp::FileTransferChannelCreationProperties(fileName,
-                                                                           KMimeType::findByFileContent(filePath)->name(),
+                                                                           db.mimeTypeForFile(filePath).name(),
                                                                            fileInfo.size());
 
         fileTransferProperties.setUri(QUrl::fromLocalFile(filePath).toString());
@@ -185,9 +186,9 @@ Tp::PendingChannelRequest* Actions::startFileTransfer(const Tp::AccountPtr &acco
         notification->sendEvent();
 
     } else {
-
+        QMimeDatabase db;
         fileTransferProperties = Tp::FileTransferChannelCreationProperties(
-                                    filePath, KMimeType::findByFileContent(filePath)->name());
+                                    filePath, db.mimeTypeForFile(filePath, QMimeDatabase::MatchContent).name());
     }
 
     return account->createFileTransfer(contact,

-- 
ktp-common-internals packaging