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

Merge branch 'maint'

Browse Source 
Conflicts:
	src/calcurse.h
	src/io.c
This commit is contained in:
Lukas Fleischer 2011-11-11 12:29:48 +01:00
commit 14b6ae79a2
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calcurse.h
View File

@ -100,6 +100,9 @@
#define DPID_PATH DIR_NAME DPID_PATH_NAME #define DPID_PATH DIR_NAME DPID_PATH_NAME
#define NOTES_DIR DIR_NAME NOTES_DIR_NAME #define NOTES_DIR DIR_NAME NOTES_DIR_NAME
#define DEFAULT_EDITOR "vi"
#define DEFAULT_PAGER "less"
#define ATTR_FALSE 0 #define ATTR_FALSE 0
#define ATTR_TRUE 1 #define ATTR_TRUE 1
#define ATTR_LOWEST 2 #define ATTR_LOWEST 2

5
src/calendar.c
View File

@ -145,7 +145,10 @@ void
calendar_stop_date_thread (void) calendar_stop_date_thread (void)
{ {
if (calendar_t_date) if (calendar_t_date)
pthread_cancel (calendar_t_date); {
pthread_cancel (calendar_t_date);
pthread_join (calendar_t_date, NULL);
}
} }
/* Set static variable today to current date */ /* Set static variable today to current date */

8
src/io.c
View File

@ -2768,6 +2768,9 @@ io_import_data (enum import_type type, struct conf *conf, char *stream_name)
ngettext ("%d todo", "%d todos", stats.todos), stats.todos); ngettext ("%d todo", "%d todos", stats.todos), stats.todos);
snprintf (stats_str[3], BUFSIZ, _("%d skipped"), stats.skipped); snprintf (stats_str[3], BUFSIZ, _("%d skipped"), stats.skipped);
/* Update the number of todo items. */
todo_set_nb (todo_nb () + stats.todos);
if (ui_mode == UI_CURSES && !conf->skip_system_dialogs) if (ui_mode == UI_CURSES && !conf->skip_system_dialogs)
{ {
char read[BUFSIZ], stat[BUFSIZ]; char read[BUFSIZ], stat[BUFSIZ];
@ -2911,7 +2914,10 @@ void
io_stop_psave_thread (void) io_stop_psave_thread (void)
{ {
if (io_t_psave) if (io_t_psave)
pthread_cancel (io_t_psave); {
pthread_cancel (io_t_psave);
pthread_join (io_t_psave, NULL);
}
} }
/* /*

5
src/notify.c
View File

@ -190,7 +190,10 @@ void
notify_stop_main_thread (void) notify_stop_main_thread (void)
{ {
if (notify_t_main) if (notify_t_main)
pthread_cancel (notify_t_main); {
pthread_cancel (notify_t_main);
pthread_join (notify_t_main, NULL);
}
} }
/* /*

6
src/vars.c
View File

@ -117,8 +117,6 @@ struct dmon_conf dmon;
void void
vars_init (struct conf *conf) vars_init (struct conf *conf)
{ {
char *PATH_VI = "/usr/bin/vi";
char *PATH_LESS = "/usr/bin/less";
char *ed, *pg; char *ed, *pg;
/* Variables for user configuration */ /* Variables for user configuration */
@ -137,12 +135,12 @@ vars_init (struct conf *conf)
if (ed == NULL || ed[0] == '\0') if (ed == NULL || ed[0] == '\0')
ed = getenv ("EDITOR"); ed = getenv ("EDITOR");
if (ed == NULL || ed[0] == '\0') if (ed == NULL || ed[0] == '\0')
ed = PATH_VI; ed = DEFAULT_EDITOR;
conf->editor = ed; conf->editor = ed;
pg = getenv ("PAGER"); pg = getenv ("PAGER");
if (pg == NULL || pg[0] == '\0') if (pg == NULL || pg[0] == '\0')
pg = PATH_LESS; pg = DEFAULT_PAGER;
conf->pager = pg; conf->pager = pg;
wins_set_layout (1); wins_set_layout (1);