From 6e61d86ba202b5c7ef939970a74be13c6bcc2d20 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 23 Mar 2011 11:26:54 +0000 Subject: default gsettings now set to banshee to reflect the players desktop id change and voip widget low icon name corrected --- src/voip-input-widget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/voip-input-widget.c b/src/voip-input-widget.c index 1b36496..5f67fab 100644 --- a/src/voip-input-widget.c +++ b/src/voip-input-widget.c @@ -97,7 +97,7 @@ voip_input_widget_init (VoipInputWidget *self) g_signal_connect(priv->ido_voip_input_slider, "slider-released", G_CALLBACK(voip_input_widget_slider_released), self); GtkWidget* primary_image = ido_scale_menu_item_get_primary_image((IdoScaleMenuItem*)priv->ido_voip_input_slider); - GIcon * primary_gicon = g_themed_icon_new_with_default_fallbacks("audio-input-microphone-zero-panel"); + GIcon * primary_gicon = g_themed_icon_new_with_default_fallbacks("audio-input-microphone-low-zero-panel"); gtk_image_set_from_gicon(GTK_IMAGE(primary_image), primary_gicon, GTK_ICON_SIZE_MENU); g_object_unref(primary_gicon); -- cgit v1.2.3 From 478a6ac491e013bd0c9b13a34177c46d5645314b Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 23 Mar 2011 11:53:27 +0000 Subject: video playlists now filtered out --- src/playlists-menu-item.vala | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/playlists-menu-item.vala b/src/playlists-menu-item.vala index 782b5a2..c784734 100644 --- a/src/playlists-menu-item.vala +++ b/src/playlists-menu-item.vala @@ -46,8 +46,9 @@ public class PlaylistsMenuitem : PlayerItem public new void update (PlaylistDetails[] playlists) { foreach ( PlaylistDetails detail in playlists ){ - - if (this.already_observed(detail)) continue; + // We don't want to list playlists which are for videos)' + if (this.already_observed(detail) || this.is_video_related(detail)) + continue; Dbusmenu.Menuitem menuitem = new Menuitem(); menuitem.property_set (MENUITEM_PROP_LABEL, detail.name); @@ -119,6 +120,13 @@ public class PlaylistsMenuitem : PlayerItem return false; } + private bool is_video_related (PlaylistDetails new_detail) + { + var location = (string)new_detail.path; + if (location.contains ("/VideoLibrarySource/")) return true; + return false; + } + public void active_playlist_update (PlaylistDetails detail) { var update = detail.name; -- cgit v1.2.3 From 16ad03db951eb08a80041b7a0ed29f38db1a96f3 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 23 Mar 2011 14:41:10 +0000 Subject: use the new icons for playlists --- src/playlists-menu-item.vala | 5 +---- src/sound-service-dbus.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/playlists-menu-item.vala b/src/playlists-menu-item.vala index c784734..704f61c 100644 --- a/src/playlists-menu-item.vala +++ b/src/playlists-menu-item.vala @@ -52,10 +52,7 @@ public class PlaylistsMenuitem : PlayerItem Dbusmenu.Menuitem menuitem = new Menuitem(); menuitem.property_set (MENUITEM_PROP_LABEL, detail.name); - var result = this.parse_icon_path (detail.icon_path); - if (result != null) { - menuitem.property_set (MENUITEM_PROP_ICON_NAME, (string)result); - } + menuitem.property_set (MENUITEM_PROP_ICON_NAME, "playlist-symbolic"); menuitem.property_set (MENUITEM_PATH, (string)detail.path); menuitem.property_set_bool (MENUITEM_PROP_VISIBLE, true); diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c index 7c817af..1b9d29e 100644 --- a/src/sound-service-dbus.c +++ b/src/sound-service-dbus.c @@ -148,11 +148,8 @@ sound_service_dbus_create_root_item (SoundServiceDbus* self) { SoundServiceDbusPrivate * priv = SOUND_SERVICE_DBUS_GET_PRIVATE(self); priv->root_menuitem = dbusmenu_menuitem_new(); - g_debug("Root ID: %d", dbusmenu_menuitem_get_id(priv->root_menuitem)); + //g_debug("Root ID: %d", dbusmenu_menuitem_get_id(priv->root_menuitem)); DbusmenuServer *server = dbusmenu_server_new (INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH); - const gchar* paths[] = {"/usr/share/banshee-1/icons", NULL}; - dbusmenu_server_set_icon_paths (server, - paths); dbusmenu_server_set_root (server, priv->root_menuitem); g_object_unref (priv->root_menuitem); priv->device = device_new (self); -- cgit v1.2.3