Index: components/html-editor/ChangeLog
===================================================================
--- components/html-editor/ChangeLog	(revision 8638)
+++ components/html-editor/ChangeLog	(working copy)
@@ -1,3 +1,13 @@
+2007-12-01  Alex Kloss  <alexkloss@att.net>
+
+	** Fix for bug #498089
+
+	* table.c: (table_widget):
+	Connect Color label mnemonic to GiComboBox
+	* gtkhtml-editor-properties.glade:
+	Add/reassign mnemonics for Rows, Columns, and Image
+	labels to proper widgets.
+
 2007-11-30  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #500398
Index: components/html-editor/gtkhtml-editor-properties.glade
===================================================================
--- components/html-editor/gtkhtml-editor-properties.glade	(revision 8638)
+++ components/html-editor/gtkhtml-editor-properties.glade	(working copy)
@@ -134,6 +134,7 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">2</property>
 			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">spin_table_rows</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -196,7 +197,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label2">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Columns:</property>
+			      <property name="label" translatable="yes">Colu_mns:</property>
 			      <property name="use_underline">True</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -206,6 +207,7 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">2</property>
 			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">spin_table_columns</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -742,7 +744,7 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">entry7</property>
+			  <property name="mnemonic_widget">entry_table_bg_pixmap</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
Index: components/html-editor/table.c
===================================================================
--- components/html-editor/table.c	(revision 8638)
+++ components/html-editor/table.c	(working copy)
@@ -234,6 +234,7 @@
 					     color_group_fetch ("table_bg_color", d->cd));
         gi_color_combo_box_set_preview_relief (GI_COLOR_COMBO (d->combo_bg_color), GTK_RELIEF_NORMAL); \
         g_signal_connect (d->combo_bg_color, "color_changed", G_CALLBACK (changed_bg_color), d);
+        gtk_label_set_mnemonic_widget (GTK_LABEL (glade_xml_get_widget (xml, "label141")), GTK_WIDGET (d->combo_bg_color));
 	gtk_box_pack_start (GTK_BOX (glade_xml_get_widget (xml, "bg_color_hbox")), d->combo_bg_color, FALSE, FALSE, 0);
 
 	d->entry_bg_pixmap = glade_xml_get_widget (xml, "entry_table_bg_pixmap");
