1 files changed, 48 insertions, 17 deletions

diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 3b7f7456..8759c171 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -29,8 +29,8 @@
 #include <tqdatetime.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
 #include <tdeio/netaccess.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
@@ -73,23 +73,54 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
 #ifdef AUTOSTART_KALARM
 	if (autostart)
 	{
-		/* The alarm daemon is being autostarted.
-		 * Check if KAlarm needs to be autostarted in the system tray.
+		/* The alarm daemon has been autostarted.
+		 * Check if also KAlarm needs to be autostarted (by the daemon) in the system tray.
 		 * This should ideally be handled internally by KAlarm, but is done by kalarmd
-		 * for the following reason:
-		 * KAlarm needs to be both session restored and autostarted, but KDE doesn't
-		 * currently cater properly for this - there is no guarantee that the session
-		 * restoration activation will come before the autostart activation. If they
-		 * come in the wrong order, KAlarm won't know that it is supposed to restore
-		 * itself and instead will simply open a new window.
+		 * to correctly handle the cases when KAlarm is restored and when it is autostarted.
+		 * If the autostart request comes before the restoring one, KAlarm would not know
+		 * that it is supposed to restore itself and instead would simply open a new window.
+		 * So we first check if the session has been fully restored by the session manager
+		 * and if so we can continue safely. If the session hasn't yet been fully restored
+		 * or created, we wait for up to 30 seconds and then continue as normal.
 		 */
 		TDEConfig kaconfig(locate("config", "kalarmrc"));
 		kaconfig.setGroup(TQString::fromLatin1("General"));
 		autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false);
 		if (autostart)
 		{
-			kdDebug(5900) << "AlarmDaemon::AlarmDaemon(): wait to autostart KAlarm\n";
-			TQTimer::singleShot(KALARM_AUTOSTART_TIMEOUT * 1000, this, TQT_SLOT(autostartKAlarm()));
+			bool done = false;
+			DCOPClient* client = tdeApp->dcopClient();
+			if (client->isApplicationRegistered("ksmserver"))
+			{
+				TQByteArray callData;
+				TQCString replyType;
+				TQByteArray replyData;
+				for (int i=0; !done && i<KALARM_AUTOSTART_TIMEOUT; ++i)
+				{
+					// Check if the session has been fully created/restored. If not, wait a little and try again
+					if (!tdeApp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) ||
+							replyType != "bool")
+					{
+						done = true;	// In case of DCOP call error, just continue normally
+					}
+					else
+					{
+						bool result;
+						TQDataStream replyStream(replyData, IO_ReadOnly);
+						replyStream >> result;
+						if (result)
+						{
+							done = true;	// Session created/restored ==> continue
+						}
+						else
+						{
+							sleep(1); // Session not yet fully created/restored ==> wait and retry
+						}
+					}
+				}
+			// Give some extra time to KAlarm to be fully restored, then proceed as usual
+			TQTimer::singleShot(3000, this, TQ_SLOT(autostartKAlarm()));
+			}
 		}
 	}
 	if (!autostart)
@@ -137,7 +168,7 @@ void AlarmDaemon::startMonitoring()
 {
 	// Set up the alarm timer
 	mAlarmTimer = new TQTimer(this);
-	connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot()));
+	connect(mAlarmTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarmsSlot()));
 	setTimerStatus();
 
 	// Start monitoring calendar files.
@@ -185,7 +216,7 @@ void AlarmDaemon::reloadCal(ADCalendar* cal, bool reset)
 	{
 		cal->close();
 		if (!cal->setLoadedConnected())
-			connect(cal, TQT_SIGNAL(loaded(ADCalendar*, bool)), TQT_SLOT(calendarLoaded(ADCalendar*, bool)));
+			connect(cal, TQ_SIGNAL(loaded(ADCalendar*, bool)), TQ_SLOT(calendarLoaded(ADCalendar*, bool)));
 		cal->loadFile(reset);
 	}
 	else if (reset)
@@ -481,12 +512,12 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
 	TQString id = TQString::fromLatin1("ad:") + eventID;    // prefix to indicate that the notification if from the daemon
 
 	// Check if the client application is running and ready to receive notification
-	bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
+	bool registered = tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
 	bool ready = registered;
 	if (registered)
 	{
 		// It's running, but check if it has created our DCOP interface yet
-		QCStringList objects = kapp->dcopClient()->remoteObjects(appname);
+		QCStringList objects = tdeApp->dcopClient()->remoteObjects(appname);
 		if (objects.find(client->dcopObject()) == objects.end())
 			ready = false;
 	}
@@ -575,7 +606,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
 	if (!client)
 		return;
 	TQCString appname = client->appName();
-	if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
+	if (tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
 	{
 		KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED)
 		                                                  : KAlarmd::CALENDAR_UNAVAILABLE;