[tracker/miner-web: 17/33] libtracker-miner: Switch back the web API to sync

[Adrien Bustany <abustany src gnome org>]

commit 753cc16ff1bd631dc36e9a7497735e713e2070f9
Author: Adrien Bustany <madcat mymadcat com>
Date:   Sun Jan 24 12:38:14 2010 -0300

    libtracker-miner: Switch back the web API to sync

 src/libtracker-miner/tracker-miner-web.c |   28 +++----------
 src/libtracker-miner/tracker-miner-web.h |   68 +++++++++---------------------
 2 files changed, 26 insertions(+), 70 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-web.c b/src/libtracker-miner/tracker-miner-web.c
index 9dcc10d..14e6c75 100644
--- a/src/libtracker-miner/tracker-miner-web.c
+++ b/src/libtracker-miner/tracker-miner-web.c
@@ -215,36 +215,20 @@ tracker_miner_web_dbus_dissociate (TrackerMinerWeb        *miner,
 	}
 }
 
-void
-tracker_miner_web_authenticate (TrackerMinerWeb     *miner,
-                                GCancellable        *cancellable,
-                                GAsyncReadyCallback *callback,
-                                gpointer             user_data)
-{
-	g_assert (TRACKER_IS_MINER_WEB (miner));
-	TRACKER_MINER_WEB_GET_CLASS (miner)->authenticate (miner, cancellable, callback, user_data);
-}
-
 TrackerMinerWebAssociationStatus
-tracker_miner_web_authenticate_finish (TrackerMinerWeb  *miner,
-                                       GAsyncResult     *result,
-                                       GError          **error)
+tracker_miner_web_authenticate (TrackerMinerWeb     *miner,
+                                GError             **error)
 {
 	g_assert (TRACKER_IS_MINER_WEB (miner));
-
-	GSimpleAsyncResult *r = G_SIMPLE_ASYNC_RESULT (result);
-
-	g_simple_async_result_propagate_error (r, error);
+	return TRACKER_MINER_WEB_GET_CLASS (miner)->authenticate (miner, error);
 }
 
-void
+GHashTable*
 tracker_miner_web_get_association_data (TrackerMinerWeb     *miner,
-                                        GCancellable        *cancellable,
-                                        GAsyncReadyCallback *callback,
-                                        gpointer             user_data)
+                                        GError             **error)
 {
 	g_assert (TRACKER_IS_MINER_WEB (miner));
-	return TRACKER_MINER_WEB_GET_CLASS (miner)->get_association_data (miner, cancellable, callback, user_data);
+	return TRACKER_MINER_WEB_GET_CLASS (miner)->get_association_data (miner, error);
 }
 
 void
diff --git a/src/libtracker-miner/tracker-miner-web.h b/src/libtracker-miner/tracker-miner-web.h
index 59b658a..515400c 100644
--- a/src/libtracker-miner/tracker-miner-web.h
+++ b/src/libtracker-miner/tracker-miner-web.h
@@ -109,57 +109,29 @@ typedef struct {
         TrackerMinerClass parent_class;
 
         /* vmethods */
-        void        (* authenticate)         (TrackerMinerWeb     *miner,
-		                                      GCancellable        *cancellable,
-		                                      GAsyncReadyCallback *callback,
-		                                      gpointer             user_data);
-		GHashTable* (* get_association_data) (TrackerMinerWeb     *miner,
-		                                      GCancellable        *cancellable,
-		                                      GAsyncReadyCallback *callback
-		                                      gpointer            user_data);
-		void        (* associate)            (TrackerMinerWeb   *miner,
-		                                      const GHashTable  *association_data,
-		                                      GCancellable        *cancellable,
-		                                      GAsyncReadyCallback *callback
-		                                      gpointer            user_data);
-		void        (* dissociate)           (TrackerMinerWeb   *miner,
-		                                      GCancellable        *cancellable,
-		                                      GAsyncReadyCallback *callback
-		                                      gpointer            user_data);
+        TrackerMinerWebAssociationStatus (* authenticate)         (TrackerMinerWeb     *miner,
+		                                      GError             **error);
+		GHashTable*                      (* get_association_data) (TrackerMinerWeb     *miner,
+		                                                           GError             **error);
+		void                             (* associate)            (TrackerMinerWeb     *miner,
+		                                                           const GHashTable    *association_data,
+		                                                           GError             **error);
+		void                             (* dissociate)           (TrackerMinerWeb     *miner,
+		                                                           GError             **error);
 } TrackerMinerWebClass;
 
-GType                            tracker_miner_web_get_type                    (void) G_GNUC_CONST;
-GQuark                           tracker_miner_web_error_quark                 (void);
+GType                            tracker_miner_web_get_type              (void) G_GNUC_CONST;
+GQuark                           tracker_miner_web_error_quark           (void);
 
-void                             tracker_miner_web_authenticate                (TrackerMinerWeb     *miner,
-                                                                                GCancellable        *cancellable,
-                                                                                GAsyncReadyCallback *callback,
-                                                                                gpointer             user_data);
-TrackerMinerWebAssociationStatus tracker_miner_web_authenticate_finish         (TrackerMinerWeb     *miner,
-                                                                                GAsyncResult        *result,
-                                                                                GError             **error);
-void                             tracker_miner_web_get_association_data        (TrackerMinerWeb     *miner,
-                                                                                GCancellable        *cancellable,
-                                                                                GAsyncReadyCallback *callback,
-                                                                                gpointer             user_data);
-GHashTable*                      tracker_miner_web_get_association_data_finish (TrackerMinerWeb     *miner,
-                                                                                GAsyncResult        *result,
-                                                                                GError             **error);
-void                             tracker_miner_web_associate                   (TrackerMinerWeb     *miner,
-                                                                                const GHashTable    *association_data,
-                                                                                GCancellable        *cancellable,
-                                                                                GAsyncReadyCallback *callback,
-                                                                                gpointer             user_data);
-void                             tracker_miner_web_associate_finish            (TrackerMinerWeb     *miner,
-                                                                                GAsyncResult        *result,
-                                                                                GError             **error);
-void                             tracker_miner_web_dissociate                  (TrackerMinerWeb   *miner,
-                                                                                GCancellable        *cancellable,
-                                                                                GAsyncReadyCallback *callback,
-                                                                                gpointer             user_data);
-void                             tracker_miner_web_dissociate_finish           (TrackerMinerWeb   *miner,
-                                                                                GAsyncResult        *result,
-                                                                                GError             **error);
+TrackerMinerWebAssociationStatus tracker_miner_web_authenticate          (TrackerMinerWeb     *miner,
+                                                                          GError             **error);
+GHashTable*                      tracker_miner_web_get_association_data  (TrackerMinerWeb     *miner,
+                                                                          GError             **error);
+void                             tracker_miner_web_associate             (TrackerMinerWeb     *miner,
+                                                                          const GHashTable    *association_data,
+                                                                          GError             **error);
+void                             tracker_miner_web_dissociate            (TrackerMinerWeb     *miner,
+                                                                          GError             **error);
 
 G_END_DECLS