[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/22 08:39:38

Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.106.2.11
retrieving revision 1.106.2.12
diff -u -b -r1.106.2.11 -r1.106.2.12
--- gtkutil.c   6 Nov 2007 11:17:22 -0000       1.106.2.11
+++ gtkutil.c   22 Nov 2007 08:39:38 -0000      1.106.2.12
@@ -3808,6 +3808,7 @@
       GtkWidget *wbutton = NULL;
       GtkWidget *weventbox;
       Lisp_Object func = intern ("x-gtk-map-stock");
+      Lisp_Object specified_file;
 
       ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i);
 
@@ -3826,8 +3827,9 @@
           continue;
         }
 
-      if (EQ (Qt, Ffboundp (func))) 
-        stock = call1 (func, file_for_image (image));
+      specified_file = file_for_image (image);
+      if (!NILP (specified_file) && EQ (Qt, Ffboundp (func)))
+        stock = call1 (func, specified_file);
 
       if (! NILP (stock) && STRINGP (stock))
         {