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

Merge branch 'maint'

Browse Source
This commit is contained in:
Lukas Fleischer 2011-07-28 13:38:12 +02:00
commit 54813eef19
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/args.c
View File

@ -880,6 +880,8 @@ parse_args (int argc, char **argv, struct conf *conf)
{ {
io_check_file (path_apts, (int *)0); io_check_file (path_apts, (int *)0);
io_check_file (path_todo, (int *)0); io_check_file (path_todo, (int *)0);
/* Get default pager in case we need to show a log file. */
vars_init (conf);
io_load_app (); io_load_app ();
io_load_todo (); io_load_todo ();
io_import_data (IO_IMPORT_ICAL, conf, ifile); io_import_data (IO_IMPORT_ICAL, conf, ifile);

4
src/io.c
View File

@ -2423,10 +2423,10 @@ ical_read_event (FILE *fdi, FILE *log, unsigned *noevents, unsigned *noapoints,
{ {
const int ITEMLINE = *lineno; const int ITEMLINE = *lineno;
const struct string endevent = STRING_BUILD ("END:VEVENT"); const struct string endevent = STRING_BUILD ("END:VEVENT");
const struct string summary = STRING_BUILD ("SUMMARY:"); const struct string summary = STRING_BUILD ("SUMMARY");
const struct string dtstart = STRING_BUILD ("DTSTART"); const struct string dtstart = STRING_BUILD ("DTSTART");
const struct string dtend = STRING_BUILD ("DTEND"); const struct string dtend = STRING_BUILD ("DTEND");
const struct string duration = STRING_BUILD ("DURATION:"); const struct string duration = STRING_BUILD ("DURATION");
const struct string rrule = STRING_BUILD ("RRULE"); const struct string rrule = STRING_BUILD ("RRULE");
const struct string exdate = STRING_BUILD ("EXDATE"); const struct string exdate = STRING_BUILD ("EXDATE");
const struct string alarm = STRING_BUILD ("BEGIN:VALARM"); const struct string alarm = STRING_BUILD ("BEGIN:VALARM");