[SCM] ktp-text-ui packaging branch, master, updated. debian/0.7.0-1-106-g6b3ee9d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=9022f35

The following commit has been merged in the master branch:
commit 9022f35f2e7a086e931cf558060b14386e6921df
Author: Diane Trout <diane at ghic.org>
Date:   Tue Nov 3 22:18:50 2015 -0800

    Imported Upstream version 15.08.2
---
 CMakeLists.txt                                                     | 7 +++++--
 lib/chat-search-bar.cpp                                            | 2 +-
 logviewer/CMakeLists.txt                                           | 3 ++-
 logviewer/main.cpp                                                 | 5 +++++
 logviewer/{ktp-log-viewer.desktop => org.kde.ktplogviewer.desktop} | 1 +
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a64f0e6..b7cc430 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.8.12)
 # KDE Application Version, managed by release script
 set(KDE_APPLICATIONS_VERSION_MAJOR "15")
 set(KDE_APPLICATIONS_VERSION_MINOR "08")
-set(KDE_APPLICATIONS_VERSION_MICRO "1")
+set(KDE_APPLICATIONS_VERSION_MICRO "2")
 set(KTP_TEXT_UI_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 set(KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
 set(IS_KTP_INTERNAL_MODULE TRUE)
@@ -13,7 +13,10 @@ set(IS_KTP_INTERNAL_MODULE TRUE)
 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 Archive Sonnet WidgetsAddons Service Emoticons KIO KCMUtils NotifyConfig Notifications I18n WebKit WindowSystem XmlGui ItemViews TextWidgets IconThemes)
+find_package (KF5 REQUIRED COMPONENTS Archive Sonnet WidgetsAddons Service Emoticons
+                                      KIO KCMUtils NotifyConfig Notifications I18n
+                                      WebKit WindowSystem XmlGui ItemViews TextWidgets
+                                      IconThemes DBusAddons)
 find_package (Qt5 REQUIRED COMPONENTS WebKitWidgets)
 find_package (KTp REQUIRED)
 
diff --git a/lib/chat-search-bar.cpp b/lib/chat-search-bar.cpp
index f0a559f..484975a 100644
--- a/lib/chat-search-bar.cpp
+++ b/lib/chat-search-bar.cpp
@@ -166,7 +166,7 @@ bool ChatSearchBar::event(QEvent *e)
             return true;
         }
     }
-    return false;
+    return QWidget::event(e);
 }
 
 void ChatSearchBar::textChanged(const QString& text)
diff --git a/logviewer/CMakeLists.txt b/logviewer/CMakeLists.txt
index ac35ff6..c36157c 100644
--- a/logviewer/CMakeLists.txt
+++ b/logviewer/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(ktp-log-viewer
             KF5::ConfigCore
             KF5::ItemViews
             KF5::CoreAddons
+            KF5::DBusAddons
             KF5::KIOWidgets
             KF5::Emoticons
             KF5::KCMUtils
@@ -35,5 +36,5 @@ target_link_libraries(ktp-log-viewer
             ktpchat)
 
 install(TARGETS ktp-log-viewer DESTINATION ${BIN_INSTALL_DIR})
-install(FILES ktp-log-viewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES org.kde.ktplogviewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 install(FILES log-viewer.rc DESTINATION  ${DATA_INSTALL_DIR}/ktp-log-viewer/)
diff --git a/logviewer/main.cpp b/logviewer/main.cpp
index 00dbc03..85ce2bc 100644
--- a/logviewer/main.cpp
+++ b/logviewer/main.cpp
@@ -22,6 +22,7 @@
 
 #include <KAboutData>
 #include <KLocalizedString>
+#include <KDBusService>
 
 #include "log-viewer.h"
 #include "../ktptextui_version.h"
@@ -45,11 +46,15 @@ int main(int argc, char *argv[])
     aboutData.addAuthor(i18n("Daniele E. Domenichelli"), i18n("Developer"), "daniele.domenichelli at gmail.com");
     aboutData.addAuthor(i18n("Dan Vrátil"), i18n("Developer"), "dvratil at redhat.com");
     aboutData.setProductName("telepathy/log-viewer"); //set the correct name for bug reporting
+    aboutData.setOrganizationDomain(QByteArray("kde.org"));
     aboutData.setLicense(KAboutLicense::GPL_V2);
 
     KAboutData::setApplicationData(aboutData);
     QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("documentation")));
 
+    // register to DBus
+    const KDBusService dbusService(KDBusService::Multiple);
+
     QCommandLineParser parser;
     parser.addHelpOption();
     parser.addVersionOption();
diff --git a/logviewer/ktp-log-viewer.desktop b/logviewer/org.kde.ktplogviewer.desktop
similarity index 99%
rename from logviewer/ktp-log-viewer.desktop
rename to logviewer/org.kde.ktplogviewer.desktop
index d6966ef..bb46032 100644
--- a/logviewer/ktp-log-viewer.desktop
+++ b/logviewer/org.kde.ktplogviewer.desktop
@@ -144,3 +144,4 @@ Terminal=false
 Icon=documentation
 Categories=Qt;KDE;Network;InstantMessaging;
 X-DBUS-StartupType=Unique
+X-DBUS-ServiceName=org.kde.ktplogviewer

-- 
ktp-text-ui packaging