Permalink
Browse files

Remove the old PCDM-xloop script (no longer needed), and also clean u…

…p the testing functions for using pure C classes to start up the user session (the Qt session startup is working fine)
  • Loading branch information...
1 parent 687d934 commit 999faefb6957d959ef8ba409ac0d425660fc938c Ken Moore committed Nov 5, 2013
View
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Allow Auto-Login the first time PCDM starts
-touch /tmp/.PCDMAutoLogin
-# Now start the X Server
-while [ ! -e /var/run/nologin ]; do
- /usr/local/bin/PCDM-session --once
-done
View
@@ -106,10 +106,6 @@ scripts=PCDMd
scripts.path=/usr/local/sbin
scripts.extra=cp PCDMd $(INSTALL_ROOT)/usr/local/sbin/PCDMd
-xloop=PCDM-xloop
-xloop.path=/usr/local/sbin
-xloop.extra=cp PCDM-xloop $(INSTALL_ROOT)/usr/local/sbin/PCDM-xloop && chmod 755 $(INSTALL_ROOT)/usr/local/sbin/PCDM-xloop
-
rcd=rc.d/pcdm
rcd.path=/usr/local/etc/rc.d
rcd.extra=cp rc.d/pcdm $(INSTALL_ROOT)/usr/local/etc/rc.d/pcdm
@@ -125,6 +121,6 @@ conf=pcdm.conf
conf.path=/usr/local/etc
conf.extra=cp pcdm.conf $(INSTALL_ROOT)/usr/local/etc/pcdm.conf.dist && chmod 600 $(INSTALL_ROOT)/usr/local/etc/pcdm.conf.dist
-INSTALLS += dotrans scripts rcd cleanthemes theme conf target xloop
+INSTALLS += dotrans scripts rcd cleanthemes theme conf target
RESOURCES += PCDM.qrc
View
@@ -31,7 +31,7 @@
//#define prefix "/usr/local/"
//#endif
-bool USECLIBS=false;
+//bool USECLIBS=false;
int runSingleSession(int argc, char *argv[]){
//QTime clock;
@@ -125,8 +125,10 @@ int runSingleSession(int argc, char *argv[]){
w.setWindowState(Qt::WindowMaximized); //Qt::WindowFullScreen);
//Setup the signals/slots to startup the desktop session
- if(USECLIBS){ QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString)), &desktop,SLOT(setupDesktop(QString,QString,QString))); }
- else{ QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString)), &desktop,SLOT(loginToXSession(QString,QString,QString)) ); }
+ //if(USECLIBS){ QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString)), &desktop,SLOT(setupDesktop(QString,QString,QString))); }
+ //else{
+ QObject::connect( &w,SIGNAL(xLoginAttempt(QString,QString,QString)), &desktop,SLOT(loginToXSession(QString,QString,QString)) );
+ //}
//Setup the signals/slots for return information for the GUI
QObject::connect( &desktop, SIGNAL(InvalidLogin()), &w, SLOT(slotLoginFailure()) );
QObject::connect( &desktop, SIGNAL(started()), &w, SLOT(slotLoginSuccess()) );
@@ -138,8 +140,10 @@ int runSingleSession(int argc, char *argv[]){
} // end of PCDM GUI running
int retcode = 0;
//Wait for the desktop session to finish before exiting
- if(USECLIBS){ desktop.startDesktop(); }
- else{ desktop.waitForSessionClosed(); }
+ //if(USECLIBS){ desktop.startDesktop(); }
+ //else{
+ desktop.waitForSessionClosed();
+ //}
splash.show(); //show the splash screen again
QCoreApplication::processEvents();
//check for shutdown process
@@ -178,6 +178,7 @@ void XProcess::slotCleanup(int exitCode, QProcess::ExitStatus status){
system(xhostcmd.toUtf8());
}
+/*
//Start the desktop in the current process with C functions
void XProcess::startDesktop(){
//Check for PAM username/password validity
@@ -273,9 +274,9 @@ void XProcess::startDesktop(){
//Now start the process
system(cmd.toLatin1());
}
-
+*/
-void XProcess::setupDesktop(QString user, QString pwd, QString desktop){
+/*void XProcess::setupDesktop(QString user, QString pwd, QString desktop){
//Setup internal variables
xuser = Backend::getUsernameFromDisplayname(user);
xpwd = pwd;
@@ -288,7 +289,7 @@ void XProcess::setupDesktop(QString user, QString pwd, QString desktop){
if(ok){ emit ValidLogin(); }
else{ emit InvalidLogin(); }
}
-
+ */
//Stand-alone function to check a username/password combination for validity
@@ -32,13 +32,13 @@ class XProcess : public QProcess
bool isRunning();
void waitForSessionClosed();
- void startDesktop();
+ //void startDesktop();
public slots:
void loginToXSession(QString, QString, QString); //user, pwd, desktop
void checkPW(QString,QString); //user, pwd
- void setupDesktop(QString,QString,QString); //user, pwd, desktop
+ //void setupDesktop(QString,QString,QString); //user, pwd, desktop
private:
int fstatus; //fork status

0 comments on commit 999faef

Please sign in to comment.