Changeset 56718fd


Ignore:
Timestamp:
10/28/14 08:22:35 (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.1, releng/10.1.1
Children:
03bb9ab, 0553bb7
Parents:
3ef5df8
Message:

Another couple little fixes for the new usage of syscache in the pc-systemupdatertray.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-systemupdatertray/TrayUI.cpp

    r8823fd2 r56718fd  
    282282    updateTrayIcon(); 
    283283    updateToolTip(); 
    284     QTimer::singleShot(60000, watcher, SLOT(checkFlags()) ); //make sure to manually check 1 minute from now 
     284    //QTimer::singleShot(60000, watcher, SLOT(checkFlags()) ); //make sure to manually check 1 minute from now 
    285285} 
    286286 
     
    293293  updateTrayIcon(); 
    294294  updateToolTip();   
    295   QTimer::singleShot(60000, watcher, SLOT(checkFlags()) ); //make sure to manually check 1 minute from now 
     295  //QTimer::singleShot(60000, watcher, SLOT(checkFlags()) ); //make sure to manually check 1 minute from now 
    296296} 
    297297 
     
    323323  bool oldstat = noInternet; 
    324324  if(flag != SystemFlags::NetRestart){ noInternet = false; } 
     325  bool runcheck = false; 
    325326  switch(flag){ 
    326327        case SystemFlags::NetRestart: 
     
    332333          if(msg==SystemFlags::Working){ PKGSTATUS=1; } 
    333334          else if(msg==SystemFlags::Updating){ PKGSTATUS=3; } 
    334           else{ startPKGCheck(); } //check it 
     335          else{ runcheck=true; } //check it 
    335336          break; 
    336337        case SystemFlags::SysUpdate: 
    337338          if(msg==SystemFlags::Working){ SYSSTATUS=1; } 
    338339          else if(msg==SystemFlags::Updating){ SYSSTATUS=3; } 
    339           else{ startSYSCheck(); } //unknown - check it 
     340          else{ runcheck=true; } //check it 
    340341          break;         
    341342        case SystemFlags::WardenUpdate: 
    342343          if(msg==SystemFlags::Working){ WARDENSTATUS=1; } 
    343344          else if(msg==SystemFlags::Updating){ WARDENSTATUS=3; } 
    344           else{ startWardenCheck(); } //check it 
     345          else{ runcheck=true; } //check it 
    345346          break;         
    346347  } 
     348  if(runcheck){ checkForUpdates(); } 
    347349  qDebug() << "System Status Change:" << SYSSTATUS << PKGSTATUS << WARDENSTATUS << noInternet; 
    348350  //Update the tray icon 
Note: See TracChangeset for help on using the changeset viewer.