-rw-r--r-- | core/apps/helpbrowser/main.cpp | 11 | ||||
-rw-r--r-- | core/opie-login/main.cpp | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/core/apps/helpbrowser/main.cpp b/core/apps/helpbrowser/main.cpp index b1bea56..dc82e93 100644 --- a/core/apps/helpbrowser/main.cpp +++ b/core/apps/helpbrowser/main.cpp | |||
@@ -12,22 +12,15 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "helpbrowser.h" | 21 | #include "helpbrowser.h" |
22 | 22 | ||
23 | #include <qtopia/qpeapplication.h> | 23 | #include <qtopia/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | int main( int argc, char ** argv ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<HelpBrowser> ) |
26 | { | ||
27 | QPEApplication a( argc, argv ); | ||
28 | |||
29 | HelpBrowser mw; | ||
30 | a.showMainWidget( &mw ); | ||
31 | |||
32 | return a.exec(); | ||
33 | } | ||
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 | |||
@@ -191,25 +191,24 @@ 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() ); |
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 | } |
212 | } | 211 | } |
213 | } | 212 | } |
214 | return 0; | 213 | return 0; |
215 | } | 214 | } |