[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kalarmd
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2003-02-28 21:51:07
[Download RAW message or body]

CVS commit by djarvie: 

Option out the session start delay - this should be unnecessary after session restoration being prevented


  M +14 -2     alarmdaemon.cpp   1.54
  M +1 -1      alarmdaemon.h   1.29


--- kdepim/kalarmd/alarmdaemon.h  #1.28:1.29
@@ -46,5 +46,5 @@ class AlarmDaemon : public QObject, publ
   private slots:
     void    checkAlarmsSlot();
-    void    checkIfSessionStarted();
+//    void    checkIfSessionStarted();
 
     void    checkAlarms();

--- kdepim/kalarmd/alarmdaemon.cpp  #1.53:1.54
@@ -51,12 +51,17 @@
 
 
+#ifdef CHECK_IF_SESSION_STARTED
 const int LOGIN_DELAY( 5 );
+#endif
 
 AlarmDaemon::AlarmDaemon(QObject *parent, const char *name)
-  : QObject(parent, name), DCOPObject(name),
-    mSessionStartTimer(0)
+  : QObject(parent, name), DCOPObject(name)
+#ifdef CHECK_IF_SESSION_STARTED
+    , mSessionStartTimer(0)
+#endif
 {
   kdDebug(5900) << "AlarmDaemon::AlarmDaemon()" << endl;
 
+#ifdef CHECK_IF_SESSION_STARTED
   bool splash = kapp->dcopClient()->isApplicationRegistered("ksplash");
   if (splash  ||  static_cast<AlarmApp*>(kapp)->startedAtLogin())
@@ -72,7 +77,12 @@ AlarmDaemon::AlarmDaemon(QObject *parent
     mSessionStartTimer->start(splash ? 1000 : LOGIN_DELAY * 1000);
   }
+#endif
 
   readCheckInterval();
+#ifdef CHECK_IF_SESSION_STARTED
   readDaemonData(!!mSessionStartTimer);
+#else
+  readDaemonData(false);
+#endif
 
   enableAutoStart(true);    // switch autostart on whenever the program is run
@@ -549,4 +559,5 @@ bool AlarmDaemon::notifyEvent(ADCalendar
 }
 
+#ifdef CHECK_IF_SESSION_STARTED
 /*
  * Called by the timer to check whether session startup is complete.
@@ -579,4 +590,5 @@ void AlarmDaemon::checkIfSessionStarted(
   }
 }
+#endif
 
 /*


[prev in list] [next in list] [prev in thread] [next in thread]