aboutsummaryrefslogtreecommitdiffstats
path: root/src/day.c
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2011-07-07 18:23:30 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2011-07-21 18:13:40 +0200
commit87664095cdd2c85d50e1be42442c0c24b611c7dc (patch)
tree48146b5854874fd8c699ab3348b4151905e09760 /src/day.c
parent40772daaf4d241a71f6eba5190cf8cd03d028880 (diff)
downloadcalcurse-87664095cdd2c85d50e1be42442c0c24b611c7dc.tar.gz
calcurse-87664095cdd2c85d50e1be42442c0c24b611c7dc.zip
Refactor out note functions
* Add new note_edit() and note_view() helper functions. Use these instead of copy-pasted code in *_note_edit(). * Move all note-related functions (note_edit(), note_view(), note_erase()) to a new source file "note.c". Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
Diffstat (limited to 'src/day.c')
-rw-r--r--src/day.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/src/day.c b/src/day.c
index ffbe567..884d86b 100644
--- a/src/day.c
+++ b/src/day.c
@@ -1043,25 +1043,12 @@ day_edit_note (char *editor)
struct apoint *a;
struct recur_event *re;
struct event *e;
- char fullname[BUFSIZ];
- char *filename;
long date;
int item_num;
item_num = apoint_hilt ();
p = day_get_item (item_num);
- if (p->note == NULL)
- {
- if ((filename = new_tempfile (path_notes, NOTESIZ)) == NULL)
- return;
- else
- p->note = filename;
- }
- (void)snprintf (fullname, BUFSIZ, "%s%s", path_notes, p->note);
- wins_launch_external (fullname, editor);
-
- if (io_file_is_empty (fullname) > 0)
- erase_note (&p->note, ERASE_FORCE);
+ edit_note (&p->note, editor);
date = calendar_get_slctd_day_sec ();
switch (p->type)
@@ -1089,14 +1076,8 @@ day_edit_note (char *editor)
void
day_view_note (char *pager)
{
- struct day_item *p;
- char fullname[BUFSIZ];
-
- p = day_get_item (apoint_hilt ());
- if (p->note == NULL)
- return;
- (void)snprintf (fullname, BUFSIZ, "%s%s", path_notes, p->note);
- wins_launch_external (fullname, pager);
+ struct day_item *p = day_get_item (apoint_hilt ());
+ view_note (p->note, pager);
}
/* Pipe an appointment or event to an external program. */