Changeset 999faef


Ignore:
Timestamp:
11/05/13 14:37:47 (9 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
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)

Location:
src-qt4/PCDM
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/PCDM.pro

    r1b89eeb r999faef  
    107107scripts.extra=cp PCDMd $(INSTALL_ROOT)/usr/local/sbin/PCDMd 
    108108 
    109 xloop=PCDM-xloop 
    110 xloop.path=/usr/local/sbin 
    111 xloop.extra=cp PCDM-xloop $(INSTALL_ROOT)/usr/local/sbin/PCDM-xloop && chmod 755 $(INSTALL_ROOT)/usr/local/sbin/PCDM-xloop 
    112  
    113109rcd=rc.d/pcdm 
    114110rcd.path=/usr/local/etc/rc.d 
     
    126122conf.extra=cp pcdm.conf $(INSTALL_ROOT)/usr/local/etc/pcdm.conf.dist && chmod 600 $(INSTALL_ROOT)/usr/local/etc/pcdm.conf.dist 
    127123 
    128 INSTALLS += dotrans scripts rcd cleanthemes theme conf target xloop 
     124INSTALLS += dotrans scripts rcd cleanthemes theme conf target 
    129125 
    130126RESOURCES += PCDM.qrc 
  • 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(); 
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    r687d934 r999faef  
    179179} 
    180180 
     181/* 
    181182//Start the desktop in the current process with C functions 
    182183void XProcess::startDesktop(){ 
     
    274275  system(cmd.toLatin1()); 
    275276} 
    276  
    277    
    278 void XProcess::setupDesktop(QString user, QString pwd, QString desktop){ 
     277*/ 
     278   
     279/*void XProcess::setupDesktop(QString user, QString pwd, QString desktop){ 
    279280  //Setup internal variables 
    280281  xuser = Backend::getUsernameFromDisplayname(user); 
     
    289290  else{ emit InvalidLogin(); } 
    290291} 
    291    
     292  */ 
    292293   
    293294 
  • src-qt4/PCDM/src/pcdm-xprocess.h

    r1691c6a r999faef  
    3333        void waitForSessionClosed(); 
    3434         
    35         void startDesktop();  
     35        //void startDesktop();  
    3636         
    3737   
     
    3939        void loginToXSession(QString, QString, QString); //user, pwd, desktop 
    4040        void checkPW(QString,QString); //user, pwd 
    41         void setupDesktop(QString,QString,QString); //user, pwd, desktop 
     41        //void setupDesktop(QString,QString,QString); //user, pwd, desktop 
    4242         
    4343  private: 
Note: See TracChangeset for help on using the changeset viewer.