-rw-r--r-- | core/launcher/main.cpp | 10 |
1 files changed, 5 insertions, 5 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 @@ -81,29 +81,29 @@ void initEnvironment() 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 */ + QPEApplication::defaultRotation(); /* to ensure deforient matches reality */ } static void initKeyboard() { Config config("qpe"); config.setGroup( "Keyboard" ); @@ -166,34 +166,34 @@ int initApplication( int argc, char ** argv ) AlarmServer::initialize(); Server *s = new Server(); new SysFileMonitor(s); #ifdef QWS Network::createServer(s); #endif s->show(); -#if 0 +#if 0 if ( QDate::currentDate().year() < 2005 ) { if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), ServerApplication::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 ( ); } } #endif create_pidfile(); odebug << "--> mainloop in" << oendl; int rv = a.exec(); odebug << "<-- mainloop out" << oendl; - remove_pidfile(); + remove_pidfile(); odebug << "removing server object..." << oendl; delete s; odebug << "returning from qpe/initapplication..." << oendl; return rv; } static const char *pidfile_path = "/var/run/opie.pid"; |