mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
KUniqueApplication::newInstance() already takes care about DBus (thanks to David for the hint).
svn path=/trunk/KDE/kdebase/apps/; revision=645447
This commit is contained in:
parent
75f4f45c98
commit
e74cc60fef
20
src/main.cpp
20
src/main.cpp
|
@ -19,13 +19,10 @@
|
|||
***************************************************************************/
|
||||
|
||||
#include "dolphinapplication.h"
|
||||
#include "dolphinmainwindow.h"
|
||||
|
||||
#include <kaboutdata.h>
|
||||
#include <kcmdlineargs.h>
|
||||
#include <klocale.h>
|
||||
#include <krun.h>
|
||||
#include <QDBusInterface>
|
||||
#include <QDBusReply>
|
||||
|
||||
static KCmdLineOptions options[] =
|
||||
{
|
||||
|
@ -56,10 +53,11 @@ int main(int argc, char **argv)
|
|||
KCmdLineArgs::init(argc, argv, &about);
|
||||
KCmdLineArgs::addCmdLineOptions(options);
|
||||
|
||||
DolphinApplication* app = 0;
|
||||
if (DolphinApplication::start()) {
|
||||
app = new DolphinApplication();
|
||||
if (!DolphinApplication::start()) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
DolphinApplication app;
|
||||
#ifdef __GNUC__
|
||||
#warning TODO, SessionManagement
|
||||
#endif
|
||||
|
@ -72,11 +70,5 @@ int main(int argc, char **argv)
|
|||
}
|
||||
} else {
|
||||
#endif
|
||||
return app->exec();
|
||||
}
|
||||
|
||||
static QDBusInterface dbusIface("org.kde.dolphin", "/dolphin/Application", "",
|
||||
QDBusConnection::connectToBus(QDBusConnection::SessionBus, "session_bus"));
|
||||
dbusIface.call("openWindow");
|
||||
return 0;
|
||||
return app.exec();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue