[tracker/gdbus-porting: 39/65] build: Fixed whitespace and coding style

[Jürg Billeter <juergbi src gnome org>]

commit 4c602b391a1b7b5ce511c2918940ef6983530afa
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Jan 4 10:03:24 2011 +0000

    build: Fixed whitespace and coding style

 src/libtracker-miner/Makefile.am             |    4 +-
 src/libtracker-miner/tracker-miner-manager.c |   28 +++++++++++++------------
 src/libtracker-miner/tracker-thumbnailer.c   |    2 +-
 src/miners/fs/tracker-miner-files-index.c    |    3 +-
 src/tracker-extract/Makefile.am              |    3 +-
 5 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 71fd6a9..3fad292 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -57,7 +57,7 @@ libtracker_minerinclude_HEADERS =                      \
 	tracker-network-provider.h                     \
 	tracker-password-provider.h                    \
 	tracker-storage.h                              \
-	tracker-thumbnailer.h                          
+	tracker-thumbnailer.h
 
 libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS =    \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@@ -111,4 +111,4 @@ CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST =                                           \
 	tracker-marshal.list                           \
 	tracker-miner.vapi                             \
-	tracker-miner.deps                             
+	tracker-miner.deps
\ No newline at end of file
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index 59a0f0a..5a39921 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -244,7 +244,7 @@ miner_progress_changed (GDBusConnection *connection,
 	const gchar *status = NULL;
 	gdouble progress = 0;
 
-	// todo test this g_variant_get
+	/* FIXME: todo test this g_variant_get */
 	g_variant_get (parameters, "^sd", &status, &progress);
 	g_signal_emit (user_data, signals[MINER_PROGRESS], 0, sender_name, status, progress);
 }
@@ -282,7 +282,7 @@ tracker_miner_manager_init (TrackerMinerManager *manager)
 
 	priv = TRACKER_MINER_MANAGER_GET_PRIVATE (manager);
 
