[Emacs-diffs] Changes to emacs/src/gtkutil.c,v [EMACS_22_BASE]

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Jan Djärv <jhd>        07/11/06 11:17:23

Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.106.2.10
retrieving revision 1.106.2.11
diff -u -b -r1.106.2.10 -r1.106.2.11
--- gtkutil.c   16 Sep 2007 09:34:41 -0000      1.106.2.10
+++ gtkutil.c   6 Nov 2007 11:17:22 -0000       1.106.2.11
@@ -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)