p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Stubplement LdDocument file operations. 

Prototypes for these functions were wrong; fixed.
This commit is contained in:
Přemysl Eric Janouch 2010-12-11 15:46:30 +01:00
parent e364267010
commit f9dbe12971
2 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/ld-document.c
View File

@ -229,12 +229,29 @@ ld_document_clear_internal (LdDocument *self)
*/
gboolean
ld_document_load_from_file (LdDocument *self,
const gchar *filename, GError *error)
const gchar *filename, GError **error)
{
g_return_val_if_fail (LD_IS_DOCUMENT (self), FALSE);
JsonParser *parser;
GError *json_error;
/* TODO */
g_return_val_if_fail (LD_IS_DOCUMENT (self), FALSE);
g_return_val_if_fail (filename != NULL, FALSE);
/* TODO: Implement loading for real. This is just a stub. */
parser = json_parser_new ();
json_error = NULL;
json_parser_load_from_file (parser, filename, &json_error);
if (json_error)
{
g_propagate_error (error, json_error);
g_object_unref (parser);
return FALSE;
}
ld_document_clear (self);
g_object_unref (parser);
return TRUE;
}
/**
@ -249,12 +266,34 @@ ld_document_load_from_file (LdDocument *self,
*/
gboolean
ld_document_save_to_file (LdDocument *self,
const gchar *filename, GError *error)
const gchar *filename, GError **error)
{
g_return_val_if_fail (LD_IS_DOCUMENT (self), FALSE);
JsonGenerator *generator;
JsonNode *root;
GError *json_error;
/* TODO */
g_return_val_if_fail (LD_IS_DOCUMENT (self), FALSE);
g_return_val_if_fail (filename != NULL, FALSE);
/* TODO: Implement saving for real. This is just a stub. */
generator = json_generator_new ();
g_object_set (generator, "pretty", TRUE, NULL);
/* XXX: json-glib dislikes empty objects. */
root = json_node_new (JSON_NODE_OBJECT);
json_generator_set_root (generator, root);
json_node_free (root);
json_error = NULL;
json_generator_to_file (generator, filename, &json_error);
if (json_error)
{
g_propagate_error (error, json_error);
g_object_unref (generator);
return FALSE;
}
g_object_unref (generator);
return TRUE;
}
/**

4
src/ld-document.h
View File

@ -60,9 +60,9 @@ GType ld_document_get_type (void) G_GNUC_CONST;
LdDocument *ld_document_new (void);
void ld_document_clear (LdDocument *self);
gboolean ld_document_load_from_file (LdDocument *self,
const gchar *filename, GError *error);
const gchar *filename, GError **error);
gboolean ld_document_save_to_file (LdDocument *self,
const gchar *filename, GError *error);
const gchar *filename, GError **error);
gboolean ld_document_get_modified (LdDocument *self);
void ld_document_set_modified (LdDocument *self, gboolean value);