[Emacs-diffs] /srv/bzr/emacs/trunk r101113: * src/gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL

[Stefan Monnier]

------------------------------------------------------------
revno: 101113
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2010-08-17 23:43:47 +0200
message:
  * src/gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL
  is a string.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-17 21:05:26 +0000
+++ b/src/ChangeLog     2010-08-17 21:43:47 +0000
@@ -1,3 +1,8 @@
+2010-08-17  Stefan Monnier  <address@hidden>
+
+       * gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL
+       is a string.
+
 2010-08-17  Jan Djärv  <address@hidden>
 
        * nsfns.m (ns_frame_parm_handlers): Add a slot for the
@@ -41,8 +46,9 @@
 
 2010-08-15  Jan Djärv  <address@hidden>
 
-       * 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  <address@hidden>
 
@@ -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.

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2010-08-11 18:28:10 +0000
+++ b/src/gtkutil.c     2010-08-17 21:43:47 +0000
@@ -4292,7 +4292,8 @@
       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);