[libgdata] [contacts] Don't require that queries are GDataContactsQuerys

[Philip Withnall <pwithnall src gnome org>]

commit 1b9bff25139448bc18f4afd3025d86c5fe942362
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri May 15 07:32:37 2009 +0100

    [contacts] Don't require that queries are GDataContactsQuerys
---
 gdata/services/contacts/gdata-contacts-service.c |   10 +++++-----
 gdata/services/contacts/gdata-contacts-service.h |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdata/services/contacts/gdata-contacts-service.c b/gdata/services/contacts/gdata-contacts-service.c
index 49aa79e..03ced35 100644
--- a/gdata/services/contacts/gdata-contacts-service.c
+++ b/gdata/services/contacts/gdata-contacts-service.c
@@ -39,7 +39,7 @@
 #include "gdata-contacts-service.h"
 #include "gdata-service.h"
 #include "gdata-private.h"
-#include "gdata-contacts-query.h"
+#include "gdata-query.h"
 
 G_DEFINE_TYPE (GDataContactsService, gdata_contacts_service, GDATA_TYPE_SERVICE)
 #define GDATA_CONTACTS_SERVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CONTACTS_SERVICE, GDataContactsServicePrivate))
@@ -80,7 +80,7 @@ gdata_contacts_service_new (const gchar *client_id)
 /**
  * gdata_contacts_service_query_contacts:
  * @self: a #GDataContactsService
- * @query: a #GDataContactsQuery with the query parameters, or %NULL
+ * @query: a #GDataQuery with the query parameters, or %NULL
  * @cancellable: optional #GCancellable object, or %NULL
  * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: data to pass to the @progress_callback function
@@ -95,7 +95,7 @@ gdata_contacts_service_new (const gchar *client_id)
  * Since: 0.2.0
  **/
 GDataFeed *
-gdata_contacts_service_query_contacts (GDataContactsService *self, GDataContactsQuery *query, GCancellable *cancellable,
+gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable,
 				       GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
 {
 	/* Ensure we're authenticated first */
@@ -112,7 +112,7 @@ gdata_contacts_service_query_contacts (GDataContactsService *self, GDataContacts
 /**
  * gdata_contacts_service_query_contacts_async:
  * @self: a #GDataContactsService
- * @query: a #GDataContactsQuery with the query parameters, or %NULL
+ * @query: a #GDataQuery with the query parameters, or %NULL
  * @cancellable: optional #GCancellable object, or %NULL
  * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: data to pass to the @progress_callback function
@@ -128,7 +128,7 @@ gdata_contacts_service_query_contacts (GDataContactsService *self, GDataContacts
  * Since: 0.2.0
  **/
 void
-gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataContactsQuery *query, GCancellable *cancellable,
+gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable,
 					     GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
 					     GAsyncReadyCallback callback, gpointer user_data)
 {
diff --git a/gdata/services/contacts/gdata-contacts-service.h b/gdata/services/contacts/gdata-contacts-service.h
index e64596e..7a64c18 100644
--- a/gdata/services/contacts/gdata-contacts-service.h
+++ b/gdata/services/contacts/gdata-contacts-service.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 
 #include <gdata/gdata-service.h>
-#include <gdata/services/contacts/gdata-contacts-query.h>
+#include <gdata/gdata-query.h>
 #include <gdata/services/contacts/gdata-contacts-contact.h>
 
 G_BEGIN_DECLS
@@ -61,10 +61,10 @@ GType gdata_contacts_service_get_type (void) G_GNUC_CONST;
 
 GDataContactsService *gdata_contacts_service_new (const gchar *client_id);
 
-GDataFeed *gdata_contacts_service_query_contacts (GDataContactsService *self, GDataContactsQuery *query, GCancellable *cancellable,
+GDataFeed *gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable,
 						  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
 						  GError **error) G_GNUC_WARN_UNUSED_RESULT;
-void gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataContactsQuery *query, GCancellable *cancellable,
+void gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable,
 						  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
 						  GAsyncReadyCallback callback, gpointer user_data);