diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-07-02 21:22:18 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-07-02 22:34:12 +0800 |
commit | f267827d67d3fd11478fbf94da9cd6095400a49c (patch) | |
tree | 29bf07f39ab001ea53bdb1bd67c32242e53c0944 /calendar/gui/e-memo-table.c | |
parent | dfc653bb43a6311c04d7881c2d1b1642c081f839 (diff) | |
download | gsoc2013-evolution-f267827d67d3fd11478fbf94da9cd6095400a49c.tar gsoc2013-evolution-f267827d67d3fd11478fbf94da9cd6095400a49c.tar.gz gsoc2013-evolution-f267827d67d3fd11478fbf94da9cd6095400a49c.tar.bz2 gsoc2013-evolution-f267827d67d3fd11478fbf94da9cd6095400a49c.tar.lz gsoc2013-evolution-f267827d67d3fd11478fbf94da9cd6095400a49c.tar.xz gsoc2013-evolution-f267827d67d3fd11478fbf94da9cd6095400a49c.tar.zst gsoc2013-evolution-f267827d67d3fd11478fbf94da9cd6095400a49c.zip |
ETableSpecification: Implement GInitable.
e_table_specification_new() now takes a table specification filename and
a GError and parses the file as part of instance creation. If a file or
parse error occurs, e_table_specification_new() returns NULL.
This replaces e_table_specification_load_from_file().
New functions:
e_table_specification_get_filename()
Removed functions:
e_table_specification_load_from_file()
Diffstat (limited to 'calendar/gui/e-memo-table.c')
-rw-r--r-- | calendar/gui/e-memo-table.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 7537dc8130..4609356914 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -332,6 +332,7 @@ memo_table_constructed (GObject *object) ETableSpecification *specification; AtkObject *a11y; gchar *etspecfile; + GError *local_error = NULL; memo_table = E_MEMO_TABLE (object); model = e_memo_table_get_model (memo_table); @@ -408,12 +409,19 @@ memo_table_constructed (GObject *object) etspecfile = g_build_filename ( EVOLUTION_ETSPECDIR, "e-memo-table.etspec", NULL); - specification = e_table_specification_new (); - e_table_specification_load_from_file (specification, etspecfile); + specification = e_table_specification_new (etspecfile, &local_error); + + /* Failure here is fatal. */ + if (local_error != NULL) { + g_error ("%s: %s", etspecfile, local_error->message); + g_assert_not_reached (); + } + e_table_construct ( E_TABLE (memo_table), E_TABLE_MODEL (model), extras, specification); + g_object_unref (specification); g_free (etspecfile); |