-rw-r--r-- | core/launcher/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 5bbed59..8ed8710 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -70,49 +70,49 @@ void initEnvironment() config.setGroup( "Location" ); QString tz = config.readEntry( "Timezone", getenv("TZ") ).stripWhiteSpace(); // timezone if (tz.isNull() || tz.isEmpty()) tz = "America/New_York"; setenv( "TZ", tz, 1 ); config.writeEntry( "Timezone", tz); // language config.setGroup( "Language" ); QString lang = config.readEntry( "Language", getenv("LANG") ).stripWhiteSpace(); if( lang.isNull() || lang.isEmpty()) lang = "en_US"; setenv( "LANG", lang, 1 ); config.writeEntry("Language", lang); config.write(); // rotation int t = ODevice::inst()->rotation(); odebug << "ODevice reports transformation to be " << t << oendl; QString env( getenv("QWS_DISPLAY") ); if ( env.isEmpty() ) { int rot = ODevice::inst()->rotation() * 90; - QString qws_display = QString("Transformed:Rot%1:0").arg(rot); + QString qws_display = QString( "%1:Rot%2:0").arg(ODevice::inst()->qteDriver()).arg(rot); odebug << "setting QWS_DISPLAY to '" << qws_display << "'" << oendl; setenv("QWS_DISPLAY", (const char*) qws_display, 1); } else odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl; QPEApplication::defaultRotation(); /* to ensure deforient matches reality */ } static void initKeyboard() { Config config("qpe"); config.setGroup( "Keyboard" ); int ard = config.readNumEntry( "RepeatDelay" ); int arp = config.readNumEntry( "RepeatPeriod" ); if ( ard > 0 && arp > 0 ) qwsSetKeyboardAutoRepeat( ard, arp ); QString layout = config.readEntry( "Layout", "us101" ); Server::setKeyboardLayout( layout ); } |