Merge lp:~darkxst/gnome-settings-daemon/have-unity into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Tim Lunn]

[Robert Ancell (robert-ancell)]

Is this fixing a specific problem?

https://developer.gnome.org/gio/unstable/gio-Watching-Bus-Names.html#g-bus-watch-name says
"You are guaranteed that one of the handlers will be invoked after calling this function" so have_unity will be set to FALSE immediately.

It is a bit odd that since there are two watches notify_have_shell will be called twice (once for each name) but the result should be the same - in GNOME have_unity will be set to FALSE.

[Robert Ancell (robert-ancell)]

review: Needs Information

[lp:~darkxst/gnome-settings-daemon/have-unity]

469. By Tim Lunn on 2014-04-09

remove non-logical code

Unmerged revisions

469. By Tim Lunn on 2014-04-09

remove non-logical code

468. By Tim Lunn on 2014-04-09

* debian/patches/90_set_gmenus_xsettings.patch:
  - don't set have_unity = TRUE before unity has appeared

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-09 01:39:02 +0000
+++ debian/changelog	2014-04-09 02:51:58 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.8.6.1-0ubuntu12) UNRELEASED; urgency=medium
+
+  * debian/patches/90_set_gmenus_xsettings.patch:
+    - don't set have_unity = TRUE before unity has appeared
+
+ -- Tim Lunn <[e-mail]>  Wed, 09 Apr 2014 12:14:22 +1000
+
 gnome-settings-daemon (3.8.6.1-0ubuntu11) trusty; urgency=medium
 
   [ Jackson Doak ]

=== modified file 'debian/patches/90_set_gmenus_xsettings.patch'
--- debian/patches/90_set_gmenus_xsettings.patch	2014-04-09 01:37:13 +0000
+++ debian/patches/90_set_gmenus_xsettings.patch	2014-04-09 02:51:58 +0000
@@ -93,7 +93,7 @@
          manager->priv->have_shell = TRUE;
          manager->priv->shell_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
                                                                 "org.gnome.Shell",
-@@ -867,6 +899,20 @@
+@@ -871,6 +903,19 @@
                                                                 NULL);
  }
  
@@ -101,7 +101,6 @@
 +start_unity_monitor (GnomeXSettingsManager *manager)
 +{
 +        notify_have_shell (manager);
-+        manager->priv->have_unity = TRUE;
 +        manager->priv->unity_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
 +                                                               "com.canonical.AppMenu.Registrar",
 +                                                               0,