1 files changed, 10 insertions, 2 deletions

diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 674829d..81f4d1e 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -61,8 +61,9 @@
 using namespace Opie;
 
 int login_main ( int argc, char **argv, pid_t ppid );
 void sigterm ( int sig );
+void sigint ( int sig );
 void exit_closelog ( );
 
 static struct option long_options [] = {
         { "autologin", 1, 0, 'a' },
@@ -73,9 +74,8 @@ static struct option long_options [] = {
 int main ( int argc, char **argv )
 {
         pid_t ppid = ::getpid ( );
 
-
         if ( ::geteuid ( ) != 0 ) {
                 ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] );
                 return 1;
         }
@@ -103,9 +103,10 @@ int main ( int argc, char **argv )
 
         ::setpgid ( 0, 0 );
         ::setsid ( );
 
-        ::signal ( SIGTERM, sigterm );
+                ::signal ( SIGTERM, sigterm );
+        ::signal ( SIGINT, sigterm );
 
         ::openlog ( "opie-login", LOG_CONS, LOG_AUTHPRIV );
         ::atexit ( exit_closelog );
 
@@ -121,8 +122,10 @@ int main ( int argc, char **argv )
                         time_t started = ::time ( 0 );
 
                         while ( ::waitpid ( child, &status, 0 ) < 0 ) { }
 
+                        LoginApplication::logout ( );
+
                         if (( ::time ( 0 ) - started ) < 3 ) {
                                 if ( autolog ) {
                                         ::syslog ( LOG_ERR, "Respawning too fast -- disabling auto-login\n" );
                                         autolog = 0;
@@ -147,8 +150,10 @@ int main ( int argc, char **argv )
                                 }
                         }
                         if ( killedbysig ) {  // qpe was killed by an uncaught signal
                                 qApp = 0;
+                                
+                                ::syslog ( LOG_ERR, "Opie was killed by a signal #%d", killedbysig );
 
                                 QWSServer::setDesktopBackground ( QImage ( ));
                                 QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer );
                                 app-> setFont ( QFont ( "Helvetica", 10 ));
@@ -302,15 +307,18 @@ private:
   bool m_backlight_forcedoff;
 };
 
 
+namespace Opie { extern int force_appearance; }  // HACK to get around the force-style setting
 
 
 int login_main ( int argc, char **argv, pid_t ppid )
 {
         QWSServer::setDesktopBackground( QImage() );
         LoginApplication *app = new LoginApplication ( argc, argv, ppid );
 
+        Opie::force_appearance = 0;
+
         app-> setFont ( QFont ( "Helvetica", 10 ));
         app-> setStyle ( new QPEStyle ( ));
 
         ODevice::inst ( )-> setSoftSuspend ( true );