Merge from BRANCH_1_0

2 files changed, 24 insertions, 7 deletions

diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index d95a59b..7dcb5f6 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -51,12 +51,13 @@
 #include <qwindowsystem_qws.h>
 #include <qwsmouse_qws.h>
 #include <qmessagebox.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qfile.h>
+#include <qtextstream.h>
 
 #include "loginapplication.h"
 #include "loginwindowimpl.h"
 #include "calibrate.h"
 
 using namespace Opie;
@@ -71,12 +72,13 @@ static struct option long_options [] = {
 	{ 0, 0, 0, 0 }
 };
 
 
 int main ( int argc, char **argv )
 {
+    int userExited = 0;
 	pid_t ppid = ::getpid ( );
 
 	if ( ::geteuid ( ) != 0 ) {
 		::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] );
 		return 1;
 	}
@@ -134,17 +136,23 @@ int main ( int argc, char **argv )
 				else {
 					::syslog ( LOG_ERR, "Respawning too fast -- going down\n" );
 					break;
 				}
 			}
 			int killedbysig = 0;
+            userExited=0;
+            if (WIFEXITED(status)!=0 ) {
+                if (WEXITSTATUS(status)==137)  {
+                    userExited=1;
+                }
+            }
 
 			if ( WIFSIGNALED( status )) {
 				switch ( WTERMSIG( status )) {
-					case SIGINT :
 					case SIGTERM:
+					case SIGINT :
 					case SIGKILL:
 						break;
 
 					default     :
 						killedbysig = WTERMSIG( status );
 						break;
@@ -159,43 +167,51 @@ int main ( int argc, char **argv )
 				QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer );
 				app-> setFont ( QFont ( "Helvetica", 10 ));
 				app-> setStyle ( new QPEStyle ( ));
 
 				const char *sig = ::strsignal ( killedbysig );
 				QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool );
-				l-> setText ( LoginWindowImpl::tr( "OPIE was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig ));
+				l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig ));
 				l-> setAlignment ( Qt::AlignCenter );
 				l-> move ( 0, 0 );
 				l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
 				l-> show ( );
 				QTimer::singleShot ( 3000, app, SLOT( quit ( )));
 				app-> exec ( );
 				delete app;
 				qApp = 0;
 			}
 		}
 		else {
 			if ( !autolog ) {
-				Config cfg ( "opie-login" );
+                QString confFile=QPEApplication::qpeDir() + "/etc/opie-login.conf";
+				Config cfg ( confFile, Config::File );
 				cfg. setGroup ( "General" );
 				QString user = cfg. readEntry ( "AutoLogin" );
 				
 				if ( !user. isEmpty ( ))
 					autolog = ::strdup ( user. latin1 ( ));
 			}
 		
-			if ( autolog ) {
-				LoginApplication::setLoginAs ( autolog );
+			if ( autolog && !userExited ) {
+
+                QWSServer::setDesktopBackground( QImage() );
+                ODevice::inst ( )-> setDisplayStatus ( true );
+                ODevice::inst ( )-> setSoftSuspend ( false );
+                LoginApplication *app = new LoginApplication ( argc, argv, ppid );
+                LoginApplication::setLoginAs ( autolog );
+  
 
 				if ( LoginApplication::changeIdentity ( ))
 					::exit ( LoginApplication::login ( ));
 				else
 					::exit ( 0 );
 			}
-			else 
+			else  {
 				::exit ( login_main ( argc, argv, ppid ));
+            }
 		}
 	}
 	return 0;
 }
 
 void sigterm ( int /*sig*/ )
@@ -352,13 +368,13 @@ int login_main ( int argc, char **argv, pid_t ppid )
 	if ( app-> loginAs ( )) {
 		if ( app-> changeIdentity ( )) {
 			app-> login ( );
 
 			// if login succeeds, it never comes back
 
-			QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start OPIE." ));
+			QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start Opie." ));
 			rc = 1;
 		}
 		else {
 			QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not switch to new user identity" ));
 			rc = 2;
 		}
diff --git a/core/opie-login/opie-login.conffiles b/core/opie-login/opie-login.conffiles
new file mode 100644
index 0000000..90645ee
--- a/dev/null
+++ b/core/opie-login/opie-login.conffiles
@@ -0,0 +1 @@
+/opt/QtPalmtop/etc/opie-login.conf