# HG changeset patch # User Jan Dj¸«£rv # Date 1194347842 0 # Node ID 7c710af0ae5e96f176335d05f4b19bfcdb13ff45 # Parent 0c660f35bf59e330ab93a21188628f6757680301 (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and abort with a message on unhandled store_type values. diff -r 0c660f35bf59 -r 7c710af0ae5e src/gtkutil.c --- a/src/gtkutil.c Mon Nov 05 06:40:26 2007 +0000 +++ b/src/gtkutil.c Tue Nov 06 11:17:22 2007 +0000 @@ -3476,6 +3476,25 @@ wmenuimage = gtk_image_new_from_pixbuf (dest_pixbuf); } + else + { + fprintf (stderr, "internal error: GTK_IMAGE_PIXBUF failed\n"); + abort (); + } + } + else if (store_type == GTK_IMAGE_ICON_NAME) + { + const gchar *icon_name; + GtkIconSize icon_size; + + gtk_image_get_icon_name (wimage, &icon_name, &icon_size); + wmenuimage = gtk_image_new_from_icon_name (icon_name, + GTK_ICON_SIZE_MENU); + } + else + { + fprintf (stderr, "internal error: store_type is %d\n", store_type); + abort (); } } if (wmenuimage)