Ignore:
Timestamp:
02/12/14 05:15:44 (8 months ago)
Author:
Kris Moore <kris@…>
Branches:
releng/10.0
Children:
f106e15
Parents:
c01b277
git-author:
Ken Moore <ken@…> (02/11/14 14:31:14)
git-committer:
Kris Moore <kris@…> (02/12/14 05:15:44)
Message:

Couple quick fixes to the life-preserver tray:
1) Make sure that the new single-instance functionality will not startup a prompt to open the main GUI for 30 seconds after the tray gets launched. This prevents "double-taps" on user login when the DE also starts up an instance automatically.
2) Whenever the system check timer goes off, also check that the lpreserver log file is being watched, and re-initialize the log file watcher if necessary.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/lp-tray/LPWatcher.h

    r6a2483b rd45a9eb  
    2525        bool isRunning(); 
    2626        bool hasError(); 
     27        bool initPhase(); 
    2728 
    2829public slots: 
     
    3839        //File system watcher 
    3940        QFileSystemWatcher *watcher; 
    40         QTimer *timer; 
     41        QTimer *timer, *iniTimer; 
    4142        int sysCheckTime; 
    4243        QFile *logfile, *repfile; 
     
    4445        //Replication size variables 
    4546        QString repTotK, lastSize; 
     47        bool INIT; 
    4648 
     49        void setupLogFile(); 
    4750        void readLogFile(bool quiet = false); 
    4851        void readReplicationFile(); //always sends quiet signals 
     
    6063        void fileChanged(QString); //file system watcher saw a change 
    6164        void checkPoolStatus(); //check for serious system errors 
     65        void endInitPhase(); 
    6266 
    6367signals: 
Note: See TracChangeset for help on using the changeset viewer.