From 2b9713656b939ec657b8d77932a2a7d147aa1f23 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 3 Jul 2013 07:58:31 -0400 Subject: GalViewFactoryEtable: Remove "specification" property. No longer needed. Removed functions: gal_view_factory_etable_get_specification() --- modules/addressbook/e-book-shell-view-private.c | 19 +------------------ modules/calendar/e-cal-shell-view-private.c | 19 +------------------ modules/calendar/e-memo-shell-view-private.c | 19 +------------------ modules/calendar/e-task-shell-view-private.c | 19 +------------------ modules/mail/e-mail-shell-view-private.c | 19 +------------------ 5 files changed, 5 insertions(+), 90 deletions(-) (limited to 'modules') diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c index eb7f3e074c..79112202f2 100644 --- a/modules/addressbook/e-book-shell-view-private.c +++ b/modules/addressbook/e-book-shell-view-private.c @@ -460,30 +460,13 @@ book_shell_view_load_view_collection (EShellViewClass *shell_view_class) { GalViewCollection *collection; GalViewFactory *factory; - ETableSpecification *spec; - const gchar *base_dir; - gchar *filename; - GError *local_error = NULL; collection = shell_view_class->view_collection; - base_dir = EVOLUTION_ETSPECDIR; - filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL); - spec = e_table_specification_new (filename, &local_error); - - /* Failure here is fatal. */ - if (local_error != NULL) { - g_error ("%s: %s", filename, local_error->message); - g_assert_not_reached (); - } - - factory = gal_view_factory_etable_new (spec); + factory = gal_view_factory_etable_new (); gal_view_collection_add_factory (collection, factory); g_object_unref (factory); - g_object_unref (spec); - g_free (filename); - factory = gal_view_factory_minicard_new (); gal_view_collection_add_factory (collection, factory); g_object_unref (factory); diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 7b0c6c472b..be6e67f102 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -416,23 +416,9 @@ cal_shell_view_load_view_collection (EShellViewClass *shell_view_class) { GalViewCollection *collection; GalViewFactory *factory; - ETableSpecification *spec; - const gchar *base_dir; - gchar *filename; - GError *local_error = NULL; collection = shell_view_class->view_collection; - base_dir = EVOLUTION_ETSPECDIR; - filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL); - spec = e_table_specification_new (filename, &local_error); - - /* Failure here is fatal. */ - if (local_error != NULL) { - g_error ("%s: %s", filename, local_error->message); - g_assert_not_reached (); - } - factory = calendar_view_factory_new (GNOME_CAL_DAY_VIEW); gal_view_collection_add_factory (collection, factory); g_object_unref (factory); @@ -449,13 +435,10 @@ cal_shell_view_load_view_collection (EShellViewClass *shell_view_class) gal_view_collection_add_factory (collection, factory); g_object_unref (factory); - factory = gal_view_factory_etable_new (spec); + factory = gal_view_factory_etable_new (); gal_view_collection_add_factory (collection, factory); g_object_unref (factory); - g_object_unref (spec); - g_free (filename); - gal_view_collection_load (collection); } diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c index 78d636027a..26c43e1450 100644 --- a/modules/calendar/e-memo-shell-view-private.c +++ b/modules/calendar/e-memo-shell-view-private.c @@ -126,30 +126,13 @@ memo_shell_view_load_view_collection (EShellViewClass *shell_view_class) { GalViewCollection *collection; GalViewFactory *factory; - ETableSpecification *spec; - const gchar *base_dir; - gchar *filename; - GError *local_error = NULL; collection = shell_view_class->view_collection; - base_dir = EVOLUTION_ETSPECDIR; - filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL); - spec = e_table_specification_new (filename, &local_error); - - /* Failure here is fatal. */ - if (local_error != NULL) { - g_error ("%s: %s", filename, local_error->message); - g_assert_not_reached (); - } - - factory = gal_view_factory_etable_new (spec); + factory = gal_view_factory_etable_new (); gal_view_collection_add_factory (collection, factory); g_object_unref (factory); - g_object_unref (spec); - g_free (filename); - gal_view_collection_load (collection); } diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c index fa70b5bcae..ff42581cac 100644 --- a/modules/calendar/e-task-shell-view-private.c +++ b/modules/calendar/e-task-shell-view-private.c @@ -191,30 +191,13 @@ task_shell_view_load_view_collection (EShellViewClass *shell_view_class) { GalViewCollection *collection; GalViewFactory *factory; - ETableSpecification *spec; - const gchar *base_dir; - gchar *filename; - GError *local_error = NULL; collection = shell_view_class->view_collection; - base_dir = EVOLUTION_ETSPECDIR; - filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL); - spec = e_table_specification_new (filename, &local_error); - - /* Failure here is fatal. */ - if (local_error != NULL) { - g_error ("%s: %s", filename, local_error->message); - g_assert_not_reached (); - } - - factory = gal_view_factory_etable_new (spec); + factory = gal_view_factory_etable_new (); gal_view_collection_add_factory (collection, factory); g_object_unref (factory); - g_object_unref (spec); - g_free (filename); - gal_view_collection_load (collection); } diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 7779236e9e..7bb3043aae 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -542,30 +542,13 @@ mail_shell_view_load_view_collection (EShellViewClass *shell_view_class) { GalViewCollection *collection; GalViewFactory *factory; - ETableSpecification *spec; - const gchar *base_dir; - gchar *filename; - GError *local_error = NULL; collection = shell_view_class->view_collection; - base_dir = EVOLUTION_ETSPECDIR; - filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL); - spec = e_table_specification_new (filename, &local_error); - - /* Failure here is fatal. */ - if (local_error != NULL) { - g_error ("%s: %s", filename, local_error->message); - g_assert_not_reached (); - } - - factory = gal_view_factory_etable_new (spec); + factory = gal_view_factory_etable_new (); gal_view_collection_add_factory (collection, factory); g_object_unref (factory); - g_object_unref (spec); - g_free (filename); - gal_view_collection_load (collection); } -- cgit v1.2.3