aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-03-23 14:41:10 +0000
committerConor Curran <conor.curran@canonical.com>2011-03-23 14:41:10 +0000
commit16ad03db951eb08a80041b7a0ed29f38db1a96f3 (patch)
tree8e1bbd9236a78bfef15122b5282b06a9858b6d88
parent478a6ac491e013bd0c9b13a34177c46d5645314b (diff)
downloadayatana-indicator-sound-16ad03db951eb08a80041b7a0ed29f38db1a96f3.tar.gz
ayatana-indicator-sound-16ad03db951eb08a80041b7a0ed29f38db1a96f3.tar.bz2
ayatana-indicator-sound-16ad03db951eb08a80041b7a0ed29f38db1a96f3.zip
use the new icons for playlists
-rw-r--r--src/playlists-menu-item.vala5
-rw-r--r--src/sound-service-dbus.c5
2 files changed, 2 insertions, 8 deletions
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);