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

is a string.

2 files changed, 12 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6e4d3379beb..29d3294210c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index fd89015aedc..5cfc980c5b8 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -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);