diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-07-03 05:36:01 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-07-06 04:40:50 +0800 |
| commit | a2e20af49304296b3c2b10305cb1312031107d55 (patch) | |
| tree | fef2296790edf090261bd529c6fbfb5ee988c9f3 /e-util | |
| parent | bb5f5ad90beabd459e27d7aaac44d92c9b106c00 (diff) | |
| download | gsoc2013-evolution-a2e20af49304296b3c2b10305cb1312031107d55.tar.gz gsoc2013-evolution-a2e20af49304296b3c2b10305cb1312031107d55.tar.zst gsoc2013-evolution-a2e20af49304296b3c2b10305cb1312031107d55.zip | |
GalViewFactoryClass: Remove the new_view() method.
GalViewFactory can now use its "gal_view_type" class member to
instantiate an appropriate GalView without help from subclasses.
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/gal-view-factory-etable.c | 8 | ||||
| -rw-r--r-- | e-util/gal-view-factory.c | 7 | ||||
| -rw-r--r-- | e-util/gal-view-factory.h | 6 |
3 files changed, 4 insertions, 17 deletions
diff --git a/e-util/gal-view-factory-etable.c b/e-util/gal-view-factory-etable.c index f9a6edd9ae..08eb91aaae 100644 --- a/e-util/gal-view-factory-etable.c +++ b/e-util/gal-view-factory-etable.c @@ -32,13 +32,6 @@ G_DEFINE_TYPE ( gal_view_factory_etable, GAL_TYPE_VIEW_FACTORY) -static GalView * -view_factory_etable_new_view (GalViewFactory *factory, - const gchar *name) -{ - return gal_view_etable_new (name); -} - static void gal_view_factory_etable_class_init (GalViewFactoryEtableClass *class) { @@ -46,7 +39,6 @@ gal_view_factory_etable_class_init (GalViewFactoryEtableClass *class) view_factory_class = GAL_VIEW_FACTORY_CLASS (class); view_factory_class->gal_view_type = GAL_TYPE_VIEW_ETABLE; - view_factory_class->new_view = view_factory_etable_new_view; } static void diff --git a/e-util/gal-view-factory.c b/e-util/gal-view-factory.c index d235a63d86..9d0ef7596f 100644 --- a/e-util/gal-view-factory.c +++ b/e-util/gal-view-factory.c @@ -68,21 +68,20 @@ gal_view_factory_get_type_code (GalViewFactory *factory) /** * gal_view_factory_new_view: * @factory: a #GalViewFactory - * @name: the name for the view + * @title: the title for the view * * Returns: The new view */ GalView * gal_view_factory_new_view (GalViewFactory *factory, - const gchar *name) + const gchar *title) { GalViewFactoryClass *class; g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), NULL); class = GAL_VIEW_FACTORY_GET_CLASS (factory); - g_return_val_if_fail (class->new_view != NULL, NULL); - return class->new_view (factory, name); + return g_object_new (class->gal_view_type, "title", title, NULL); } diff --git a/e-util/gal-view-factory.h b/e-util/gal-view-factory.h index 73cc02251e..0eb4d00786 100644 --- a/e-util/gal-view-factory.h +++ b/e-util/gal-view-factory.h @@ -62,10 +62,6 @@ struct _GalViewFactoryClass { GObjectClass parent_class; GType gal_view_type; - - /* Methods */ - GalView * (*new_view) (GalViewFactory *factory, - const gchar *name); }; GType gal_view_factory_get_type (void); @@ -77,7 +73,7 @@ GType gal_view_factory_get_type (void); const gchar * gal_view_factory_get_type_code (GalViewFactory *factory); GalView * gal_view_factory_new_view (GalViewFactory *factory, - const gchar *name); + const gchar *title); G_END_DECLS |