procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(update_frame_tool_bar): Don't call x-gtk-map-stock if

Browse source 
file for image is nil.
This commit is contained in:
Jan Djärv 2007-11-22 08:40:20 +00:00
parent 33127d1a78
commit 1fbf538610
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2007-11-22 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* gtkutil.c (update_frame_tool_bar): Don't call x-gtk-map-stock if
file for image is nil.
2007-11-19 Jason Rumney <jasonr@gnu.org>
* w32bdf.c (w32_init_bdf_font, w32_BDF_to_x_font): CreateFileMapping

6
src/gtkutil.c
View file

@ -3808,6 +3808,7 @@ update_frame_tool_bar (f)
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 @@ update_frame_tool_bar (f)
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))
{