diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-03-23 13:46:05 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-03-23 13:46:05 -0400 |
| commit | 52375af2e5266de12fb9430d41a4941bd937c15b (patch) | |
| tree | 2f9b6645b0f66ae2eddd025ebe8b64dacd1ad48a /src | |
| parent | f05dff9b5d6c5e921f3056c142068ea7f6f41486 (diff) | |
| parent | 4b955bef19d6a40d9da19a64ff4d0889ae3135a9 (diff) | |
| download | ayatana-indicator-sound-52375af2e5266de12fb9430d41a4941bd937c15b.tar.gz ayatana-indicator-sound-52375af2e5266de12fb9430d41a4941bd937c15b.tar.bz2 ayatana-indicator-sound-52375af2e5266de12fb9430d41a4941bd937c15b.zip | |
Import upstream version 0.6.5.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/player-controller.c | 4 | ||||
| -rw-r--r-- | src/player-controller.vala | 4 | ||||
| -rw-r--r-- | src/settings-manager.c | 6 | ||||
| -rw-r--r-- | src/settings-manager.vala | 3 |
4 files changed, 12 insertions, 5 deletions
diff --git a/src/player-controller.c b/src/player-controller.c index 5a2a64f..6dfd909 100644 --- a/src/player-controller.c +++ b/src/player-controller.c @@ -533,7 +533,7 @@ void player_controller_update_layout (PlayerController* self) { _tmp4_ = gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT); _tmp5_ = (PlayerItem*) _tmp4_; _tmp6_ = g_app_info_get_id (self->priv->_app_info); - dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) _tmp5_, DBUSMENU_MENUITEM_PROP_VISIBLE, g_strcmp0 (_tmp6_, "banshee.desktop") == 0); + dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) _tmp5_, DBUSMENU_MENUITEM_PROP_VISIBLE, g_strcmp0 (_tmp6_, "banshee-1.desktop") == 0); _g_object_unref0 (_tmp5_); _g_object_unref0 (playlists_menuitem); return; @@ -550,7 +550,7 @@ void player_controller_update_layout (PlayerController* self) { _g_object_unref0 (_tmp10_); _g_object_unref0 (_tmp8_); _tmp14_ = g_app_info_get_id (self->priv->_app_info); - if (g_strcmp0 (_tmp14_, "banshee.desktop") == 0) { + if (g_strcmp0 (_tmp14_, "banshee-1.desktop") == 0) { gpointer _tmp15_ = NULL; PlayerItem* _tmp16_; TransportMenuitem* transport; diff --git a/src/player-controller.vala b/src/player-controller.vala index 20479d9..86dfe9b 100644 --- a/src/player-controller.vala +++ b/src/player-controller.vala @@ -150,12 +150,12 @@ public class PlayerController : GLib.Object playlists_menuitem.root_item.property_set_bool (MENUITEM_PROP_VISIBLE, false ); this.custom_items[widget_order.TRANSPORT].property_set_bool (MENUITEM_PROP_VISIBLE, - this.app_info.get_id() == "banshee.desktop"); + this.app_info.get_id() == "banshee-1.desktop"); return; } this.custom_items[widget_order.METADATA].property_set_bool (MENUITEM_PROP_VISIBLE, this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format())); - if (this.app_info.get_id() == "banshee.desktop"){ + if (this.app_info.get_id() == "banshee-1.desktop"){ TransportMenuitem transport = this.custom_items[widget_order.TRANSPORT] as TransportMenuitem; transport.handle_cached_action(); } diff --git a/src/settings-manager.c b/src/settings-manager.c index a22d4fa..8c67740 100644 --- a/src/settings-manager.c +++ b/src/settings-manager.c @@ -154,6 +154,12 @@ GeeArrayList* settings_manager_fetch_interested (SettingsManager* self) { _tmp5_ = g_strdup (s_collection[s_it]); s = _tmp5_; { + gboolean _tmp6_; + _tmp6_ = gee_abstract_collection_contains ((GeeAbstractCollection*) list, s); + if (_tmp6_) { + _g_free0 (s); + continue; + } if (_vala_string_array_contains (blacklisted, blacklisted_length1, s)) { _g_free0 (s); continue; diff --git a/src/settings-manager.vala b/src/settings-manager.vala index 6800423..7acc3b1 100644 --- a/src/settings-manager.vala +++ b/src/settings-manager.vala @@ -41,7 +41,8 @@ public class SettingsManager : GLib.Object var interested = this.settings.get_strv ("interested-media-players"); var list = new ArrayList<string>(); foreach(var s in interested){ - if ( s in blacklisted ) continue; + if (s in list) continue; + if (s in blacklisted) continue; list.add(s); } return list; |