Merge lp:~ken-vandine/gwibber/lp_923863 into lp:gwibber

[Ken VanDine]

Shutdown the service when using Quit from the menu if the unity lens isn't running.

[David Klasinc (bigwhale)]

review: Approve

=== modified file 'client/gwibber-client.vala'
--- client/gwibber-client.vala	2012-02-16 06:06:00 +0000
+++ client/gwibber-client.vala	2012-02-16 19:20:25 +0000
@@ -327,6 +327,34 @@
   private void on_quit ()
   {
     destroy ();
+    var service = new Gwibber.Service();
+
+    /* Check if the unity lens is running and only shutdown the 
+    *  service if it isn't
+    */
+    bool has_owner = false;
+    try {
+      string name = "com.canonical.Unity.Lens.Gwibber";
+      DBusConnection bus = Bus.get_sync (BusType.SESSION);
+      Variant result = bus.call_sync ("org.freedesktop.DBus",
+                                      "/org/freedesktop/dbus",
+                                      "org.freedesktop.DBus",
+                                      "NameHasOwner",
+                                      new Variant ("(s)", name),
+                                      new VariantType ("(b)"),
+                                      DBusCallFlags.NO_AUTO_START,
+                                      -1);
+      result.get ("(b)", out has_owner);
+    } catch (Error e) {
+      warning ("Unable to decide if '%s' is running: %s", name, e.message);
+    }
+
+    if (!has_owner)
+    {
+      debug ("Lens isn't running");
+      service.quit ();
+    }
+
   }
 
   bool on_configure_event (Gdk.EventConfigure event) {