1 files changed, 20 insertions, 32 deletions

diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
index ee61207855..d5804b18d9 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.c
@@ -29,39 +29,42 @@
 #include "gal-view-factory-minicard.h"
 #include "gal-view-minicard.h"
 
-G_DEFINE_TYPE (GalViewFactoryMinicard, gal_view_factory_minicard, GAL_VIEW_FACTORY_TYPE)
+G_DEFINE_TYPE (
+	GalViewFactoryMinicard,
+	gal_view_factory_minicard, GAL_TYPE_VIEW_FACTORY)
 
 static const gchar *
-gal_view_factory_minicard_get_title       (GalViewFactory *factory)
+gal_view_factory_minicard_get_title (GalViewFactory *factory)
 {
 	return _("Card View");
 }
 
-static GalView *
-gal_view_factory_minicard_new_view        (GalViewFactory *factory,
-					   const gchar     *name)
-{
-	return gal_view_minicard_new(name);
-}
-
 static const gchar *
 gal_view_factory_minicard_get_type_code (GalViewFactory *factory)
 {
 	return "minicard";
 }
 
+static GalView *
+gal_view_factory_minicard_new_view (GalViewFactory *factory,
+                                    const gchar *name)
+{
+	return gal_view_minicard_new (name);
+}
+
 static void
-gal_view_factory_minicard_class_init      (GalViewFactoryMinicardClass *minicard_class)
+gal_view_factory_minicard_class_init (GalViewFactoryMinicardClass *minicard_class)
 {
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(minicard_class);
+	GalViewFactoryClass *view_factory_class;
 
-	view_factory_class->get_title           = gal_view_factory_minicard_get_title;
-	view_factory_class->new_view            = gal_view_factory_minicard_new_view;
-	view_factory_class->get_type_code       = gal_view_factory_minicard_get_type_code;
+	view_factory_class = GAL_VIEW_FACTORY_CLASS (minicard_class);
+	view_factory_class->get_title = gal_view_factory_minicard_get_title;
+	view_factory_class->get_type_code = gal_view_factory_minicard_get_type_code;
+	view_factory_class->new_view = gal_view_factory_minicard_new_view;
 }
 
 static void
-gal_view_factory_minicard_init            (GalViewFactoryMinicard *factory)
+gal_view_factory_minicard_init (GalViewFactoryMinicard *factory)
 {
 }
 
@@ -74,23 +77,8 @@ gal_view_factory_minicard_init            (GalViewFactoryMinicard *factory)
  * Returns: The new GalViewFactoryMinicard.
  */
 GalViewFactory *
-gal_view_factory_minicard_new        (void)
-{
-	return gal_view_factory_minicard_construct (g_object_new (GAL_TYPE_VIEW_FACTORY_MINICARD, NULL));
-}
-
-/**
- * gal_view_minicard_construct
- * @factory: The factory to construct
- *
- * constructs the GalViewFactoryMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewFactoryMinicard.
- */
-GalViewFactory *
-gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory)
+gal_view_factory_minicard_new (void)
 {
-	return GAL_VIEW_FACTORY(factory);
+	return g_object_new (GAL_TYPE_VIEW_FACTORY_MINICARD, NULL);
 }