[tracker/writeback] Revert "tracker-writeback: Some code clean ups from initial review"

[Martyn James Russell <mr src gnome org>]

commit 8303ee404e95f6db83c5485f7943b01fbb8596dd
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Nov 25 14:33:26 2009 +0000

    Revert "tracker-writeback: Some code clean ups from initial review"
    
    This reverts commit e7d8744b71ee7c411c4e98b2715ce040e4ffa24b.

 src/tracker-store/tracker-main.c                   |    2 +-
 src/tracker-store/tracker-writeback.c              |    8 +++---
 .../tracker-writeback-dispatcher.c                 |   26 ++++++++++----------
 src/tracker-writeback/tracker-writeback-file.c     |    2 +-
 src/tracker-writeback/tracker-writeback-module.c   |    4 +-
 src/tracker-writeback/tracker-writeback-mp3.c      |    6 ++--
 src/tracker-writeback/tracker-writeback-xmp.c      |    4 +--
 7 files changed, 25 insertions(+), 27 deletions(-)
---
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index 5371d63..5a5b28c 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -303,7 +303,7 @@ get_writeback_predicates (void)
 
 	result_set = tracker_data_query_sparql ("SELECT ?predicate WHERE { "
 	                                        "  ?predicate tracker:writeback true "
-	                                        "}",
+	                                        "}", 
 	                                        NULL);
 
 	if (result_set) {
diff --git a/src/tracker-store/tracker-writeback.c b/src/tracker-store/tracker-writeback.c
index 5495a94..e679587 100644
--- a/src/tracker-store/tracker-writeback.c
+++ b/src/tracker-store/tracker-writeback.c
@@ -79,7 +79,7 @@ tracker_writeback_check (const gchar *graph,
 		}
 
 		g_hash_table_insert (private->events, 
-				     g_strdup (subject),
+		                     g_strdup (subject),
 		                     copy_rdf_types (rdf_types));
 	} else {
 		g_debug ("No predicates to notify for writeback");
@@ -135,8 +135,8 @@ tracker_writeback_init (TrackerWritebackGetPredicatesFunc func)
 
 	g_static_private_set (&private_key, private, free_private);
 
-	private->allowances = g_hash_table_new_full (g_str_hash,
-						     g_str_equal,
+	private->allowances = g_hash_table_new_full (g_str_hash, 
+	                                             g_str_equal,
 	                                             (GDestroyNotify) g_free,
 	                                             NULL);
 
@@ -157,7 +157,7 @@ tracker_writeback_init (TrackerWritebackGetPredicatesFunc func)
 	count = g_strv_length (predicates_to_signal);
 	for (i = 0; i < count; i++) {
 		g_message ("  Adding:'%s'", predicates_to_signal[i]);
-		g_hash_table_insert (private->allowances,
+		g_hash_table_insert (private->allowances, 
 		                     g_strdup (predicates_to_signal[i]),
 		                     GINT_TO_POINTER (TRUE));
 	}
diff --git a/src/tracker-writeback/tracker-writeback-dispatcher.c b/src/tracker-writeback/tracker-writeback-dispatcher.c
index 266200e..de5d2dc 100644
--- a/src/tracker-writeback/tracker-writeback-dispatcher.c
+++ b/src/tracker-writeback/tracker-writeback-dispatcher.c
@@ -209,17 +209,17 @@ tracker_writeback_dispatcher_init (TrackerWritebackDispatcher *dispatcher)
 
 	priv->dbus_data->proxy_resources = 
 		dbus_g_proxy_new_for_name (priv->dbus_data->connection,
-					   TRACKER_SERVICE,
-					   TRACKER_RESOURCES_OBJECT,
-					   TRACKER_INTERFACE_RESOURCES);
+		                           TRACKER_SERVICE,
+		                           TRACKER_RESOURCES_OBJECT,
+		                           TRACKER_INTERFACE_RESOURCES);
 
 	dbus_g_proxy_add_signal (priv->dbus_data->proxy_resources, 
-				 "Writeback",
+	                         "Writeback",
 	                         TRACKER_TYPE_STR_STRV_MAP,
 	                         G_TYPE_INVALID);
 
 	dbus_g_proxy_connect_signal (priv->dbus_data->proxy_resources, 
-				     "Writeback",
+	                             "Writeback",
 	                             G_CALLBACK (sparql_writeback_cb),
 	                             dispatcher,
 	                             NULL);
@@ -273,8 +273,8 @@ tracker_writeback_dispatcher_new (void)
 }
 
 static gboolean
-sparql_rdf_types_match (const gchar * const *module_types,
-			const gchar * const *rdf_types)
+sparql_rdf_types_match (const gchar * const *module_types, 
+                        const gchar * const *rdf_types)
 {
 	guint n;
 
@@ -293,8 +293,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)
 {
 	TrackerWritebackDispatcherPrivate *priv;
 	QueryData *data;
@@ -323,8 +323,8 @@ sparql_query_cb (GPtrArray *result,
 				TrackerWriteback *writeback;
 
 				g_message ("  Updating metadata for file:'%s' using module:'%s'",
-					   "unknown",
-					   module->name);
+				           "unknown",
+				           module->name);
 
 				writeback = tracker_writeback_module_create (module);
 				tracker_writeback_update_metadata (writeback, result);
@@ -341,8 +341,8 @@ sparql_query_cb (GPtrArray *result,
 
 static void
 sparql_writeback_cb (DBusGProxy                 *proxy,
-		     GHashTable                 *subjects,
-		     TrackerWritebackDispatcher *object)
+                     GHashTable                 *subjects,
+                     TrackerWritebackDispatcher *object)
 {
 	TrackerWritebackDispatcherPrivate *priv;
 	QueryData *data;
diff --git a/src/tracker-writeback/tracker-writeback-file.c b/src/tracker-writeback/tracker-writeback-file.c
index 9133c62..c84a0e3 100644
--- a/src/tracker-writeback/tracker-writeback-file.c
+++ b/src/tracker-writeback/tracker-writeback-file.c
@@ -94,7 +94,7 @@ tracker_writeback_file_update_metadata (TrackerWriteback *writeback,
 	file = g_file_new_for_uri (row[0]);
 
 	file_info = g_file_query_info (file, 
-				       G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+	                               G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 	                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 	                               NULL, NULL);
 
diff --git a/src/tracker-writeback/tracker-writeback-module.c b/src/tracker-writeback/tracker-writeback-module.c
index dd5c077..bdfb3ee 100644
--- a/src/tracker-writeback/tracker-writeback-module.c
+++ b/src/tracker-writeback/tracker-writeback-module.c
@@ -66,9 +66,9 @@ writeback_module_load (GTypeModule *module)
 	g_module_make_resident (writeback_module->module);
 
 	if (!g_module_symbol (writeback_module->module, "writeback_module_create",
-			      (gpointer *) &writeback_module->create) ||
+	                      (gpointer *) &writeback_module->create) ||
 	    !g_module_symbol (writeback_module->module, "writeback_module_get_rdf_types",
-			      (gpointer *) &writeback_module->get_rdf_types)) {
+	                      (gpointer *) &writeback_module->get_rdf_types)) {
 		g_warning ("Could not load module symbols for '%s': %s",
 		           writeback_module->name,
 		           g_module_error ());
diff --git a/src/tracker-writeback/tracker-writeback-mp3.c b/src/tracker-writeback/tracker-writeback-mp3.c
index 1726e09..fe4d23c 100644
--- a/src/tracker-writeback/tracker-writeback-mp3.c
+++ b/src/tracker-writeback/tracker-writeback-mp3.c
@@ -41,10 +41,10 @@ struct TrackerWritebackMP3Class {
 	TrackerWritebackFileClass parent_class;
 };
 
-static GType                tracker_writeback_mp3_get_type     (void) G_GNUC_CONST;
+static GType                tracker_writeback_mp3_get_type             (void) G_GNUC_CONST;
 static gboolean             writeback_mp3_update_file_metadata (TrackerWritebackFile *wbf,
-								GFile                *file,
-								GPtrArray            *values);
+                                                                GFile                *file,
+                                                                GPtrArray            *values);
 static const gchar * const *writeback_mp3_content_types        (TrackerWritebackFile *wbf);
 
 G_DEFINE_DYNAMIC_TYPE (TrackerWritebackMP3, tracker_writeback_mp3, TRACKER_TYPE_WRITEBACK_FILE);
diff --git a/src/tracker-writeback/tracker-writeback-xmp.c b/src/tracker-writeback/tracker-writeback-xmp.c
index 985c51b..ed03590 100644
--- a/src/tracker-writeback/tracker-writeback-xmp.c
+++ b/src/tracker-writeback/tracker-writeback-xmp.c
@@ -37,8 +37,6 @@
 
 #define TRACKER_TYPE_WRITEBACK_XMP (tracker_writeback_xmp_get_type ())
 
-#define DEBUG_XMP
-
 typedef struct TrackerWritebackXMP TrackerWritebackXMP;
 typedef struct TrackerWritebackXMPClass TrackerWritebackXMPClass;
 
@@ -193,7 +191,7 @@ writeback_module_get_rdf_types (void)
 	        TRACKER_NFO_PREFIX "Image",
 	        TRACKER_NFO_PREFIX "Audio",
 	        TRACKER_NFO_PREFIX "Video",
-	        NULL
+	        NULL 
 	};
 
 	return rdf_types;