Index: ChangeLog
===================================================================
--- ChangeLog	(revision 1756)
+++ ChangeLog	(working copy)
@@ -8,6 +8,14 @@
 gcalctool change history.
 =========================
 
+2007-10-23 Rich Burridge <rich.burridge@sun.com>
+
+    * glade/gcalctool.glade:
+      More work on bug ##488694 - [a11y] Several calculator buttons 
+      don't speak correctly with Orca. Removed the accessible descriptions
+      (not needed) and adjusted the "shift left" and "shift right" names
+      (they were reversed).
+
 2007-10-23 Robert Ancell <robert.ancell@gmail.com>
 
     * gcalctool/gtk.c:
Index: glade/gcalctool.glade
===================================================================
--- glade/gcalctool.glade	(revision 1756)
+++ glade/gcalctool.glade	(working copy)
@@ -4011,7 +4011,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Hexadecimal digit D</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Hexadecimal digit D [d]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4034,7 +4033,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">User-defined functions</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">User-defined functions [F]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="menu_button_button_press_cb"/>
 	      <signal name="key-press-event" handler="menu_button_key_press_cb"/>
@@ -4111,7 +4109,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Shift right</atkproperty>
+		<atkproperty name="AtkObject::accessible_name" translatable="yes">Shift left</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="menu_button_button_press_cb"/>
 	      <signal name="key-press-event" handler="menu_button_key_press_cb"/>
@@ -4188,7 +4186,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Shift left</atkproperty>
+		<atkproperty name="AtkObject::accessible_name" translatable="yes">Shift right</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="menu_button_button_press_cb"/>
 	      <signal name="key-press-event" handler="menu_button_key_press_cb"/>
@@ -4266,7 +4264,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Constants</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Constants [#]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="menu_button_button_press_cb"/>
 	      <signal name="key-press-event" handler="menu_button_key_press_cb"/>
@@ -4344,7 +4341,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Accuracy</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Accuracy</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="menu_button_button_press_cb"/>
 	      <signal name="key-press-event" handler="menu_button_key_press_cb"/>
@@ -4423,7 +4419,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Modulus Division</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Modulus Division [M]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4448,7 +4443,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Random number</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Random number</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4473,7 +4467,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Bitwise XOR</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Bitwise XOR [x]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4498,7 +4491,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Bitwise XNOR</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Bitwise XNOR [n]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4523,7 +4515,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Base 10 Log</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Base 10 log [G]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4548,7 +4539,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Natural log</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Natural log [N]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4573,7 +4563,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Tangent</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Tangent [L]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4623,7 +4612,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Bitwise AND</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Bitwise AND [&amp;]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4648,7 +4636,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Sine</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Sine [K]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4673,7 +4660,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">32 bit unsigned integer</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">32 bit unsigned integer</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4698,7 +4684,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Bitwise OR</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Bitwise OR [|]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4723,7 +4708,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Cosine</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Cosine [J]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4748,7 +4732,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">16 bit unsigned integer</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">16 bit unsigned integer</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4773,7 +4756,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Exponential</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Exponential</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4798,7 +4780,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Hexadecimal digit F</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Hexadecimal digit F [f]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4823,7 +4804,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Hexadecimal digit C</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Hexadecimal digit C [c]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4848,7 +4828,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Hexadecimal digit B</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Hexadecimal digit B [b]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4873,7 +4852,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Hexadecimal digit E</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Hexadecimal digit E [e]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4898,7 +4876,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">Hexadecimal digit A</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">Hexadecimal digit A [a]</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 	    </widget>
@@ -4921,7 +4898,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">E to the x</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">E to the x</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 
@@ -5015,7 +4991,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">X to the y</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">X to the y</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 
@@ -5062,7 +5037,6 @@
 	      <property name="focus_on_click">True</property>
 	      <accessibility>
 		<atkproperty name="AtkObject::accessible_name" translatable="yes">10 to the x</atkproperty>
-		<atkproperty name="AtkObject::accessible_description" translatable="yes">10 to the x</atkproperty>
 	      </accessibility>
 	      <signal name="clicked" handler="button_cb"/>
 
@@ -5137,7 +5111,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Backspace</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Remove rightmost character from displayed value</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5162,7 +5135,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Change sign</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Change Sign [c]</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5187,7 +5159,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Clear</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Clear displayed value and any partial calculation</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5256,7 +5227,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Left bracket</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Left bracket</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5279,7 +5249,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Reciprocal</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Reciprocal [r]</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 
@@ -5328,7 +5297,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Percentage</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Percentage</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5353,7 +5321,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Right bracket</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Right bracket</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5378,7 +5345,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Backspace</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Remove rightmost character from displayed value</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5403,7 +5369,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Change sign</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Change Sign [c]</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5453,7 +5418,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Absolute value</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Absolute value [u]</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5478,7 +5442,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Fractional portion</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Fractional portion</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5503,7 +5466,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Integer portion</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Integer portion</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5528,7 +5490,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Clear entry</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Clear</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5551,7 +5512,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Exchange with register</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Exchange with register</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="menu_button_button_press_cb"/>
 		  <signal name="key-press-event" handler="menu_button_key_press_cb"/>
@@ -5629,7 +5589,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Retreive from register</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Retrieve from register</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="menu_button_button_press_cb"/>
 		  <signal name="key-press-event" handler="menu_button_key_press_cb"/>
@@ -5709,7 +5668,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Clear</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Clear displayed value and any partial calculation</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -5732,7 +5690,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Store to register</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Store to register</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="menu_button_button_press_cb"/>
 		  <signal name="key-press-event" handler="menu_button_key_press_cb"/>
@@ -5810,7 +5767,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Square</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Square [@]</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 
@@ -6016,7 +5972,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Divide</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Divide</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -6110,7 +6065,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Numeric point</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Numeric point</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -6135,7 +6089,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Calculate result</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Calculate result</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
@@ -6233,7 +6186,6 @@
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
 		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Add</atkproperty>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Add</atkproperty>
 		  </accessibility>
 		  <signal name="clicked" handler="button_cb"/>
 		</widget>
