summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2015-08-23 11:09:06 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2015-08-27 14:32:31 (GMT)
commitb45b9ed9b12d8f05237f52b00a8d61cff1d53806 (patch)
tree039eedd1d9804a9d72b0031524d108685dca7b29
parent0d29e4477a5dd74762f5eb57f13914761c8beae6 (diff)
downloadtdebase-b45b9ed9.zip
tdebase-b45b9ed9.tar.gz
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>
-rw-r--r--ksmserver/server.cpp6
-rw-r--r--ksmserver/server.h4
-rw-r--r--ksmserver/startup.cpp1
3 files changed, 10 insertions, 1 deletions
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index f09dcd9..505865c 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -592,6 +592,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
state = Idle;
dialogActive = false;
saveSession = false;
+ m_startupCompleted = false;
wmPhase1WaitingCount = 0;
TDEConfig* config = TDEGlobal::config();
config->setGroup("General" );
@@ -990,3 +991,8 @@ bool KSMServer::defaultSession() const
{
return sessionGroup.isEmpty();
}
+
+bool KSMServer::startupCompleted()
+{
+ return m_startupCompleted;
+}
diff --git a/ksmserver/server.h b/ksmserver/server.h
index bc67775..a90ef43 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -61,6 +61,7 @@ k_dcop:
void autoStart2Done();
void kcmPhase1Done();
void kcmPhase2Done();
+ bool startupCompleted();
public:
KSMServer( const TQString& windowManager, const TQString& windowManagerAddArgs, bool only_local );
~KSMServer();
@@ -181,7 +182,7 @@ private:
TQString windowWmClientMachine(WId w);
WId windowWmClientLeader(WId w);
TQCString windowSessionId(WId w, WId leader);
-
+
bool checkStartupSuspend();
void finishStartup();
void resumeStartupInternal();
@@ -235,6 +236,7 @@ private:
TQTimer startupSuspendTimeoutTimer;
bool waitAutoStart2;
bool waitKcmInit2;
+ bool m_startupCompleted;
TQTimer pendingShutdown;
TDEApplication::ShutdownConfirm pendingShutdown_confirm;
TDEApplication::ShutdownType pendingShutdown_sdtype;
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index b1ed999..fb9e696 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -389,6 +389,7 @@ void KSMServer::finishStartup()
startupNotifierIPDlg=0;
}
+ m_startupCompleted = true;
setupXIOErrorHandler(); // From now on handle X errors as normal shutdown.
}