author | kergoth <kergoth> | 2003-08-09 17:42:14 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:42:14 (UTC) |
commit | 1ab4ca95e4d2cf24d32b38c9031cb6076351e730 (patch) (unidiff) | |
tree | 644d196b01c7f280981bd17da23c7592a18e5643 /core/opiealarm | |
parent | ec14206f63dd93e9fb84c76cbc76fc1968637590 (diff) | |
download | opie-1ab4ca95e4d2cf24d32b38c9031cb6076351e730.zip opie-1ab4ca95e4d2cf24d32b38c9031cb6076351e730.tar.gz opie-1ab4ca95e4d2cf24d32b38c9031cb6076351e730.tar.bz2 |
Merge from BRANCH_1_0
-rw-r--r-- | core/opiealarm/Makefile | 4 | ||||
-rw-r--r-- | core/opiealarm/config.in | 2 | ||||
-rw-r--r-- | core/opiealarm/opiealarm.c | 7 |
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 | |||
@@ -21,6 +21,2 @@ clean: | |||
21 | -rm -f *~ core | 21 | -rm -f *~ core |
22 | 22 | ||
23 | install: | ||
24 | cp $(DESTDIR)/opiealarm $(INSTALL_ROOT)/opt/QtPalmtop/bin | ||
25 | chown root $(INSTALL_ROOT)/opt/QtPalmtop/bin/opiealarm | ||
26 | 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 @@ | |||
1 | config OPIEALARM | 1 | config OPIEALARM |
2 | boolean "opie-opiealarm (Alarm daemon, sets RTC with wakeup time on suspend)" | 2 | boolean "Opiealarm (Alarm daemon, sets RTC with wakeup time on suspend)" |
3 | depends ! TARGET_X86 | 3 | depends ! TARGET_X86 |
4 | default "y" | 4 | 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 | |||
@@ -94,4 +94,5 @@ int fork_with_pidfile ( void ) | |||
94 | return 0; | 94 | return 0; |
95 | } | 95 | } |
96 | //sleep( 60 ); | ||
96 | 97 | ||
97 | // child process needs to react to SIGUSR2. This is sent when | 98 | // child process needs to react to SIGUSR2. This is sent when |
@@ -207,5 +208,5 @@ int main ( int argc, char **argv ) | |||
207 | int suspend ( int fix_rtc ) | 208 | int suspend ( int fix_rtc ) |
208 | { | 209 | { |
209 | FILE *fp; | 210 | FILE *fp = NULL; |
210 | char buf [64]; | 211 | char buf [64]; |
211 | time_t alrt, syst, rtct; | 212 | time_t alrt, syst, rtct; |
@@ -259,5 +260,5 @@ int suspend ( int fix_rtc ) | |||
259 | 260 | ||
260 | fclose ( fp ); | 261 | fclose ( fp ); |
261 | fp = 0; | 262 | fp = NULL; |
262 | 263 | ||
263 | alrt = atoi ( buf ); // get the alarm time | 264 | alrt = atoi ( buf ); // get the alarm time |
@@ -372,5 +373,5 @@ int resume ( int resuspend ) | |||
372 | remove_pidfile ( ); | 373 | remove_pidfile ( ); |
373 | 374 | ||
374 | // no need for system() since this process is no longer usefull anyway | 375 | // no need for system() since this process is no longer usefull anyway |
375 | execv ( "/opt/QtPalmtop/bin/qcop", argv ); | 376 | execv ( "/opt/QtPalmtop/bin/qcop", argv ); |
376 | 377 | ||