Merge lp:~charlesk/indicator-sound/lp-1432446-use-bus-watcher-for-notifications into lp:indicator-sound/15.10

[Charles Kerr]

Use the BusWatcher to look for org.freedesktop.Notifications ownership changes on the bus.

Use BusWatcher, rather than a GDBusProxy, to watch for org.freedesktop.Notifications' owner to change. BusWatcher already handles bus errors gracefully, and as a bonus the resulting service code is slightly simpler.

This crash is happening when there are bigger problems on the system, evidenced by the ticket's description of a blank white screen before this crash shows up. i-sound isn't much use without a working session bus, but at least we can stop it from generating redundant bug reports.

Sibling 15.04 MP: https://code.launchpad.net/~charlesk/indicator-sound/lp-1432446-use-bus-watcher-for-notifications/+merge/256861

[dobey (dobey)]

review: Approve

=== modified file 'src/service.vala'
--- src/service.vala	2015-02-27 22:36:17 +0000
+++ src/service.vala	2015-05-05 19:09:37 +0000
@@ -19,7 +19,6 @@
 
 public class IndicatorSound.Service: Object {
 	DBusConnection bus;
-	DBusProxy notification_proxy;
 
 	public Service (MediaPlayerList playerlist, VolumeControl volume, AccountsServiceUser? accounts) {
 		try {
@@ -29,18 +28,10 @@
 		}
 
 		sync_notification = new Notify.Notification(_("Volume"), "", "audio-volume-muted");
-		try {
-			this.notification_proxy = new DBusProxy.for_bus_sync(GLib.BusType.SESSION,
-				DBusProxyFlags.DO_NOT_LOAD_PROPERTIES | DBusProxyFlags.DO_NOT_CONNECT_SIGNALS | DBusProxyFlags.DO_NOT_AUTO_START,
-				null, /* interface info */
-				"org.freedesktop.Notifications",
-				"/org/freedesktop/Notifications",
-				"org.freedesktop.Notifications",
-				null);
-			this.notification_proxy.notify["g-name-owner"].connect ( () => { debug("Notifications name owner changed"); check_sync_notification = false; } );
-		} catch (GLib.Error e) {
-			error("Unable to build notification proxy: %s", e.message);
-		}
+		BusWatcher.watch_namespace (GLib.BusType.SESSION,
+		                            "org.freedesktop.Notifications",
+		                            () => { debug("Notifications name appeared"); check_sync_notification = false; },
+		                            () => { debug("Notifications name vanshed");  check_sync_notification = false; });
 
 		this.settings = new Settings ("com.canonical.indicator.sound");
 		this.sharedsettings = new Settings ("com.ubuntu.sound");