Ignore:
Timestamp:
03/14/14 10:23:18 (4 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2
Children:
bf6b163
Parents:
370de21
Message:

Small update to PCDM:
1) Clean up session management/restarts (in case login fails during all the PAM or user/group changes)
2) Update the location of the lastlogin file (/var/db/pcdm/lastlogin), and make sure it is getting saved/loaded properly.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/main.cpp

    r28c79ad rfdf420c  
    145145    w.setWindowState(Qt::WindowMaximized); //Qt::WindowFullScreen); 
    146146 
    147     //Setup the signals/slots to startup the desktop session 
    148     //if(USECLIBS){ QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString)), &desktop,SLOT(setupDesktop(QString,QString,QString))); } 
    149     //else{  
    150             QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString,QString)), &desktop,SLOT(loginToXSession(QString,QString,QString,QString)) );  
    151     //} 
     147    //Setup the signals/slots to startup the desktop session  
     148    QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString,QString)), &desktop,SLOT(loginToXSession(QString,QString,QString,QString)) );  
    152149    //Setup the signals/slots for return information for the GUI 
    153150    QObject::connect( &desktop, SIGNAL(InvalidLogin()), &w, SLOT(slotLoginFailure()) ); 
     
    160157  }  // end of PCDM GUI running 
    161158  //Wait for the desktop session to finish before exiting 
    162   //if(USECLIBS){ desktop.startDesktop(); } 
    163   //else{  
    164159    desktop.waitForSessionClosed();  
    165   //} 
    166160  splash.show(); //show the splash screen again 
    167161  //Now wait a couple seconds for things to settle 
     
    180174      QCoreApplication::processEvents(QEventLoop::AllEvents, 100);  
    181175    } 
    182     //set the return code for a shutdown 
    183     retCode = -1; //make sure it does not start a new session 
    184176  } 
    185177   
     
    214206    qDebug() << "-- PCDM Session Ended --"; 
    215207    //check for special exit code 
    216     if(retCode != 0){ neverquit=FALSE; } 
     208    if(retCode == -1){ neverquit=true; } //make sure we go around again at least once 
     209    else if(retCode != 0){ neverquit=FALSE; } 
    217210    //Now kill the shild process (whole session) 
    218211    qDebug() << "Exiting child process"; 
Note: See TracChangeset for help on using the changeset viewer.