--- launcher/main.cpp 31 Jan 2007 05:11:08 -0000 1.46 +++ launcher/main.cpp 12 Sep 2008 23:33:35 -0000 @@ -98,7 +98,10 @@ else odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl; + owarn << "InitEnvironment debug 1" << oendl; + QPEApplication::defaultRotation(); /* to ensure deforient matches reality */ + owarn << "InitEnvironment debug 2" << oendl; } static void initKeyboard() @@ -143,14 +146,20 @@ int initApplication( int argc, char ** argv ) { + owarn << "initApp Debug 1" << oendl; cleanup(); + owarn << "initApp Debug 2" << oendl; initEnvironment(); + owarn << "initApp Debug 3" << oendl; #ifdef QWS QWSServer::setDesktopBackground( QImage() ); #endif + owarn << "initApp Debug 4" << oendl; ServerApplication a( argc, argv, QApplication::GuiServer ); + owarn << "initApp Debug 5" << oendl; initKeyboard(); + owarn << "initApp Debug 6" << oendl; bool firstUseShown = firstUse(); if ( firstUseShown ) @@ -159,18 +168,24 @@ return 0; } + owarn << "initApp Debug 7" << oendl; { QCopEnvelope e("QPE/System", "setBacklight(int)" ); e << -3; // Forced on } + owarn << "initApp Debug 8" << oendl; AlarmServer::initialize(); + owarn << "initApp Debug 9" << oendl; Server *s = new Server(); + owarn << "initApp Debug 10" << oendl; new SysFileMonitor(s); + owarn << "initApp Debug 11" << oendl; #ifdef QWS Network::createServer(s); #endif s->show(); + owarn << "initApp Debug 12" << oendl; if ( !firstUseShown ) { Config config( "qpe" ); @@ -195,15 +210,16 @@ } } + owarn << "initApp Debug 13" << oendl; create_pidfile(); - odebug << "--> mainloop in" << oendl; + owarn << "--> mainloop in" << oendl; int rv = a.exec(); - odebug << "<-- mainloop out" << oendl; + owarn << "<-- mainloop out" << oendl; remove_pidfile(); - odebug << "removing server object..." << oendl; + owarn << "removing server object..." << oendl; delete s; - odebug << "returning from qpe/initapplication..." << oendl; + owarn << "returning from qpe/initapplication..." << oendl; return rv; } --- launcher/serverapp.cpp 10 Aug 2008 14:40:26 -0000 1.27 +++ launcher/serverapp.cpp 12 Sep 2008 23:33:35 -0000 @@ -311,32 +311,44 @@ : Opie::Core::OApplication( argc, argv, t ) { ms_is_starting = true; +// m_loggedin = false; + + owarn << "ServerApplication debug 1" << oendl; // We know we'll have lots of cached pixmaps due to App/DocLnks QPixmapCache::setCacheLimit(512); + owarn << "ServerApplication debug 2" << oendl; m_ps = new PowerStatus; + owarn << "ServerApplication debug 3" << oendl; m_ps_last = new PowerStatus; + owarn << "ServerApplication debug 4" << oendl; pa = new DesktopPowerAlerter( 0 ); + owarn << "ServerApplication debug 5" << oendl; m_apm_timer = new QTimer( this ); connect(m_apm_timer, SIGNAL( timeout() ), this, SLOT( apmTimeout() ) ); + owarn << "ServerApplication debug 6" << oendl; reloadPowerWarnSettings(); + owarn << "ServerApplication debug 7" << oendl; QCopChannel *channel = new QCopChannel( "QPE/System", this ); connect(channel, SIGNAL(received(const QCString&,const QByteArray&) ), this, SLOT(systemMessage(const QCString&,const QByteArray&) ) ); + owarn << "ServerApplication debug 8" << oendl; channel = new QCopChannel("QPE/Launcher", this ); connect(channel, SIGNAL(received(const QCString&,const QByteArray&) ), this, SLOT(launcherMessage(const QCString&,const QByteArray&) ) ); + owarn << "ServerApplication debug 9" << oendl; m_screensaver = new OpieScreenSaver(); m_screensaver->setInterval( -1 ); QWSServer::setScreenSaver( m_screensaver ); + owarn << "ServerApplication debug 10" << oendl; connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( rereadVolumes() ) ); @@ -350,6 +362,7 @@ kf = new KeyFilter(this); + owarn << "ServerApplication debug 11" << oendl; connect( kf, SIGNAL(launch()), this, SIGNAL(launch()) ); connect( kf, SIGNAL(power()), this, SIGNAL(power()) ); connect( kf, SIGNAL(backlight()), this, SIGNAL(backlight()) ); @@ -362,19 +375,26 @@ connect( kf, SIGNAL(backlight()), this, SLOT(toggleLight()) ); + owarn << "ServerApplication debug 12" << oendl; connect( this, SIGNAL(power() ), SLOT(togglePower() ) ); + owarn << "ServerApplication debug 13" << oendl; rereadVolumes(); + owarn << "ServerApplication debug 14" << oendl; serverApp = this; + owarn << "ServerApplication debug 15" << oendl; apmTimeout(); + owarn << "ServerApplication debug 16" << oendl; grabKeyboard(); + owarn << "ServerApplication debug 17" << oendl; /* make sure the event filter is installed */ /* std::limits::max() when you've stdc++ */ const ODeviceButton* but = ODevice::inst()->buttonForKeycode( SHRT_MAX ); Q_CONST_UNUSED( but ) + owarn << "ServerApplication debug 18" << oendl; }