-	priv->connection =  g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+	priv->connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
 
 	if (!priv->connection) {
 		g_critical ("Could not connect to the D-Bus session bus, %s",
@@ -304,7 +304,7 @@ tracker_miner_manager_init (TrackerMinerManager *manager)
 		data = m->data;
 		data->connection = g_object_ref (priv->connection);
 
-		// todo test all these routines
+		/* FIXME: todo test all these routines */
 
 		proxy = g_dbus_proxy_new_sync (priv->connection,
 		                               G_DBUS_PROXY_FLAGS_NONE,
@@ -581,7 +581,8 @@ initialize_miners_data (TrackerMinerManager *manager)
 	GMainLoop *main_loop;
 	GFile *file;
 	TrackerCrawler *crawler;
-	const gchar    *miners_dir;
+	const gchar *miners_dir;
+
 	crawler = tracker_crawler_new ();
 	main_loop = g_main_loop_new (NULL, FALSE);
 
@@ -595,7 +596,7 @@ initialize_miners_data (TrackerMinerManager *manager)
 	/* Go through service files */
 	miners_dir = g_getenv ("TRACKER_MINERS_DIR");
 	if (G_LIKELY (miners_dir == NULL)) {
-		miners_dir = TRACKER_MINERS_DIR ;
+		miners_dir = TRACKER_MINERS_DIR;
 	} else {
 		g_message ("Crawling miners in '%s' (set in env)", miners_dir);
 	}
@@ -651,7 +652,7 @@ tracker_miner_manager_get_available (TrackerMinerManager *manager)
  * until all pause requests have been resumed.
  *
  * Returns: %TRUE if the miner was paused successfully, otherwise
- * %FALSE. 
+ * %FALSE.
  **/
 gboolean
 tracker_miner_manager_pause (TrackerMinerManager *manager,
@@ -686,7 +687,7 @@ tracker_miner_manager_pause (TrackerMinerManager *manager,
 		app_name = "TrackerMinerManager client";
 	}
 
-	// todo test this call
+	/* FIXME: todo test this call */
 	v = g_dbus_proxy_call_sync (proxy,
 	                            "Pause",
 	                            g_variant_new ("ssi", app_name, reason, (gint) cookie),
@@ -715,10 +716,10 @@ tracker_miner_manager_pause (TrackerMinerManager *manager,
  * @cookie: pause cookie
  *
  * Tells @miner to resume activity. The miner won't actually resume
- * operations until all pause requests have been resumed. 
+ * operations until all pause requests have been resumed.
  *
  * Returns: %TRUE if the miner was successfully resumed, otherwise
- * %FALSE. 
+ * %FALSE.
  **/
 gboolean
 tracker_miner_manager_resume (TrackerMinerManager *manager,
@@ -738,7 +739,7 @@ tracker_miner_manager_resume (TrackerMinerManager *manager,
 		return FALSE;
 	}
 
-	// todo test this call
+	/* FIXME: todo test this call */
 	v = g_dbus_proxy_call_sync (proxy,
 	                            "Resume",
 	                            g_variant_new ("i", (gint) cookie),
@@ -870,7 +871,7 @@ tracker_miner_manager_get_status (TrackerMinerManager  *manager,
 		return FALSE;
 	}
 
-	// todo test this call
+	/* FIXME: todo test this call */
 	v = g_dbus_proxy_call_sync (proxy,
 	                            "GetStatus",
 	                            NULL,
@@ -891,6 +892,7 @@ tracker_miner_manager_get_status (TrackerMinerManager  *manager,
 
 	if (v && status) {
 		gsize len;
+
 		*status = g_variant_dup_string (v, &len);
 	}
 
@@ -950,7 +952,7 @@ tracker_miner_manager_is_paused (TrackerMinerManager *manager,
 		return FALSE;
 	}
 
-	// todo test this call
+	/* FIXME: todo test this call */
 	v = g_dbus_proxy_call_sync (proxy,
 	                            "GetPauseDetails",
 	                            NULL,
@@ -972,7 +974,7 @@ tracker_miner_manager_is_paused (TrackerMinerManager *manager,
 	}
 
 	if (v) {
-		// todo test this format string
+		/* FIXME: todo test this format string */
 		g_variant_get (v, "^as^as", &apps, &r);
 		g_variant_unref (v);
 	}
diff --git a/src/libtracker-miner/tracker-thumbnailer.c b/src/libtracker-miner/tracker-thumbnailer.c
index 44925af..ea5a6df 100644
--- a/src/libtracker-miner/tracker-thumbnailer.c
+++ b/src/libtracker-miner/tracker-thumbnailer.c
@@ -215,7 +215,7 @@ error_handler:
 			guint i;
 
 			/* The table that you receive may contain duplicate mime-types, because
-		 	* they are grouped against the uri_schemes table */
+			 * they are grouped against the uri_schemes table */
 
 			hash = g_hash_table_new (g_str_hash, g_str_equal);
 
diff --git a/src/miners/fs/tracker-miner-files-index.c b/src/miners/fs/tracker-miner-files-index.c
index f6117d4..de4629a 100644
--- a/src/miners/fs/tracker-miner-files-index.c
+++ b/src/miners/fs/tracker-miner-files-index.c
@@ -481,8 +481,7 @@ handle_method_call (GDBusConnection       *connection,
 
 	if (g_strcmp0 (method_name, "ReindexMimeTypes") == 0) {
 		tracker_miner_files_index_reindex_mime_types (miner, invocation, parameters);
-	} else
-	if (g_strcmp0 (method_name, "IndexFile") == 0) {
+	} else if (g_strcmp0 (method_name, "IndexFile") == 0) {
 		handle_method_call_index_file (miner, invocation, parameters);
 	} else {
 		g_assert_not_reached ();
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 4c69748..ce9d84a 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -388,8 +388,7 @@ tracker-marshal.c: tracker-marshal.list
 	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
 		   $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
 
-BUILT_SOURCES =                                        \
-	$(marshal_sources)                             
+BUILT_SOURCES = $(marshal_sources)
 
 CLEANFILES = $(BUILT_SOURCES)