[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:25:24 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=50a901a
The following commit has been merged in the master branch:
commit 50a901a06733299af2238fc4c4d26d2f8052dae0
Author: Martin Klapetek <mklapetek at kde.org>
Date: Fri May 29 00:03:46 2015 +0200
Make log viewer usable in multiple instances
Also kills the "KDEInit couldn't launch log viewer" error and Plasma
being blocked issue
REVIEW: 123907
BUG: 346395
FIXED-IN: 15.04.2
---
CMakeLists.txt | 5 ++++-
logviewer/CMakeLists.txt | 3 ++-
logviewer/main.cpp | 5 +++++
logviewer/{ktp-log-viewer.desktop => org.kde.ktplogviewer.desktop} | 1 +
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 526e20f..ddc7483 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,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/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 1674566..f3852fb 100644
--- a/logviewer/ktp-log-viewer.desktop
+++ b/logviewer/org.kde.ktplogviewer.desktop
@@ -141,3 +141,4 @@ Terminal=false
Icon=documentation
Categories=Qt;KDE;Network;InstantMessaging;
X-DBUS-StartupType=Unique
+X-DBUS-ServiceName=org.kde.ktplogviewer
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list