Commit f1c59e07 authored by Martin Klapetek's avatar Martin Klapetek

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
parent 42cf29d5
......@@ -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)
......
......@@ -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/)
......@@ -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@gmail.com");
aboutData.addAuthor(i18n("Dan Vrátil"), i18n("Developer"), "dvratil@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();
......
......@@ -144,3 +144,4 @@ Terminal=false
Icon=documentation
Categories=Qt;KDE;Network;InstantMessaging;
X-DBUS-StartupType=Unique
X-DBUS-ServiceName=org.kde.ktplogviewer
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment