Undo unintentional commit

2 files changed, 44 insertions, 61 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
@@ -44,70 +44,54 @@
 #include <unistd.h>
 
 #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
 #include "../calibrate/calibrate.h"
 #endif
 
 using namespace Opie;
 
-void initEnvironment( )
+void initEnvironment()
 {
-    Config config("locale");
-    config.setGroup( "Location" );
-    QString tz = config.readEntry( "Timezone", getenv("TZ") );
+  Config config("locale");
+  config.setGroup( "Location" );
+  QString tz = config.readEntry( "Timezone", getenv("TZ") );
 
-    // if not timezone set, pick New York
-    if (tz.isNull())
-        tz = "America/New_York";
+  // 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 );
+  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 );
 }
 
 
 int initApplication( int argc, char ** argv )
 {
-    struct ODevice *odev = ODevice::inst();
-
-    initEnvironment( );
+    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
-    }
+	{ // 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()) );
     QObject::connect( &a, SIGNAL(backlight()),   d, SLOT(toggleLight()) );
     QObject::connect( &a, SIGNAL(symbol()),   d, SLOT(toggleSymbolInput()) );
@@ -115,76 +99,76 @@ int initApplication( int argc, char ** argv )
     QObject::connect( &a, SIGNAL(capsLockStateToggle()),   d, SLOT(toggleCapsLockState()) );
     QObject::connect( &a, SIGNAL(prepareForRestart()),   d, SLOT(terminateServers()) );
 
     (void)new SysFileMonitor(d);
     Network::createServer(d);
 
 #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
     if ( !QFile::exists( "/etc/pointercal" ) ) {
-    // Make sure calibration widget starts on top.
-    Calibrate *cal = new Calibrate;
-    cal->exec();
-    delete cal;
+	// Make sure calibration widget starts on top.
+	Calibrate *cal = new Calibrate;
+	cal->exec();
+	delete cal;
     }
 #endif
 
     d->show();
 
-    if ( QDate::currentDate ( ). year ( ) < 2000 ) {
-        if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::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 ( );		                              
-        }
-    }
+	if ( QDate::currentDate ( ). year ( ) < 2000 ) {
+		if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::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 ( );		                              
+		}
+	}
 
     int rv =  a.exec();
 
     delete d;
 
-    odev-> setSoftSuspend ( false );
+	ODevice::inst ( )-> setSoftSuspend ( false );
 
     return rv;
 }
 
 static const char *pidfile_path = "/var/run/opie.pid";
 
 void create_pidfile ( )
 {
-    FILE *f;
+	FILE *f;
 
-    if (( f = ::fopen ( pidfile_path, "w" ))) {
-        ::fprintf ( f, "%d", getpid ( ));
-        ::fclose ( f );
-    }
+	if (( f = ::fopen ( pidfile_path, "w" ))) {
+		::fprintf ( f, "%d", getpid ( ));
+		::fclose ( f );
+	}
 }
 
 void remove_pidfile ( )
 {
-    ::unlink ( pidfile_path );
+	::unlink ( pidfile_path );
 }
 
 void handle_sigterm ( int /* sig */ )
 {
-    if ( qApp )
-        qApp-> quit ( );
+	if ( qApp )
+		qApp-> quit ( );
 }
 
 int main( int argc, char ** argv )
 {
     ::signal ( SIGCHLD, SIG_IGN );
 
-    ::signal ( SIGTERM, handle_sigterm );
-    ::signal ( SIGINT, handle_sigterm );
+	::signal ( SIGTERM, handle_sigterm );
+	::signal ( SIGINT, handle_sigterm );
 
-    ::setsid ( );
-    ::setpgid ( 0, 0 );
+	::setsid ( );
+	::setpgid ( 0, 0 );
 
-    ::atexit ( remove_pidfile );
-    create_pidfile ( );
+	::atexit ( remove_pidfile );
+	create_pidfile ( );
 
     int retVal = initApplication ( argc, argv );
 
     // Kill them. Kill them all.
     ::kill ( 0, SIGTERM );
     ::sleep ( 1 );
     ::kill ( 0, SIGKILL );
 
diff --git a/packages b/packages
index fc26ef8..b05f90a 100644
--- a/packages
+++ b/packages
@@ -3,17 +3,16 @@ CONFIG_BINARY	noncore/tools/calc2/binary	binary.pro
 CONFIG_CALC2	noncore/tools/calc2	calc2.pro
 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
 CONFIG_MOBILEMSG	noncore/comm/mobilemsg	mobilemsg.pro
 CONFIG_NETMONAPPLET	noncore/unsupported/netmonapplet	netmonapplet.pro