aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-12-21 17:57:10 +0000
committerConor Curran <conor.curran@canonical.com>2010-12-21 17:57:10 +0000
commit1d49193cf8e565e55eb9d6b519e9d76438af9197 (patch)
tree631720dfa4f9d666636c5b895510382d41a509b9
parenta822c2aa28a91b8ca529760b041d7a11ab823daf (diff)
parent4aa3c531119fec777e63bdb3fe953b6a35d5ffae (diff)
downloadayatana-indicator-sound-1d49193cf8e565e55eb9d6b519e9d76438af9197.tar.gz
ayatana-indicator-sound-1d49193cf8e565e55eb9d6b519e9d76438af9197.tar.bz2
ayatana-indicator-sound-1d49193cf8e565e55eb9d6b519e9d76438af9197.zip
merged bug fix for colour banshee icon
-rw-r--r--src/title-widget.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/title-widget.c b/src/title-widget.c
index cbdf28e..08b4b81 100644
--- a/src/title-widget.c
+++ b/src/title-widget.c
@@ -92,7 +92,7 @@ title_widget_set_icon(TitleWidget *self)
GString* app_panel = g_string_new ( g_utf8_strdown ( dbusmenu_menuitem_property_get(priv->twin_item, DBUSMENU_TITLE_MENUITEM_NAME),
-1 ));
GtkWidget * icon = NULL;
-
+
// Not ideal but apparently we want the banshee icon to be the greyscale one
// and any others to be the icon from the desktop file => colour.
if ( g_string_equal ( banshee_string, app_panel ) == TRUE &&
@@ -153,18 +153,12 @@ title_widget_property_update(DbusmenuMenuitem* item, gchar* property,
{
g_return_if_fail (IS_TITLE_WIDGET (userdata));
TitleWidget* mitem = TITLE_WIDGET(userdata);
- g_debug("PROPERTY UPDATE FOR THE TITLE");
if(g_ascii_strcasecmp(DBUSMENU_TITLE_MENUITEM_NAME, property) == 0){
gtk_menu_item_set_label (GTK_MENU_ITEM(mitem),
g_value_get_string(value));
}
else if(g_ascii_strcasecmp(DBUSMENU_TITLE_MENUITEM_ICON, property) == 0){
- g_debug("changing the icon data on the title - %s",
- g_value_get_string(value));
- GtkWidget * icon = gtk_image_new_from_icon_name(g_value_get_string(value),
- GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mitem), GTK_WIDGET(icon));
-
+ title_widget_set_icon (mitem);
}
}