[evolution-data-server] Remove deprecated ECalBackend::set_default_timezone

[Milan Crha <mcrha src gnome org>]

commit 10f57ce884d5b59b4cb088746858c7afdab3cbd0
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jul 16 09:34:47 2010 +0200

    Remove deprecated ECalBackend::set_default_timezone
    
    It's deprecated since 2006-07-10

 calendar/libedata-cal/e-cal-backend-sync.c |   52 +--------------------------
 calendar/libedata-cal/e-cal-backend-sync.h |    5 ---
 calendar/libedata-cal/e-cal-backend.c      |   25 -------------
 calendar/libedata-cal/e-cal-backend.h      |    2 -
 configure.ac                               |    2 +-
 5 files changed, 3 insertions(+), 83 deletions(-)
---
diff --git a/calendar/libedata-cal/e-cal-backend-sync.c b/calendar/libedata-cal/e-cal-backend-sync.c
index ccf7a99..a3b81fc 100644
--- a/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/calendar/libedata-cal/e-cal-backend-sync.c
@@ -475,51 +475,14 @@ e_cal_backend_sync_add_timezone (ECalBackendSync *backend, EDataCal *cal, const
  * @tz: Timezone object as string.
  * @error: Out parameter for a #GError.
  *
- * Calls the set_default_timezone method on the given backend.
+ * Calls the set_default_zone method on the given backend.
  */
 void
 e_cal_backend_sync_set_default_zone (ECalBackendSync *backend, EDataCal *cal, const gchar *tz, GError **error)
 {
 	e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_SYNC (backend), InvalidArg);
 
-	/* Old backends might be using the set_default_timezone */
-	if (!E_CAL_BACKEND_SYNC_GET_CLASS (backend)->set_default_zone_sync) {
-		icalcomponent *icalcomp = icalparser_parse_string (tz);
-		const gchar *tzid = NULL;
-		icaltimezone *zone = icaltimezone_new ();
-
-		if (icalcomp) {
-			icaltimezone_set_component (zone, icalcomp);
-			tzid = icaltimezone_get_tzid (zone);
-		}
-
-		LOCK_WRAPPER (set_default_timezone_sync, (backend, cal, tzid, error));
-
-		icaltimezone_free (zone, 1);
-	} else {
-		LOCK_WRAPPER (set_default_zone_sync, (backend, cal, tz, error));
-	}
-}
-
-/**
- * @deprecated This virual function should not be used in the backends, use
- * e_cal_backend_sync_set_zone instead. This function restricts the default timezone
- * to be libical builtin timezone.
- *
- * e_cal_backend_sync_set_default_timezone:
- * @backend: An ECalBackendSync object.
- * @cal: An EDataCal object.
- * @tzid: ID of the timezone to be set as default.
- * @error: Out parameter for a #GError.
- *
- * Calls the set_default_timezone method on the given backend.
- */
-void
-e_cal_backend_sync_set_default_timezone (ECalBackendSync *backend, EDataCal *cal, const gchar *tzid, GError **error)
-{
-	e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_SYNC (backend), InvalidArg);
-
-	LOCK_WRAPPER (set_default_timezone_sync, (backend, cal, tzid, error));
+	LOCK_WRAPPER (set_default_zone_sync, (backend, cal, tz, error));
 }
 
 /**
@@ -933,16 +896,6 @@ _e_cal_backend_set_default_zone (ECalBackend *backend, EDataCal *cal, EServerMet
 }
 
 static void
-_e_cal_backend_set_default_timezone (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *tzid)
-{
-	GError *error = NULL;
-
-	e_cal_backend_sync_set_default_timezone (E_CAL_BACKEND_SYNC (backend), cal, tzid, &error);
-
-	e_data_cal_notify_default_timezone_set (cal, context, error);
-}
-
-static void
 _e_cal_backend_get_changes (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *change_id)
 {
 	GError *error = NULL;
@@ -1039,7 +992,6 @@ e_cal_backend_sync_class_init (ECalBackendSyncClass *klass)
 	backend_class->get_attachment_list = _e_cal_backend_get_attachment_list;
 	backend_class->get_timezone = _e_cal_backend_get_timezone;
 	backend_class->add_timezone = _e_cal_backend_add_timezone;
-	backend_class->set_default_timezone = _e_cal_backend_set_default_timezone;
 	backend_class->set_default_zone = _e_cal_backend_set_default_zone;
 	backend_class->get_changes = _e_cal_backend_get_changes;
 	backend_class->get_free_busy = _e_cal_backend_get_free_busy;
diff --git a/calendar/libedata-cal/e-cal-backend-sync.h b/calendar/libedata-cal/e-cal-backend-sync.h
index 416324f..5080582 100644
--- a/calendar/libedata-cal/e-cal-backend-sync.h
+++ b/calendar/libedata-cal/e-cal-backend-sync.h
@@ -58,7 +58,6 @@ struct _ECalBackendSyncClass {
 
 	void (*get_timezone_sync) (ECalBackendSync *backend, EDataCal *cal, const gchar *tzid, gchar **object, GError **perror);
 	void (*add_timezone_sync) (ECalBackendSync *backend, EDataCal *cal, const gchar *tzobj, GError **perror);
-	void (*set_default_timezone_sync) (ECalBackendSync *backend, EDataCal *cal, const gchar *tzid, GError **perror);
 	void (*set_default_zone_sync) (ECalBackendSync *backend, EDataCal *cal, const gchar *tz, GError **perror);
 
 	void (*get_changes_sync) (ECalBackendSync *backend, EDataCal *cal, const gchar *change_id, GList **adds, GList **modifies, GList **deletes, GError **perror);
@@ -183,10 +182,6 @@ void	e_cal_backend_sync_add_timezone		(ECalBackendSync *backend,
 						 EDataCal *cal,
 						 const gchar *tzobj,
 						 GError **error);
-void	e_cal_backend_sync_set_default_timezone	(ECalBackendSync *backend,
-						 EDataCal *cal,
-						 const gchar *tzid,
-						 GError **error);
 void	e_cal_backend_sync_set_default_zone	(ECalBackendSync *backend,
 						 EDataCal *cal,
 						 const gchar *tzobj,
diff --git a/calendar/libedata-cal/e-cal-backend.c b/calendar/libedata-cal/e-cal-backend.c
index 419c953..43aa3af 100644
--- a/calendar/libedata-cal/e-cal-backend.c
+++ b/calendar/libedata-cal/e-cal-backend.c
@@ -250,7 +250,6 @@ e_cal_backend_class_init (ECalBackendClass *class)
 	class->send_objects = NULL;
 	class->get_timezone = NULL;
 	class->add_timezone = NULL;
-	class->set_default_timezone = NULL;
 
 	g_type_class_add_private (class, sizeof (ECalBackendPrivate));
 }
@@ -1039,30 +1038,6 @@ e_cal_backend_set_default_zone (ECalBackend *backend, EDataCal *cal, EServerMeth
 }
 
 /**
- * @deprecated This virual function should not be used in the backends, use
- * e_cal_backend_set_zone instead. This function restricts the default timezone
- * to be libical builtin timezone.
- *
- * e_cal_backend_set_default_timezone:
- * @backend: A calendar backend.
- * @cal: An #EDataCal object.
- * @tzid: The TZID identifying the timezone.
- *
- * Sets the default timezone for the calendar, which is used to resolve
- * DATE and floating DATE-TIME values.
- *
- */
-void
-e_cal_backend_set_default_timezone (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *tzid)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (E_IS_CAL_BACKEND (backend));
-	g_return_if_fail (tzid != NULL);
-
-	(* CLASS (backend)->set_default_timezone) (backend, cal, context, tzid);
-}
-
-/**
  * e_cal_backend_add_timezone
  * @backend: A calendar backend.
  * @cal: An #EDataCal object.
diff --git a/calendar/libedata-cal/e-cal-backend.h b/calendar/libedata-cal/e-cal-backend.h
index 95abfa3..8e5e87f 100644
--- a/calendar/libedata-cal/e-cal-backend.h
+++ b/calendar/libedata-cal/e-cal-backend.h
@@ -93,7 +93,6 @@ struct _ECalBackendClass {
 	void (* get_timezone) (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *tzid);
 	void (* add_timezone) (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *object);
 	void (* set_default_zone) (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *tzobj);
-	void (* set_default_timezone) (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *tzid);
 
 	void (* start_query) (ECalBackend *backend, EDataCalView *query);
 
@@ -155,7 +154,6 @@ void e_cal_backend_set_mode (ECalBackend *backend, CalMode mode);
 
 void e_cal_backend_get_timezone (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *tzid);
 void e_cal_backend_add_timezone (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *object);
-void e_cal_backend_set_default_timezone (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *tzid);
 void e_cal_backend_set_default_zone (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *tzobj);
 
 void e_cal_backend_get_changes (ECalBackend *backend, EDataCal *cal, EServerMethodContext context, const gchar *change_id);
diff --git a/configure.ac b/configure.ac
index f5ef844..e979259 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ LIBECAL_CURRENT=10
 LIBECAL_REVISION=2
 LIBECAL_AGE=2
 
-LIBEDATACAL_CURRENT=8
+LIBEDATACAL_CURRENT=9
 LIBEDATACAL_REVISION=0
 LIBEDATACAL_AGE=0