summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-26 03:30:49 (UTC)
committer kergoth <kergoth>2003-01-26 03:30:49 (UTC)
commit77af78cf44026f52cc119a16554749daefc59617 (patch) (side-by-side diff)
tree8b2afa79b4efa5a1b0f0e4d5a488796067d904a1
parent7efc361470c6c91eb06ae7e800bb64aa645f6f73 (diff)
downloadopie-77af78cf44026f52cc119a16554749daefc59617.zip
opie-77af78cf44026f52cc119a16554749daefc59617.tar.gz
opie-77af78cf44026f52cc119a16554749daefc59617.tar.bz2
Undo unintentional commit
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/main.cpp20
-rw-r--r--packages1
2 files changed, 2 insertions, 19 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
@@ -63,44 +63,28 @@ void initEnvironment( )
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
}
@@ -137,13 +121,13 @@ int initApplication( int argc, char ** argv )
}
int rv = a.exec();
delete d;
- odev-> setSoftSuspend ( false );
+ ODevice::inst ( )-> setSoftSuspend ( false );
return rv;
}
static const char *pidfile_path = "/var/run/opie.pid";
diff --git a/packages b/packages
index fc26ef8..b05f90a 100644
--- a/packages
+++ b/packages
@@ -5,13 +5,12 @@ CONFIG_CALIBRATE core/apps/calibrate calibrate.pro
CONFIG_CHESS noncore/games/chess chess.pro
CONFIG_CONVERTER noncore/unsupported/opiemail/converter converter.pro
CONFIG_DIALUP noncore/unsupported/netsetup/dialup dialup.pro
CONFIG_DICTIONARY noncore/apps/dictionary dictionary.pro
CONFIG_GSMTOOL noncore/comm/gsmtool gsmtool.pro
CONFIG_KEYVIEW development/keyview keyview.pro
-CONFIG_ROTTEST development/rottest rottest.pro
CONFIG_LAN noncore/unsupported/netsetup/lan lan.pro
CONFIG_LIB noncore/unsupported/opiemail/lib lib.pro
CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeg libffmpeg.pro
CONFIG_LIBFLASH core/multimedia/opieplayer/libflash libflash.pro
CONFIG_LIBOPIE_PIM libopie/pim pim.pro
CONFIG_LIBSQL libsql libsql.pro