[tracker] libtracker-miner: Fixed warnings and cleaned up tracker-miner.[ch]
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker] libtracker-miner: Fixed warnings and cleaned up tracker-miner.[ch]
- Date: Wed, 2 Dec 2009 09:08:02 +0000 (UTC)
commit caa12e0149178a17474c88f4b55f2bb5c035c5d8
Author: Martyn Russell <martyn lanedo com>
Date: Wed Dec 2 10:31:06 2009 +0200
libtracker-miner: Fixed warnings and cleaned up tracker-miner.[ch]
Group / name functions more logically and fixed build warnings from
new GIO branch merge
src/libtracker-miner/tracker-miner.c | 367 +++++++++++++++++-----------------
src/libtracker-miner/tracker-miner.h | 99 ++++-----
2 files changed, 228 insertions(+), 238 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner.c b/src/libtracker-miner/tracker-miner.c
index e28bcdb..a17c193 100644
--- a/src/libtracker-miner/tracker-miner.c
+++ b/src/libtracker-miner/tracker-miner.c
@@ -107,29 +107,29 @@ static GQuark dbus_data = 0;
static guint signals[LAST_SIGNAL] = { 0 };
-static void miner_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec);
-static void miner_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec);
-static void miner_finalize (GObject *object);
-static void miner_constructed (GObject *object);
-static void dbus_data_destroy (gpointer data);
-static DBusData * dbus_data_create (TrackerMiner *miner,
- const gchar *name);
-static void pause_data_destroy (gpointer data);
-static PauseData *pause_data_new (const gchar *application,
- const gchar *reason);
-
-static void async_call_notify_error (AsyncCallData *data,
- gint code,
- const gchar *message);
-static void async_call_data_destroy (AsyncCallData *data,
- gboolean remove);
-
+static void miner_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void miner_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void miner_finalize (GObject *object);
+static void miner_constructed (GObject *object);
+static void dbus_data_destroy (gpointer data);
+static DBusData * dbus_data_new (TrackerMiner *miner,
+ const gchar *name);
+static void pause_data_destroy (gpointer data);
+static PauseData *pause_data_new (const gchar *application,
+ const gchar *reason);
+static void async_call_data_notify_error (AsyncCallData *data,
+ gint code,
+ const gchar *message);
+static void async_call_data_destroy (AsyncCallData *data,
+ gboolean remove);
+static void sparql_cancelled_cb (GCancellable *cancellable,
+ AsyncCallData *data);
G_DEFINE_ABSTRACT_TYPE (TrackerMiner, tracker_miner, G_TYPE_OBJECT)
@@ -389,7 +389,7 @@ static void
async_call_finalize_foreach (AsyncCallData *data,
gpointer user_data)
{
- async_call_notify_error (data, 0, "Miner is being finalized");
+ async_call_data_notify_error (data, 0, "Miner is being finalized");
async_call_data_destroy (data, FALSE);
}
@@ -439,7 +439,7 @@ miner_constructed (GObject *object)
data = g_object_get_qdata (G_OBJECT (miner), dbus_data);
if (G_LIKELY (!data)) {
- data = dbus_data_create (miner, miner->private->name);
+ data = dbus_data_new (miner, miner->private->name);
}
if (G_UNLIKELY (!data)) {
@@ -454,19 +454,6 @@ miner_constructed (GObject *object)
dbus_data_destroy);
}
-/**
- * tracker_miner_error_quark:
- *
- * Returns the #GQuark used to identify miner errors in GError structures.
- *
- * Returns: the error #GQuark
- **/
-GQuark
-tracker_miner_error_quark (void)
-{
- return g_quark_from_static_string (TRACKER_MINER_ERROR_DOMAIN);
-}
-
static gboolean
dbus_register_service (DBusGProxy *proxy,
const gchar *name)
@@ -601,8 +588,8 @@ dbus_data_destroy (gpointer data)
}
static DBusData *
-dbus_data_create (TrackerMiner *miner,
- const gchar *name)
+dbus_data_new (TrackerMiner *miner,
+ const gchar *name)
{
DBusData *data;
DBusGConnection *connection;
@@ -687,71 +674,6 @@ pause_data_destroy (gpointer data)
g_slice_free (PauseData, pd);
}
-/**
- * tracker_miner_start:
- * @miner: a #TrackerMiner
- *
- * Tells the miner to start processing data.
- **/
-void
-tracker_miner_start (TrackerMiner *miner)
-{
- g_return_if_fail (TRACKER_IS_MINER (miner));
- g_return_if_fail (miner->private->started == FALSE);
-
- miner->private->started = TRUE;
-
- g_signal_emit (miner, signals[STARTED], 0);
-}
-
-/**
- * tracker_miner_stop:
- * @miner: a #TrackerMiner
- *
- * Tells the miner to stop processing data.
- **/
-void
-tracker_miner_stop (TrackerMiner *miner)
-{
- g_return_if_fail (TRACKER_IS_MINER (miner));
- g_return_if_fail (miner->private->started == TRUE);
-
- miner->private->started = FALSE;
-
- g_signal_emit (miner, signals[STOPPED], 0);
-}
-
-/**
- * tracker_miner_writeback:
- * @miner: a #TrackerMiner
- * @subjects: the subjects to mark as writeback
- *
- * Tells the miner to mark @subjects are writeback.
- **/
-void
-tracker_miner_writeback (TrackerMiner *miner, const GStrv subjects)
-{
- g_return_if_fail (TRACKER_IS_MINER (miner));
-
- g_signal_emit (miner, signals[WRITEBACK], 0, subjects);
-}
-
-/**
- * tracker_miner_is_started:
- * @miner: a #TrackerMiner
- *
- * Returns #TRUE if the miner has been started.
- *
- * Returns: #TRUE if the miner is already started.
- **/
-gboolean
-tracker_miner_is_started (TrackerMiner *miner)
-{
- g_return_val_if_fail (TRACKER_IS_MINER (miner), TRUE);
-
- return miner->private->started;
-}
-
static void
async_call_data_destroy (AsyncCallData *data,
gboolean remove)
@@ -778,9 +700,36 @@ async_call_data_destroy (AsyncCallData *data,
g_slice_free (AsyncCallData, data);
}
+static AsyncCallData *
+async_call_data_new (TrackerMiner *miner,
+ GCancellable *cancellable,
+ gpointer callback,
+ gpointer user_data,
+ gpointer source_function)
+{
+ AsyncCallData *data;
+
+ data = g_slice_new0 (AsyncCallData);
+ data->miner = miner;
+ data->callback = callback;
+ data->user_data = user_data;
+ data->source_function = source_function;
+
+ if (cancellable) {
+ data->cancellable = g_object_ref (cancellable);
+
+ data->signal_id = g_signal_connect (cancellable, "cancelled",
+ G_CALLBACK (sparql_cancelled_cb), data);
+ }
+
+ g_ptr_array_add (miner->private->async_calls, data);
+
+ return data;
+}
+
static void
-run_update_callback (AsyncCallData *data,
- const GError *error)
+async_call_data_update_callback (AsyncCallData *data,
+ GError *error)
{
GAsyncReadyCallback callback;
GSimpleAsyncResult *result;
@@ -804,16 +753,15 @@ run_update_callback (AsyncCallData *data,
}
static void
-run_query_callback (AsyncCallData *data,
- const GPtrArray *query_results,
- GError *error)
+async_call_data_query_callback (AsyncCallData *data,
+ const GPtrArray *query_results,
+ GError *error)
{
GAsyncReadyCallback callback;
+ GSimpleAsyncResult *result;
callback = data->callback;
- GSimpleAsyncResult *result = NULL;
-
if (error) {
result = g_simple_async_result_new_from_error (G_OBJECT (data->miner),
callback,
@@ -826,19 +774,48 @@ run_query_callback (AsyncCallData *data,
data->source_function);
}
- g_simple_async_result_set_op_res_gpointer (result, query_results, NULL);
+ g_simple_async_result_set_op_res_gpointer (result, (gpointer) query_results, NULL);
g_simple_async_result_complete (result);
g_object_unref (result);
}
static void
+async_call_data_notify_error (AsyncCallData *data,
+ gint code,
+ const gchar *message)
+{
+ TrackerMiner *miner;
+ GError *error;
+
+ miner = data->miner;
+
+ if (data->id != 0) {
+ tracker_cancel_call (miner->private->client, data->id);
+ data->id = 0;
+ }
+
+ if (data->callback) {
+ error = g_error_new_literal (miner_error_quark, code, message);
+
+ if (data->source_function == tracker_miner_execute_update ||
+ data->source_function == tracker_miner_execute_batch_update ||
+ data->source_function == tracker_miner_commit) {
+ async_call_data_update_callback (data, error);
+ } else {
+ async_call_data_query_callback (data, NULL, error);
+ }
+
+ g_error_free (error);
+ }
+}
+
+static void
sparql_update_cb (GError *error,
gpointer user_data)
{
AsyncCallData *data = user_data;
- run_update_callback (data, error);
-
+ async_call_data_update_callback (data, error);
async_call_data_destroy (data, TRUE);
if (error) {
@@ -853,7 +830,7 @@ sparql_query_cb (GPtrArray *result,
{
AsyncCallData *data = user_data;
- run_query_callback (data, result, error);
+ async_call_data_query_callback (data, result, error);
if (error) {
g_error_free (error);
@@ -872,68 +849,90 @@ sparql_cancelled_cb (GCancellable *cancellable,
{
TrackerMinerPrivate *priv;
- async_call_notify_error (data, 0, "SPARQL operation was cancelled");
+ async_call_data_notify_error (data, 0, "SPARQL operation was cancelled");
priv = TRACKER_MINER_GET_PRIVATE (data->miner);
async_call_data_destroy (data, TRUE);
}
-static AsyncCallData *
-async_call_data_new (TrackerMiner *miner,
- GCancellable *cancellable,
- gpointer callback,
- gpointer user_data,
- gpointer source_function)
+/**
+ * tracker_miner_error_quark:
+ *
+ * Returns the #GQuark used to identify miner errors in GError structures.
+ *
+ * Returns: the error #GQuark
+ **/
+GQuark
+tracker_miner_error_quark (void)
{
- AsyncCallData *data;
-
- data = g_slice_new0 (AsyncCallData);
- data->miner = miner;
- data->callback = callback;
- data->user_data = user_data;
- data->source_function = source_function;
-
- if (cancellable) {
- data->cancellable = g_object_ref (cancellable);
+ return g_quark_from_static_string (TRACKER_MINER_ERROR_DOMAIN);
+}
- data->signal_id = g_signal_connect (cancellable, "cancelled",
- G_CALLBACK (sparql_cancelled_cb), data);
- }
+/**
+ * tracker_miner_start:
+ * @miner: a #TrackerMiner
+ *
+ * Tells the miner to start processing data.
+ **/
+void
+tracker_miner_start (TrackerMiner *miner)
+{
+ g_return_if_fail (TRACKER_IS_MINER (miner));
+ g_return_if_fail (miner->private->started == FALSE);
- g_ptr_array_add (miner->private->async_calls, data);
+ miner->private->started = TRUE;
- return data;
+ g_signal_emit (miner, signals[STARTED], 0);
}
-static void
-async_call_notify_error (AsyncCallData *data,
- gint code,
- const gchar *message)
+/**
+ * tracker_miner_stop:
+ * @miner: a #TrackerMiner
+ *
+ * Tells the miner to stop processing data.
+ **/
+void
+tracker_miner_stop (TrackerMiner *miner)
{
- TrackerMiner *miner;
- GError *error;
+ g_return_if_fail (TRACKER_IS_MINER (miner));
+ g_return_if_fail (miner->private->started == TRUE);
- miner = data->miner;
+ miner->private->started = FALSE;
- if (data->id != 0) {
- tracker_cancel_call (miner->private->client, data->id);
- data->id = 0;
- }
+ g_signal_emit (miner, signals[STOPPED], 0);
+}
- if (data->callback) {
- error = g_error_new_literal (miner_error_quark, code, message);
+/**
+ * tracker_miner_writeback:
+ * @miner: a #TrackerMiner
+ * @subjects: the subjects to mark as writeback
+ *
+ * Tells the miner to mark @subjects are writeback.
+ **/
+void
+tracker_miner_writeback (TrackerMiner *miner,
+ const GStrv subjects)
+{
+ g_return_if_fail (TRACKER_IS_MINER (miner));
- if (data->source_function == tracker_miner_execute_update ||
- data->source_function == tracker_miner_execute_batch_update ||
- data->source_function == tracker_miner_commit) {
- run_update_callback (data, error);
- } else {
- run_query_callback (data, NULL, error);
- }
+ g_signal_emit (miner, signals[WRITEBACK], 0, subjects);
+}
- g_error_free (error);
- }
+/**
+ * tracker_miner_is_started:
+ * @miner: a #TrackerMiner
+ *
+ * Returns #TRUE if the miner has been started.
+ *
+ * Returns: #TRUE if the miner is already started.
+ **/
+gboolean
+tracker_miner_is_started (TrackerMiner *miner)
+{
+ g_return_val_if_fail (TRACKER_IS_MINER (miner), TRUE);
+
+ return miner->private->started;
}
/**
@@ -992,9 +991,9 @@ tracker_miner_execute_update (TrackerMiner *miner,
*
**/
void
-tracker_miner_execute_update_finish (TrackerMiner *miner,
- GAsyncResult *result,
- GError **error)
+tracker_miner_execute_update_finish (TrackerMiner *miner,
+ GAsyncResult *result,
+ GError **error)
{
GSimpleAsyncResult *r = G_SIMPLE_ASYNC_RESULT (result);
@@ -1021,11 +1020,11 @@ tracker_miner_execute_update_finish (TrackerMiner *miner,
* object containing an error.
**/
void
-tracker_miner_execute_sparql (TrackerMiner *miner,
- const gchar *sparql,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+tracker_miner_execute_sparql (TrackerMiner *miner,
+ const gchar *sparql,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
TrackerMinerPrivate *priv;
AsyncCallData *data;
@@ -1053,10 +1052,10 @@ tracker_miner_execute_sparql (TrackerMiner *miner,
* occured during the query, @error will be set.
*
**/
-const GPtrArray*
-tracker_miner_execute_sparql_finish (TrackerMiner *miner,
- GAsyncResult *result,
- GError **error)
+const GPtrArray *
+tracker_miner_execute_sparql_finish (TrackerMiner *miner,
+ GAsyncResult *result,
+ GError **error)
{
GSimpleAsyncResult *r = G_SIMPLE_ASYNC_RESULT (result);
@@ -1087,11 +1086,11 @@ tracker_miner_execute_sparql_finish (TrackerMiner *miner,
* object containing an error.
**/
void
-tracker_miner_execute_batch_update (TrackerMiner *miner,
- const gchar *sparql,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+tracker_miner_execute_batch_update (TrackerMiner *miner,
+ const gchar *sparql,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
TrackerMinerPrivate *priv;
AsyncCallData *data;
@@ -1146,10 +1145,10 @@ tracker_miner_execute_batch_update_finish (TrackerMiner *miner,
**/
void
-tracker_miner_commit (TrackerMiner *miner,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+tracker_miner_commit (TrackerMiner *miner,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
TrackerMinerPrivate *priv;
@@ -1177,9 +1176,9 @@ tracker_miner_commit (TrackerMiner *miner,
*
**/
void
-tracker_miner_commit_finish (TrackerMiner *miner,
- GAsyncResult *result,
- GError **error)
+tracker_miner_commit_finish (TrackerMiner *miner,
+ GAsyncResult *result,
+ GError **error)
{
GSimpleAsyncResult *r = G_SIMPLE_ASYNC_RESULT (result);
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index 80d73e3..b0f4589 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -83,62 +83,53 @@ typedef struct {
GError *error);
void (* writeback) (TrackerMiner *miner,
const GStrv subjects);
-
} TrackerMinerClass;
-GType tracker_miner_get_type (void) G_GNUC_CONST;
-GQuark tracker_miner_error_quark (void);
-
-void tracker_miner_start (TrackerMiner *miner);
-void tracker_miner_stop (TrackerMiner *miner);
-
-gboolean tracker_miner_is_started (TrackerMiner *miner);
-
-gint tracker_miner_pause (TrackerMiner *miner,
- const gchar *reason,
- GError **error);
-gboolean tracker_miner_resume (TrackerMiner *miner,
- gint cookie,
- GError **error);
-
-void tracker_miner_execute_update (TrackerMiner *miner,
- const gchar *sparql,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-void tracker_miner_execute_update_finish (TrackerMiner *miner,
- GAsyncResult *result,
- GError **error);
-
-void tracker_miner_execute_sparql (TrackerMiner *miner,
- const gchar *sparql,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-const GPtrArray* tracker_miner_execute_sparql_finish (TrackerMiner *miner,
- GAsyncResult *result,
- GError **error);
-
-void tracker_miner_execute_batch_update (TrackerMiner *miner,
- const gchar *sparql,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-void tracker_miner_execute_batch_update_finish (TrackerMiner *miner,
- GAsyncResult *result,
- GError **error);
-
-void tracker_miner_commit (TrackerMiner *miner,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-void tracker_miner_commit_finish (TrackerMiner *miner,
- GAsyncResult *result,
- GError **error);
+GType tracker_miner_get_type (void) G_GNUC_CONST;
+GQuark tracker_miner_error_quark (void);
+
+void tracker_miner_start (TrackerMiner *miner);
+void tracker_miner_stop (TrackerMiner *miner);
+void tracker_miner_writeback (TrackerMiner *miner,
+ const GStrv subjects);
+gboolean tracker_miner_is_started (TrackerMiner *miner);
+gint tracker_miner_pause (TrackerMiner *miner,
+ const gchar *reason,
+ GError **error);
+gboolean tracker_miner_resume (TrackerMiner *miner,
+ gint cookie,
+ GError **error);
+void tracker_miner_execute_update (TrackerMiner *miner,
+ const gchar *sparql,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+void tracker_miner_execute_update_finish (TrackerMiner *miner,
+ GAsyncResult *result,
+ GError **error);
+void tracker_miner_execute_sparql (TrackerMiner *miner,
+ const gchar *sparql,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+const GPtrArray* tracker_miner_execute_sparql_finish (TrackerMiner *miner,
+ GAsyncResult *result,
+ GError **error);
+void tracker_miner_execute_batch_update (TrackerMiner *miner,
+ const gchar *sparql,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+void tracker_miner_execute_batch_update_finish (TrackerMiner *miner,
+ GAsyncResult *result,
+ GError **error);
+void tracker_miner_commit (TrackerMiner *miner,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+void tracker_miner_commit_finish (TrackerMiner *miner,
+ GAsyncResult *result,
+ GError **error);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
