[tracker/miner-fs-initable-iface] libtracker-miner, tracker-miner-fs: Always use inner_error and propagate it

[Aleksander Morgado <aleksm src gnome org>]

commit 1b4eb450b01a7a6e27adb8768f8ad06557b84e86
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Tue Feb 1 13:13:05 2011 +0100

    libtracker-miner, tracker-miner-fs: Always use inner_error and propagate it

 src/libtracker-miner/tracker-miner-object.c |    6 ++++--
 src/libtracker-miner/tracker-miner-web.c    |    3 ++-
 src/miners/fs/tracker-miner-applications.c  |    4 +++-
 src/miners/fs/tracker-miner-files.c         |    7 +++++--
 4 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-object.c b/src/libtracker-miner/tracker-miner-object.c
index 7b944a8..72b9a4e 100644
--- a/src/libtracker-miner/tracker-miner-object.c
+++ b/src/libtracker-miner/tracker-miner-object.c
@@ -355,14 +355,16 @@ miner_initable_init (GInitable     *initable,
 	};
 
 	/* Try to get SPARQL connection... */
-	miner->private->connection = tracker_sparql_connection_get (NULL, error);
+	miner->private->connection = tracker_sparql_connection_get (NULL, &inner_error);
 	if (!miner->private->connection) {
+		g_propagate_error (error, inner_error);
 		return FALSE;
 	}
 
 	/* Try to get DBus connection... */
-	miner->private->d_connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, error);
+	miner->private->d_connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &inner_error);
 	if (!miner->private->d_connection) {
+		g_propagate_error (error, inner_error);
 		return FALSE;
 	}
 
diff --git a/src/libtracker-miner/tracker-miner-web.c b/src/libtracker-miner/tracker-miner-web.c
index 4fbf5dd..cf14b39 100644
--- a/src/libtracker-miner/tracker-miner-web.c
+++ b/src/libtracker-miner/tracker-miner-web.c
@@ -158,7 +158,8 @@ miner_web_initable_init (GInitable     *initable,
 	mw = TRACKER_MINER_WEB (initable);
 
 	/* Chain up parent's initable callback before calling child's one */
-	if (!miner_web_initable_parent_iface->init (initable, cancellable, error)) {
+	if (!miner_web_initable_parent_iface->init (initable, cancellable, &inner_error)) {
+		g_propagate_error (error, inner_error);
 		return FALSE;
 	}
 
diff --git a/src/miners/fs/tracker-miner-applications.c b/src/miners/fs/tracker-miner-applications.c
index 9559265..67b543e 100644
--- a/src/miners/fs/tracker-miner-applications.c
+++ b/src/miners/fs/tracker-miner-applications.c
@@ -113,12 +113,14 @@ miner_applications_initable_init (GInitable     *initable,
 	TrackerMinerApplications *ma;
 	TrackerMinerFS *fs;
 	GFile *file;
+	GError *inner_error = NULL;
 
 	ma = TRACKER_MINER_APPLICATIONS (initable);
 	fs = TRACKER_MINER_FS (initable);
 
 	/* Chain up parent's initable callback before calling child's one */
-	if (!miner_applications_initable_parent_iface->init (initable, cancellable, error)) {
+	if (!miner_applications_initable_parent_iface->init (initable, cancellable, &inner_error)) {
+		g_propagate_error (error, inner_error);
 		return FALSE;
 	}
 
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index 44459e3..5dadeb3 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -337,6 +337,7 @@ miner_files_initable_init (GInitable     *initable,
 {
 	TrackerMinerFiles *mf;
 	TrackerMinerFS *fs;
+	GError *inner_error = NULL;
 	GSList *mounts = NULL;
 	GSList *dirs;
 	GSList *m;
@@ -345,13 +346,15 @@ miner_files_initable_init (GInitable     *initable,
 	fs = TRACKER_MINER_FS (initable);
 
 	/* Chain up parent's initable callback before calling child's one */
-	if (!miner_files_initable_parent_iface->init (initable, cancellable, error)) {
+	if (!miner_files_initable_parent_iface->init (initable, cancellable, &inner_error)) {
+		g_propagate_error (error, inner_error);
 		return FALSE;
 	}
 
 	/* Set up extractor and signals */
-	mf->private->connection =  g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, error);
+	mf->private->connection =  g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &inner_error);
 	if (!mf->private->connection) {
+		g_propagate_error (error, inner_error);
 		g_prefix_error (error,
 		                "Could not connect to the D-Bus session bus. ");
 		return FALSE;