# HG changeset patch
# User Jan D <jan.h.d@swipnet.se>
# Date 1284717268 -7200
# Node ID 0b48e1b8f0e35829e558a232d23fd7290c91ca8a
# Parent  bbc922c0cfa8933cec84d1500d35f78b96a956ab
* keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not HELP.

diff -r bbc922c0cfa8 -r 0b48e1b8f0e3 src/ChangeLog
--- a/src/ChangeLog	Fri Sep 17 11:04:35 2010 +0200
+++ b/src/ChangeLog	Fri Sep 17 11:54:28 2010 +0200
@@ -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 -r bbc922c0cfa8 -r 0b48e1b8f0e3 src/keyboard.c
--- a/src/keyboard.c	Fri Sep 17 11:04:35 2010 +0200
+++ b/src/keyboard.c	Fri Sep 17 11:54:28 2010 +0200
@@ -8305,7 +8305,7 @@
         {
           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;