diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2007-11-22 08:35:57 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2007-11-22 08:35:57 +0000 |
| commit | d4ad8c0488f1d78b147f93e5b76edbe41a037e2f (patch) | |
| tree | 47aa7be91f5e40ba2717a59436dc10d76c99a4ff /src/gtkutil.c | |
| parent | d2ea686304322d9184a6a29590111793d7ffeb42 (diff) | |
| download | emacs-d4ad8c0488f1d78b147f93e5b76edbe41a037e2f.tar.gz | |
(update_frame_tool_bar): Don't call x-gtk-map-stock if
file for image is nil.
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 6 |
1 files changed, 4 insertions, 2 deletions
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)) { |