From d4ad8c0488f1d78b147f93e5b76edbe41a037e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Thu, 22 Nov 2007 08:35:57 +0000 Subject: (update_frame_tool_bar): Don't call x-gtk-map-stock if file for image is nil. --- src/gtkutil.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gtkutil.c') 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)) { -- cgit v1.2.1