Added DCOP method startupCompleted() to KSMServer: this allows to check whether the

session has been fully created/restored. This relates to bug 1610.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 9 years ago
parent 0d29e4477a
commit b45b9ed9b1

@ -592,6 +592,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
state = Idle; state = Idle;
dialogActive = false; dialogActive = false;
saveSession = false; saveSession = false;
m_startupCompleted = false;
wmPhase1WaitingCount = 0; wmPhase1WaitingCount = 0;
TDEConfig* config = TDEGlobal::config(); TDEConfig* config = TDEGlobal::config();
config->setGroup("General" ); config->setGroup("General" );
@ -990,3 +991,8 @@ bool KSMServer::defaultSession() const
{ {
return sessionGroup.isEmpty(); return sessionGroup.isEmpty();
} }
bool KSMServer::startupCompleted()
{
return m_startupCompleted;
}

@ -61,6 +61,7 @@ k_dcop:
void autoStart2Done(); void autoStart2Done();
void kcmPhase1Done(); void kcmPhase1Done();
void kcmPhase2Done(); void kcmPhase2Done();
bool startupCompleted();
public: public:
KSMServer( const TQString& windowManager, const TQString& windowManagerAddArgs, bool only_local ); KSMServer( const TQString& windowManager, const TQString& windowManagerAddArgs, bool only_local );
~KSMServer(); ~KSMServer();
@ -181,7 +182,7 @@ private:
TQString windowWmClientMachine(WId w); TQString windowWmClientMachine(WId w);
WId windowWmClientLeader(WId w); WId windowWmClientLeader(WId w);
TQCString windowSessionId(WId w, WId leader); TQCString windowSessionId(WId w, WId leader);
bool checkStartupSuspend(); bool checkStartupSuspend();
void finishStartup(); void finishStartup();
void resumeStartupInternal(); void resumeStartupInternal();
@ -235,6 +236,7 @@ private:
TQTimer startupSuspendTimeoutTimer; TQTimer startupSuspendTimeoutTimer;
bool waitAutoStart2; bool waitAutoStart2;
bool waitKcmInit2; bool waitKcmInit2;
bool m_startupCompleted;
TQTimer pendingShutdown; TQTimer pendingShutdown;
TDEApplication::ShutdownConfirm pendingShutdown_confirm; TDEApplication::ShutdownConfirm pendingShutdown_confirm;
TDEApplication::ShutdownType pendingShutdown_sdtype; TDEApplication::ShutdownType pendingShutdown_sdtype;

@ -389,6 +389,7 @@ void KSMServer::finishStartup()
startupNotifierIPDlg=0; startupNotifierIPDlg=0;
} }
m_startupCompleted = true;
setupXIOErrorHandler(); // From now on handle X errors as normal shutdown. setupXIOErrorHandler(); // From now on handle X errors as normal shutdown.
} }

Loading…
Cancel
Save