Commit c3554f68 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* src/gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL

is a string.
parent 1ff2e434
2010-08-17 Stefan Monnier <monnier@iro.umontreal.ca>
* gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL
is a string.
2010-08-17 Jan Djärv <jan.h.d@swipnet.se>
 
* nsfns.m (ns_frame_parm_handlers): Add a slot for the
......@@ -41,8 +46,9 @@
 
2010-08-15 Jan Djärv <jan.h.d@swipnet.se>
 
* keyboard.c (parse_tool_bar_item): malloc buf. Set TOOL_BAR_ITEM_LABEL
to empty string if not set to new_lbl (Bug#6855).
* keyboard.c (parse_tool_bar_item): malloc buf.
Set TOOL_BAR_ITEM_LABEL to empty string if not set to
new_lbl (Bug#6855).
 
2010-08-14 Eli Zaretskii <eliz@gnu.org>
 
......@@ -50,8 +56,8 @@
* w32term.c (x_draw_stretch_glyph_string): In R2L rows, display
the cursor on the right edge of the stretch glyph.
 
* xdisp.c (window_box_right_offset, window_box_right): Fix
commentary.
* xdisp.c (window_box_right_offset, window_box_right):
Fix commentary.
 
* xdisp.c (Fcurrent_bidi_paragraph_direction): Fix paragraph
direction when point is inside a run of whitespace characters.
......
......@@ -4292,7 +4292,8 @@ update_frame_tool_bar (FRAME_PTR f)
GtkWidget *wbutton = NULL;
GtkWidget *weventbox;
Lisp_Object specified_file;
char *label = SSDATA (PROP (TOOL_BAR_ITEM_LABEL));
char *label = (STRINGP (PROP (TOOL_BAR_ITEM_LABEL))
? SSDATA (PROP (TOOL_BAR_ITEM_LABEL)) : "");
ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment