Permalink
Browse files

Fix up the new PCDM splashscreen, and also fix a bug in the login pro…

…cess from the recent compilation fix for 10.x
  • Loading branch information...
1 parent 38bddb5 commit a9ab1d6562659b58f203ee8f3613897f786e3a69 Ken Moore committed Nov 7, 2013
@@ -99,7 +99,6 @@ bool XProcess::startXSession(){
//Now allow this user access to the Xserver
QString xhostcmd = "xhost si:localuser:"+xuser;
system(xhostcmd.toUtf8());
-
//QWidget *wid = new QWidget();
if (setgid(pw->pw_gid) < 0) {
qDebug() << "setgid() failed!";
@@ -121,36 +120,33 @@ bool XProcess::startXSession(){
emit InvalidLogin(); //Make sure the GUI knows that it was a failure
return FALSE;
}
-
//Startup the PAM session
if( !pam_startSession() ){ pam_shutdown(); return FALSE; }
pam_session_open = TRUE; //flag that pam has an open session
-
QString cmd;
// Configure the DE startup command
// - Add the DE startup command to the end
cmd.append("dbus-launch --exit-with-session "+xcmd);
//cmd.append(xcmd);
//cmd.append("; kill -l KILL"); //to clean up the session afterwards
-
//Backend::log("Startup command: "+cmd);
// Setup the process environment
setupSessionEnvironment();
-
//Log the DE startup outputs as well
this->setStandardOutputFile(xhome+"/.pcdm-startup.log",QIODevice::Truncate);
this->setStandardErrorFile(xhome+"/.pcdm-startup.err",QIODevice::Truncate);
// Startup the process(s)
// - Setup to run the user's <home-dir>/.xprofile startup script
if(QFile::exists(xhome+"/.xprofile")){
- disconnect(SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup(int, QProcess::ExitStatus)) );
+ disconnect(SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) );
+ qDebug() << "Run user ~/.xprofile";
this->start("sh "+xhome+"/.xprofile &");//make sure to start it in parallel
if(!this->waitForFinished(30000) ){
//If it still has not finished this after 30 seconds, kill it
this->terminate();
}
- connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup(int, QProcess::ExitStatus)) );
+ connect( this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotCleanup()) );
}
this->start(cmd);
return TRUE;
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a9ab1d6

Please sign in to comment.