[evolution-data-server/eclient] Remove unnecessary 'const' qualifiers from structures in public EBookClient/ECalClient APIs

From: Milan Crha <mcrha src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server/eclient] Remove unnecessary 'const' qualifiers from structures in public EBookClient/ECalClient APIs
Date: Wed, 27 Apr 2011 13:08:28 +0000 (UTC)
commit 80105e1a7ff08c1729d8ed97a0ce0c589e5b5e50
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 27 15:07:37 2011 +0200

    Remove unnecessary 'const' qualifiers from structures in public EBookClient/ECalClient APIs

 addressbook/libebook/e-book-client.c              |   76 ++++++++++----------
 addressbook/libebook/e-book-client.h              |   21 +++---
 calendar/libecal/e-cal-client.c                   |   48 +++++++-------
 calendar/libecal/e-cal-client.h                   |   24 +++---
 tests/libebook/client/test-client-async.c         |    8 ++-
 tests/libebook/client/test-client-get-book-view.c |   19 ++++--
 tests/libebook/client/test-client-search.c        |   13 +++-
 tests/libebook/client/test-client-stress-views.c  |   10 ++-
 tests/libebook/client/test-client.c               |    8 ++-
 9 files changed, 125 insertions(+), 102 deletions(-)
---
diff --git a/addressbook/libebook/e-book-client.c b/addressbook/libebook/e-book-client.c
index 11ad4f2..d479427 100644
--- a/addressbook/libebook/e-book-client.c
+++ b/addressbook/libebook/e-book-client.c
@@ -1382,7 +1382,7 @@ e_book_client_get_supported_auth_methods_sync (EBookClient *client, GSList **aut
  * Since: 3.2
  **/
 void
-e_book_client_add_contact (EBookClient *client, const EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_book_client_add_contact (EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *vcard, *gdbus_vcard = NULL;
 
@@ -1455,7 +1455,7 @@ e_book_client_add_contact_finish (EBookClient *client, GAsyncResult *result, gch
  * Since: 3.2
  **/
 gboolean
-e_book_client_add_contact_sync (EBookClient *client, const EContact *contact, gchar **added_uid, GCancellable *cancellable, GError **error)
+e_book_client_add_contact_sync (EBookClient *client, /* const */ EContact *contact, gchar **added_uid, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
 	gchar *vcard, *gdbus_vcard = NULL, *out_uid = NULL;
@@ -1502,7 +1502,7 @@ e_book_client_add_contact_sync (EBookClient *client, const EContact *contact, gc
  * Since: 3.2
  **/
 void
-e_book_client_modify_contact (EBookClient *client, const EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_book_client_modify_contact (EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *vcard, *gdbus_vcard = NULL;
 
@@ -1551,7 +1551,7 @@ e_book_client_modify_contact_finish (EBookClient *client, GAsyncResult *result,
  * Since: 3.2
  **/
 gboolean
-e_book_client_modify_contact_sync (EBookClient *client, const EContact *contact, GCancellable *cancellable, GError **error)
+e_book_client_modify_contact_sync (EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
 	gchar *vcard, *gdbus_vcard = NULL;
@@ -1590,7 +1590,7 @@ e_book_client_modify_contact_sync (EBookClient *client, const EContact *contact,
  * Since: 3.2
  **/
 void
-e_book_client_remove_contact (EBookClient *client, const EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_book_client_remove_contact (EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *uid;
 	const gchar *lst[2];
@@ -1643,7 +1643,7 @@ e_book_client_remove_contact_finish (EBookClient *client, GAsyncResult *result,
  * Since: 3.2
  **/
 gboolean
-e_book_client_remove_contact_sync (EBookClient *client, const EContact *contact, GCancellable *cancellable, GError **error)
+e_book_client_remove_contact_sync (EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
 	gchar *uid;
@@ -1981,31 +1981,31 @@ e_book_client_get_contact_sync (EBookClient *client, const gchar *uid, EContact
 /**
  * e_book_client_get_contacts:
  * @client: an #EBookClient
- * @query: an #EBookQuery
+ * @sexp: an S-expression representing the query
  * @cancellable: a #GCancellable; can be %NULL
  * @callback: callback to call when a result is ready
  * @user_data: user data for the @callback
  *
- * Query @client with @query, receiving a list of contacts which
+ * Query @client with @sexp, receiving a list of contacts which
  * matched. The call is finished by e_book_client_get_contacts_finish()
  * from the @callback.
  *
+ * Note: @sexp can be obtained through #EBookQuery, by converting it
+ * to a string with e_book_query_to_string().
+ *
  * Since: 3.2
  **/
 void
-e_book_client_get_contacts (EBookClient *client, const EBookQuery *query, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_book_client_get_contacts (EBookClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
-	gchar *sexp, *gdbus_sexp = NULL;
-
-	g_return_if_fail (query != NULL);
+	gchar *gdbus_sexp = NULL;
 
-	sexp = e_book_query_to_string ((EBookQuery *) query);
+	g_return_if_fail (sexp != NULL);
 
 	e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), cancellable, callback, user_data, e_book_client_get_contacts,
 			e_gdbus_book_call_get_contact_list,
 			NULL, NULL, NULL, e_gdbus_book_call_get_contact_list_finish, NULL);
 
-	g_free (sexp);
 	g_free (gdbus_sexp);
 }
 
@@ -2055,30 +2055,33 @@ e_book_client_get_contacts_finish (EBookClient *client, GAsyncResult *result, GS
 /**
  * e_book_client_get_contacts_sync:
  * @client: an #EBookClient
- * @query: an #EBookQuery
+ * @sexp: an S-expression representing the query
  * @contacts: (out) a #GSList of matched #EContact-s
  * @cancellable: a #GCancellable; can be %NULL
  * @error: (out): a #GError to set an error, if any
  *
- * Query @client with @query, receiving a list of contacts which matched.
+ * Query @client with @sexp, receiving a list of contacts which matched.
  * If successful, then the @contacts is set to newly allocated #GSList of
  * #EContact-s, which should be freed with e_client_util_free_object_slist().
  *
+ * Note: @sexp can be obtained through #EBookQuery, by converting it
+ * to a string with e_book_query_to_string().
+ *
  * Returns: %TRUE if successful, %FALSE otherwise.
  *
  * Since: 3.2
  **/
 gboolean
-e_book_client_get_contacts_sync (EBookClient *client, const EBookQuery *query, GSList **contacts, GCancellable *cancellable, GError **error)
+e_book_client_get_contacts_sync (EBookClient *client, const gchar *sexp, GSList **contacts, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
-	gchar *sexp, *gdbus_sexp = NULL;
+	gchar *gdbus_sexp = NULL;
 	gchar **vcards = NULL;
 
 	g_return_val_if_fail (client != NULL, FALSE);
 	g_return_val_if_fail (E_IS_BOOK_CLIENT (client), FALSE);
 	g_return_val_if_fail (client->priv != NULL, FALSE);
-	g_return_val_if_fail (query != NULL, FALSE);
+	g_return_val_if_fail (sexp != NULL, FALSE);
 	g_return_val_if_fail (contacts != NULL, FALSE);
 
 	if (!client->priv->gdbus_book) {
@@ -2086,8 +2089,6 @@ e_book_client_get_contacts_sync (EBookClient *client, const EBookQuery *query, G
 		return FALSE;
 	}
 
-	sexp = e_book_query_to_string ((EBookQuery *) query);
-
 	res = e_client_proxy_call_sync_string__strv (E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), &vcards, cancellable, error, e_gdbus_book_call_get_contact_list_sync);
 
 	if (vcards && res) {
@@ -2103,7 +2104,6 @@ e_book_client_get_contacts_sync (EBookClient *client, const EBookQuery *query, G
 		*contacts = NULL;
 	}
 
-	g_free (sexp);
 	g_free (gdbus_sexp);
 	g_strfreev (vcards);
 
@@ -2113,31 +2113,31 @@ e_book_client_get_contacts_sync (EBookClient *client, const EBookQuery *query, G
 /**
  * e_book_client_get_view:
  * @client: an #EBookClient
- * @query: an #EBookQuery
+ * @sexp: an S-expression representing the query
  * @cancellable: a #GCancellable; can be %NULL
  * @callback: callback to call when a result is ready
  * @user_data: user data for the @callback
  *
- * Query @client with @query, creating an #EBookView.
+ * Query @client with @sexp, creating an #EBookView.
  * The call is finished by e_book_client_get_view_finish()
  * from the @callback.
  *
+ * Note: @sexp can be obtained through #EBookQuery, by converting it
+ * to a string with e_book_query_to_string().
+ *
  * Since: 3.2
  **/
 void
-e_book_client_get_view (EBookClient *client, const EBookQuery *query, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_book_client_get_view (EBookClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
-	gchar *sexp, *gdbus_sexp = NULL;
-
-	g_return_if_fail (query != NULL);
+	gchar *gdbus_sexp = NULL;
 
-	sexp = e_book_query_to_string ((EBookQuery *) query);
+	g_return_if_fail (sexp != NULL);
 
 	e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), cancellable, callback, user_data, e_book_client_get_view,
 			e_gdbus_book_call_get_view,
 			NULL, NULL, e_gdbus_book_call_get_view_finish, NULL, NULL);
 
-	g_free (sexp);
 	g_free (gdbus_sexp);
 }
 
@@ -2210,30 +2210,33 @@ e_book_client_get_view_finish (EBookClient *client, GAsyncResult *result, EBookV
 /**
  * e_book_client_get_view_sync:
  * @client: an #EBookClient
- * @query: an #EBookQuery
+ * @sexp: an S-expression representing the query
  * @book_view: (out) an #EBookView
  * @cancellable: a #GCancellable; can be %NULL
  * @error: (out): a #GError to set an error, if any
  *
- * Query @client with @query, creating an #EBookView.
+ * Query @client with @sexp, creating an #EBookView.
  * If successful, then the @book_view is set to newly allocated #EBookView,
  * which should be freed with g_object_unref().
  *
+ * Note: @sexp can be obtained through #EBookQuery, by converting it
+ * to a string with e_book_query_to_string().
+ *
  * Returns: %TRUE if successful, %FALSE otherwise.
  *
  * Since: 3.2
  **/
 gboolean
-e_book_client_get_view_sync (EBookClient *client, const EBookQuery *query, EBookView **book_view, GCancellable *cancellable, GError **error)
+e_book_client_get_view_sync (EBookClient *client, const gchar *sexp, EBookView **book_view, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
-	gchar *sexp, *gdbus_sexp = NULL;
+	gchar *gdbus_sexp = NULL;
 	gchar *view_path = NULL;
 
 	g_return_val_if_fail (client != NULL, FALSE);
 	g_return_val_if_fail (E_IS_BOOK_CLIENT (client), FALSE);
 	g_return_val_if_fail (client->priv != NULL, FALSE);
-	g_return_val_if_fail (query != NULL, FALSE);
+	g_return_val_if_fail (sexp != NULL, FALSE);
 	g_return_val_if_fail (book_view != NULL, FALSE);
 
 	if (!client->priv->gdbus_book) {
@@ -2241,11 +2244,8 @@ e_book_client_get_view_sync (EBookClient *client, const EBookQuery *query, EBook
 		return FALSE;
 	}
 
-	sexp = e_book_query_to_string ((EBookQuery *) query);
-
 	res = e_client_proxy_call_sync_string__string (E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), &view_path, cancellable, error, e_gdbus_book_call_get_view_sync);
 
-	g_free (sexp);
 	g_free (gdbus_sexp);
 
 	return complete_get_view (client, res, view_path, book_view, error);
diff --git a/addressbook/libebook/e-book-client.h b/addressbook/libebook/e-book-client.h
index 7b5fd10..c8d8d18 100644
--- a/addressbook/libebook/e-book-client.h
+++ b/addressbook/libebook/e-book-client.h
@@ -27,7 +27,6 @@
 
 #include <libedataserver/e-client.h>
 #include <libedataserver/e-source-list.h>
-#include <libebook/e-book-query.h>
 #include <libebook/e-book-view.h>
 
 #define E_TYPE_BOOK_CLIENT		(e_book_client_get_type ())
@@ -106,17 +105,17 @@ void		e_book_client_get_supported_auth_methods	(EBookClient *client, GCancellabl
 gboolean	e_book_client_get_supported_auth_methods_finish	(EBookClient *client, GAsyncResult *result, GSList **auth_methods, GError **error);
 gboolean	e_book_client_get_supported_auth_methods_sync	(EBookClient *client, GSList **auth_methods, GCancellable *cancellable, GError **error);
 
-void		e_book_client_add_contact			(EBookClient *client, const EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_book_client_add_contact			(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_book_client_add_contact_finish		(EBookClient *client, GAsyncResult *result, gchar **added_uid, GError **error);
-gboolean	e_book_client_add_contact_sync			(EBookClient *client, const EContact *contact, gchar **added_uid, GCancellable *cancellable, GError **error);
+gboolean	e_book_client_add_contact_sync			(EBookClient *client, /* const */ EContact *contact, gchar **added_uid, GCancellable *cancellable, GError **error);
 
-void		e_book_client_modify_contact			(EBookClient *client, const EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_book_client_modify_contact			(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_book_client_modify_contact_finish		(EBookClient *client, GAsyncResult *result, GError **error);
-gboolean	e_book_client_modify_contact_sync		(EBookClient *client, const EContact *contact, GCancellable *cancellable, GError **error);
+gboolean	e_book_client_modify_contact_sync		(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GError **error);
 
-void		e_book_client_remove_contact			(EBookClient *client, const EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_book_client_remove_contact			(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_book_client_remove_contact_finish		(EBookClient *client, GAsyncResult *result, GError **error);
-gboolean	e_book_client_remove_contact_sync		(EBookClient *client, const EContact *contact, GCancellable *cancellable, GError **error);
+gboolean	e_book_client_remove_contact_sync		(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GError **error);
 
 void		e_book_client_remove_contact_by_uid		(EBookClient *client, const gchar *uid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_book_client_remove_contact_by_uid_finish	(EBookClient *client, GAsyncResult *result, GError **error);
@@ -130,13 +129,13 @@ void		e_book_client_get_contact			(EBookClient *client, const gchar *uid, GCance
 gboolean	e_book_client_get_contact_finish		(EBookClient *client, GAsyncResult *result, EContact **contact, GError **error);
 gboolean	e_book_client_get_contact_sync			(EBookClient *client, const gchar *uid, EContact **contact, GCancellable *cancellable, GError **error);
 
-void		e_book_client_get_contacts			(EBookClient *client, const EBookQuery *query, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_book_client_get_contacts			(EBookClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_book_client_get_contacts_finish		(EBookClient *client, GAsyncResult *result, GSList **contacts, GError **error);
-gboolean	e_book_client_get_contacts_sync			(EBookClient *client, const EBookQuery *query, GSList **contacts, GCancellable *cancellable, GError **error);
+gboolean	e_book_client_get_contacts_sync			(EBookClient *client, const gchar *sexp, GSList **contacts, GCancellable *cancellable, GError **error);
 
-void		e_book_client_get_view				(EBookClient *client, const EBookQuery *query, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_book_client_get_view				(EBookClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_book_client_get_view_finish			(EBookClient *client, GAsyncResult *result, EBookView **book_view, GError **error);
-gboolean	e_book_client_get_view_sync			(EBookClient *client, const EBookQuery *query, EBookView **book_view, GCancellable *cancellable, GError **error);
+gboolean	e_book_client_get_view_sync			(EBookClient *client, const gchar *sexp, EBookView **book_view, GCancellable *cancellable, GError **error);
 
 G_END_DECLS
 
diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c
index b7a4e9a..a7dd348 100644
--- a/calendar/libecal/e-cal-client.c
+++ b/calendar/libecal/e-cal-client.c
@@ -938,7 +938,7 @@ e_cal_client_get_local_attachment_store (ECalClient *client)
  * Since: 3.2
  **/
 void
-e_cal_client_set_default_timezone (ECalClient *client, const icaltimezone *zone)
+e_cal_client_set_default_timezone (ECalClient *client, /* const */ icaltimezone *zone)
 {
 	g_return_if_fail (client != NULL);
 	g_return_if_fail (E_IS_CAL_CLIENT (client));
@@ -946,7 +946,7 @@ e_cal_client_set_default_timezone (ECalClient *client, const icaltimezone *zone)
 	g_return_if_fail (zone != NULL);
 
 	icaltimezone_free (client->priv->default_zone, 1);
-	client->priv->default_zone = icaltimezone_copy ((icaltimezone *) zone);
+	client->priv->default_zone = icaltimezone_copy (zone);
 }
 
 /**
@@ -954,11 +954,11 @@ e_cal_client_set_default_timezone (ECalClient *client, const icaltimezone *zone)
  * @client: A calendar client.
  *
  * Returns: Default timezone previously set with e_cal_client_set_default_timezone().
- * Returned pointer is owned by the @client.
+ * Returned pointer is owned by the @client and should not be freed.
  *
  * Since: 3.2
  **/
-const icaltimezone *
+/* const */ icaltimezone *
 e_cal_client_get_default_timezone (ECalClient *client)
 {
 	g_return_val_if_fail (client != NULL, NULL);
@@ -2944,13 +2944,13 @@ e_cal_client_get_free_busy_sync (ECalClient *client, time_t start, time_t end, c
  * Since: 3.2
  **/
 void
-e_cal_client_create_object (ECalClient *client, const icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_cal_client_create_object (ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *comp_str, *gdbus_comp = NULL;
 
 	g_return_if_fail (icalcomp != NULL);
 
-	comp_str = icalcomponent_as_ical_string_r ((icalcomponent *) icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (icalcomp);
 
 	e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), cancellable, callback, user_data, e_cal_client_create_object,
 			e_gdbus_cal_call_create_object,
@@ -3007,7 +3007,7 @@ e_cal_client_create_object_finish (ECalClient *client, GAsyncResult *result, gch
  * Since: 3.2
  **/
 gboolean
-e_cal_client_create_object_sync (ECalClient *client, const icalcomponent *icalcomp, gchar **uid, GCancellable *cancellable, GError **error)
+e_cal_client_create_object_sync (ECalClient *client, /* const */ icalcomponent *icalcomp, gchar **uid, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
 	gchar *comp_str, *gdbus_comp = NULL;
@@ -3024,7 +3024,7 @@ e_cal_client_create_object_sync (ECalClient *client, const icalcomponent *icalco
 		return FALSE;
 	}
 
-	comp_str = icalcomponent_as_ical_string_r ((icalcomponent *) icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (icalcomp);
 
 	res = e_client_proxy_call_sync_string__string (E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), &out_string, cancellable, error, e_gdbus_cal_call_create_object_sync);
 
@@ -3057,13 +3057,13 @@ e_cal_client_create_object_sync (ECalClient *client, const icalcomponent *icalco
  * Since: 3.2
  **/
 void
-e_cal_client_modify_object (ECalClient *client, const icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_cal_client_modify_object (ECalClient *client, /* const */ icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *comp_str, **strv;
 
 	g_return_if_fail (icalcomp != NULL);
 
-	comp_str = icalcomponent_as_ical_string_r ((icalcomponent *) icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (icalcomp);
 	strv = e_gdbus_cal_encode_modify_object (comp_str, mod);
 
 	e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_modify_object,
@@ -3113,7 +3113,7 @@ e_cal_client_modify_object_finish (ECalClient *client, GAsyncResult *result, GEr
  * Since: 3.2
  **/
 gboolean
-e_cal_client_modify_object_sync (ECalClient *client, const icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GError **error)
+e_cal_client_modify_object_sync (ECalClient *client, /* const */ icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
 	gchar *comp_str, **strv;
@@ -3128,7 +3128,7 @@ e_cal_client_modify_object_sync (ECalClient *client, const icalcomponent *icalco
 		return FALSE;
 	}
 
-	comp_str = icalcomponent_as_ical_string_r ((icalcomponent *) icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (icalcomp);
 	strv = e_gdbus_cal_encode_modify_object (comp_str, mod);
 
 	res = e_client_proxy_call_sync_strv__void (E_CLIENT (client), (const gchar * const *) strv, cancellable, error, e_gdbus_cal_call_modify_object_sync);
@@ -3256,13 +3256,13 @@ e_cal_client_remove_object_sync (ECalClient *client, const gchar *uid, const gch
  * Since: 3.2
  **/
 void
-e_cal_client_receive_objects (ECalClient *client, const icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_cal_client_receive_objects (ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *comp_str, *gdbus_comp = NULL;
 
 	g_return_if_fail (icalcomp != NULL);
 
-	comp_str = icalcomponent_as_ical_string_r ((icalcomponent *) icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (icalcomp);
 
 	e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), cancellable, callback, user_data, e_cal_client_receive_objects,
 			e_gdbus_cal_call_receive_objects,
@@ -3306,7 +3306,7 @@ e_cal_client_receive_objects_finish (ECalClient *client, GAsyncResult *result, G
  * Since: 3.2
  **/
 gboolean
-e_cal_client_receive_objects_sync (ECalClient *client, const icalcomponent *icalcomp, GCancellable *cancellable, GError **error)
+e_cal_client_receive_objects_sync (ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
 	gchar *comp_str, *gdbus_comp = NULL;
@@ -3320,7 +3320,7 @@ e_cal_client_receive_objects_sync (ECalClient *client, const icalcomponent *ical
 		return FALSE;
 	}
 
-	comp_str = icalcomponent_as_ical_string_r ((icalcomponent *) icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (icalcomp);
 
 	res = e_client_proxy_call_sync_string__void (E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), cancellable, error, e_gdbus_cal_call_receive_objects_sync);
 
@@ -3346,13 +3346,13 @@ e_cal_client_receive_objects_sync (ECalClient *client, const icalcomponent *ical
  * Since: 3.2
  **/
 void
-e_cal_client_send_objects (ECalClient *client, const icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_cal_client_send_objects (ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *comp_str, *gdbus_comp = NULL;
 
 	g_return_if_fail (icalcomp != NULL);
 
-	comp_str = icalcomponent_as_ical_string_r ((icalcomponent *) icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (icalcomp);
 
 	e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), cancellable, callback, user_data, e_cal_client_send_objects,
 			e_gdbus_cal_call_send_objects,
@@ -3449,7 +3449,7 @@ e_cal_client_send_objects_finish (ECalClient *client, GAsyncResult *result, GSLi
  * Since: 3.2
  **/
 gboolean
-e_cal_client_send_objects_sync (ECalClient *client, const icalcomponent *icalcomp, GSList **users, icalcomponent **modified_icalcomp, GCancellable *cancellable, GError **error)
+e_cal_client_send_objects_sync (ECalClient *client, /* const */ icalcomponent *icalcomp, GSList **users, icalcomponent **modified_icalcomp, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
 	gchar **out_strv = NULL, *comp_str, *gdbus_comp = NULL;
@@ -3466,7 +3466,7 @@ e_cal_client_send_objects_sync (ECalClient *client, const icalcomponent *icalcom
 		return FALSE;
 	}
 
-	comp_str = icalcomponent_as_ical_string_r ((icalcomponent *) icalcomp);
+	comp_str = icalcomponent_as_ical_string_r (icalcomp);
 
 	res = e_client_proxy_call_sync_string__strv (E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), &out_strv, cancellable, error, e_gdbus_cal_call_send_objects_sync);
 
@@ -4007,7 +4007,7 @@ e_cal_client_get_timezone_sync (ECalClient *client, const gchar *tzid, icaltimez
  * Since: 3.2
  **/
 void
-e_cal_client_add_timezone (ECalClient *client, const icaltimezone *zone, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+e_cal_client_add_timezone (ECalClient *client, /* const */ icaltimezone *zone, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	icalcomponent *icalcomp;
 	gchar *zone_str, *gdbus_zone = NULL;
@@ -4017,7 +4017,7 @@ e_cal_client_add_timezone (ECalClient *client, const icaltimezone *zone, GCancel
 	if (zone == icaltimezone_get_utc_timezone ())
 		return;
 
-	icalcomp = icaltimezone_get_component ((icaltimezone *) zone);
+	icalcomp = icaltimezone_get_component (zone);
 	g_return_if_fail (icalcomp != NULL);
 
 	zone_str = icalcomponent_as_ical_string_r (icalcomp);
@@ -4062,7 +4062,7 @@ e_cal_client_add_timezone_finish (ECalClient *client, GAsyncResult *result, GErr
  * Since: 3.2
  **/
 gboolean
-e_cal_client_add_timezone_sync (ECalClient *client, const icaltimezone *zone, GCancellable *cancellable, GError **error)
+e_cal_client_add_timezone_sync (ECalClient *client, /* const */ icaltimezone *zone, GCancellable *cancellable, GError **error)
 {
 	gboolean res;
 	icalcomponent *icalcomp;
@@ -4076,7 +4076,7 @@ e_cal_client_add_timezone_sync (ECalClient *client, const icaltimezone *zone, GC
 	if (zone == icaltimezone_get_utc_timezone ())
 		return TRUE;
 
-	icalcomp = icaltimezone_get_component ((icaltimezone *) zone);
+	icalcomp = icaltimezone_get_component (zone);
 	if (!icalcomp) {
 		g_set_error_literal (error, E_CLIENT_ERROR, E_CLIENT_ERROR_INVALID_ARG, e_client_error_to_string (E_CLIENT_ERROR_INVALID_ARG));
 		return FALSE;
diff --git a/calendar/libecal/e-cal-client.h b/calendar/libecal/e-cal-client.h
index d348ed6..02f0397 100644
--- a/calendar/libecal/e-cal-client.h
+++ b/calendar/libecal/e-cal-client.h
@@ -96,8 +96,8 @@ gboolean		e_cal_client_get_sources		(ESourceList **sources, ECalClientSourceType
 /* Calendar properties not managed by EClient */
 ECalClientSourceType	e_cal_client_get_source_type		(ECalClient *client);
 const gchar *		e_cal_client_get_local_attachment_store	(ECalClient *client);
-void			e_cal_client_set_default_timezone	(ECalClient *client, const icaltimezone *zone);
-const icaltimezone *	e_cal_client_get_default_timezone	(ECalClient *client);
+void			e_cal_client_set_default_timezone	(ECalClient *client, /* const */ icaltimezone *zone);
+/*const*/ icaltimezone *e_cal_client_get_default_timezone	(ECalClient *client);
 
 /* Check predefined capabilities */
 gboolean		e_cal_client_check_one_alarm_only	(ECalClient *client);
@@ -157,25 +157,25 @@ void		e_cal_client_get_free_busy			(ECalClient *client, time_t start, time_t end
 gboolean	e_cal_client_get_free_busy_finish		(ECalClient *client, GAsyncResult *result, GError **error);
 gboolean	e_cal_client_get_free_busy_sync			(ECalClient *client, time_t start, time_t end, const GSList *users, GCancellable *cancellable, GError **error);
 
-void		e_cal_client_create_object			(ECalClient *client, const icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_cal_client_create_object			(ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_cal_client_create_object_finish		(ECalClient *client, GAsyncResult *result, gchar **uid, GError **error);
-gboolean	e_cal_client_create_object_sync			(ECalClient *client, const icalcomponent *icalcomp, gchar **uid, GCancellable *cancellable, GError **error);
+gboolean	e_cal_client_create_object_sync			(ECalClient *client, /* const */ icalcomponent *icalcomp, gchar **uid, GCancellable *cancellable, GError **error);
 
-void		e_cal_client_modify_object			(ECalClient *client, const icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_cal_client_modify_object			(ECalClient *client, /* const */ icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_cal_client_modify_object_finish		(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_modify_object_sync			(ECalClient *client, const icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GError **error);
+gboolean	e_cal_client_modify_object_sync			(ECalClient *client, /* const */ icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GError **error);
 
 void		e_cal_client_remove_object			(ECalClient *client, const gchar *uid, const gchar *rid, CalObjModType mod, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_cal_client_remove_object_finish		(ECalClient *client, GAsyncResult *result, GError **error);
 gboolean	e_cal_client_remove_object_sync			(ECalClient *client, const gchar *uid, const gchar *rid, CalObjModType mod, GCancellable *cancellable, GError **error);
 
-void		e_cal_client_receive_objects			(ECalClient *client, const icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_cal_client_receive_objects			(ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_cal_client_receive_objects_finish		(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_receive_objects_sync		(ECalClient *client, const icalcomponent *icalcomp, GCancellable *cancellable, GError **error);
+gboolean	e_cal_client_receive_objects_sync		(ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GError **error);
 
-void		e_cal_client_send_objects			(ECalClient *client, const icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_cal_client_send_objects			(ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_cal_client_send_objects_finish		(ECalClient *client, GAsyncResult *result, GSList **users, icalcomponent **modified_icalcomp, GError **error);
-gboolean	e_cal_client_send_objects_sync			(ECalClient *client, const icalcomponent *icalcomp, GSList **users, icalcomponent **modified_icalcomp, GCancellable *cancellable, GError **error);
+gboolean	e_cal_client_send_objects_sync			(ECalClient *client, /* const */ icalcomponent *icalcomp, GSList **users, icalcomponent **modified_icalcomp, GCancellable *cancellable, GError **error);
 
 void		e_cal_client_get_attachment_uris		(ECalClient *client, const gchar *uid, const gchar *rid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_cal_client_get_attachment_uris_finish		(ECalClient *client, GAsyncResult *result, GSList **attachment_uris, GError **error);
@@ -189,9 +189,9 @@ void		e_cal_client_get_timezone			(ECalClient *client, const gchar *tzid, GCance
 gboolean	e_cal_client_get_timezone_finish		(ECalClient *client, GAsyncResult *result, icaltimezone **zone, GError **error);
 gboolean	e_cal_client_get_timezone_sync			(ECalClient *client, const gchar *tzid, icaltimezone **zone, GCancellable *cancellable, GError **error);
 
-void		e_cal_client_add_timezone			(ECalClient *client, const icaltimezone *zone, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void		e_cal_client_add_timezone			(ECalClient *client, /* const */ icaltimezone *zone, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean	e_cal_client_add_timezone_finish		(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_add_timezone_sync			(ECalClient *client, const icaltimezone *zone, GCancellable *cancellable, GError **error);
+gboolean	e_cal_client_add_timezone_sync			(ECalClient *client, /* const */ icaltimezone *zone, GCancellable *cancellable, GError **error);
 
 G_END_DECLS
 
diff --git a/tests/libebook/client/test-client-async.c b/tests/libebook/client/test-client-async.c
index 6e0ef97..2b78be6 100644
--- a/tests/libebook/client/test-client-async.c
+++ b/tests/libebook/client/test-client-async.c
@@ -2,6 +2,7 @@
 
 #include <stdlib.h>
 #include <libebook/e-book-client.h>
+#include <libebook/e-book-query.h>
 
 #include "client-test-utils.h"
 
@@ -37,12 +38,15 @@ static void
 print_all_emails (EBookClient *book_client)
 {
 	EBookQuery *query;
+	gchar *sexp;
 
 	query = e_book_query_field_exists (E_CONTACT_FULL_NAME);
+	sexp = e_book_query_to_string (query);
+	e_book_query_unref (query);
 
-	e_book_client_get_contacts (book_client, query, NULL, print_all_emails_cb, NULL);
+	e_book_client_get_contacts (book_client, sexp, NULL, print_all_emails_cb, NULL);
 
-	e_book_query_unref (query);
+	g_free (sexp);
 }
 
 static void
diff --git a/tests/libebook/client/test-client-get-book-view.c b/tests/libebook/client/test-client-get-book-view.c
index 3e2b47a..06d323b 100644
--- a/tests/libebook/client/test-client-get-book-view.c
+++ b/tests/libebook/client/test-client-get-book-view.c
@@ -2,6 +2,7 @@
 
 #include <stdlib.h>
 #include <libebook/e-book-client.h>
+#include <libebook/e-book-query.h>
 
 #include "client-test-utils.h"
 
@@ -91,15 +92,18 @@ call_get_book_view (gpointer user_data)
 {
 	EBookQuery *query;
 	EBookClient *book_client = user_data;
+	gchar *sexp;
 
 	g_return_val_if_fail (book_client != NULL, NULL);
 	g_return_val_if_fail (E_IS_BOOK_CLIENT (book_client), NULL);
 
 	query = e_book_query_any_field_contains ("");
+	sexp = e_book_query_to_string (query);
+	e_book_query_unref (query);
 
-	e_book_client_get_view (book_client, query, NULL, get_book_view_cb, NULL);
+	e_book_client_get_view (book_client, sexp, NULL, get_book_view_cb, NULL);
 
-	e_book_query_unref (query);
+	g_free (sexp);
 
 	return NULL;
 }
@@ -110,6 +114,7 @@ main (gint argc, gchar **argv)
 	EBookClient *book_client;
 	EBookQuery *query;
 	EBookView *view;
+	gchar *sexp;
 	GError *error = NULL;
 
 	main_initialize ();
@@ -121,27 +126,29 @@ main (gint argc, gchar **argv)
 		return 1;
 
 	query = e_book_query_any_field_contains ("");
-	if (!e_book_client_get_view_sync (book_client, query, &view, NULL, &error)) {
+	sexp = e_book_query_to_string (query);
+	e_book_query_unref (query);
+	if (!e_book_client_get_view_sync (book_client, sexp, &view, NULL, &error)) {
 		report_error ("get book view sync", &error);
-		e_book_query_unref (query);
+		g_free (sexp);
 		g_object_unref (book_client);
 
 		return 1;
 	}
 
+	g_free (sexp);
+
 	setup_and_start_view (view);
 
 	start_main_loop (NULL, NULL);
 
 	if (!e_client_remove_sync (E_CLIENT (book_client), NULL, &error)) {
 		report_error ("client remove sync", &error);
-		e_book_query_unref (query);
 		g_object_unref (book_client);
 
 		return 1;
 	}
 
-	e_book_query_unref (query);
 	g_object_unref (book_client);
 
 	/*
diff --git a/tests/libebook/client/test-client-search.c b/tests/libebook/client/test-client-search.c
index d1900e4..f9b0c81 100644
--- a/tests/libebook/client/test-client-search.c
+++ b/tests/libebook/client/test-client-search.c
@@ -2,6 +2,7 @@
 
 #include <stdlib.h>
 #include <libebook/e-book-client.h>
+#include <libebook/e-book-query.h>
 
 #include "client-test-utils.h"
 
@@ -11,6 +12,7 @@ main (gint argc, gchar **argv)
 	EBookClient *book_client;
 	const gchar *query_string;
 	EBookQuery *query;
+	gchar *sexp;
 	GSList *c, *contacts;
 	GError *error = NULL;
 
@@ -30,15 +32,18 @@ main (gint argc, gchar **argv)
 		return 1;
 	}
 
+	sexp = e_book_query_to_string (query);
+	e_book_query_unref (query);
+
 	book_client = open_system_book (FALSE);
 	if (!book_client) {
-		e_book_query_unref (query);
+		g_free (sexp);
 		return 1;
 	}
 
-	if (!e_book_client_get_contacts_sync (book_client, query, &contacts, NULL, &error)) {
+	if (!e_book_client_get_contacts_sync (book_client, sexp, &contacts, NULL, &error)) {
 		report_error ("get contacts sync", &error);
-		e_book_query_unref (query);
+		g_free (sexp);
 		g_object_unref (book_client);
 		return 1;
 	}
@@ -55,7 +60,7 @@ main (gint argc, gchar **argv)
 	g_slist_foreach (contacts, (GFunc) g_object_unref, NULL);
 	g_slist_free (contacts);
 
-	e_book_query_unref (query);
+	g_free (sexp);
 	g_object_unref (book_client);
 
 	return 0;
diff --git a/tests/libebook/client/test-client-stress-views.c b/tests/libebook/client/test-client-stress-views.c
index 0b6116a..34e83c1 100644
--- a/tests/libebook/client/test-client-stress-views.c
+++ b/tests/libebook/client/test-client-stress-views.c
@@ -2,6 +2,7 @@
 
 #include <stdlib.h>
 #include <libebook/e-book-client.h>
+#include <libebook/e-book-query.h>
 
 #include "client-test-utils.h"
 
@@ -39,20 +40,23 @@ stress_book_views (EBookClient *book_client, gboolean in_thread)
 	EBookQuery *query;
 	EBookView *view = NULL;
 	EBookView *new_view;
+	gchar *sexp;
 	gint i;
 
 	g_return_val_if_fail (book_client != NULL, -1);
 	g_return_val_if_fail (E_IS_BOOK_CLIENT (book_client), -1);
 
 	query = e_book_query_any_field_contains ("");
+	sexp = e_book_query_to_string (query);
+	e_book_query_unref (query);
 
 	for (i = 0; i < NUM_VIEWS; i++) {
 		GError *error = NULL;
 
-		if (!e_book_client_get_view_sync (book_client, query, &new_view, NULL, &error)) {
+		if (!e_book_client_get_view_sync (book_client, sexp, &new_view, NULL, &error)) {
 			report_error ("get book view sync", &error);
 			g_object_unref (view);
-			e_book_query_unref (query);
+			g_free (sexp);
 			return 1;
 		}
 
@@ -77,7 +81,7 @@ stress_book_views (EBookClient *book_client, gboolean in_thread)
 	e_book_view_stop (view);
 	g_object_unref (view);
 
-	e_book_query_unref (query);
+	g_free (sexp);
 
 	return 0;
 }
diff --git a/tests/libebook/client/test-client.c b/tests/libebook/client/test-client.c
index f4e8cfc..45011ab 100644
--- a/tests/libebook/client/test-client.c
+++ b/tests/libebook/client/test-client.c
@@ -2,6 +2,7 @@
 
 #include <stdlib.h>
 #include <libebook/e-book-client.h>
+#include <libebook/e-book-query.h>
 
 #include "client-test-utils.h"
 
@@ -10,14 +11,17 @@ print_all_emails (EBookClient *book)
 {
 	GError *error = NULL;
 	EBookQuery *query;
+	gchar *sexp;
 	gboolean result;
 	GSList *cards, *c;
 
 	query = e_book_query_field_exists (E_CONTACT_FULL_NAME);
+	sexp = e_book_query_to_string (query);
+	e_book_query_unref (query);
 
-	result = e_book_client_get_contacts_sync (book, query, &cards, NULL, &error);
+	result = e_book_client_get_contacts_sync (book, sexp, &cards, NULL, &error);
 
-	e_book_query_unref (query);
+	g_free (sexp);
 
 	if (!result) {
 		fprintf (stderr, "Error getting card list: %s\n", error ? error->message : "Unknown error");
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]