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() --- .../evolution-util/evolution-util-sections.txt | 1 - e-util/gal-view-factory-etable.c | 110 +-------------------- e-util/gal-view-factory-etable.h | 5 +- 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 +--- 8 files changed, 8 insertions(+), 203 deletions(-) diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt index f3f0acad53..e9d1ec292c 100644 --- a/doc/reference/evolution-util/evolution-util-sections.txt +++ b/doc/reference/evolution-util/evolution-util-sections.txt @@ -4665,7 +4665,6 @@ gal_view_factory_get_type GalViewFactoryEtable GalViewFactoryEtable gal_view_factory_etable_new -gal_view_factory_etable_get_specification GAL_VIEW_FACTORY_ETABLE GAL_IS_VIEW_FACTORY_ETABLE diff --git a/e-util/gal-view-factory-etable.c b/e-util/gal-view-factory-etable.c index f26a3a3de6..cc54468260 100644 --- a/e-util/gal-view-factory-etable.c +++ b/e-util/gal-view-factory-etable.c @@ -27,85 +27,11 @@ #include "gal-view-etable.h" #include "gal-view-factory-etable.h" -#define GAL_VIEW_FACTORY_ETABLE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), GAL_TYPE_VIEW_FACTORY_ETABLE, GalViewFactoryEtablePrivate)) - -struct _GalViewFactoryEtablePrivate { - ETableSpecification *specification; -}; - -enum { - PROP_0, - PROP_SPECIFICATION -}; - G_DEFINE_TYPE ( GalViewFactoryEtable, gal_view_factory_etable, GAL_TYPE_VIEW_FACTORY) -static void -view_factory_etable_set_specification (GalViewFactoryEtable *factory, - ETableSpecification *specification) -{ - g_return_if_fail (factory->priv->specification == NULL); - g_return_if_fail (E_IS_TABLE_SPECIFICATION (specification)); - - factory->priv->specification = g_object_ref (specification); -} - -static void -view_factory_etable_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (property_id) { - case PROP_SPECIFICATION: - view_factory_etable_set_specification ( - GAL_VIEW_FACTORY_ETABLE (object), - g_value_get_object (value)); - return; - } - - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -} - -static void -view_factory_etable_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - switch (property_id) { - case PROP_SPECIFICATION: - g_value_set_object ( - value, - gal_view_factory_etable_get_specification ( - GAL_VIEW_FACTORY_ETABLE (object))); - return; - } - - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -} - -static void -view_factory_etable_dispose (GObject *object) -{ - GalViewFactoryEtablePrivate *priv; - - priv = GAL_VIEW_FACTORY_ETABLE_GET_PRIVATE (object); - - if (priv->specification != NULL) { - g_object_unref (priv->specification); - priv->specification = NULL; - } - - /* Chain up to parent's dispose() method. */ - G_OBJECT_CLASS (gal_view_factory_etable_parent_class)->dispose (object); -} - static const gchar * view_factory_etable_get_type_code (GalViewFactory *factory) { @@ -122,41 +48,20 @@ view_factory_etable_new_view (GalViewFactory *factory, static void gal_view_factory_etable_class_init (GalViewFactoryEtableClass *class) { - GObjectClass *object_class; GalViewFactoryClass *view_factory_class; - g_type_class_add_private (class, sizeof (GalViewFactoryEtablePrivate)); - - object_class = G_OBJECT_CLASS (class); - object_class->set_property = view_factory_etable_set_property; - object_class->get_property = view_factory_etable_get_property; - object_class->dispose = view_factory_etable_dispose; - view_factory_class = GAL_VIEW_FACTORY_CLASS (class); view_factory_class->get_type_code = view_factory_etable_get_type_code; view_factory_class->new_view = view_factory_etable_new_view; - - g_object_class_install_property ( - object_class, - PROP_SPECIFICATION, - g_param_spec_object ( - "specification", - NULL, - NULL, - E_TYPE_TABLE_SPECIFICATION, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY)); } static void gal_view_factory_etable_init (GalViewFactoryEtable *factory) { - factory->priv = GAL_VIEW_FACTORY_ETABLE_GET_PRIVATE (factory); } /** * gal_view_factory_etable_new: - * @specification: The spec to create GalViewEtables based upon. * * A new GalViewFactory for creating ETable views. Create one of * these and pass it to GalViewCollection for use. @@ -164,19 +69,8 @@ gal_view_factory_etable_init (GalViewFactoryEtable *factory) * Returns: The new GalViewFactoryEtable. */ GalViewFactory * -gal_view_factory_etable_new (ETableSpecification *specification) +gal_view_factory_etable_new (void) { - g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), NULL); - - return g_object_new ( - GAL_TYPE_VIEW_FACTORY_ETABLE, - "specification", specification, NULL); + return g_object_new (GAL_TYPE_VIEW_FACTORY_ETABLE, NULL); } -ETableSpecification * -gal_view_factory_etable_get_specification (GalViewFactoryEtable *factory) -{ - g_return_val_if_fail (GAL_IS_VIEW_FACTORY_ETABLE (factory), NULL); - - return factory->priv->specification; -} diff --git a/e-util/gal-view-factory-etable.h b/e-util/gal-view-factory-etable.h index 4edddda691..268f9183b6 100644 --- a/e-util/gal-view-factory-etable.h +++ b/e-util/gal-view-factory-etable.h @@ -68,10 +68,7 @@ struct _GalViewFactoryEtableClass { GType gal_view_factory_etable_get_type (void) G_GNUC_CONST; -GalViewFactory *gal_view_factory_etable_new (ETableSpecification *specification); -ETableSpecification * - gal_view_factory_etable_get_specification - (GalViewFactoryEtable *factory); +GalViewFactory *gal_view_factory_etable_new (void); G_END_DECLS 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