summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-11-06 10:28:39 (UTC)
committer mickeyl <mickeyl>2003-11-06 10:28:39 (UTC)
commit0b55f9efe488141e13bcaf84f5a05dfc69b550ba (patch) (unidiff)
treeaf5a146f922e2e075d7a57ab32c1e22018f338a7
parent8c283be8e455571a03f11035b23f649e49de726c (diff)
downloadopie-0b55f9efe488141e13bcaf84f5a05dfc69b550ba.zip
opie-0b55f9efe488141e13bcaf84f5a05dfc69b550ba.tar.gz
opie-0b55f9efe488141e13bcaf84f5a05dfc69b550ba.tar.bz2
merge core/opie-login
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
@@ -191,7 +191,7 @@ int main ( int argc, char **argv )
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() );
@@ -199,6 +199,7 @@ int main ( int argc, char **argv )
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 ( ));