fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apoint_switch_notify() prototype updated to take into account date_t type

Browse Source
This commit is contained in:
Frederic Culot 2007-07-01 17:54:33 +00:00
parent 7093cbefb7
commit 10a6d6d570
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/apoint.c
View File

@ -1,4 +1,4 @@
/* $calcurse: apoint.c,v 1.10 2007/04/04 19:35:09 culot Exp $ */ /* $calcurse: apoint.c,v 1.11 2007/07/01 17:54:33 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -39,6 +39,7 @@
#include "utils.h" #include "utils.h"
#include "notify.h" #include "notify.h"
#include "recur.h" #include "recur.h"
#include "calendar.h"
apoint_llist_t *alist_p; apoint_llist_t *alist_p;
@ -333,7 +334,7 @@ apoint_llist_node_t *apoint_recur_s2apoint_s(
* Switch notification state. * Switch notification state.
*/ */
void void
apoint_switch_notify(int year, int month, int day, int item_num) apoint_switch_notify(int item_num)
{ {
apoint_llist_node_t *apoint; apoint_llist_node_t *apoint;
struct day_item_s *p; struct day_item_s *p;
@ -344,7 +345,7 @@ apoint_switch_notify(int year, int month, int day, int item_num)
if (p->type != APPT && p->type != RECUR_APPT) if (p->type != APPT && p->type != RECUR_APPT)
return; return;
date = date2sec(year, month, day, 0, 0); date = calendar_get_slctd_day_sec();
if (p->type == RECUR_APPT) { if (p->type == RECUR_APPT) {
recur_apoint_switch_notify(date, p->appt_pos); recur_apoint_switch_notify(date, p->appt_pos);

37
src/apoint.h
View File

@ -1,4 +1,4 @@
/* $calcurse: apoint.h,v 1.5 2007/02/24 17:35:00 culot Exp $ */ /* $calcurse: apoint.h,v 1.6 2007/07/01 17:54:33 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -28,7 +28,9 @@
#define CALCURSE_APOINT_H #define CALCURSE_APOINT_H
#include <ncurses.h> #include <ncurses.h>
#include "notify.h" #include "notify.h"
#include "vars.h"
#define HRMIN_SIZE 6 #define HRMIN_SIZE 6
#define MESG_MAXSIZE 256 #define MESG_MAXSIZE 256
@ -52,22 +54,21 @@ typedef struct apoint_llist {
extern apoint_llist_t *alist_p; extern apoint_llist_t *alist_p;
int apoint_llist_init(void); int apoint_llist_init(void);
apoint_llist_node_t *apoint_new(char *, long, long, char state); apoint_llist_node_t *apoint_new(char *, long, long, char);
unsigned apoint_inday(apoint_llist_node_t *o, long start); unsigned apoint_inday(apoint_llist_node_t *, long);
void apoint_sec2str(apoint_llist_node_t *o, void apoint_sec2str(apoint_llist_node_t *, int, long,
int type, long day, char *start, char *end); char *, char *);
void apoint_write(apoint_llist_node_t *o, FILE * f); void apoint_write(apoint_llist_node_t *, FILE *);
apoint_llist_node_t *apoint_scan(FILE * f, struct tm start, struct tm end, apoint_llist_node_t *apoint_scan(FILE *, struct tm, struct tm, char);
char state); void apoint_delete_bynum(long, unsigned);
void apoint_delete_bynum(long start, unsigned num); void display_item_date(WINDOW *, int, apoint_llist_node_t *,
void display_item_date(WINDOW *win, int color, apoint_llist_node_t *i, int, long, int, int);
int type, long date, int y, int x); int get_item_line(int, int);
int get_item_line(int item_nb, int nb_events_inday); void scroll_pad_down(int, int, int);
void scroll_pad_down(int item_nb, int nb_events_inday, int win_length); void scroll_pad_up(int, int);
void scroll_pad_up(int item_nb, int nb_events_inday); struct notify_app_s *apoint_check_next(struct notify_app_s *, long);
struct notify_app_s *apoint_check_next(struct notify_app_s *app, long start); apoint_llist_node_t *apoint_recur_s2apoint_s(recur_apoint_llist_node_t *);
apoint_llist_node_t *apoint_recur_s2apoint_s(recur_apoint_llist_node_t *p); void apoint_switch_notify(int);
void apoint_switch_notify(int year, int month, int day, int item_num);
#endif /* CALCURSE_APOINT_H */ #endif /* CALCURSE_APOINT_H */