[evolution-ews] replace guint32 with EServerMethodContext in e_data_cal apis for < 3.2 versions

[Chenthill Palanisamy <pchen src gnome org>]

commit b6bfd5bf9827a6c92cb13fb047e35bc116e2488c
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Wed Sep 28 17:08:17 2011 +0530

    replace guint32 with EServerMethodContext in e_data_cal apis for < 3.2 versions

 src/calendar/e-cal-backend-ews.c   |    4 ----
 src/calendar/libedata-cal-compat.h |   32 ++++++++++++++++++--------------
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 116b4aa..a373f67 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -68,10 +68,6 @@
 
 G_DEFINE_TYPE (ECalBackendEws, e_cal_backend_ews, E_TYPE_CAL_BACKEND)
 
-#if EDS_CHECK_VERSION (3,1,0)
-#define EServerMethodContext guint32
-#endif
-
 /* Private part of the CalBackendEws structure */
 struct _ECalBackendEwsPrivate {
 	/* Fields required for online server requests */
diff --git a/src/calendar/libedata-cal-compat.h b/src/calendar/libedata-cal-compat.h
index b368288..07b7ee5 100644
--- a/src/calendar/libedata-cal-compat.h
+++ b/src/calendar/libedata-cal-compat.h
@@ -22,25 +22,29 @@
 #include <libedata-cal/e-data-cal-view.h>
 #include <libedataserver/eds-version.h>
 
-void	e_data_cal_respond_add_timezone_compat			(EDataCal *cal, guint32 opid, const gchar *tzid, GError *error);
+#if EDS_CHECK_VERSION (3,1,0)
+#define EServerMethodContext guint32
+#endif
+
+void	e_data_cal_respond_add_timezone_compat			(EDataCal *cal, EServerMethodContext opid, const gchar *tzid, GError *error);
 void    e_data_cal_view_notify_objects_added_compat 		(EDataCalView *view, const GSList *objects);
 
 #if ! EDS_CHECK_VERSION (3,1,0)
 
-void		e_data_cal_respond_open				(EDataCal *cal, guint32 opid, GError *error);
-void		e_data_cal_respond_remove			(EDataCal *cal, guint32 opid, GError *error);
-void		e_data_cal_respond_refresh			(EDataCal *cal, guint32 opid, GError *error);
-void		e_data_cal_respond_get_object			(EDataCal *cal, guint32 opid, GError *error, const gchar *object);
-void		e_data_cal_respond_get_object_list		(EDataCal *cal, guint32 opid, GError *error, const GSList *objects);
-void		e_data_cal_respond_create_object		(EDataCal *cal, guint32 opid, GError *error, const gchar *uid, const gchar *object);
-void		e_data_cal_respond_modify_object		(EDataCal *cal, guint32 opid, GError *error, const gchar *old_object, const gchar *object);
-void		e_data_cal_respond_remove_object		(EDataCal *cal, guint32 opid, GError *error, const ECalComponentId *id, const gchar *old_object, const gchar *object);
-void		e_data_cal_respond_receive_objects		(EDataCal *cal, guint32 opid, GError *error);
-void		e_data_cal_respond_send_objects			(EDataCal *cal, guint32 opid, GError *error, const GSList *users, const gchar *calobj);
-void		e_data_cal_respond_discard_alarm		(EDataCal *cal, guint32 opid, GError *error);
-void		e_data_cal_respond_get_timezone			(EDataCal *cal, guint32 opid, GError *error, const gchar *tzobject);
+void		e_data_cal_respond_open				(EDataCal *cal, EServerMethodContext opid, GError *error);
+void		e_data_cal_respond_remove			(EDataCal *cal, EServerMethodContext opid, GError *error);
+void		e_data_cal_respond_refresh			(EDataCal *cal, EServerMethodContext opid, GError *error);
+void		e_data_cal_respond_get_object			(EDataCal *cal, EServerMethodContext opid, GError *error, const gchar *object);
+void		e_data_cal_respond_get_object_list		(EDataCal *cal, EServerMethodContext opid, GError *error, const GSList *objects);
+void		e_data_cal_respond_create_object		(EDataCal *cal, EServerMethodContext opid, GError *error, const gchar *uid, const gchar *object);
+void		e_data_cal_respond_modify_object		(EDataCal *cal, EServerMethodContext opid, GError *error, const gchar *old_object, const gchar *object);
+void		e_data_cal_respond_remove_object		(EDataCal *cal, EServerMethodContext opid, GError *error, const ECalComponentId *id, const gchar *old_object, const gchar *object);
+void		e_data_cal_respond_receive_objects		(EDataCal *cal, EServerMethodContext opid, GError *error);
+void		e_data_cal_respond_send_objects			(EDataCal *cal, EServerMethodContext opid, GError *error, const GSList *users, const gchar *calobj);
+void		e_data_cal_respond_discard_alarm		(EDataCal *cal, EServerMethodContext opid, GError *error);
+void		e_data_cal_respond_get_timezone			(EDataCal *cal, EServerMethodContext opid, GError *error, const gchar *tzobject);
 
-void		e_data_cal_respond_get_free_busy		(EDataCal *cal, guint32 opid, GError *error);
+void		e_data_cal_respond_get_free_busy		(EDataCal *cal, EServerMethodContext opid, GError *error);
 void		e_data_cal_report_free_busy_data		(EDataCal *cal, const GSList *freebusy);
 void            e_data_cal_view_notify_complete                 (EDataCalView *view, const GError *error);