[tracker/writeback] Fix indenting.
- From: Carlos Garnacho <carlosg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/writeback] Fix indenting.
- Date: Thu, 26 Nov 2009 11:39:43 +0000 (UTC)
commit 4fe16a9400f9e2d249837e9eed426bc631968ec6
Author: Carlos Garnacho <carlos lanedo com>
Date: Thu Nov 26 12:34:40 2009 +0100
Fix indenting.
src/tracker-writeback/tracker-writeback-consumer.c | 26 +-
.../tracker-writeback-dispatcher.c | 356 ++++++++++----------
2 files changed, 191 insertions(+), 191 deletions(-)
---
diff --git a/src/tracker-writeback/tracker-writeback-consumer.c b/src/tracker-writeback/tracker-writeback-consumer.c
index d7b4dee..b08a418 100644
--- a/src/tracker-writeback/tracker-writeback-consumer.c
+++ b/src/tracker-writeback/tracker-writeback-consumer.c
@@ -56,10 +56,10 @@ enum {
STATE_PROCESSING
};
-static void tracker_writeback_consumer_finalize (GObject *object);
-static void tracker_writeback_consumer_constructed (GObject *object);
+static void tracker_writeback_consumer_finalize (GObject *object);
+static void tracker_writeback_consumer_constructed (GObject *object);
-static gboolean process_queue_cb (gpointer user_data);
+static gboolean process_queue_cb (gpointer user_data);
G_DEFINE_TYPE (TrackerWritebackConsumer, tracker_writeback_consumer, G_TYPE_OBJECT)
@@ -84,9 +84,9 @@ tracker_writeback_consumer_init (TrackerWritebackConsumer *consumer)
priv->client = tracker_connect (TRUE, 0);
priv->modules = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
- NULL);
+ g_str_equal,
+ (GDestroyNotify) g_free,
+ NULL);
priv->process_queue = g_queue_new ();
priv->manager = tracker_writeback_get_miner_manager ();
@@ -138,7 +138,7 @@ tracker_writeback_consumer_new (void)
static gboolean
sparql_rdf_types_match (const gchar * const *module_types,
- const gchar * const *rdf_types)
+ const gchar * const *rdf_types)
{
guint n;
@@ -157,8 +157,8 @@ sparql_rdf_types_match (const gchar * const *module_types,
static void
sparql_query_cb (GPtrArray *result,
- GError *error,
- gpointer user_data)
+ GError *error,
+ gpointer user_data)
{
TrackerWritebackConsumerPrivate *priv;
TrackerWritebackConsumer *consumer;
@@ -189,8 +189,8 @@ sparql_query_cb (GPtrArray *result,
TrackerWriteback *writeback;
g_message (" Updating metadata for subject:'%s' using module:'%s'",
- data->subject,
- module->name);
+ data->subject,
+ module->name);
writeback = tracker_writeback_module_create (module);
tracker_writeback_update_metadata (writeback, result, priv->client);
@@ -248,8 +248,8 @@ process_queue_cb (gpointer user_data)
void
tracker_writeback_consumer_add_subject (TrackerWritebackConsumer *consumer,
- const gchar *subject,
- const GStrv rdf_types)
+ const gchar *subject,
+ const GStrv rdf_types)
{
TrackerWritebackConsumerPrivate *priv;
QueryData *data;
diff --git a/src/tracker-writeback/tracker-writeback-dispatcher.c b/src/tracker-writeback/tracker-writeback-dispatcher.c
index 74b712b..f085ddd 100644
--- a/src/tracker-writeback/tracker-writeback-dispatcher.c
+++ b/src/tracker-writeback/tracker-writeback-dispatcher.c
@@ -32,40 +32,40 @@
#define TRACKER_INTERFACE_RESOURCES "org.freedesktop.Tracker1.Resources"
#define DBUS_MATCH_STR \
- "type='signal', " \
- "sender='" TRACKER_SERVICE "', " \
- "path='" TRACKER_RESOURCES_OBJECT "', " \
- "interface='" TRACKER_INTERFACE_RESOURCES "'"
+ "type='signal', " \
+ "sender='" TRACKER_SERVICE "', " \
+ "path='" TRACKER_RESOURCES_OBJECT "', " \
+ "interface='" TRACKER_INTERFACE_RESOURCES "'"
typedef struct {
- GMainContext *context;
+ GMainContext *context;
DBusConnection *connection;
} TrackerWritebackDispatcherPrivate;
enum {
- PROP_0,
- PROP_MAIN_CONTEXT
+ PROP_0,
+ PROP_MAIN_CONTEXT
};
enum {
- WRITEBACK,
- LAST_SIGNAL
+ WRITEBACK,
+ LAST_SIGNAL
};
static guint signals[LAST_SIGNAL] = { 0 };
-static void tracker_writeback_dispatcher_finalize (GObject *object);
-static void tracker_writeback_dispatcher_constructed (GObject *object);
+static void tracker_writeback_dispatcher_finalize (GObject *object);
+static void tracker_writeback_dispatcher_constructed (GObject *object);
-static void tracker_writeback_dispatcher_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec);
-static void tracker_writeback_dispatcher_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec);
+static void tracker_writeback_dispatcher_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void tracker_writeback_dispatcher_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec);
G_DEFINE_TYPE (TrackerWritebackDispatcher, tracker_writeback_dispatcher, G_TYPE_OBJECT)
@@ -73,180 +73,180 @@ G_DEFINE_TYPE (TrackerWritebackDispatcher, tracker_writeback_dispatcher, G_TYPE_
static void
tracker_writeback_dispatcher_class_init (TrackerWritebackDispatcherClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = tracker_writeback_dispatcher_finalize;
- object_class->constructed = tracker_writeback_dispatcher_constructed;
- object_class->get_property = tracker_writeback_dispatcher_get_property;
- object_class->set_property = tracker_writeback_dispatcher_set_property;
+ object_class->finalize = tracker_writeback_dispatcher_finalize;
+ object_class->constructed = tracker_writeback_dispatcher_constructed;
+ object_class->get_property = tracker_writeback_dispatcher_get_property;
+ object_class->set_property = tracker_writeback_dispatcher_set_property;
- g_object_class_install_property (object_class,
+ g_object_class_install_property (object_class,
PROP_MAIN_CONTEXT,
g_param_spec_pointer ("context",
- "Main context",
- "Main context to run the DBus service on",
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ "Main context",
+ "Main context to run the DBus service on",
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
- signals[WRITEBACK] =
+ signals[WRITEBACK] =
g_signal_new ("writeback",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TrackerWritebackDispatcherClass, writeback),
NULL, NULL,
- tracker_marshal_VOID__STRING_BOXED,
+ tracker_marshal_VOID__STRING_BOXED,
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRV);
- g_type_class_add_private (object_class, sizeof (TrackerWritebackDispatcherPrivate));
+ g_type_class_add_private (object_class, sizeof (TrackerWritebackDispatcherPrivate));
}
static void
handle_writeback_signal (TrackerWritebackDispatcher *dispatcher,
- DBusMessage *message)
+ DBusMessage *message)
{
- DBusMessageIter iter;
- gchar *signature;
- int arg_type;
+ DBusMessageIter iter;
+ gchar *signature;
+ int arg_type;
- g_message ("Got writeback DBus signal");
+ g_message ("Got writeback DBus signal");
- if (!dbus_message_iter_init (message, &iter)) {
- g_critical (" Message had no arguments");
- return;
- }
+ if (!dbus_message_iter_init (message, &iter)) {
+ g_critical (" Message had no arguments");
+ return;
+ }
- signature = dbus_message_iter_get_signature (&iter);
+ signature = dbus_message_iter_get_signature (&iter);
- if (g_strcmp0 (signature, "a{sas}") != 0) {
- g_critical (" Unexpected message signature '%s'", signature);
- g_free (signature);
- return;
- }
+ if (g_strcmp0 (signature, "a{sas}") != 0) {
+ g_critical (" Unexpected message signature '%s'", signature);
+ g_free (signature);
+ return;
+ }
- g_free (signature);
+ g_free (signature);
- while ((arg_type = dbus_message_iter_get_arg_type (&iter)) != DBUS_TYPE_INVALID) {
- DBusMessageIter arr, dict, types_arr;
- const gchar *subject;
- GArray *rdf_types;
+ while ((arg_type = dbus_message_iter_get_arg_type (&iter)) != DBUS_TYPE_INVALID) {
+ DBusMessageIter arr, dict, types_arr;
+ const gchar *subject;
+ GArray *rdf_types;
- rdf_types = g_array_new (TRUE, TRUE, sizeof (gchar *));
+ rdf_types = g_array_new (TRUE, TRUE, sizeof (gchar *));
- dbus_message_iter_recurse (&iter, &arr);
- dbus_message_iter_recurse (&arr, &dict);
+ dbus_message_iter_recurse (&iter, &arr);
+ dbus_message_iter_recurse (&arr, &dict);
- dbus_message_iter_get_basic (&dict, &subject);
+ dbus_message_iter_get_basic (&dict, &subject);
- dbus_message_iter_next (&dict);
- dbus_message_iter_recurse (&dict, &types_arr);
+ dbus_message_iter_next (&dict);
+ dbus_message_iter_recurse (&dict, &types_arr);
- while ((arg_type = dbus_message_iter_get_arg_type (&types_arr)) != DBUS_TYPE_INVALID) {
- const gchar *type;
+ while ((arg_type = dbus_message_iter_get_arg_type (&types_arr)) != DBUS_TYPE_INVALID) {
+ const gchar *type;
- dbus_message_iter_get_basic (&types_arr, &type);
+ dbus_message_iter_get_basic (&types_arr, &type);
- g_array_append_val (rdf_types, type);
+ g_array_append_val (rdf_types, type);
- dbus_message_iter_next (&types_arr);
- }
+ dbus_message_iter_next (&types_arr);
+ }
- g_signal_emit (dispatcher, signals[WRITEBACK], 0, subject, rdf_types->data);
- g_array_free (rdf_types, TRUE);
+ g_signal_emit (dispatcher, signals[WRITEBACK], 0, subject, rdf_types->data);
+ g_array_free (rdf_types, TRUE);
- dbus_message_iter_next (&iter);
- }
+ dbus_message_iter_next (&iter);
+ }
}
static DBusHandlerResult
message_filter (DBusConnection *connection,
- DBusMessage *message,
- gpointer user_data)
+ DBusMessage *message,
+ gpointer user_data)
{
- if (dbus_message_is_signal (message,
- TRACKER_INTERFACE_RESOURCES,
- "Writeback")) {
- TrackerWritebackDispatcher *dispatcher = user_data;
+ if (dbus_message_is_signal (message,
+ TRACKER_INTERFACE_RESOURCES,
+ "Writeback")) {
+ TrackerWritebackDispatcher *dispatcher = user_data;
- handle_writeback_signal (dispatcher, message);
+ handle_writeback_signal (dispatcher, message);
- return DBUS_HANDLER_RESULT_HANDLED;
- }
+ return DBUS_HANDLER_RESULT_HANDLED;
+ }
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
static DBusConnection *
setup_dbus_connection (TrackerWritebackDispatcher *dispatcher,
- GMainContext *context)
+ GMainContext *context)
{
- DBusConnection *connection;
- DBusError error;
- gint result;
+ DBusConnection *connection;
+ DBusError error;
+ gint result;
- dbus_error_init (&error);
+ dbus_error_init (&error);
- /* Create DBus connection */
- connection = dbus_bus_get_private (DBUS_BUS_SESSION, &error);
+ /* Create DBus connection */
+ connection = dbus_bus_get_private (DBUS_BUS_SESSION, &error);
- if (dbus_error_is_set (&error)) {
- g_critical ("Could not connect to the D-Bus session bus, %s",
- error.message);
- dbus_error_free (&error);
- return NULL;
- }
+ if (dbus_error_is_set (&error)) {
+ g_critical ("Could not connect to the D-Bus session bus, %s",
+ error.message);
+ dbus_error_free (&error);
+ return NULL;
+ }
- dbus_connection_set_exit_on_disconnect (connection, FALSE);
+ dbus_connection_set_exit_on_disconnect (connection, FALSE);
- /* Request writeback service name */
+ /* Request writeback service name */
g_message ("Registering D-Bus service '%s'...", TRACKER_WRITEBACK_DBUS_NAME);
- result = dbus_bus_request_name (connection,
- TRACKER_WRITEBACK_DBUS_NAME, 0,
- &error);
+ result = dbus_bus_request_name (connection,
+ TRACKER_WRITEBACK_DBUS_NAME, 0,
+ &error);
- if (dbus_error_is_set (&error)) {
+ if (dbus_error_is_set (&error)) {
g_critical ("Could not acquire name:'%s', %s",
- TRACKER_WRITEBACK_DBUS_NAME, error.message);
- dbus_error_free (&error);
+ TRACKER_WRITEBACK_DBUS_NAME, error.message);
+ dbus_error_free (&error);
dbus_connection_close (connection);
- dbus_connection_unref (connection);
+ dbus_connection_unref (connection);
- return NULL;
- }
+ return NULL;
+ }
- if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
g_critical ("D-Bus service name:'%s' is already taken, "
- "perhaps the application is already running?",
- TRACKER_WRITEBACK_DBUS_NAME);
+ "perhaps the application is already running?",
+ TRACKER_WRITEBACK_DBUS_NAME);
dbus_connection_close (connection);
- dbus_connection_unref (connection);
+ dbus_connection_unref (connection);
return NULL;
}
- /* Add message filter function */
- if (!dbus_connection_add_filter (connection, message_filter, dispatcher, NULL)) {
- g_critical ("Could not add message filter");
+ /* Add message filter function */
+ if (!dbus_connection_add_filter (connection, message_filter, dispatcher, NULL)) {
+ g_critical ("Could not add message filter");
dbus_connection_close (connection);
- dbus_connection_unref (connection);
+ dbus_connection_unref (connection);
- return NULL;
- }
+ return NULL;
+ }
- /* Add match to receive writeback signals */
- dbus_bus_add_match (connection, DBUS_MATCH_STR, &error);
+ /* Add match to receive writeback signals */
+ dbus_bus_add_match (connection, DBUS_MATCH_STR, &error);
- if (dbus_error_is_set (&error)) {
- g_critical ("Could not add match rules, %s", error.message);
- dbus_error_free (&error);
+ if (dbus_error_is_set (&error)) {
+ g_critical ("Could not add match rules, %s", error.message);
+ dbus_error_free (&error);
dbus_connection_close (connection);
- dbus_connection_unref (connection);
+ dbus_connection_unref (connection);
- return NULL;
- }
+ return NULL;
+ }
- /* Set up with the thread context */
- dbus_connection_setup_with_g_main (connection, context);
+ /* Set up with the thread context */
+ dbus_connection_setup_with_g_main (connection, context);
- return connection;
+ return connection;
}
static void
@@ -257,101 +257,101 @@ tracker_writeback_dispatcher_init (TrackerWritebackDispatcher *dispatcher)
static void
tracker_writeback_dispatcher_finalize (GObject *object)
{
- TrackerWritebackDispatcherPrivate *priv;
- DBusError error;
+ TrackerWritebackDispatcherPrivate *priv;
+ DBusError error;
- priv = TRACKER_WRITEBACK_DISPATCHER_GET_PRIVATE (object);
- dbus_error_init (&error);
+ priv = TRACKER_WRITEBACK_DISPATCHER_GET_PRIVATE (object);
+ dbus_error_init (&error);
- dbus_bus_remove_match (priv->connection, DBUS_MATCH_STR, &error);
+ dbus_bus_remove_match (priv->connection, DBUS_MATCH_STR, &error);
- if (dbus_error_is_set (&error)) {
- g_critical ("Could not remove match rules, %s", error.message);
- dbus_error_free (&error);
- }
+ if (dbus_error_is_set (&error)) {
+ g_critical ("Could not remove match rules, %s", error.message);
+ dbus_error_free (&error);
+ }
- dbus_connection_remove_filter (priv->connection, message_filter, object);
- dbus_connection_unref (priv->connection);
+ dbus_connection_remove_filter (priv->connection, message_filter, object);
+ dbus_connection_unref (priv->connection);
- G_OBJECT_CLASS (tracker_writeback_dispatcher_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tracker_writeback_dispatcher_parent_class)->finalize (object);
}
static void
tracker_writeback_dispatcher_constructed (GObject *object)
{
- TrackerWritebackDispatcherPrivate *priv;
- TrackerWritebackDispatcher *dispatcher;
- DBusConnection *connection;
+ TrackerWritebackDispatcherPrivate *priv;
+ TrackerWritebackDispatcher *dispatcher;
+ DBusConnection *connection;
- dispatcher = TRACKER_WRITEBACK_DISPATCHER (object);
+ dispatcher = TRACKER_WRITEBACK_DISPATCHER (object);
priv = TRACKER_WRITEBACK_DISPATCHER_GET_PRIVATE (dispatcher);
- connection = setup_dbus_connection (dispatcher, priv->context);
- g_assert (connection != NULL);
+ connection = setup_dbus_connection (dispatcher, priv->context);
+ g_assert (connection != NULL);
- priv->connection = connection;
+ priv->connection = connection;
}
static void
tracker_writeback_dispatcher_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec)
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- TrackerWritebackDispatcherPrivate *priv;
+ TrackerWritebackDispatcherPrivate *priv;
priv = TRACKER_WRITEBACK_DISPATCHER_GET_PRIVATE (object);
- switch (param_id) {
- case PROP_MAIN_CONTEXT:
- g_value_set_pointer (value, priv->context);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ switch (param_id) {
+ case PROP_MAIN_CONTEXT:
+ g_value_set_pointer (value, priv->context);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
- }
+ }
}
static void
-tracker_writeback_dispatcher_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec)
+tracker_writeback_dispatcher_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- TrackerWritebackDispatcherPrivate *priv;
+ TrackerWritebackDispatcherPrivate *priv;
priv = TRACKER_WRITEBACK_DISPATCHER_GET_PRIVATE (object);
- switch (param_id) {
- case PROP_MAIN_CONTEXT:
- {
- GMainContext *context;
+ switch (param_id) {
+ case PROP_MAIN_CONTEXT:
+ {
+ GMainContext *context;
- context = g_value_get_pointer (value);
+ context = g_value_get_pointer (value);
- if (context != priv->context) {
- if (priv->context) {
- g_main_context_unref (priv->context);
- priv->context = NULL;
- }
+ if (context != priv->context) {
+ if (priv->context) {
+ g_main_context_unref (priv->context);
+ priv->context = NULL;
+ }
- if (context) {
- priv->context = g_main_context_ref (context);
- }
- }
- }
+ if (context) {
+ priv->context = g_main_context_ref (context);
+ }
+ }
+ }
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
- }
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ }
}
TrackerWritebackDispatcher *
tracker_writeback_dispatcher_new (GMainContext *context)
{
return g_object_new (TRACKER_TYPE_WRITEBACK_DISPATCHER,
- "context", context,
- NULL);
+ "context", context,
+ NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]