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
@@ -1,193 +1,177 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "desktop.h"
 #include "taskbar.h"
 #include "stabmon.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/network.h>
 #include <qpe/config.h>
 #if defined( QT_QWS_SHARP ) || defined( QT_QWS_IPAQ )
 #include <qpe/custom.h>
 #endif
 
 #include <opie/odevice.h>
 
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qwindowsystem_qws.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/alarmserver.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #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()) );
     QObject::connect( &a, SIGNAL(numLockStateToggle()),   d, SLOT(toggleNumLockState()) );
     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 );
 
     return retVal;
 }
 
diff --git a/packages b/packages
index fc26ef8..b05f90a 100644
--- a/packages
+++ b/packages
@@ -1,107 +1,106 @@
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_BINARY   noncore/tools/calc2/binarybinary.pro
         CONFIG_CALC2    noncore/tools/calc2calc2.pro
         CONFIG_CALIBRATE        core/apps/calibratecalibrate.pro
         CONFIG_CHESS    noncore/games/chesschess.pro
         CONFIG_CONVERTER        noncore/unsupported/opiemail/converterconverter.pro
         CONFIG_DIALUP   noncore/unsupported/netsetup/dialupdialup.pro
         CONFIG_DICTIONARY       noncore/apps/dictionarydictionary.pro
         CONFIG_GSMTOOL  noncore/comm/gsmtoolgsmtool.pro
         CONFIG_KEYVIEW  development/keyviewkeyview.pro
-        CONFIG_ROTTEST  development/rottestrottest.pro
         CONFIG_LAN      noncore/unsupported/netsetup/lanlan.pro
         CONFIG_LIB      noncore/unsupported/opiemail/liblib.pro
         CONFIG_LIBFFMPEG        core/multimedia/opieplayer/libffmpeglibffmpeg.pro
         CONFIG_LIBFLASH         core/multimedia/opieplayer/libflashlibflash.pro
         CONFIG_LIBOPIE_PIM      libopie/pimpim.pro
         CONFIG_LIBSQL   libsqllibsql.pro
         CONFIG_MOBILEMSG        noncore/comm/mobilemsgmobilemsg.pro
         CONFIG_NETMONAPPLET     noncore/unsupported/netmonappletnetmonapplet.pro
         CONFIG_NETSETUP         noncore/unsupported/netsetupnetsetup.pro
         CONFIG_OFILESELECTOR    libopie/ofileselectorofileselector.pro
         CONFIG_OPIE-WRITE       noncore/apps/opie-writeopie-write.pro
         CONFIG_OPIEMAIL         noncore/unsupported/opiemailopiemail.pro
         CONFIG_POP3     noncore/unsupported/opiemail/ifaces/pop3pop3.pro
         CONFIG_QUICKEXEC        quickexecquickexec.pro
         CONFIG_RESTARTAPPLET    core/applets/restartappletrestartapplet.pro
         CONFIG_RESTARTAPPLET2   core/applets/restartapplet2restartapplet2.pro
         CONFIG_SDMON    noncore/unsupported/sdmonsdmon.pro
         CONFIG_SIMPLE   noncore/tools/calc2/simplesimple.pro
         CONFIG_SMTP     noncore/unsupported/opiemail/ifaces/smtpsmtp.pro
         CONFIG_SPREADSHEET      noncore/unsupported/spreadsheetspreadsheet.pro
         CONFIG_SYSTEMTIME       noncore/unsupported/systemtimesystemtime.pro
         CONFIG_TEST     libsql/testtest.pro
         CONFIG_TEST     noncore/apps/opie-console/testtest.pro
         CONFIG_UBROWSER         noncore/net/ubrowserubrowser.pro
         CONFIG_WELLENREITER     noncore/net/wellenreiterwellenreiter.pro
         CONFIG_WLANSETUP        noncore/unsupported/wlansetupwlansetup.pro
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
         CONFIG_OPIETOOTH-APPLET         noncore/net/opietooth/appletapplet.pro
         CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BEND     noncore/mail/bendbend.pro
         CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
         CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro
         CONFIG_CARDMON  core/applets/cardmoncardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.pro
         CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
         CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro
         CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
         CONFIG_DRAWPAD  noncore/graphics/drawpaddrawpad.pro
         CONFIG_DVORAK   inputmethods/dvorakdvorak.pro
         CONFIG_EMBEDDEDKONSOLE  core/apps/embeddedkonsoleembeddedkonsole.pro
         CONFIG_FIFTEEN  noncore/games/fifteenfifteen.pro
         CONFIG_FILEBROWSER      core/apps/filebrowserfilebrowser.pro
         CONFIG_FLAT     noncore/styles/flatflat.pro
         CONFIG_FORMATTER        noncore/tools/formatterformatter.pro
         CONFIG_FREETYPE         freetypefreetype.pro
         CONFIG_FRESH    noncore/styles/freshfresh.pro
         CONFIG_FTPLIB   noncore/net/ftplibftplib.pro
         CONFIG_GO       noncore/games/gogo.pro
         CONFIG_HANDWRITING      inputmethods/handwritinghandwriting.pro
         CONFIG_HELPBROWSER      core/apps/helpbrowserhelpbrowser.pro
         CONFIG_HOMEAPPLET       core/applets/homeapplethomeapplet.pro
         CONFIG_INTERFACES       noncore/net/networksettings/interfacesinterfaces.pro
         CONFIG_IRDAAPPLET       core/applets/irdaappletirdaapplet.pro
         CONFIG_JUMPX    inputmethods/jumpxjumpx.pro
         CONFIG_KBILL    noncore/games/kbillkbill.pro
         CONFIG_KCHECKERS        noncore/games/kcheckerskcheckers.pro
         CONFIG_KEYBOARD         inputmethods/keyboardkeyboard.pro
         CONFIG_KEYPEBBLE        noncore/comm/keypebblekeypebble.pro
         CONFIG_KJUMPX   inputmethods/kjumpxkjumpx.pro
         CONFIG_KPACMAN  noncore/games/kpacmankpacman.pro
         CONFIG_LANGUAGE         noncore/settings/languagelanguage.pro
         CONFIG_LAUNCHER-SETTINGS        core/settings/launcherlauncher.pro
         CONFIG_LAUNCHER_CORE    core/launcherlauncher.pro
         CONFIG_LIBOPIETOOTH     noncore/net/opietooth/liblib.pro
 CONFIG_LIBKATE  noncore/apps/tinykate/libkate libkate.pro
         CONFIG_LIBMAD   core/multimedia/opieplayer/libmadlibmad.pro
         CONFIG_LIBMAIL  noncore/mail/libmaillibmail.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
         CONFIG_LIBOPIE  libopielibopie.pro
         CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
         CONFIG_LIGHT-AND-POWER  core/settings/light-and-powerlight-and-power.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
         CONFIG_OPIETOOTH-MANAGER        noncore/net/opietooth/managermanager.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
         CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
         CONFIG_MINESWEEP        noncore/games/minesweepminesweep.pro
         CONFIG_MODPLUG  core/multimedia/opieplayer/modplugmodplug.pro
         CONFIG_MULTIKEY         inputmethods/multikeymultikey.pro
         CONFIG_NETSYSTEMTIME    noncore/settings/netsystemtimenetsystemtime.pro
         CONFIG_NETWORKSETUP     noncore/net/networksettingsnetworksettings.pro