| -rw-r--r-- | core/launcher/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index fa4df3c..a6e2a9d 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -58,57 +58,57 @@ 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 ); #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) setenv( "QWS_SIZE", "240x320", 0 ); #endif /* * Rotation: * 1. use env var if set * 2. use saved default if set * 3. use physical orientation (currently fails due to ODevice * using a QPixmap and therefore requiring a QApplication) */ - if ( ( rot = QPEApplication::defaultRotation ( ) ) == 0 ) { + if ( getenv("QWS_DISPLAY") == NULL ) { Config config("qpe"); config.setGroup( "Rotation" ); if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 ) rot = ODevice::inst ( )-> rotation ( ) * 90; - } - setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1); - QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */ + setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1); + QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */ + } } int initApplication( int argc, char ** argv ) { initEnvironment(); //Don't flicker at startup: QWSServer::setDesktopBackground( QImage() ); DesktopApplication a( argc, argv, QApplication::GuiServer ); 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()) ); |