Ignore:
Timestamp:
Nov 5, 2013 2:37:47 PM (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
f24f00e, b28c8d9
Parents:
687d934
Message:

Remove the old PCDM-xloop script (no longer needed), and also clean up the testing functions for using pure C classes to start up the user session (the Qt session startup is working fine)

File:
1 edited

Legend:

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

    rf235f91 r999faef  
    3232//#endif 
    3333 
    34 bool USECLIBS=false; 
     34//bool USECLIBS=false; 
    3535 
    3636int runSingleSession(int argc, char *argv[]){ 
     
    126126 
    127127    //Setup the signals/slots to startup the desktop session 
    128     if(USECLIBS){ QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString)), &desktop,SLOT(setupDesktop(QString,QString,QString))); } 
    129     else{ QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString)), &desktop,SLOT(loginToXSession(QString,QString,QString)) ); } 
     128    //if(USECLIBS){ QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString)), &desktop,SLOT(setupDesktop(QString,QString,QString))); } 
     129    //else{  
     130            QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString)), &desktop,SLOT(loginToXSession(QString,QString,QString)) );  
     131    //} 
    130132    //Setup the signals/slots for return information for the GUI 
    131133    QObject::connect( &desktop, SIGNAL(InvalidLogin()), &w, SLOT(slotLoginFailure()) ); 
     
    139141  int retcode = 0; 
    140142  //Wait for the desktop session to finish before exiting 
    141   if(USECLIBS){ desktop.startDesktop(); } 
    142   else{ desktop.waitForSessionClosed(); } 
     143  //if(USECLIBS){ desktop.startDesktop(); } 
     144  //else{  
     145    desktop.waitForSessionClosed();  
     146  //} 
    143147  splash.show(); //show the splash screen again 
    144148  QCoreApplication::processEvents(); 
Note: See TracChangeset for help on using the changeset viewer.