diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gtkutil.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f5a86a78ce2..a9bac7dbf6b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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-22 Dan Nicolaescu <dann@ics.uci.edu> * term.c: Include stdarg.h. diff --git a/src/gtkutil.c b/src/gtkutil.c index 77d5fd65649..41926ace154 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3821,6 +3821,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); @@ -3839,8 +3840,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)) { |