From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 7 Oct 2012 01:42:32 +0000 (-0400)
Subject: s/E_DATA_CAL_VIEW_TYPE/E_TYPE_DATA_CAL_VIEW/
X-Git-Tag: upstream/3.7.4~367
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21c7ad31d5ce3a9486e1e836949f2c1a36f73fa2;p=platform%2Fupstream%2Fevolution-data-server.git

s/E_DATA_CAL_VIEW_TYPE/E_TYPE_DATA_CAL_VIEW/
---

diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c
index 6ba33d2..5c5a742 100644
--- a/calendar/libedata-cal/e-data-cal-view.c
+++ b/calendar/libedata-cal/e-data-cal-view.c
@@ -33,7 +33,7 @@
 
 #define E_DATA_CAL_VIEW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_DATA_CAL_VIEW_TYPE, EDataCalViewPrivate))
+	((obj), E_TYPE_DATA_CAL_VIEW, EDataCalViewPrivate))
 
 static void ensure_pending_flush_timeout (EDataCalView *view);
 
@@ -166,7 +166,7 @@ e_data_cal_view_new (ECalBackend *backend,
 {
 	EDataCalView *view;
 
-	view = g_object_new (E_DATA_CAL_VIEW_TYPE, "backend", backend, "sexp", sexp, NULL);
+	view = g_object_new (E_TYPE_DATA_CAL_VIEW, "backend", backend, "sexp", sexp, NULL);
 
 	return view;
 }
diff --git a/calendar/libedata-cal/e-data-cal-view.h b/calendar/libedata-cal/e-data-cal-view.h
index 414352f..945b891 100644
--- a/calendar/libedata-cal/e-data-cal-view.h
+++ b/calendar/libedata-cal/e-data-cal-view.h
@@ -28,23 +28,23 @@
 #include <libecal/libecal.h>
 
 /* Standard GObject macros */
-#define E_DATA_CAL_VIEW_TYPE \
+#define E_TYPE_DATA_CAL_VIEW \
 	(e_data_cal_view_get_type ())
 #define E_DATA_CAL_VIEW(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_DATA_CAL_VIEW_TYPE, EDataCalView))
+	((obj), E_TYPE_DATA_CAL_VIEW, EDataCalView))
 #define E_DATA_CAL_VIEW_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_CAST \
-	((klass), E_DATA_CAL_VIEW_TYPE, EDataCalViewClass))
+	((klass), E_TYPE_DATA_CAL_VIEW, EDataCalViewClass))
 #define E_IS_DATA_CAL_VIEW(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_DATA_CAL_VIEW_TYPE))
+	((obj), E_TYPE_DATA_CAL_VIEW))
 #define E_IS_DATA_CAL_VIEW_CLASS(cls) \
 	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_DATA_CAL_VIEW_TYPE))
+	((cls), E_TYPE_DATA_CAL_VIEW))
 #define E_DATA_CAL_VIEW_GET_CLASS(obj) \
 	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_DATA_CAL_VIEW_TYPE, EDataCalViewClass))
+	((obj), E_TYPE_DATA_CAL_VIEW, EDataCalViewClass))
 
 G_BEGIN_DECLS
 
diff --git a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
index 4367a03..56437d0 100644
--- a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
+++ b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
@@ -372,7 +372,7 @@ e_data_cal_view_notify_complete
 <SUBSECTION Standard>
 E_DATA_CAL_VIEW
 E_IS_DATA_CAL_VIEW
-E_DATA_CAL_VIEW_TYPE
+E_TYPE_DATA_CAL_VIEW
 E_DATA_CAL_VIEW_CLASS
 E_IS_DATA_CAL_VIEW_CLASS
 E_DATA_CAL_VIEW_GET_CLASS