[tracker/gdbus: 14/21] libtracker-bus: Fix error handling

[Martyn James Russell <mr src gnome org>]

commit d9b17f33902fa4058d31995e908873a8cbe1dc7f
Author: Jürg Billeter <j bitron ch>
Date:   Mon Oct 25 14:05:08 2010 +0200

    libtracker-bus: Fix error handling

 src/libtracker-bus/tracker-bus.vala |   42 +++++++++++++++-------------------
 1 files changed, 19 insertions(+), 23 deletions(-)
---
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala
index fe78190..fad74ad 100644
--- a/src/libtracker-bus/tracker-bus.vala
+++ b/src/libtracker-bus/tracker-bus.vala
@@ -68,30 +68,22 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
 	static Statistics statistics_object;
 	static bool initialized;
 
-	public Connection ()
+	public Connection () throws Sparql.Error, IOError, DBusError
 	requires (!initialized) {
-		initialized = true;
-		
-		try {
-			// FIXME: Ideally we would just get these as and when we need them
-			resources_object = GLib.Bus.get_proxy_sync (BusType.SESSION,
-			                                            TRACKER_DBUS_SERVICE,
-			                                            TRACKER_DBUS_OBJECT_RESOURCES);
-			steroids_object = GLib.Bus.get_proxy_sync (BusType.SESSION,
-			                                           TRACKER_DBUS_SERVICE,
-			                                           TRACKER_DBUS_OBJECT_STEROIDS);
-			statistics_object = GLib.Bus.get_proxy_sync (BusType.SESSION,
-			                                             TRACKER_DBUS_SERVICE,
-			                                             TRACKER_DBUS_OBJECT_STATISTICS);
-		} catch (DBusError e) {
-			warning ("Could not connect to D-Bus service:'%s': %s", TRACKER_DBUS_INTERFACE_RESOURCES, e.message);
-			initialized = false;
-			return;
-		}
-		
+		// FIXME: Ideally we would just get these as and when we need them
+		resources_object = GLib.Bus.get_proxy_sync (BusType.SESSION,
+		                                            TRACKER_DBUS_SERVICE,
+		                                            TRACKER_DBUS_OBJECT_RESOURCES);
+		steroids_object = GLib.Bus.get_proxy_sync (BusType.SESSION,
+		                                           TRACKER_DBUS_SERVICE,
+		                                           TRACKER_DBUS_OBJECT_STEROIDS);
+		statistics_object = GLib.Bus.get_proxy_sync (BusType.SESSION,
+		                                             TRACKER_DBUS_SERVICE,
+		                                             TRACKER_DBUS_OBJECT_STATISTICS);
+
 		initialized = true;
 	}
- 
+
 	~Connection () {
 		initialized = false;
 	}
@@ -383,6 +375,10 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
 }
 
 public Tracker.Sparql.Connection module_init () {
-	Tracker.Sparql.Connection plugin = new Tracker.Bus.Connection ();
-	return plugin;
+	try {
+		Tracker.Sparql.Connection plugin = new Tracker.Bus.Connection ();
+		return plugin;
+	} catch {
+		return null;
+	}
 }