aboutsummaryrefslogtreecommitdiff
path: root/src/loadsave.c
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2011-12-25 23:56:20 +0000
committerThomas White <taw@bitwiz.org.uk>2011-12-25 23:56:20 +0000
commit683e72ae5fa90fd14101bd6ec8921468e96a50f5 (patch)
tree0f8512f7894294e08a23d6a877309e566cdc1817 /src/loadsave.c
parent3c75a65b5ba707353874cd737d73d782e23d00ac (diff)
Load and save the slide notes
Diffstat (limited to 'src/loadsave.c')
-rw-r--r--src/loadsave.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/loadsave.c b/src/loadsave.c
index b85f4d0..a4c2891 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -36,6 +36,7 @@
#include "stylesheet.h"
#include "slide_render.h"
#include "mainwindow.h"
+#include "notes.h"
static int alloc_children(struct ds_node *node)
@@ -366,7 +367,6 @@ int get_field_s(struct ds_node *root, const char *key, char **val)
node = find_node(root, key, 0);
if ( node == NULL ) {
- fprintf(stderr, "Couldn't find field '%s'\n", key);
*val = NULL;
return 1;
}
@@ -469,6 +469,8 @@ static struct slide *tree_to_slide(struct presentation *p, struct ds_node *root)
s = new_slide();
s->parent = p;
+ load_notes(root, s);
+
/* Loop over objects */
for ( i=0; i<root->n_children; i++ ) {
@@ -746,6 +748,7 @@ void serialize_end(struct serializer *ser)
{
free(ser->stack[--ser->stack_depth]);
rebuild_prefix(ser);
+ ser->empty_set = 1;
}
@@ -801,6 +804,9 @@ int save_presentation(struct presentation *p, const char *filename)
serialize_end(&ser);
}
+
+ write_notes(s, &ser);
+
serialize_end(&ser);
}