[yelp] Correctly detect Unity for conditional processing

[Shaun McCance <shaunm src gnome org>]

commit 60dc23ab04ae06b04accdb6d251ba92bb2380796
Author: Shaun McCance <shaunm gnome org>
Date:   Tue Sep 3 08:57:18 2013 -0400

    Correctly detect Unity for conditional processing
    
    Unity provides the org.gnome.Shell DBus interface, so it wasn't
    getting detected because Yelp assumed it was GNOME Shell.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=707352

 libyelp/yelp-settings.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/libyelp/yelp-settings.c b/libyelp/yelp-settings.c
index c202a05..c3acaa5 100644
--- a/libyelp/yelp-settings.c
+++ b/libyelp/yelp-settings.c
@@ -320,12 +320,16 @@ yelp_settings_constructed (GObject *object)
     if (env_classic)
         yelp_settings_set_if_token (settings, "platform:gnome-classic");
 
-    if (env_shell)
+    /* order is important:
+       gnome-shell also provides org.gnome.Panel
+       unity also provides org.gnome.Shell
+     */
+    if (env_unity)
+        yelp_settings_set_if_token (settings, "platform:unity");
+    else if (env_shell)
         yelp_settings_set_if_token (settings, "platform:gnome-shell");
     else if (env_xfce)
         yelp_settings_set_if_token (settings, "platform:xfce");
-    else if (env_unity)
-        yelp_settings_set_if_token (settings, "platform:unity");
     else if (env_panel)
         yelp_settings_set_if_token (settings, "platform:gnome-panel");