comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- branch
- soc.2013.gobjectification.plugins
- changeset 36930
- c1b0e75051e3
- parent 36838
- 9dd39a792240
- parent 35047
- cf8ca70094ff
- child 36959
- 4806ff428ecd
equal
deleted
inserted
replaced
| 36929:eed15b8d51a1 | 36930:c1b0e75051e3 |
|---|---|
| 1708 pidgin_append_menu_action(GtkWidget *menu, PurpleMenuAction *act, | 1708 pidgin_append_menu_action(GtkWidget *menu, PurpleMenuAction *act, |
| 1709 gpointer object) | 1709 gpointer object) |
| 1710 { | 1710 { |
| 1711 GtkWidget *menuitem; | 1711 GtkWidget *menuitem; |
| 1712 GList *list; | 1712 GList *list; |
| 1713 const gchar *stock_id; | |
| 1714 GtkWidget *icon_image = NULL; | |
| 1713 | 1715 |
| 1714 if (act == NULL) { | 1716 if (act == NULL) { |
| 1715 return pidgin_separator(menu); | 1717 return pidgin_separator(menu); |
| 1716 } | 1718 } |
| 1717 | 1719 |
| 1720 stock_id = purple_menu_action_get_stock_icon(act); | |
| 1721 if (stock_id) { | |
| 1722 icon_image = gtk_image_new_from_stock(stock_id, | |
| 1723 gtk_icon_size_from_name( | |
| 1724 PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); | |
| 1725 } | |
| 1726 | |
| 1727 if (icon_image) { | |
| 1728 menuitem = gtk_image_menu_item_new_with_mnemonic( | |
| 1729 purple_menu_action_get_label(act)); | |
| 1730 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), | |
| 1731 icon_image); | |
| 1732 } else { | |
| 1733 menuitem = gtk_menu_item_new_with_mnemonic( | |
| 1734 purple_menu_action_get_label(act)); | |
| 1735 } | |
| 1736 | |
| 1718 list = purple_menu_action_get_children(act); | 1737 list = purple_menu_action_get_children(act); |
| 1719 menuitem = gtk_menu_item_new_with_mnemonic(purple_menu_action_get_label(act)); | |
| 1720 | 1738 |
| 1721 if (list == NULL) { | 1739 if (list == NULL) { |
| 1722 PurpleCallback callback; | 1740 PurpleCallback callback; |
| 1723 | 1741 |
| 1724 callback = purple_menu_action_get_callback(act); | 1742 callback = purple_menu_action_get_callback(act); |
