From 369daca6146c0e97db0308adb9c64c10ad1cb096 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
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.
---
 addressbook/gui/widgets/gal-view-minicard.c | 54 ++---------------------------
 addressbook/gui/widgets/gal-view-minicard.h |  3 --
 2 files changed, 2 insertions(+), 55 deletions(-)

(limited to 'addressbook')

diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index 61cd1444ac..9abf8124c4 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -59,11 +59,7 @@ view_minicard_finalize (GObject *object)
 {
 	GalViewMinicard *view = GAL_VIEW_MINICARD (object);
 
-	if (view->title != NULL) {
-		gal_view_minicard_detach (view);
-		g_free (view->title);
-		view->title = NULL;
-	}
+	gal_view_minicard_detach (view);
 
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (gal_view_minicard_parent_class)->finalize (object);
@@ -109,28 +105,6 @@ view_minicard_save (GalView *view,
 	xmlFreeDoc (doc);
 }
 
-static const gchar *
-view_minicard_get_title (GalView *view)
-{
-	GalViewMinicard *view_minicard;
-
-	view_minicard = GAL_VIEW_MINICARD (view);
-
-	return view_minicard->title;
-}
-
-static void
-view_minicard_set_title (GalView *view,
-                         const gchar *title)
-{
-	GalViewMinicard *view_minicard;
-
-	view_minicard = GAL_VIEW_MINICARD (view);
-
-	g_free (view_minicard->title);
-	view_minicard->title = g_strdup (title);
-}
-
 static const gchar *
 view_minicard_get_type_code (GalView *view)
 {
@@ -148,7 +122,6 @@ view_minicard_clone (GalView *view)
 
 	view_minicard = GAL_VIEW_MINICARD (view);
 	GAL_VIEW_MINICARD (clone)->column_width = view_minicard->column_width;
-	GAL_VIEW_MINICARD (clone)->title = g_strdup (view_minicard->title);
 
 	return clone;
 }
@@ -165,8 +138,6 @@ gal_view_minicard_class_init (GalViewMinicardClass *class)
 	gal_view_class = GAL_VIEW_CLASS (class);
 	gal_view_class->load = view_minicard_load;
 	gal_view_class->save = view_minicard_save;
-	gal_view_class->get_title = view_minicard_get_title;
-	gal_view_class->set_title = view_minicard_set_title;
 	gal_view_class->get_type_code = view_minicard_get_type_code;
 	gal_view_class->clone = view_minicard_clone;
 
@@ -175,7 +146,6 @@ gal_view_minicard_class_init (GalViewMinicardClass *class)
 static void
 gal_view_minicard_init (GalViewMinicard *gvm)
 {
-	gvm->title = NULL;
 	gvm->column_width = 225.0;
 
 	gvm->emvw = NULL;
@@ -194,27 +164,7 @@ gal_view_minicard_init (GalViewMinicard *gvm)
 GalView *
 gal_view_minicard_new (const gchar *title)
 {
-	return gal_view_minicard_construct (
-		g_object_new (GAL_TYPE_VIEW_MINICARD, NULL), title);
-}
-
-/**
- * gal_view_minicard_construct
- * @view: The view to construct.
- * @title: The name of the new view.
- *
- * Constructs the GalViewMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewMinicard.
- */
-GalView *
-gal_view_minicard_construct (GalViewMinicard *view,
-                             const gchar *title)
-{
-	view->title = g_strdup (title);
-
-	return GAL_VIEW (view);
+	return g_object_new (GAL_TYPE_VIEW_MINICARD, "title", title, NULL);
 }
 
 void
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
index 04e67113de..4cec9568ca 100644
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ b/addressbook/gui/widgets/gal-view-minicard.h
@@ -56,7 +56,6 @@ typedef struct _GalViewMinicardClass GalViewMinicardClass;
 struct _GalViewMinicard {
 	GalView              parent;
 
-	gchar                *title;
 	gdouble               column_width;
 
 	EMinicardViewWidget *emvw;
@@ -69,8 +68,6 @@ struct _GalViewMinicardClass {
 
 GType		gal_view_minicard_get_type	(void);
 GalView *	gal_view_minicard_new		(const gchar *title);
-GalView *	gal_view_minicard_construct	(GalViewMinicard *view,
-						 const gchar *title);
 void		gal_view_minicard_attach	(GalViewMinicard *view,
 						 EAddressbookView *address_view);
 void		gal_view_minicard_detach	(GalViewMinicard *view);
-- 
cgit v1.2.3