-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
@@ -157,13 +157,13 @@ void initEnvironment()
 	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"));
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
@@ -107,13 +107,13 @@ static Global::Command builtins[] = {
 #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 },
 };