summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 5ecde1e..7d2ed63 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -170,56 +170,57 @@ int main ( int argc, char **argv )
170 170
171 const char *sig = ::strsignal ( killedbysig ); 171 const char *sig = ::strsignal ( killedbysig );
172 QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool ); 172 QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool );
173 l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig )); 173 l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig ));
174 l-> setAlignment ( Qt::AlignCenter ); 174 l-> setAlignment ( Qt::AlignCenter );
175 l-> move ( 0, 0 ); 175 l-> move ( 0, 0 );
176 l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); 176 l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
177 l-> show ( ); 177 l-> show ( );
178 QTimer::singleShot ( 3000, app, SLOT( quit ( ))); 178 QTimer::singleShot ( 3000, app, SLOT( quit ( )));
179 app-> exec ( ); 179 app-> exec ( );
180 delete app; 180 delete app;
181 qApp = 0; 181 qApp = 0;
182 } 182 }
183 } 183 }
184 else { 184 else {
185 if ( !autolog ) { 185 if ( !autolog ) {
186 QString confFile=QPEApplication::qpeDir() + "/etc/opie-login.conf"; 186 QString confFile=QPEApplication::qpeDir() + "/etc/opie-login.conf";
187 Config cfg ( confFile, Config::File ); 187 Config cfg ( confFile, Config::File );
188 cfg. setGroup ( "General" ); 188 cfg. setGroup ( "General" );
189 QString user = cfg. readEntry ( "AutoLogin" ); 189 QString user = cfg. readEntry ( "AutoLogin" );
190 190
191 if ( !user. isEmpty ( )) 191 if ( !user. isEmpty ( ))
192 autolog = ::strdup ( user. latin1 ( )); 192 autolog = ::strdup ( user. latin1 ( ));
193 } 193 }
194 194
195 if ( autolog && !userExited ) { 195 if ( autolog && !userExited ) {
196 196
197 QWSServer::setDesktopBackground( QImage() ); 197 QWSServer::setDesktopBackground( QImage() );
198 ODevice::inst ( )-> setDisplayStatus ( true ); 198 ODevice::inst ( )-> setDisplayStatus ( true );
199 ODevice::inst ( )-> setSoftSuspend ( false ); 199 ODevice::inst ( )-> setSoftSuspend ( false );
200 LoginApplication *app = new LoginApplication ( argc, argv, ppid ); 200 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
201 LoginApplication::setLoginAs ( autolog ); 201 LoginApplication::setLoginAs ( autolog );
202
202 203
203 if ( LoginApplication::changeIdentity ( )) 204 if ( LoginApplication::changeIdentity ( ))
204 ::exit ( LoginApplication::login ( )); 205 ::exit ( LoginApplication::login ( ));
205 else 206 else
206 ::exit ( 0 ); 207 ::exit ( 0 );
207 } 208 }
208 else { 209 else {
209 ::exit ( login_main ( argc, argv, ppid )); 210 ::exit ( login_main ( argc, argv, ppid ));
210 } 211 }
211 } 212 }
212 } 213 }
213 return 0; 214 return 0;
214} 215}
215 216
216void sigterm ( int /*sig*/ ) 217void sigterm ( int /*sig*/ )
217{ 218{
218 ::exit ( 0 ); 219 ::exit ( 0 );
219} 220}
220 221
221 222
222void exit_closelog ( ) 223void exit_closelog ( )
223{ 224{
224 ::closelog ( ); 225 ::closelog ( );
225} 226}