1 files changed, 2 insertions, 18 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 1e5eb46..49b41d6 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -57,56 +57,40 @@ void initEnvironment( )
 
     // if not timezone set, pick New York
     if (tz.isNull())
         tz = "America/New_York";
 
     setenv( "TZ", tz, 1 );
     config.writeEntry( "Timezone", tz);
 
     config.setGroup( "Language" );
     QString lang = config.readEntry( "Language", getenv("LANG") );
     if ( !lang.isNull() )
         setenv( "LANG", lang, 1 );
-
 }
 
 
 int initApplication( int argc, char ** argv )
 {
-    struct ODevice *odev = ODevice::inst();
-
     initEnvironment( );
 
 #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX)
     setenv( "QWS_SIZE", "240x320", 0 );
 #endif
 
     //Don't flicker at startup:
     QWSServer::setDesktopBackground( QImage() );
     DesktopApplication a( argc, argv, QApplication::GuiServer );
 
-    int rot;
-    switch ( odev-> rotation( ) ) {
-        case None:
-            rot = 0;
-        case Rot90:
-            rot = 90;
-        case Rot180:
-            rot = 180;
-        case Rot270:
-            rot = 270;
-    }
-    a.setDefaultRotation( rot );
-  
-    odev-> setSoftSuspend ( true );
+        ODevice::inst ( )-> setSoftSuspend ( true );
 
     { // init backlight
         QCopEnvelope e("QPE/System", "setBacklight(int)" );
         e << -3; // Forced on
     }
 
     AlarmServer::initialize();
 
     Desktop *d = new Desktop();
 
     QObject::connect( &a, SIGNAL(power()),   d, SLOT(togglePower()) );
     QObject::connect( &a, SIGNAL(backlight()),   d, SLOT(toggleLight()) );
@@ -131,25 +115,25 @@ int initApplication( int argc, char ** argv )
 
     if ( QDate::currentDate ( ). year ( ) < 2000 ) {
         if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ). arg( TimeString::dateString ( QDate::currentDate ( ))), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
             QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" );
                     e << QString ( );                                 
         }
     }
 
     int rv =  a.exec();
 
     delete d;
 
-    odev-> setSoftSuspend ( false );
+        ODevice::inst ( )-> setSoftSuspend ( false );
 
     return rv;
 }
 
 static const char *pidfile_path = "/var/run/opie.pid";
 
 void create_pidfile ( )
 {
     FILE *f;
 
     if (( f = ::fopen ( pidfile_path, "w" ))) {
         ::fprintf ( f, "%d", getpid ( ));