* keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not HELP.

diff --git a/src/ChangeLog b/src/ChangeLog
index 71a1caa38e831f63e72030b5fbea8d8937a63b63..df7202fc24387c17bb516cd626054dceecdfb356 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL
+       not HELP.
+
 2010-09-17  Stephen Berman  <stephen.berman@gmx.net>
 
        * frame.c (Ftool_bar_pixel_width): New function to expose tool

diff --git a/src/keyboard.c b/src/keyboard.c
index 7b1a39403f39a5bb81c914761608afed68ba2bad..eed031a3c2e6ca29ce05d958a549681d59fdc450 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8305,7 +8305,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
         {
           const char *bad_label = "!!?GARBLED ITEM?!!";
           /* `:label LABEL-STRING'.  */
-          PROP (TOOL_BAR_ITEM_HELP) = STRINGP (value)
+          PROP (TOOL_BAR_ITEM_LABEL) = STRINGP (value)
             ? value
             : make_string (bad_label, strlen (bad_label));
           have_label = 1;