diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-23 16:08:39 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-23 16:08:39 -0600 |
| commit | fc096ca12b152461dfddbfdf74720b98691448ce (patch) | |
| tree | 69929f4ec42be0086b9ca063365bc36f9f915390 /libdbusmenu-gtk/parser.c | |
| parent | a439aeb8fd08d9858055bbb2ae1326a1335600d1 (diff) | |
| download | libdbusmenu-fc096ca12b152461dfddbfdf74720b98691448ce.tar.gz libdbusmenu-fc096ca12b152461dfddbfdf74720b98691448ce.tar.bz2 libdbusmenu-fc096ca12b152461dfddbfdf74720b98691448ce.zip | |
Stop using the data field in gtk image for GTK3
Diffstat (limited to 'libdbusmenu-gtk/parser.c')
| -rw-r--r-- | libdbusmenu-gtk/parser.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index f1c46ba..cfce42a 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -427,12 +427,15 @@ update_stock_item (DbusmenuMenuitem *menuitem, if (gtk_image_get_storage_type (image) != GTK_IMAGE_STOCK) return FALSE; - gtk_stock_lookup (image->data.stock.stock_id, &stock); + gchar * stock_id = NULL; + gtk_image_get_stock(image, &stock_id, NULL); + + gtk_stock_lookup (stock_id, &stock); if (should_show_image (image)) dbusmenu_menuitem_property_set (menuitem, DBUSMENU_MENUITEM_PROP_ICON_NAME, - image->data.stock.stock_id); + stock_id); else dbusmenu_menuitem_property_remove (menuitem, DBUSMENU_MENUITEM_PROP_ICON_NAME); @@ -473,13 +476,16 @@ update_icon_name (DbusmenuMenuitem *menuitem, if (gtk_image_get_storage_type (image) != GTK_IMAGE_ICON_NAME) return; - if (should_show_image (image)) + if (should_show_image (image)) { + const gchar * icon_name = NULL; + gtk_image_get_icon_name(image, &icon_name, NULL); dbusmenu_menuitem_property_set (menuitem, DBUSMENU_MENUITEM_PROP_ICON_NAME, - image->data.name.icon_name); - else + icon_name); + } else { dbusmenu_menuitem_property_remove (menuitem, DBUSMENU_MENUITEM_PROP_ICON_NAME); + } } static GtkWidget * |