[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [spacebar] /: [mobile-logger] Store the contact's display name that KPeople provides
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2016-03-14 16:00:41
Message-ID: E1afUvB-00061j-Gs () scm ! kde ! org
[Download RAW message or body]

Git commit 65e1b428858ba410f6a91e8b0e6a70413250c71c by Martin Klapetek.
Committed on 14/03/2016 at 15:59.
Pushed by mklapetek into branch 'master'.

[mobile-logger] Store the contact's display name that KPeople provides

Adds a dependency on KPeople to the mobile-logger

CCMAIL: bhush94@gmail.com

M  +1    -5    CMakeLists.txt
M  +1    -0    mobile-logger/CMakeLists.txt
M  +7    -1    mobile-logger/channel-watcher.cpp
M  +2    -1    mobile-logger/text-channel-observer.cpp

http://commits.kde.org/spacebar/65e1b428858ba410f6a91e8b0e6a70413250c71c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4065701..53c721f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,11 +6,7 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 =

 =

-find_package (KF5 REQUIRED COMPONENTS Package Declarative DBusAddons I18n =
Service)
-# Archive Sonnet WidgetsAddons Service Emoticons
-#                                       KIO KCMUtils NotifyConfig Notifica=
tions I18n
-#                                       WebKit WindowSystem XmlGui ItemVie=
ws TextWidgets
-#                                       IconThemes DBusAddons)
+find_package (KF5 REQUIRED COMPONENTS Package Declarative DBusAddons I18n =
Service People)
 find_package (Qt5 REQUIRED COMPONENTS Core Qml Quick Network Xml DBus Sql =
Gui)
 find_package (KTp REQUIRED)
 =

diff --git a/mobile-logger/CMakeLists.txt b/mobile-logger/CMakeLists.txt
index 7c74cb3..f1814e0 100644
--- a/mobile-logger/CMakeLists.txt
+++ b/mobile-logger/CMakeLists.txt
@@ -8,6 +8,7 @@ add_executable(ktp-mobile-logger ${ktp-mobile-logger_SRCS})
 =

 target_link_libraries(ktp-mobile-logger
             ${TELEPATHY_QT5_LIBRARIES}
+            KF5::People
             KTp::CommonInternals
             KTp::Logger
             Qt5::Core
diff --git a/mobile-logger/channel-watcher.cpp b/mobile-logger/channel-watc=
her.cpp
index 936a1db..bc4cba3 100644
--- a/mobile-logger/channel-watcher.cpp
+++ b/mobile-logger/channel-watcher.cpp
@@ -29,6 +29,8 @@
 #include <KTp/contact.h>
 #include <KTp/message.h>
 =

+#include <KPeople/PersonData>
+
 #include <QSqlQuery>
 #include <QSqlError>
 #include <QSqlRecord>
@@ -69,9 +71,13 @@ ChannelWatcher::~ChannelWatcher()
 void ChannelWatcher::storeContactInfo()
 {
     QSqlQuery insertContactIdQuery;
-    insertContactIdQuery.prepare(QStringLiteral("INSERT INTO contactData V=
ALUES (NULL, :contactId);"));
+    insertContactIdQuery.prepare(QStringLiteral("INSERT INTO contactData V=
ALUES (NULL, :contactId, :displayName);"));
     insertContactIdQuery.bindValue(QStringLiteral(":contactId"), m_channel=
->targetContact()->id());
 =

+    const KPeople::PersonData person(QStringLiteral("ktp://") + m_accountO=
bjectPath.mid(35) + QStringLiteral("?") + m_channel->targetContact()->id());
+
+    insertContactIdQuery.bindValue(QStringLiteral(":displayName"), person.=
name());
+
     if (!m_db.transaction()) {
         qWarning() << "Cannot get a transaction lock for inserting contact=
 data!";
     }
diff --git a/mobile-logger/text-channel-observer.cpp b/mobile-logger/text-c=
hannel-observer.cpp
index 2dca163..2a3edb4 100644
--- a/mobile-logger/text-channel-observer.cpp
+++ b/mobile-logger/text-channel-observer.cpp
@@ -80,7 +80,8 @@ KTp::TextChannelObserver::TextChannelObserver(QObject *pa=
rent)
 =

                                                  "CREATE TABLE contactData=
 ("
                                                   "id INTEGER PRIMARY KEY,=
 "
-                                                  "targetContact VARCHAR(7=
2) UNIQUE"
+                                                  "targetContact VARCHAR(7=
2) UNIQUE, "
+                                                  "displayName VARCHAR(72)"
                                                  ");"
 =

                                                  "CREATE TABLE control ("

[prev in list] [next in list] [prev in thread] [next in thread]