summaryrefslogtreecommitdiff
path: root/core/launcher/main.cpp
authorzecke <zecke>2002-10-17 16:45:38 (UTC)
committer zecke <zecke>2002-10-17 16:45:38 (UTC)
commit0655456f68849bfad9019a7760dec961792d7519 (patch) (unidiff)
tree4651cad54a144385442a26e78f4a83b57501830f /core/launcher/main.cpp
parent8511273d7122d50ffea27f78ba13ab72af60326d (diff)
downloadopie-0655456f68849bfad9019a7760dec961792d7519.zip
opie-0655456f68849bfad9019a7760dec961792d7519.tar.gz
opie-0655456f68849bfad9019a7760dec961792d7519.tar.bz2
Move around some #ifdefs to be able to be built with Qt2/X11
Diffstat (limited to 'core/launcher/main.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 073e19a..762a596 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -32,6 +32,7 @@
32#include <opie/odevice.h> 32#include <opie/odevice.h>
33 33
34#include <qfile.h> 34#include <qfile.h>
35#include <qimage.h>
35#include <qwindowsystem_qws.h> 36#include <qwindowsystem_qws.h>
36#include <qpe/qcopenvelope_qws.h> 37#include <qpe/qcopenvelope_qws.h>
37#include <qpe/alarmserver.h> 38#include <qpe/alarmserver.h>
@@ -53,7 +54,7 @@ void initEnvironment()
53 config.setGroup( "Location" ); 54 config.setGroup( "Location" );
54 QString tz = config.readEntry( "Timezone", getenv("TZ") ); 55 QString tz = config.readEntry( "Timezone", getenv("TZ") );
55 56
56 // if not timezone set, pick New York 57 // if not timezone set, pick New York
57 if (tz.isNull()) 58 if (tz.isNull())
58 tz = "America/New_York"; 59 tz = "America/New_York";
59 60
@@ -129,7 +130,7 @@ static const char *pidfile_path = "/var/run/opie.pid";
129void create_pidfile ( ) 130void create_pidfile ( )
130{ 131{
131 FILE *f; 132 FILE *f;
132 133
133 if (( f = ::fopen ( pidfile_path, "w" ))) { 134 if (( f = ::fopen ( pidfile_path, "w" ))) {
134 ::fprintf ( f, "%d", getpid ( )); 135 ::fprintf ( f, "%d", getpid ( ));
135 ::fclose ( f ); 136 ::fclose ( f );
@@ -156,7 +157,7 @@ int main( int argc, char ** argv )
156 157
157 ::setsid ( ); 158 ::setsid ( );
158 ::setpgid ( 0, 0 ); 159 ::setpgid ( 0, 0 );
159 160
160 ::atexit ( remove_pidfile ); 161 ::atexit ( remove_pidfile );
161 create_pidfile ( ); 162 create_pidfile ( );
162 163