-Kill stupid define which sets QWS_SIZE to 240x320

-Include built-in shutdown only if OPIE_NO_BUILTIN_SHUTDOWN is defined

2 files changed, 2 insertions, 2 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index ad40536..74965df 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -115,97 +115,97 @@ static void refreshTimeZoneConfig()
 	zoneIndex = 0;
 	for (QStringList::Iterator it = zoneDefaults.begin(); it != zoneDefaults.end() ; ++it){
 	    cfg.writeEntry( "Zone" + QString::number( zoneIndex ) , *it);
 	    zoneIndex++;
 	}
     }
     // We have an existing list of timezones refresh the
     //  translations of TimeZone name
     zoneIndex = 0;
     while (cfg.hasKey( "Zone"+ QString::number( zoneIndex ))){
 	zoneID = cfg.readEntry( "Zone" + QString::number( zoneIndex ));
 	curZone = TimeZone( zoneID );
 	if ( !curZone.isValid() ){
 	    qDebug( "initEnvironment() Invalid TimeZone %s", zoneID.latin1() );
 	    break;
 	}
 	cfg.writeEntry( "ZoneName" + QString::number( zoneIndex ), curZone.city() );
 	zoneIndex++;
     }
 #endif
 }
 
 void initEnvironment()
 {
 #ifdef Q_OS_WIN32
     // Config file requires HOME dir which uses QDir which needs the winver
     qt_init_winver();
 #endif
     Config config("locale");
     config.setGroup( "Location" );
     QString tz = config.readEntry( "Timezone", getenv("TZ") ).stripWhiteSpace();
 
     // if not timezone set, pick New York
     if (tz.isNull() || tz.isEmpty())
 	tz = "America/New_York";
 
     setenv( "TZ", tz, 1 );
     config.writeEntry( "Timezone", tz);
 
     config.setGroup( "Language" );
     QString lang = config.readEntry( "Language", getenv("LANG") ).stripWhiteSpace();
     if( lang.isNull() || lang.isEmpty())
 	lang = "en_US";
 
     setenv( "LANG", lang, 1 );
     config.writeEntry("Language", lang);
     config.write();
 
-#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX)
+#if 0
      setenv( "QWS_SIZE", "240x320", 0 );
 #endif
 
 
 
      QString env(getenv("QWS_DISPLAY"));
      if (env.contains("Transformed")) {
          int rot;
          // transformed driver default rotation is controlled by the hardware.
          Config config("qpe");
          config.setGroup( "Rotation" );
          if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 )
              rot = ODevice::inst ( )-> rotation ( ) * 90;
 
          setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
          QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */
      }
 }
 
 static void initKeyboard()
 {
     Config config("qpe");
 
     config.setGroup( "Keyboard" );
 
     int ard = config.readNumEntry( "RepeatDelay" );
     int arp = config.readNumEntry( "RepeatPeriod" );
     if ( ard > 0 && arp > 0 )
 	qwsSetKeyboardAutoRepeat( ard, arp );
 
     QString layout = config.readEntry( "Layout", "us101" );
     Server::setKeyboardLayout( layout );
 }
 
 static bool firstUse()
 {
     bool needFirstUse = FALSE;
     if ( QWSServer::mouseHandler() &&
          QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
         if ( !QFile::exists( "/etc/pointercal" ) )
             needFirstUse = TRUE;
     }
 
     {
 	Config config( "qpe" );
 	config.setGroup( "Startup" );
 	needFirstUse |= config.readBoolEntry( "FirstUse", TRUE );
     }
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 450d8e5..4c62b78 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -65,97 +65,97 @@
 extern QRect qt_maxWindowRect;
 
 using namespace Opie;
 
 static QWidget *calibrate(bool)
 {
 #ifdef Q_WS_QWS
     Calibrate *c = new Calibrate;
     c->show();
     return c;
 #else
     return 0;
 #endif
 }
 
 #define FACTORY(T) \
     static QWidget *new##T( bool maximized ) { \
 	QWidget *w = new T( 0, 0, QWidget::WDestructiveClose | QWidget::WGroupLeader ); \
 	if ( maximized ) { \
 	    if ( qApp->desktop()->width() <= 350 ) { \
 		w->showMaximized(); \
 	    } else { \
 		w->resize( QSize( 300, 300 ) ); \
 	    } \
 	} \
 	w->show(); \
 	return w; \
     }
 
 
 #ifdef SINGLE_APP
 #define APP(a,b,c,d) FACTORY(b)
 #include "apps.h"
 #undef APP
 #endif // SINGLE_APP
 
 static Global::Command builtins[] = {
 
 #ifdef SINGLE_APP
 #define APP(a,b,c,d) { a, new##b, c, d },
 #include "apps.h"
 #undef APP
 #endif
 
     /* FIXME defines need to be defined*/
 #if defined(QPE_NEED_CALIBRATION)
         { "calibrate",          calibrate,	        1, 0 }, // No tr
 #endif
-#if !defined(QT_QWS_CASSIOPEIA)
+#if !defined(OPIE_NO_BUILTIN_SHUTDOWN)
 	{ "shutdown",           Global::shutdown,      	1, 0 }, // No tr
 //	{ "run",                run,			1, 0 }, // No tr
 #endif
 
 	{ 0,            calibrate,	0, 0 },
 };
 
 
 //---------------------------------------------------------------------------
 
 
 //===========================================================================
 
 Server::Server() :
     QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
     qcopBridge( 0 ),
     transferServer( 0 ),
     packageHandler( 0 ),
     syncDialog( 0 )
 {
     Global::setBuiltinCommands(builtins);
 
     tid_xfer = 0;
     /* ### FIXME ### */
 /*    tid_today = startTimer(3600*2*1000);*/
     last_today_show = QDate::currentDate();
 
 #if 0
     tsmMonitor = new TempScreenSaverMode();
     connect( tsmMonitor, SIGNAL(forceSuspend()), qApp, SIGNAL(power()) );
 #endif
 
     serverGui = new Launcher;
     serverGui->createGUI();
 
     docList = new DocumentList( serverGui );
     appLauncher = new AppLauncher(this);
     connect(appLauncher, SIGNAL(launched(int, const QString &)), this, SLOT(applicationLaunched(int, const QString &)) );
     connect(appLauncher, SIGNAL(terminated(int, const QString &)), this, SLOT(applicationTerminated(int, const QString &)) );
     connect(appLauncher, SIGNAL(connected(const QString &)), this, SLOT(applicationConnected(const QString &)) );
 
     storage = new StorageInfo( this );
     connect( storage, SIGNAL(disksChanged()), this, SLOT(storageChanged()) );
 
     // start services
     startTransferServer();
     (void) new IrServer( this );