Commit 228bcb73 authored by Emmanuel Lepage's avatar Emmanuel Lepage

Close the daemon once and for all, no more automatic respawning

parent f94242bc
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include <KSystemTrayIcon> #include <KSystemTrayIcon>
#include <KMainWindow> #include <KMainWindow>
#include "lib/instance_interface_singleton.h" #include "lib/instance_interface_singleton.h"
#include "lib/configurationmanager_interface_singleton.h"
#include "lib/callmanager_interface_singleton.h"
#include "SFLPhone.h" #include "SFLPhone.h"
...@@ -33,8 +35,12 @@ SFLPhoneApplication::SFLPhoneApplication() ...@@ -33,8 +35,12 @@ SFLPhoneApplication::SFLPhoneApplication()
*/ */
SFLPhoneApplication::~SFLPhoneApplication() SFLPhoneApplication::~SFLPhoneApplication()
{ {
// automatically destroyed // automatically destroyed
sflphoneWindow_ = 0; sflphoneWindow_ = 0;
disableSessionManagement();
InstanceInterface& instance = InstanceInterfaceSingleton::getInstance();
Q_NOREPLY instance.Unregister(getpid());
instance.connection().disconnectFromBus(instance.connection().baseService());
} }
...@@ -104,9 +110,7 @@ void SFLPhoneApplication::initializePaths() ...@@ -104,9 +110,7 @@ void SFLPhoneApplication::initializePaths()
Q_NOREPLY void SFLPhoneApplication::quit2() Q_NOREPLY void SFLPhoneApplication::quit2()
{ {
disableSessionManagement();
InstanceInterface& instance = InstanceInterfaceSingleton::getInstance();
Q_NOREPLY instance.Unregister(getpid());
} }
#include "SFLPhoneapplication.moc" #include "SFLPhoneapplication.moc"
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