author | waspe <waspe> | 2003-11-03 17:56:32 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 17:56:32 (UTC) |
commit | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (patch) (unidiff) | |
tree | a87bc5fa9890457809f457d82c6811835cdebe91 /core/opie-login | |
parent | 6d7e3e8b04b63d92c61d1109c35163690f2c9948 (diff) | |
download | opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.zip opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.tar.gz opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.tar.bz2 |
resolved merge conflict
-rw-r--r-- | core/opie-login/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 2103216..5ecde1e 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp | |||
@@ -195,17 +195,16 @@ int main ( int argc, char **argv ) | |||
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 | |||
204 | if ( LoginApplication::changeIdentity ( )) | 203 | if ( LoginApplication::changeIdentity ( )) |
205 | ::exit ( LoginApplication::login ( )); | 204 | ::exit ( LoginApplication::login ( )); |
206 | else | 205 | else |
207 | ::exit ( 0 ); | 206 | ::exit ( 0 ); |
208 | } | 207 | } |
209 | else { | 208 | else { |
210 | ::exit ( login_main ( argc, argv, ppid )); | 209 | ::exit ( login_main ( argc, argv, ppid )); |
211 | } | 210 | } |