From 369daca6146c0e97db0308adb9c64c10ad1cb096 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Jul 2013 12:30:41 -0400 Subject: GalView: Store the title string internally. This replaces the get_title() and set_title() class methods, since it's silly to defer to subclasses to track a simple string property. --- e-util/gal-view-etable.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'e-util/gal-view-etable.c') diff --git a/e-util/gal-view-etable.c b/e-util/gal-view-etable.c index 53782eefca..747c169d0c 100644 --- a/e-util/gal-view-etable.c +++ b/e-util/gal-view-etable.c @@ -60,20 +60,6 @@ gal_view_etable_save (GalView *view, e_table_state_save_to_file (GAL_VIEW_ETABLE (view)->state, filename); } -static const gchar * -gal_view_etable_get_title (GalView *view) -{ - return GAL_VIEW_ETABLE (view)->title; -} - -static void -gal_view_etable_set_title (GalView *view, - const gchar *title) -{ - g_free (GAL_VIEW_ETABLE (view)->title); - GAL_VIEW_ETABLE (view)->title = g_strdup (title); -} - static const gchar * gal_view_etable_get_type_code (GalView *view) { @@ -92,7 +78,6 @@ gal_view_etable_clone (GalView *view) gve = GAL_VIEW_ETABLE (view); GAL_VIEW_ETABLE (clone)->spec = g_object_ref (gve->spec); GAL_VIEW_ETABLE (clone)->state = e_table_state_duplicate (gve->state); - GAL_VIEW_ETABLE (clone)->title = g_strdup (gve->title); return clone; } @@ -104,9 +89,6 @@ gal_view_etable_dispose (GObject *object) gal_view_etable_detach (view); - g_free (view->title); - view->title = NULL; - g_clear_object (&view->spec); g_clear_object (&view->state); @@ -126,8 +108,6 @@ gal_view_etable_class_init (GalViewEtableClass *class) gal_view_class = GAL_VIEW_CLASS (class); gal_view_class->load = gal_view_etable_load; gal_view_class->save = gal_view_etable_save; - gal_view_class->get_title = gal_view_etable_get_title; - gal_view_class->set_title = gal_view_etable_set_title; gal_view_class->get_type_code = gal_view_etable_get_type_code; gal_view_class->clone = gal_view_etable_clone; } @@ -155,16 +135,15 @@ gal_view_etable_new (ETableSpecification *spec, g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (spec), NULL); - view = g_object_new (GAL_TYPE_VIEW_ETABLE, NULL); + view = g_object_new (GAL_TYPE_VIEW_ETABLE, "title", title, NULL); - return gal_view_etable_construct (view, spec, title); + return gal_view_etable_construct (view, spec); } /** * gal_view_etable_construct * @view: The view to construct. * @spec: The ETableSpecification that this view will be based upon. - * @title: The name of the new view. * * constructs the GalViewEtable. To be used by subclasses and * language bindings. @@ -173,8 +152,7 @@ gal_view_etable_new (ETableSpecification *spec, */ GalView * gal_view_etable_construct (GalViewEtable *view, - ETableSpecification *spec, - const gchar *title) + ETableSpecification *spec) { g_return_val_if_fail (GAL_IS_VIEW_ETABLE (view), NULL); g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (spec), NULL); @@ -184,8 +162,6 @@ gal_view_etable_construct (GalViewEtable *view, g_clear_object (&view->state); view->state = e_table_state_duplicate (spec->state); - view->title = g_strdup (title); - return GAL_VIEW (view); } -- cgit v1.2.3