diff options
| author | Shaun McCance <shaunm@gnome.org> | 2013-09-03 08:57:18 -0400 |
|---|---|---|
| committer | Shaun McCance <shaunm@gnome.org> | 2013-09-03 08:58:44 -0400 |
| commit | 60dc23ab04ae06b04accdb6d251ba92bb2380796 (patch) | |
| tree | cd06527db82aa5c4ae00f59e02bdd078b36039bc | |
| parent | f538077037a099f4c1a6fdef56d8d8dc9eb2c9ae (diff) | |
| download | yelp-60dc23ab04ae06b04accdb6d251ba92bb2380796.tar.gz | |
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
| -rw-r--r-- | 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 c202a05f..c3acaa59 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"); |