Merge from BRANCH_1_0

3 files changed, 5 insertions, 8 deletions

diff --git a/core/opiealarm/Makefile b/core/opiealarm/Makefile
index 0c8467e..255083d 100644
--- a/core/opiealarm/Makefile
+++ b/core/opiealarm/Makefile
@@ -20,7 +20,3 @@ $(DESTDIR)/opiealarm: opiealarm.c
 clean:
         -rm -f *~ core
 
-install:
-        cp $(DESTDIR)/opiealarm $(INSTALL_ROOT)/opt/QtPalmtop/bin
-        chown root $(INSTALL_ROOT)/opt/QtPalmtop/bin/opiealarm
-        chmod u+s  $(INSTALL_ROOT)/opt/QtPalmtop/bin/opiealarm 2>/dev/null || echo -e "\nopiealarm must be owned by root to work correctly.\n"
diff --git a/core/opiealarm/config.in b/core/opiealarm/config.in
index 2be9bd4..f86d01c 100644
--- a/core/opiealarm/config.in
+++ b/core/opiealarm/config.in
@@ -1,4 +1,4 @@
 config OPIEALARM
-  boolean "opie-opiealarm (Alarm daemon, sets RTC with wakeup time on suspend)"
+  boolean "Opiealarm (Alarm daemon, sets RTC with wakeup time on suspend)"
   depends ! TARGET_X86
   default "y"
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c
index 998cabd..90a743f 100644
--- a/core/opiealarm/opiealarm.c
+++ b/core/opiealarm/opiealarm.c
@@ -93,6 +93,7 @@ int fork_with_pidfile ( void )
                 perror ( "forking failed" );
                 return 0;
                 }
+                //sleep( 60 );
 
         // child process needs to react to SIGUSR2. This is sent when
         // a new opiealarm process is started.
@@ -206,7 +207,7 @@ int main ( int argc, char **argv )
 
 int suspend ( int fix_rtc )
 {
-        FILE *fp;
+        FILE *fp = NULL;
         char buf [64];
         time_t alrt, syst, rtct;
         struct tm alr, sys, rtc;
@@ -258,7 +259,7 @@ int suspend ( int fix_rtc )
                         break; //  ( 1, TIMEFILE );
 
                 fclose ( fp );
-                fp = 0;
+                fp = NULL;
         
                 alrt = atoi ( buf ); // get the alarm time
 
@@ -371,7 +372,7 @@ int resume ( int resuspend )
                         
                                 remove_pidfile ( );
                         
-                                // no need for system() since this process is no longer usefull anyway
+                                        // no need for system() since this process is no longer usefull anyway                  
                                 execv ( "/opt/QtPalmtop/bin/qcop", argv );
                                 
                                 perror ( "exec for qcop failed" );