From db0b066d3a870b0e7b4ea2d6223d30e2124ff5d2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 11 Nov 2011 15:42:39 +0100 Subject: [PATCH] Bug #660972 - Unable to publish free/busy information --- calendar/backends/file/e-cal-backend-file.c | 2 +- calendar/libecal/e-cal-client.c | 2 -- calendar/libegdbus/e-gdbus-cal.c | 6 ++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c index ebcd8f4..ff253eb 100644 --- a/calendar/backends/file/e-cal-backend-file.c +++ b/calendar/backends/file/e-cal-backend-file.c @@ -2070,7 +2070,7 @@ e_cal_backend_file_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const GSList *users, - time_t start, + time_t start, time_t end, GSList **freebusy, GError **error) diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c index 4d5b1b9..7172b28 100644 --- a/calendar/libecal/e-cal-client.c +++ b/calendar/libecal/e-cal-client.c @@ -3490,7 +3490,6 @@ e_cal_client_get_free_busy (ECalClient *client, g_return_if_fail (start > 0); g_return_if_fail (end > 0); - g_return_if_fail (users != NULL); strv = e_gdbus_cal_encode_get_free_busy (start, end, users); @@ -3552,7 +3551,6 @@ e_cal_client_get_free_busy_sync (ECalClient *client, g_return_val_if_fail (client != NULL, FALSE); g_return_val_if_fail (E_IS_CAL_CLIENT (client), FALSE); g_return_val_if_fail (client->priv != NULL, FALSE); - g_return_val_if_fail (users != NULL, FALSE); if (!client->priv->gdbus_cal) { set_proxy_gone_error (error); diff --git a/calendar/libegdbus/e-gdbus-cal.c b/calendar/libegdbus/e-gdbus-cal.c index fb7aefb..5c5af2e 100644 --- a/calendar/libegdbus/e-gdbus-cal.c +++ b/calendar/libegdbus/e-gdbus-cal.c @@ -471,8 +471,6 @@ e_gdbus_cal_encode_get_free_busy (guint in_start, gchar **strv; gint ii; - g_return_val_if_fail (in_users != NULL, NULL); - strv = g_new0 (gchar *, g_slist_length ((GSList *) in_users) + 3); strv[0] = g_strdup_printf ("%u", in_start); strv[1] = g_strdup_printf ("%u", in_end); @@ -1256,7 +1254,7 @@ E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN (cal, get_backend_property, propname, E_DECLARE_GDBUS_ASYNC_METHOD_1 (cal, set_backend_property, propnamevalue, "as") E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN (cal, get_object, uid_rid, "as", object, "s") E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN (cal, get_object_list, sexp, "s", objects, "as") -E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN (cal, get_free_busy, start_stop_users, "as", freebusy, "as") +E_DECLARE_GDBUS_ASYNC_METHOD_1 (cal, get_free_busy, start_stop_users, "as") E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN (cal, create_object, object, "s", uid, "s") E_DECLARE_GDBUS_ASYNC_METHOD_1 (cal, modify_object, object_mod, "as") E_DECLARE_GDBUS_ASYNC_METHOD_1 (cal, remove_object, uid_rid_mod, "as") @@ -1558,7 +1556,7 @@ e_gdbus_cal_proxy_init (EGdbusCalProxy *proxy) E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_VOID (set_backend_property); E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRING (get_object); E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRV (get_object_list); - E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRV (get_free_busy); + E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_VOID (get_free_busy); E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRING (create_object); E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_VOID (modify_object); E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_VOID (remove_object); -- 2.7.4