From de85e3c7862100da10fe860aef2b651245a1fdbf Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 1 Aug 2009 07:29:41 -0400
Subject: Replace more "config" classes with property bindings.

---
 calendar/gui/e-cal-model-calendar.h | 43 +++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 14 deletions(-)

(limited to 'calendar/gui/e-cal-model-calendar.h')

diff --git a/calendar/gui/e-cal-model-calendar.h b/calendar/gui/e-cal-model-calendar.h
index abe536399f..f1027032cb 100644
--- a/calendar/gui/e-cal-model-calendar.h
+++ b/calendar/gui/e-cal-model-calendar.h
@@ -28,14 +28,29 @@
 
 #include "e-cal-model.h"
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_CAL_MODEL_CALENDAR \
+	(e_cal_model_calendar_get_type ())
+#define E_CAL_MODEL_CALENDAR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendar))
+#define E_CAL_MODEL_CALENDAR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendarClass))
+#define E_IS_CAL_MODEL_CALENDAR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_MODEL_CALENDAR))
+#define E_IS_CAL_MODEL_CALENDAR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_MODEL_CALENDAR))
+#define E_CAL_MODEL_CALENDAR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendarClass))
 
-#define E_TYPE_CAL_MODEL_CALENDAR            (e_cal_model_calendar_get_type ())
-#define E_CAL_MODEL_CALENDAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendar))
-#define E_CAL_MODEL_CALENDAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendarClass))
-#define E_IS_CAL_MODEL_CALENDAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_MODEL_CALENDAR))
-#define E_IS_CAL_MODEL_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_MODEL_CALENDAR))
+G_BEGIN_DECLS
 
+typedef struct _ECalModelCalendar ECalModelCalendar;
+typedef struct _ECalModelCalendarClass ECalModelCalendarClass;
 typedef struct _ECalModelCalendarPrivate ECalModelCalendarPrivate;
 
 typedef enum {
@@ -47,18 +62,18 @@ typedef enum {
 	E_CAL_MODEL_CALENDAR_FIELD_LAST
 } ECalModelCalendarField;
 
-typedef struct {
-	ECalModel model;
+struct _ECalModelCalendar {
+	ECalModel parent;
 	ECalModelCalendarPrivate *priv;
-} ECalModelCalendar;
+};
 
-typedef struct {
+struct _ECalModelCalendarClass {
 	ECalModelClass parent_class;
-} ECalModelCalendarClass;
+};
 
-GType              e_cal_model_calendar_get_type (void);
-ECalModelCalendar *e_cal_model_calendar_new (void);
+GType		e_cal_model_calendar_get_type (void);
+ECalModel *	e_cal_model_calendar_new	(EShellSettings *shell_settings);
 
 G_END_DECLS
 
-#endif
+#endif /* E_CAL_MODEL_CALENDAR_H */
-- 
cgit