Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.483
diff -u -p -r1.483 ChangeLog
--- ChangeLog	6 Dec 2004 13:09:50 -0000	1.483
+++ ChangeLog	20 Jan 2005 08:09:11 -0000
@@ -1,3 +1,12 @@
+2005-01-20  Mengjie Yu  <meng-jie.yu@sun.com>
+
+	* gi-combo-box.c: (gi_combo_box_popup_display),
+	(gi_combo_box_init): fixed the bug that the arrow button can not
+	be focused with keyboard navigation.
+
+	Fixes #46356
+
+
 2004-11-30  Radek Doulik  <rodo@ximian.com>
 
 	* gi-*.[ch]: replace all occurences of gal by gi to be sure we
Index: gi-combo-box.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/gi-combo-box.c,v
retrieving revision 1.3
diff -u -p -r1.3 gi-combo-box.c
--- gi-combo-box.c	30 Nov 2004 15:21:25 -0000	1.3
+++ gi-combo-box.c	20 Jan 2005 08:09:17 -0000
@@ -334,6 +334,7 @@ gi_combo_box_popup_display (GiComboBox *
 			  GDK_BUTTON_RELEASE_MASK |
 			  GDK_POINTER_MOTION_MASK,
 			  NULL, NULL, GDK_CURRENT_TIME);
+	gdk_keyboard_grab (combo_box->priv->toplevel->window, TRUE, GDK_CURRENT_TIME);
 }
 
 static int
@@ -405,7 +406,7 @@ gi_combo_box_init (GiComboBox *combo_box
 	 */
 	combo_box->priv->arrow_button = gtk_toggle_button_new ();
 	gtk_button_set_relief (GTK_BUTTON (combo_box->priv->arrow_button), GTK_RELIEF_NONE);
-	GTK_WIDGET_UNSET_FLAGS (combo_box->priv->arrow_button, GTK_CAN_FOCUS);
+	GTK_WIDGET_SET_FLAGS (combo_box->priv->arrow_button, GTK_CAN_FOCUS);
 
 	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
 	gtk_container_add (GTK_CONTAINER (combo_box->priv->arrow_button), arrow);
