Commit a148102e authored by Hrvoje Senjan's avatar Hrvoje Senjan
Browse files

Register KSysguard to DBus

Unbreaks starting the app via KRun

Reviewed-by: Bhushan Shah
parent 688582e4
...@@ -54,6 +54,7 @@ target_compile_definitions(kdeinit_ksysguard PRIVATE -DPROJECT_VERSION="${PROJEC ...@@ -54,6 +54,7 @@ target_compile_definitions(kdeinit_ksysguard PRIVATE -DPROJECT_VERSION="${PROJEC
target_link_libraries(kdeinit_ksysguard target_link_libraries(kdeinit_ksysguard
KF5::ProcessUi KF5::ProcessUi
KF5::SignalPlotter KF5::SignalPlotter
KF5::DBusAddons
KF5::ItemViews KF5::ItemViews
KF5::NewStuff KF5::NewStuff
KF5::SysGuard KF5::SysGuard
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <k4aboutdata.h> #include <k4aboutdata.h>
#include <kactioncollection.h> #include <kactioncollection.h>
#include <kapplication.h> #include <kapplication.h>
#include <KDBusService>
#include <kdebug.h> #include <kdebug.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <kglobal.h> #include <kglobal.h>
...@@ -533,6 +533,7 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char** argv ) ...@@ -533,6 +533,7 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char** argv )
KAboutData aboutData( "ksysguard", i18n( "System Monitor" ), KAboutData aboutData( "ksysguard", i18n( "System Monitor" ),
PROJECT_VERSION, i18n(Description), KAboutLicense::GPL, PROJECT_VERSION, i18n(Description), KAboutLicense::GPL,
i18n( "(c) 1996-2008 The KDE System Monitor Developers" ) ); i18n( "(c) 1996-2008 The KDE System Monitor Developers" ) );
aboutData.setOrganizationDomain(QByteArray("kde.org"));
aboutData.addAuthor( i18n("John Tapsell"), i18n("Current Maintainer"), "john.tapsell@kde.org" ); aboutData.addAuthor( i18n("John Tapsell"), i18n("Current Maintainer"), "john.tapsell@kde.org" );
aboutData.addAuthor( i18n("Chris Schlaeger"), i18n("Previous Maintainer"), "cs@kde.org" ); aboutData.addAuthor( i18n("Chris Schlaeger"), i18n("Previous Maintainer"), "cs@kde.org" );
aboutData.addAuthor( i18n("Greg Martyn"), QString(), "greg.martyn@gmail.com" ); aboutData.addAuthor( i18n("Greg Martyn"), QString(), "greg.martyn@gmail.com" );
...@@ -585,6 +586,9 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char** argv ) ...@@ -585,6 +586,9 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char** argv )
Toplevel->show(); Toplevel->show();
KSGRD::SensorMgr->setBroadcaster( Toplevel ); // SensorMgr uses a QPointer for toplevel, so it is okay if Toplevel is deleted first KSGRD::SensorMgr->setBroadcaster( Toplevel ); // SensorMgr uses a QPointer for toplevel, so it is okay if Toplevel is deleted first
// register to DBus
const KDBusService dbusService(KDBusService::Multiple);
// run the application // run the application
int result = app.exec(); int result = app.exec();
......
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