summaryrefslogtreecommitdiff
authorzecke <zecke>2003-10-07 12:51:21 (UTC)
committer zecke <zecke>2003-10-07 12:51:21 (UTC)
commitc21de570e101058c5f1c4c5973a96df5a9bf62b2 (patch) (side-by-side diff)
tree5b5b2b440990eac3757549745f7e467d23bde08f
parent37ddd7628c5406f05806b97471db72e2ee943d86 (diff)
downloadopie-c21de570e101058c5f1c4c5973a96df5a9bf62b2.zip
opie-c21de570e101058c5f1c4c5973a96df5a9bf62b2.tar.gz
opie-c21de570e101058c5f1c4c5973a96df5a9bf62b2.tar.bz2
-Kill stupid define which sets QWS_SIZE to 240x320
-Include built-in shutdown only if OPIE_NO_BUILTIN_SHUTDOWN is defined
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp2
-rw-r--r--core/launcher/server.cpp2
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
@@ -151,25 +151,25 @@ void initEnvironment()
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 )
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
@@ -101,25 +101,25 @@ static QWidget *calibrate(bool)
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 },
};
//---------------------------------------------------------------------------
//===========================================================================