Changeset bcd1e95


Ignore:
Timestamp:
Dec 2, 2013 3:55:12 PM (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
e88951d
Parents:
4bb290c
Message:

Oops, fix a bug with running setxkbmap in the user session.

File:
1 edited

Legend:

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

    r4e1b189 rbcd1e95  
    6969 
    7070bool XProcess::startXSession(){ 
     71  disconnect(SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
    7172  //Check that the necessary info to start the session is available 
    7273  if( xuser.isEmpty() || xcmd.isEmpty() || xhome.isEmpty() || xde.isEmpty() ){ 
     
    141142  QString lang, kMod, kLay, kVar; 
    142143  Backend::readDefaultSysEnvironment(lang,kMod,kLay,kVar); 
    143   this->start("setxkbmap", QStringList() << "-model" << kMod << "-layout" << kLay << "-variant" << kVar); 
    144   this->waitForFinished(); 
     144  //this->start("setxkbmap", QStringList() << "-model" << kMod << "-layout" << kLay << "-variant" << kVar); 
     145  //this->waitForFinished(); 
    145146  // Startup the process(s) 
    146147   //  - Setup to run the user's <home-dir>/.xprofile startup script 
    147148  if(QFile::exists(xhome+"/.xprofile")){ 
    148     disconnect(SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
    149149    qDebug() << "Run user ~/.xprofile"; 
    150150    this->start("sh "+xhome+"/.xprofile &");//make sure to start it in parallel 
     
    153153      this->terminate(); 
    154154    } 
    155     connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
    156   } 
     155  } 
     156  connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) ); 
    157157  this->start(cmd); 
    158158  return TRUE; 
Note: See TracChangeset for help on using the changeset viewer.