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

Merge branch 'maint'

Browse Source 
Conflicts:
	src/day.c
	src/recur.c
This commit is contained in:
Lukas Fleischer
2012-11-23 18:46:38 +01:00
parent 7733d52f32 0ea23c24bf
commit 1f0f05ecc1
12 changed files with 244 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/io.c
View File

@@ -306,23 +306,6 @@ void io_extract_data(char *dst_data, const char *org, int len)
*dst_data = '\0';
}
static void display_mark(void)
{
const int DISPLAY_TIME = 1;
WINDOW *mwin;
mwin = newwin(1, 2, 1, col - 3);
custom_apply_attr(mwin, ATTR_HIGHEST);
mvwaddstr(mwin, 0, 0, "**");
wins_wrefresh(mwin);
sleep(DISPLAY_TIME);
mvwaddstr(mwin, 0, 0, " ");
wins_wrefresh(mwin);
delwin(mwin);
wins_doupdate();
}
static pthread_mutex_t io_save_mutex = PTHREAD_MUTEX_INITIALIZER;
/*
@@ -416,8 +399,6 @@ void io_save_cal(enum save_display display)
if (ui_mode == UI_CURSES && display == IO_SAVE_DISPLAY_BAR
&& conf.progress_bar)
show_bar = 1;
else if (ui_mode == UI_CURSES && display == IO_SAVE_DISPLAY_MARK)
display_mark();
if (show_bar)
progress_bar(PROGRESS_BAR_SAVE, PROGRESS_BAR_CONF);
@@ -440,8 +421,7 @@ void io_save_cal(enum save_display display)
ERROR_MSG("%s", access_pb);
/* Print a message telling data were saved */
if (ui_mode == UI_CURSES && conf.system_dialogs
&& display != IO_SAVE_DISPLAY_MARK) {
if (ui_mode == UI_CURSES && conf.system_dialogs) {
status_mesg(save_success, enter);
wgetch(win[STA].p);
}
@@ -458,7 +438,7 @@ void io_load_app(void)
{
FILE *data_file;
int c, is_appointment, is_event, is_recursive;
struct tm start, end, until, *lt;
struct tm start, end, until, lt;
llist_t exc;
time_t t;
int id = 0;
@@ -467,8 +447,8 @@ void io_load_app(void)
char note[MAX_NOTESIZ + 1], *notep;
t = time(NULL);
lt = localtime(&t);
start = end = until = *lt;
localtime_r(&t, &lt);
start = end = until = lt;
data_file = fopen(path_apts, "r");
EXIT_IF(data_file == NULL, _("failed to open appointment file"));
@@ -1133,7 +1113,7 @@ static void *io_psave_thread(void *arg)
for (;;) {
sleep(delay * MININSEC);
io_save_cal(IO_SAVE_DISPLAY_MARK);
io_save_cal(IO_SAVE_DISPLAY_NONE);
}
}