Ignore:
Timestamp:
11/07/13 12:02:00 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
3350c09, eeafa1b
Parents:
38bddb5
Message:

Fix up the new PCDM splashscreen, and also fix a bug in the login process from the recent compilation fix for 10.x

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    r72c9698 ra9ab1d6  
    100100  QString xhostcmd = "xhost si:localuser:"+xuser; 
    101101  system(xhostcmd.toUtf8()); 
    102    
    103102  //QWidget *wid = new QWidget(); 
    104103  if (setgid(pw->pw_gid) < 0) { 
     
    122121      return FALSE; 
    123122  } 
    124  
    125123  //Startup the PAM session 
    126124  if( !pam_startSession() ){ pam_shutdown(); return FALSE; } 
    127125  pam_session_open = TRUE; //flag that pam has an open session 
    128    
    129126  QString cmd; 
    130127  // Configure the DE startup command 
     
    134131  //cmd.append(xcmd); 
    135132  //cmd.append("; kill -l KILL"); //to clean up the session afterwards 
    136    
    137133  //Backend::log("Startup command: "+cmd); 
    138134  // Setup the process environment 
    139135  setupSessionEnvironment(); 
    140    
    141136  //Log the DE startup outputs as well 
    142137  this->setStandardOutputFile(xhome+"/.pcdm-startup.log",QIODevice::Truncate); 
     
    145140   //  - Setup to run the user's <home-dir>/.xprofile startup script 
    146141  if(QFile::exists(xhome+"/.xprofile")){ 
    147     disconnect(SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup(int, QProcess::ExitStatus)) ); 
     142    disconnect(SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
     143    qDebug() << "Run user ~/.xprofile"; 
    148144    this->start("sh "+xhome+"/.xprofile &");//make sure to start it in parallel 
    149145    if(!this->waitForFinished(30000) ){ 
     
    151147      this->terminate(); 
    152148    } 
    153     connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup(int, QProcess::ExitStatus)) ); 
     149    connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
    154150  } 
    155151  this->start(cmd); 
Note: See TracChangeset for help on using the changeset viewer.