(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and

abort with a message on unhandled store_type values.

diff --git a/src/ChangeLog b/src/ChangeLog
index 13c5b45267650610d61e456d263b5edc1015011f..af62228927967733dcb4e3e6f3f95b6dde68b3a0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-06  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * gtkutil.c (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
+       abort with a message on unhandled store_type values.
+
 2007-11-03  Richard Stallman  <rms@gnu.org>
 
        * xdisp.c (handle_face_prop): Use face_at_buffer_position_no_overlays

diff --git a/src/gtkutil.c b/src/gtkutil.c
index b37620caa9caf247fe592c4a9b2ac0cb0a371698..86a4703d0b7fbd0470b1e0ba3cf37474a9554833 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3476,6 +3476,25 @@ xg_tool_bar_menu_proxy (toolitem, user_data)
 
               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)