aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-memos.c5
-rw-r--r--calendar/gui/e-tasks.c4
-rw-r--r--calendar/gui/gnome-cal.c4
4 files changed, 16 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d345d3c0a6..ed73814a53 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-31 Matthew Barnes <mbarnes@redhat.com>
+
+ * gui/e-memos.c: (e_memos_setup_view_menus)
+ * gui/e-tasks.c: (e_tasks_setup_view_menus)
+ * gui/gnome-cal.c: (gnome_calendar_setup_view_menus)
+ Abort if ETable specification file fails to load.
+
2007-06-27 Milan Crha <mcrha@redhat.com>
** Fix for bug #234294
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index e53a2644a0..44a4e92a03 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -1109,8 +1109,9 @@ e_memos_setup_view_menus (EMemos *memos, BonoboUIComponent *uic)
filename = g_build_filename (EVOLUTION_ETSPECDIR,
"e-memo-table.etspec",
NULL);
- e_table_specification_load_from_file (spec,
- filename);
+ if (!e_table_specification_load_from_file (spec, filename))
+ g_error ("Unable to load ETable specification file "
+ "for memos");
g_free (filename);
factory = gal_view_factory_etable_new (spec);
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 9e00738834..d610702c47 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -1373,7 +1373,9 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)
filename = g_build_filename (EVOLUTION_ETSPECDIR,
"e-calendar-table.etspec",
NULL);
- e_table_specification_load_from_file (spec, filename);
+ if (!e_table_specification_load_from_file (spec, filename))
+ g_error ("Unable to load ETable specification file "
+ "for tasks");
g_free (filename);
factory = gal_view_factory_etable_new (spec);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 864cc064fa..2d8cf85c5e 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -2386,7 +2386,9 @@ gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
"e-cal-list-view.etspec",
NULL);
- e_table_specification_load_from_file (spec, etspecfile);
+ if (!e_table_specification_load_from_file (spec, etspecfile))
+ g_error ("Unable to load ETable specification file "
+ "for calendar");
g_free (etspecfile);
gal_factory = gal_view_factory_etable_new (spec);
g_object_unref (spec);