1 files changed, 61 insertions, 30 deletions
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
index 31a28c56d9..4cec9568ca 100644
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ b/addressbook/gui/widgets/gal-view-minicard.h
@@ -1,46 +1,77 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * gal-view-minicard.h: An Minicard View
  *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
  * Authors:
- *   Chris Lahey <clahey@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * (C) 2000, 2001 Ximian, Inc.
  */
-#ifndef _GAL_VIEW_MINICARD_H_
-#define _GAL_VIEW_MINICARD_H_
 
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
+#ifndef GAL_VIEW_MINICARD_H
+#define GAL_VIEW_MINICARD_H
+
+#include <e-util/e-util.h>
 #include <e-minicard-view-widget.h>
+#include "e-addressbook-view.h"
 
-#define GAL_VIEW_MINICARD_TYPE        (gal_view_minicard_get_type ())
-#define GAL_VIEW_MINICARD(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_MINICARD_TYPE, GalViewMinicard))
-#define GAL_VIEW_MINICARD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_MINICARD_TYPE, GalViewMinicardClass))
-#define GAL_IS_VIEW_MINICARD(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_MINICARD_TYPE))
-#define GAL_IS_VIEW_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_MINICARD_TYPE))
+/* Standard GObject macros */
+#define GAL_TYPE_VIEW_MINICARD \
+	(gal_view_minicard_get_type ())
+#define GAL_VIEW_MINICARD(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), GAL_TYPE_VIEW_MINICARD, GalViewMinicard))
+#define GAL_VIEW_MINICARD_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), GAL_TYPE_VIEW_MINICARD, GalViewMinicardClass))
+#define GAL_IS_VIEW_MINICARD(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), GAL_TYPE_VIEW_MINICARD))
+#define GAL_IS_VIEW_MINICARD_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), GAL_TYPE_VIEW_MINICARD))
+#define GAL_VIEW_MINICARD_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), GAL_TYPE_VIEW_MINICARD, GalViewMinicardClass))
 
-typedef struct {
-	GalView              base;
+G_BEGIN_DECLS
 
-	char                *title;
-	double               column_width;
+typedef struct _GalViewMinicard GalViewMinicard;
+typedef struct _GalViewMinicardClass GalViewMinicardClass;
+
+struct _GalViewMinicard {
+	GalView              parent;
+
+	gdouble               column_width;
 
 	EMinicardViewWidget *emvw;
 	guint                emvw_column_width_changed_id;
-} GalViewMinicard;
+};
 
-typedef struct {
+struct _GalViewMinicardClass {
 	GalViewClass parent_class;
-} GalViewMinicardClass;
-
-/* Standard functions */
-GtkType  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,
-				       EMinicardViewWidget *emvw);
-void     gal_view_minicard_detach     (GalViewMinicard     *view);
-
-#endif /* _GAL_VIEW_MINICARD_H_ */
+};
+
+GType		gal_view_minicard_get_type	(void);
+GalView *	gal_view_minicard_new		(const gchar *title);
+void		gal_view_minicard_attach	(GalViewMinicard *view,
+						 EAddressbookView *address_view);
+void		gal_view_minicard_detach	(GalViewMinicard *view);
+
+G_END_DECLS
+
+#endif /* GAL_VIEW_MINICARD_H */