From 891ee751d33057307925eccb3029bb5bd7fe3c01 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Tue, 30 Mar 2021 16:56:54 +0200 Subject: remove deprecated calendar service apis --- docs/reference/gdata-sections.txt.in | 12 -- gdata/gdata-core.symbols | 12 -- gdata/services/calendar/gdata-calendar-calendar.c | 83 --------- gdata/services/calendar/gdata-calendar-calendar.h | 5 - gdata/services/calendar/gdata-calendar-feed.c | 110 ------------ gdata/services/calendar/gdata-calendar-feed.h | 5 - gdata/services/calendar/gdata-calendar-query.c | 203 +--------------------- gdata/services/calendar/gdata-calendar-query.h | 10 -- gdata/services/calendar/gdata-calendar-service.c | 75 -------- gdata/services/calendar/gdata-calendar-service.h | 15 -- gdata/symbol.map | 12 -- gdata/tests/calendar.c | 24 --- 12 files changed, 1 insertion(+), 565 deletions(-) diff --git a/docs/reference/gdata-sections.txt.in b/docs/reference/gdata-sections.txt.in index 42139e44..6045ba19 100644 --- a/docs/reference/gdata-sections.txt.in +++ b/docs/reference/gdata-sections.txt.in @@ -469,8 +469,6 @@ gdata_calendar_service_query_own_calendars gdata_calendar_service_query_own_calendars_async gdata_calendar_service_query_events gdata_calendar_service_query_events_async -gdata_calendar_service_insert_event -gdata_calendar_service_insert_event_async gdata_calendar_service_insert_calendar_event gdata_calendar_service_insert_calendar_event_async @@ -498,16 +496,10 @@ gdata_calendar_query_get_single_events gdata_calendar_query_set_single_events gdata_calendar_query_get_order_by gdata_calendar_query_set_order_by -gdata_calendar_query_get_sort_order -gdata_calendar_query_set_sort_order gdata_calendar_query_get_start_min gdata_calendar_query_set_start_min gdata_calendar_query_get_start_max gdata_calendar_query_set_start_max -gdata_calendar_query_get_recurrence_expansion_start -gdata_calendar_query_set_recurrence_expansion_start -gdata_calendar_query_get_recurrence_expansion_end -gdata_calendar_query_set_recurrence_expansion_end gdata_calendar_query_get_timezone gdata_calendar_query_set_timezone gdata_calendar_query_get_max_attendees @@ -540,8 +532,6 @@ gdata_calendar_calendar_is_selected gdata_calendar_calendar_set_is_selected gdata_calendar_calendar_get_timezone gdata_calendar_calendar_set_timezone -gdata_calendar_calendar_get_edited -gdata_calendar_calendar_get_times_cleaned gdata_calendar_calendar_get_access_level gdata_calendar_calendar_get_type @@ -729,8 +719,6 @@ GDataParsablePrivate GDataCalendarFeed GDataCalendarFeed GDataCalendarFeedClass -gdata_calendar_feed_get_timezone -gdata_calendar_feed_get_times_cleaned gdata_calendar_feed_get_type GDATA_CALENDAR_FEED diff --git a/gdata/gdata-core.symbols b/gdata/gdata-core.symbols index 606df7c3..bd3d91dd 100644 --- a/gdata/gdata-core.symbols +++ b/gdata/gdata-core.symbols @@ -170,7 +170,6 @@ gdata_calendar_calendar_get_type gdata_calendar_calendar_new gdata_calendar_calendar_get_timezone gdata_calendar_calendar_set_timezone -gdata_calendar_calendar_get_times_cleaned gdata_calendar_calendar_is_hidden gdata_calendar_calendar_set_is_hidden gdata_calendar_calendar_get_color @@ -178,7 +177,6 @@ gdata_calendar_calendar_set_color gdata_calendar_calendar_is_selected gdata_calendar_calendar_set_is_selected gdata_calendar_calendar_get_access_level -gdata_calendar_calendar_get_edited gdata_calendar_event_get_type gdata_calendar_event_new gdata_calendar_event_get_edited @@ -218,14 +216,8 @@ gdata_calendar_query_get_future_events gdata_calendar_query_set_future_events gdata_calendar_query_get_order_by gdata_calendar_query_set_order_by -gdata_calendar_query_get_recurrence_expansion_start -gdata_calendar_query_set_recurrence_expansion_start -gdata_calendar_query_get_recurrence_expansion_end -gdata_calendar_query_set_recurrence_expansion_end gdata_calendar_query_get_single_events gdata_calendar_query_set_single_events -gdata_calendar_query_get_sort_order -gdata_calendar_query_set_sort_order gdata_calendar_query_get_start_min gdata_calendar_query_set_start_min gdata_calendar_query_get_start_max @@ -239,7 +231,6 @@ gdata_calendar_service_query_all_calendars_async gdata_calendar_service_query_own_calendars gdata_calendar_service_query_own_calendars_async gdata_calendar_service_query_events -gdata_calendar_service_insert_event gdata_calendar_service_insert_calendar_event gdata_operation_type_get_type gdata_service_error_get_type @@ -318,8 +309,6 @@ gdata_parsable_get_xml gdata_parsable_new_from_json gdata_parsable_get_json gdata_calendar_feed_get_type -gdata_calendar_feed_get_timezone -gdata_calendar_feed_get_times_cleaned gdata_category_get_type gdata_category_new gdata_category_get_term @@ -875,7 +864,6 @@ gdata_picasaweb_service_finish_file_upload gdata_youtube_service_upload_video gdata_youtube_service_finish_video_upload gdata_calendar_service_query_events_async -gdata_calendar_service_insert_event_async gdata_calendar_service_insert_calendar_event_async gdata_contacts_contact_get_photo_async gdata_contacts_contact_get_photo_finish diff --git a/gdata/services/calendar/gdata-calendar-calendar.c b/gdata/services/calendar/gdata-calendar-calendar.c index 1fefb5ce..c667e266 100644 --- a/gdata/services/calendar/gdata-calendar-calendar.c +++ b/gdata/services/calendar/gdata-calendar-calendar.c @@ -106,12 +106,10 @@ struct _GDataCalendarCalendarPrivate { enum { PROP_TIMEZONE = 1, - PROP_TIMES_CLEANED, PROP_IS_HIDDEN, PROP_COLOR, PROP_IS_SELECTED, PROP_ACCESS_LEVEL, - PROP_EDITED, PROP_ETAG, }; @@ -148,23 +146,6 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * GDataCalendarCalendar:times-cleaned: - * - * The number of times the calendar has been cleared of events. - * - * Deprecated: 0.17.2: Unsupported by the online API any more. There - * is no replacement; this will always return - * 0. - */ - g_object_class_install_property (gobject_class, PROP_TIMES_CLEANED, - g_param_spec_uint ("times-cleaned", - "Times cleaned", "The number of times the calendar has been cleared of events.", - 0, G_MAXUINT, 0, - G_PARAM_DEPRECATED | - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); - /** * GDataCalendarCalendar:is-hidden: * @@ -217,25 +198,6 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass) NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /** - * GDataCalendarCalendar:edited: - * - * The last time the calendar was edited. If the calendar has not been edited yet, the content indicates the time it was created. - * - * For more information, see the - * Atom Publishing Protocol specification. - * - * Deprecated: 0.17.2: Unsupported by the online API any more. There - * is no replacement; this will always return -1. - */ - g_object_class_install_property (gobject_class, PROP_EDITED, - g_param_spec_int64 ("edited", - "Edited", "The last time the calendar was edited.", - -1, G_MAXINT64, -1, - G_PARAM_DEPRECATED | - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); - /* Override the ETag property since ETags don't seem to be supported for calendars. */ g_object_class_override_property (gobject_class, PROP_ETAG, "etag"); } @@ -361,11 +323,6 @@ gdata_calendar_calendar_get_property (GObject *object, guint property_id, GValue case PROP_TIMEZONE: g_value_set_string (value, priv->timezone); break; - case PROP_TIMES_CLEANED: - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - g_value_set_uint (value, gdata_calendar_calendar_get_times_cleaned (self)); - G_GNUC_END_IGNORE_DEPRECATIONS - break; case PROP_IS_HIDDEN: g_value_set_boolean (value, priv->is_hidden); break; @@ -378,12 +335,6 @@ gdata_calendar_calendar_get_property (GObject *object, guint property_id, GValue case PROP_ACCESS_LEVEL: g_value_set_string (value, priv->access_level); break; - case PROP_EDITED: - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - g_value_set_int64 (value, - gdata_calendar_calendar_get_edited (self)); - G_GNUC_END_IGNORE_DEPRECATIONS - break; case PROP_ETAG: /* Never return an ETag */ g_value_set_string (value, NULL); @@ -655,23 +606,6 @@ gdata_calendar_calendar_set_timezone (GDataCalendarCalendar *self, const gchar * g_object_notify (G_OBJECT (self), "timezone"); } -/** - * gdata_calendar_calendar_get_times_cleaned: - * @self: a #GDataCalendarCalendar - * - * Gets the #GDataCalendarCalendar:times-cleaned property. - * - * Return value: the number of times the calendar has been totally emptied - * Deprecated: 0.17.2: Unsupported by the online API any more. There is no - * replacement; this will always return 0. - */ -guint -gdata_calendar_calendar_get_times_cleaned (GDataCalendarCalendar *self) -{ - g_return_val_if_fail (GDATA_IS_CALENDAR_CALENDAR (self), 0); - return 0; -} - /** * gdata_calendar_calendar_is_hidden: * @self: a #GDataCalendarCalendar @@ -785,20 +719,3 @@ gdata_calendar_calendar_get_access_level (GDataCalendarCalendar *self) g_return_val_if_fail (GDATA_IS_CALENDAR_CALENDAR (self), NULL); return self->priv->access_level; } - -/** - * gdata_calendar_calendar_get_edited: - * @self: a #GDataCalendarCalendar - * - * Gets the #GDataCalendarCalendar:edited property. If the property is unset, -1 will be returned. - * - * Return value: the UNIX timestamp for the time the calendar was last edited, or -1 - * Deprecated: 0.17.2: Unsupported by the online API any more. There is no - * replacement; this will always return -1. - */ -gint64 -gdata_calendar_calendar_get_edited (GDataCalendarCalendar *self) -{ - g_return_val_if_fail (GDATA_IS_CALENDAR_CALENDAR (self), -1); - return -1; -} diff --git a/gdata/services/calendar/gdata-calendar-calendar.h b/gdata/services/calendar/gdata-calendar-calendar.h index ecb61d48..d802e81e 100644 --- a/gdata/services/calendar/gdata-calendar-calendar.h +++ b/gdata/services/calendar/gdata-calendar-calendar.h @@ -76,11 +76,6 @@ gboolean gdata_calendar_calendar_is_selected (GDataCalendarCalendar *self) G_GNU void gdata_calendar_calendar_set_is_selected (GDataCalendarCalendar *self, gboolean is_selected); const gchar *gdata_calendar_calendar_get_access_level (GDataCalendarCalendar *self) G_GNUC_PURE; -#ifndef LIBGDATA_DISABLE_DEPRECATED -guint gdata_calendar_calendar_get_times_cleaned (GDataCalendarCalendar *self) G_GNUC_PURE G_GNUC_DEPRECATED; -gint64 gdata_calendar_calendar_get_edited (GDataCalendarCalendar *self) G_GNUC_DEPRECATED; -#endif /* !LIBGDATA_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* !GDATA_CALENDAR_CALENDAR_H */ diff --git a/gdata/services/calendar/gdata-calendar-feed.c b/gdata/services/calendar/gdata-calendar-feed.c index 1a8ece3a..5eea1eec 100644 --- a/gdata/services/calendar/gdata-calendar-feed.c +++ b/gdata/services/calendar/gdata-calendar-feed.c @@ -34,56 +34,11 @@ #include "gdata-feed.h" #include "gdata-private.h" -static void gdata_calendar_feed_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); - -enum { - PROP_TIMEZONE = 1, - PROP_TIMES_CLEANED -}; - G_DEFINE_TYPE (GDataCalendarFeed, gdata_calendar_feed, GDATA_TYPE_FEED) static void gdata_calendar_feed_class_init (GDataCalendarFeedClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->get_property = gdata_calendar_feed_get_property; - - /** - * GDataCalendarFeed:timezone: - * - * The timezone in which the feed's times are given. This is a timezone name in tz database notation: reference. - * - * Since: 0.3.0 - * Deprecated: 0.17.2: Unsupported by the online API any more. There - * is no replacement; this will always return %NULL. - */ - g_object_class_install_property (gobject_class, PROP_TIMEZONE, - g_param_spec_string ("timezone", - "Timezone", "The timezone in which the feed's times are given.", - NULL, - G_PARAM_DEPRECATED | - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); - - /** - * GDataCalendarFeed:times-cleaned: - * - * The number of times the feed has been completely cleared of entries. - * - * Since: 0.3.0 - * Deprecated: 0.17.2: Unsupported by the online API any more. There - * is no replacement; this will always return 0. - */ - g_object_class_install_property (gobject_class, PROP_TIMES_CLEANED, - g_param_spec_uint ("times-cleaned", - "Times cleaned", "The number of times the feed has been completely cleared of entries.", - 0, G_MAXUINT, 0, - G_PARAM_DEPRECATED | - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); } static void @@ -91,68 +46,3 @@ gdata_calendar_feed_init (GDataCalendarFeed *self) { /* Nothing to see here. */ } - -static void -gdata_calendar_feed_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) -{ - GDataCalendarFeed *self = GDATA_CALENDAR_FEED (object); - - switch (property_id) { - case PROP_TIMEZONE: - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - g_value_set_string (value, - gdata_calendar_feed_get_timezone (self)); - G_GNUC_END_IGNORE_DEPRECATIONS - break; - case PROP_TIMES_CLEANED: - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - g_value_set_uint (value, - gdata_calendar_feed_get_times_cleaned (self)); - G_GNUC_END_IGNORE_DEPRECATIONS - break; - default: - /* We don't have any other property... */ - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -/** - * gdata_calendar_feed_get_timezone: - * @self: a #GDataCalendarFeed - * - * Gets the #GDataCalendarFeed:timezone property. - * - * Return value: the feed's timezone, or %NULL - * - * Since: 0.3.0 - * Deprecated: 0.17.2: Unsupported by the online API any more. There is no - * replacement; this will always return %NULL. - */ -const gchar * -gdata_calendar_feed_get_timezone (GDataCalendarFeed *self) -{ - /* Not supported any more by version 3 of the API. */ - g_return_val_if_fail (GDATA_IS_CALENDAR_FEED (self), NULL); - return NULL; -} - -/** - * gdata_calendar_feed_get_times_cleaned: - * @self: a #GDataCalendarFeed - * - * Gets the #GDataCalendarFeed:times-cleaned property. - * - * Return value: the number of times the feed has been totally emptied - * - * Since: 0.3.0 - * Deprecated: 0.17.2: Unsupported by the online API any more. There is no - * replacement; this will always return %NULL. - */ -guint -gdata_calendar_feed_get_times_cleaned (GDataCalendarFeed *self) -{ - /* Not supported any more by version 3 of the API. */ - g_return_val_if_fail (GDATA_IS_CALENDAR_FEED (self), 0); - return 0; -} diff --git a/gdata/services/calendar/gdata-calendar-feed.h b/gdata/services/calendar/gdata-calendar-feed.h index 43b64522..1eee2de2 100644 --- a/gdata/services/calendar/gdata-calendar-feed.h +++ b/gdata/services/calendar/gdata-calendar-feed.h @@ -68,11 +68,6 @@ typedef struct { GType gdata_calendar_feed_get_type (void); -#ifndef LIBGDATA_DISABLE_DEPRECATED -const gchar *gdata_calendar_feed_get_timezone (GDataCalendarFeed *self) G_GNUC_PURE G_GNUC_DEPRECATED; -guint gdata_calendar_feed_get_times_cleaned (GDataCalendarFeed *self) G_GNUC_PURE G_GNUC_DEPRECATED; -#endif /* !LIBGDATA_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* !GDATA_CALENDAR_FEED_H */ diff --git a/gdata/services/calendar/gdata-calendar-query.c b/gdata/services/calendar/gdata-calendar-query.c index dd019529..68c02cdf 100644 --- a/gdata/services/calendar/gdata-calendar-query.c +++ b/gdata/services/calendar/gdata-calendar-query.c @@ -94,10 +94,7 @@ static void get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *que struct _GDataCalendarQueryPrivate { gboolean future_events; gchar *order_by; /* TODO: #defined values */ - gint64 recurrence_expansion_start; - gint64 recurrence_expansion_end; gboolean single_events; - gchar *sort_order; /* TODO: #defined values */ gint64 start_min; /* UNIX timestamp, seconds */ gint64 start_max; /* UNIX timestamp, seconds */ gchar *timezone; @@ -108,10 +105,7 @@ struct _GDataCalendarQueryPrivate { enum { PROP_FUTURE_EVENTS = 1, PROP_ORDER_BY, - PROP_RECURRENCE_EXPANSION_START, - PROP_RECURRENCE_EXPANSION_END, PROP_SINGLE_EVENTS, - PROP_SORT_ORDER, PROP_START_MIN, PROP_START_MAX, PROP_TIMEZONE, @@ -137,7 +131,6 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass) * GDataCalendarQuery:future-events: * * A shortcut to request all events scheduled for the future. Overrides the - * #GDataCalendarQuery:recurrence-expansion-start, #GDataCalendarQuery:recurrence-expansion-end, * #GDataCalendarQuery:start-min and #GDataCalendarQuery:start-max properties. */ g_object_class_install_property (gobject_class, PROP_FUTURE_EVENTS, @@ -158,32 +151,6 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * GDataCalendarQuery:recurrence-expansion-start: - * - * Specifies the beginning of the time period to expand recurring events for, inclusive. - * - * Deprecated: 0.17.7: Use #GDataCalendarQuery:single-events instead, as this is no longer supported on the server. - */ - g_object_class_install_property (gobject_class, PROP_RECURRENCE_EXPANSION_START, - g_param_spec_int64 ("recurrence-expansion-start", - "Recurrence expansion start", "Specifies start of period to expand recurrences for.", - -1, G_MAXINT64, -1, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED)); - - /** - * GDataCalendarQuery:recurrence-expansion-end: - * - * Specifies the end of the time period to expand recurring events for, exclusive. - * - * Deprecated: 0.17.7: Use #GDataCalendarQuery:single-events instead, as this is no longer supported on the server. - */ - g_object_class_install_property (gobject_class, PROP_RECURRENCE_EXPANSION_END, - g_param_spec_int64 ("recurrence-expansion-end", - "Recurrence expansion end", "Specifies end of period to expand recurrences for.", - -1, G_MAXINT64, -1, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED)); - /** * GDataCalendarQuery:single-events: * @@ -195,22 +162,6 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass) FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * GDataCalendarQuery:sort-order: - * - * Specifies direction of sorting. Supported values are ascending and - * descending. - * - * By default, results are returned in ascending order. - * - * Deprecated: 0.17.7: Manually sort the results after retrieving them, as this is no longer supported on the server. - */ - g_object_class_install_property (gobject_class, PROP_SORT_ORDER, - g_param_spec_string ("sort-order", - "Sort order", "Specifies direction of sorting.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED)); - /** * GDataCalendarQuery:start-min: * @@ -289,8 +240,6 @@ static void gdata_calendar_query_init (GDataCalendarQuery *self) { self->priv = gdata_calendar_query_get_instance_private (self); - self->priv->recurrence_expansion_start = -1; - self->priv->recurrence_expansion_end = -1; self->priv->start_min = -1; self->priv->start_max = -1; @@ -304,7 +253,6 @@ gdata_calendar_query_finalize (GObject *object) GDataCalendarQueryPrivate *priv = GDATA_CALENDAR_QUERY (object)->priv; g_free (priv->order_by); - g_free (priv->sort_order); g_free (priv->timezone); /* Chain up to the parent class */ @@ -323,18 +271,9 @@ gdata_calendar_query_get_property (GObject *object, guint property_id, GValue *v case PROP_ORDER_BY: g_value_set_string (value, priv->order_by); break; - case PROP_RECURRENCE_EXPANSION_START: - g_value_set_int64 (value, priv->recurrence_expansion_start); - break; - case PROP_RECURRENCE_EXPANSION_END: - g_value_set_int64 (value, priv->recurrence_expansion_end); - break; case PROP_SINGLE_EVENTS: g_value_set_boolean (value, priv->single_events); break; - case PROP_SORT_ORDER: - g_value_set_string (value, priv->sort_order); - break; case PROP_START_MIN: g_value_set_int64 (value, priv->start_min); break; @@ -369,24 +308,9 @@ gdata_calendar_query_set_property (GObject *object, guint property_id, const GVa case PROP_ORDER_BY: gdata_calendar_query_set_order_by (self, g_value_get_string (value)); break; - case PROP_RECURRENCE_EXPANSION_START: -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - gdata_calendar_query_set_recurrence_expansion_start (self, g_value_get_int64 (value)); -G_GNUC_END_IGNORE_DEPRECATIONS - break; - case PROP_RECURRENCE_EXPANSION_END: -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - gdata_calendar_query_set_recurrence_expansion_end (self, g_value_get_int64 (value)); -G_GNUC_END_IGNORE_DEPRECATIONS - break; case PROP_SINGLE_EVENTS: gdata_calendar_query_set_single_events (self, g_value_get_boolean (value)); break; - case PROP_SORT_ORDER: -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - gdata_calendar_query_set_sort_order (self, g_value_get_string (value)); -G_GNUC_END_IGNORE_DEPRECATIONS - break; case PROP_START_MIN: gdata_calendar_query_set_start_min (self, g_value_get_int64 (value)); break; @@ -449,9 +373,7 @@ get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboo /* Convert the deprecated recurrence-expansion-* properties into single-events. */ APPEND_SEP - if (priv->single_events == TRUE || - priv->recurrence_expansion_start >= 0 || - priv->recurrence_expansion_end >= 0) + if (priv->single_events == TRUE) g_string_append (query_uri, "singleEvents=true"); else g_string_append (query_uri, "singleEvents=false"); @@ -606,89 +528,6 @@ gdata_calendar_query_set_order_by (GDataCalendarQuery *self, const gchar *order_ gdata_query_set_etag (GDATA_QUERY (self), NULL); } -/** - * gdata_calendar_query_get_recurrence_expansion_start: - * @self: a #GDataCalendarQuery - * - * Gets the #GDataCalendarQuery:recurrence-expansion-start property. If the property is unset, -1 will be returned. - * - * Return value: the UNIX timestamp for the recurrence-expansion-start property, or -1 - * Deprecated: 0.17.7: Use #GDataCalendarQuery:single-events instead, as this is no longer supported on the server. - */ -gint64 -gdata_calendar_query_get_recurrence_expansion_start (GDataCalendarQuery *self) -{ - g_return_val_if_fail (GDATA_IS_CALENDAR_QUERY (self), -1); - return self->priv->recurrence_expansion_start; -} - -/** - * gdata_calendar_query_set_recurrence_expansion_start: - * @self: a #GDataCalendarQuery - * @start: a new start time, or -1 - * - * Sets the #GDataCalendarQuery:recurrence-expansion-start property of the #GDataCalendarQuery - * to the new time/date, @start. - * - * Set @start to -1 to unset the property in the query URI. - * - * Deprecated: 0.17.7: Use #GDataCalendarQuery:single-events instead, as this is no longer supported on the server. - */ -void -gdata_calendar_query_set_recurrence_expansion_start (GDataCalendarQuery *self, gint64 start) -{ - g_return_if_fail (GDATA_IS_CALENDAR_QUERY (self)); - g_return_if_fail (start >= -1); - - self->priv->recurrence_expansion_start = start; - g_object_notify (G_OBJECT (self), "recurrence-expansion-start"); - - /* Our current ETag will no longer be relevant */ - gdata_query_set_etag (GDATA_QUERY (self), NULL); -} - -/** - * gdata_calendar_query_get_recurrence_expansion_end: - * @self: a #GDataCalendarQuery - * - * Gets the #GDataCalendarQuery:recurrence-expansion-end property. If the property is unset, -1 will be returned. - * - * Return value: the UNIX timestamp for the recurrence-expansion-end property, or -1 - * - * Deprecated: 0.17.7: Use #GDataCalendarQuery:single-events instead, as this is no longer supported on the server. - */ -gint64 -gdata_calendar_query_get_recurrence_expansion_end (GDataCalendarQuery *self) -{ - g_return_val_if_fail (GDATA_IS_CALENDAR_QUERY (self), -1 ); - return self->priv->recurrence_expansion_end; -} - -/** - * gdata_calendar_query_set_recurrence_expansion_end: - * @self: a #GDataCalendarQuery - * @end: a new end time, or -1 - * - * Sets the #GDataCalendarQuery:recurrence-expansion-end property of the #GDataCalendarQuery - * to the new time/date, @end. - * - * Set @end to -1 to unset the property in the query URI. - * - * Deprecated: 0.17.7: Use #GDataCalendarQuery:single-events instead, as this is no longer supported on the server. - */ -void -gdata_calendar_query_set_recurrence_expansion_end (GDataCalendarQuery *self, gint64 end) -{ - g_return_if_fail (GDATA_IS_CALENDAR_QUERY (self)); - g_return_if_fail (end >= -1); - - self->priv->recurrence_expansion_end = end; - g_object_notify (G_OBJECT (self), "recurrence-expansion-end"); - - /* Our current ETag will no longer be relevant */ - gdata_query_set_etag (GDATA_QUERY (self), NULL); -} - /** * gdata_calendar_query_get_single_events: * @self: a #GDataCalendarQuery @@ -722,46 +561,6 @@ gdata_calendar_query_set_single_events (GDataCalendarQuery *self, gboolean singl gdata_query_set_etag (GDATA_QUERY (self), NULL); } -/** - * gdata_calendar_query_get_sort_order: - * @self: a #GDataCalendarQuery - * - * Gets the #GDataCalendarQuery:sort-order property. - * - * Return value: the sort order property, or %NULL if it is unset - * Deprecated: 0.17.7: Manually sort the results after retrieving them, as this is no longer supported on the server. - */ -const gchar * -gdata_calendar_query_get_sort_order (GDataCalendarQuery *self) -{ - g_return_val_if_fail (GDATA_IS_CALENDAR_QUERY (self), NULL); - return self->priv->sort_order; -} - -/** - * gdata_calendar_query_set_sort_order: - * @self: a #GDataCalendarQuery - * @sort_order: (allow-none): a new sort order string, or %NULL - * - * Sets the #GDataCalendarQuery:sort-order property of the #GDataCalendarQuery to the new sort order string, @sort_order. - * - * Set @sort_order to %NULL to unset the property in the query URI. - * - * Deprecated: 0.17.7: Manually sort the results after retrieving them, as this is no longer supported on the server. - */ -void -gdata_calendar_query_set_sort_order (GDataCalendarQuery *self, const gchar *sort_order) -{ - g_return_if_fail (GDATA_IS_CALENDAR_QUERY (self)); - - g_free (self->priv->sort_order); - self->priv->sort_order = g_strdup (sort_order); - g_object_notify (G_OBJECT (self), "sort-order"); - - /* Our current ETag will no longer be relevant */ - gdata_query_set_etag (GDATA_QUERY (self), NULL); -} - /** * gdata_calendar_query_get_start_min: * @self: a #GDataCalendarQuery diff --git a/gdata/services/calendar/gdata-calendar-query.h b/gdata/services/calendar/gdata-calendar-query.h index 0f3b32e8..62552700 100644 --- a/gdata/services/calendar/gdata-calendar-query.h +++ b/gdata/services/calendar/gdata-calendar-query.h @@ -84,16 +84,6 @@ void gdata_calendar_query_set_max_attendees (GDataCalendarQuery *self, guint max gboolean gdata_calendar_query_show_deleted (GDataCalendarQuery *self) G_GNUC_PURE; void gdata_calendar_query_set_show_deleted (GDataCalendarQuery *self, gboolean show_deleted); -#ifndef LIBGDATA_DISABLE_DEPRECATED -gint64 gdata_calendar_query_get_recurrence_expansion_start (GDataCalendarQuery *self) G_GNUC_DEPRECATED_FOR (gdata_calendar_query_get_single_events); -void gdata_calendar_query_set_recurrence_expansion_start (GDataCalendarQuery *self, gint64 start) G_GNUC_DEPRECATED_FOR (gdata_calendar_query_set_single_events); -gint64 gdata_calendar_query_get_recurrence_expansion_end (GDataCalendarQuery *self) G_GNUC_DEPRECATED_FOR (gdata_calendar_query_get_single_events); -void gdata_calendar_query_set_recurrence_expansion_end (GDataCalendarQuery *self, gint64 end) G_GNUC_DEPRECATED_FOR (gdata_calendar_query_set_single_events); - -const gchar *gdata_calendar_query_get_sort_order (GDataCalendarQuery *self) G_GNUC_PURE G_GNUC_DEPRECATED; -void gdata_calendar_query_set_sort_order (GDataCalendarQuery *self, const gchar *sort_order) G_GNUC_DEPRECATED_FOR (g_list_sort); -#endif /* !LIBGDATA_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* !GDATA_CALENDAR_QUERY_H */ diff --git a/gdata/services/calendar/gdata-calendar-service.c b/gdata/services/calendar/gdata-calendar-service.c index 67632621..991b21e2 100644 --- a/gdata/services/calendar/gdata-calendar-service.c +++ b/gdata/services/calendar/gdata-calendar-service.c @@ -753,42 +753,6 @@ gdata_calendar_service_query_events_async (GDataCalendarService *self, GDataCale g_free (request_uri); } -/** - * gdata_calendar_service_insert_event: - * @self: a #GDataCalendarService - * @event: the #GDataCalendarEvent to insert - * @cancellable: (allow-none): optional #GCancellable object, or %NULL - * @error: a #GError, or %NULL - * - * Inserts @event by uploading it to the online calendar service. - * - * For more details, see gdata_service_insert_entry(). - * - * Return value: (transfer full): an updated #GDataCalendarEvent, or %NULL; unref with g_object_unref() - * - * Since: 0.2.0 - * Deprecated: 0.17.2: Use gdata_calendar_service_insert_calendar_event() - * instead to be able to specify the calendar to add the event to; otherwise - * the default calendar will be used. - */ -GDataCalendarEvent * -gdata_calendar_service_insert_event (GDataCalendarService *self, GDataCalendarEvent *event, GCancellable *cancellable, GError **error) -{ - gchar *uri; - GDataEntry *entry; - - g_return_val_if_fail (GDATA_IS_CALENDAR_SERVICE (self), NULL); - g_return_val_if_fail (GDATA_IS_CALENDAR_EVENT (event), NULL); - g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - uri = build_events_uri (NULL); - entry = gdata_service_insert_entry (GDATA_SERVICE (self), get_calendar_authorization_domain (), uri, GDATA_ENTRY (event), cancellable, error); - g_free (uri); - - return GDATA_CALENDAR_EVENT (entry); -} - /** * gdata_calendar_service_insert_calendar_event: * @self: a #GDataCalendarService @@ -833,45 +797,6 @@ gdata_calendar_service_insert_calendar_event (GDataCalendarService *self, return GDATA_CALENDAR_EVENT (entry); } -/** - * gdata_calendar_service_insert_event_async: - * @self: a #GDataCalendarService - * @event: the #GDataCalendarEvent to insert - * @cancellable: (allow-none): optional #GCancellable object, or %NULL - * @callback: a #GAsyncReadyCallback to call when insertion is finished - * @user_data: (closure): data to pass to the @callback function - * - * Inserts @event by uploading it to the online calendar service. @self and @event are both reffed when this function is called, so can safely be - * unreffed after this function returns. - * - * @callback should call gdata_service_insert_entry_finish() to obtain a #GDataCalendarEvent representing the inserted event and to check for possible - * errors. - * - * For more details, see gdata_calendar_service_insert_event(), which is the synchronous version of this function, and - * gdata_service_insert_entry_async(), which is the base asynchronous insertion function. - * - * Since: 0.8.0 - * Deprecated: 0.17.2: Use - * gdata_calendar_service_insert_calendar_event_async() instead to be able to - * specify the calendar to add the event to; otherwise the default calendar - * will be used. - */ -void -gdata_calendar_service_insert_event_async (GDataCalendarService *self, GDataCalendarEvent *event, GCancellable *cancellable, - GAsyncReadyCallback callback, gpointer user_data) -{ - gchar *uri; - - g_return_if_fail (GDATA_IS_CALENDAR_SERVICE (self)); - g_return_if_fail (GDATA_IS_CALENDAR_EVENT (event)); - g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - - uri = build_events_uri (NULL); - gdata_service_insert_entry_async (GDATA_SERVICE (self), get_calendar_authorization_domain (), uri, GDATA_ENTRY (event), cancellable, - callback, user_data); - g_free (uri); -} - /** * gdata_calendar_service_insert_calendar_event_async: * @self: a #GDataCalendarService diff --git a/gdata/services/calendar/gdata-calendar-service.h b/gdata/services/calendar/gdata-calendar-service.h index 7cb397db..958dc0de 100644 --- a/gdata/services/calendar/gdata-calendar-service.h +++ b/gdata/services/calendar/gdata-calendar-service.h @@ -95,21 +95,6 @@ void gdata_calendar_service_query_events_async (GDataCalendarService *self, GDat #include -#ifndef LIBGDATA_DISABLE_DEPRECATED -GDataCalendarEvent * -gdata_calendar_service_insert_event (GDataCalendarService *self, - GDataCalendarEvent *event, - GCancellable *cancellable, - GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC G_GNUC_DEPRECATED_FOR(gdata_calendar_service_insert_calendar_event); -void -gdata_calendar_service_insert_event_async (GDataCalendarService *self, - GDataCalendarEvent *event, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) - G_GNUC_DEPRECATED_FOR (gdata_calendar_service_insert_calendar_event_async); -#endif /* !LIBGDATA_DISABLE_DEPRECATED */ - GDataCalendarEvent * gdata_calendar_service_insert_calendar_event (GDataCalendarService *self, GDataCalendarCalendar *calendar, diff --git a/gdata/symbol.map b/gdata/symbol.map index 9b9c8de1..70038472 100644 --- a/gdata/symbol.map +++ b/gdata/symbol.map @@ -49,8 +49,6 @@ global: gdata_calendar_access_rule_new; gdata_calendar_calendar_get_access_level; gdata_calendar_calendar_get_color; - gdata_calendar_calendar_get_edited; - gdata_calendar_calendar_get_times_cleaned; gdata_calendar_calendar_get_timezone; gdata_calendar_calendar_get_type; gdata_calendar_calendar_is_hidden; @@ -92,16 +90,11 @@ global: gdata_calendar_event_set_transparency; gdata_calendar_event_set_uid; gdata_calendar_event_set_visibility; - gdata_calendar_feed_get_times_cleaned; - gdata_calendar_feed_get_timezone; gdata_calendar_feed_get_type; gdata_calendar_query_get_future_events; gdata_calendar_query_get_max_attendees; gdata_calendar_query_get_order_by; - gdata_calendar_query_get_recurrence_expansion_end; - gdata_calendar_query_get_recurrence_expansion_start; gdata_calendar_query_get_single_events; - gdata_calendar_query_get_sort_order; gdata_calendar_query_get_start_max; gdata_calendar_query_get_start_min; gdata_calendar_query_get_timezone; @@ -111,11 +104,8 @@ global: gdata_calendar_query_set_future_events; gdata_calendar_query_set_max_attendees; gdata_calendar_query_set_order_by; - gdata_calendar_query_set_recurrence_expansion_end; - gdata_calendar_query_set_recurrence_expansion_start; gdata_calendar_query_set_show_deleted; gdata_calendar_query_set_single_events; - gdata_calendar_query_set_sort_order; gdata_calendar_query_set_start_max; gdata_calendar_query_set_start_min; gdata_calendar_query_set_timezone; @@ -124,8 +114,6 @@ global: gdata_calendar_service_get_type; gdata_calendar_service_insert_calendar_event; gdata_calendar_service_insert_calendar_event_async; - gdata_calendar_service_insert_event; - gdata_calendar_service_insert_event_async; gdata_calendar_service_new; gdata_calendar_service_query_all_calendars; gdata_calendar_service_query_all_calendars_async; diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c index 87fb0b81..8c3544b1 100644 --- a/gdata/tests/calendar.c +++ b/gdata/tests/calendar.c @@ -1116,26 +1116,9 @@ test_query_uri (void) gdata_calendar_query_set_order_by (query, "starttime"); g_assert_cmpstr (gdata_calendar_query_get_order_by (query), ==, "starttime"); -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - time_val = g_date_time_new_from_iso8601 ("2009-04-17T15:00:00.000Z", NULL); - gdata_calendar_query_set_recurrence_expansion_start (query, g_date_time_to_unix (time_val)); - _time = gdata_calendar_query_get_recurrence_expansion_start (query); - g_assert_cmpint (_time, ==, g_date_time_to_unix (time_val)); - - time_val = g_date_time_new_from_iso8601 ("2010-04-17T15:00:00.000Z", NULL); - gdata_calendar_query_set_recurrence_expansion_end (query, g_date_time_to_unix (time_val)); - _time = gdata_calendar_query_get_recurrence_expansion_end (query); - g_assert_cmpint (_time, ==, g_date_time_to_unix (time_val)); -G_GNUC_END_IGNORE_DEPRECATIONS - gdata_calendar_query_set_single_events (query, TRUE); g_assert (gdata_calendar_query_get_single_events (query) == TRUE); -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - gdata_calendar_query_set_sort_order (query, "descending"); - g_assert_cmpstr (gdata_calendar_query_get_sort_order (query), ==, "descending"); -G_GNUC_END_IGNORE_DEPRECATIONS - time_val = g_date_time_new_from_iso8601 ("2009-04-17T15:00:00.000Z", NULL); gdata_calendar_query_set_start_min (query, g_date_time_to_unix (time_val)); _time = gdata_calendar_query_get_start_min (query); @@ -1196,14 +1179,7 @@ test_query_etag (void) CHECK_ETAG (gdata_calendar_query_set_future_events (query, FALSE)) CHECK_ETAG (gdata_calendar_query_set_order_by (query, "shizzle")) -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - CHECK_ETAG (gdata_calendar_query_set_recurrence_expansion_start (query, -1)) - CHECK_ETAG (gdata_calendar_query_set_recurrence_expansion_end (query, -1)) -G_GNUC_END_IGNORE_DEPRECATIONS CHECK_ETAG (gdata_calendar_query_set_single_events (query, FALSE)) -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - CHECK_ETAG (gdata_calendar_query_set_sort_order (query, "shizzle")) -G_GNUC_END_IGNORE_DEPRECATIONS CHECK_ETAG (gdata_calendar_query_set_start_min (query, -1)) CHECK_ETAG (gdata_calendar_query_set_start_max (query, -1)) CHECK_ETAG (gdata_calendar_query_set_timezone (query, "about now")) -- cgit v1.2.1