[evolution-patches] EEntry fix for addressbook bug 45931

[Chris Toshok <toshok ximian com>]

this *probably* fixes it..  I can't reproduce the bug, but we're
definitely returning from this method too early if we're trying to pop
down the completion view, which would result in the symptoms described
in the bug.

Chris


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/ChangeLog,v
retrieving revision 1.885
diff -u -r1.885 ChangeLog
--- ChangeLog	21 Aug 2004 00:31:04 -0000	1.885
+++ ChangeLog	24 Aug 2004 01:22:39 -0000
@@ -1,3 +1,11 @@
+2004-08-23  Chris Toshok  <toshok ximian com>
+
+	[ probable fix for the remaining portion of #45931 ]
+	
+	* gal/e-text/e-entry.c (e_entry_show_popup): only return early if
+	we're trying to pop up the view while the entry is unfocused.  if
+	we're trying to pop it down, carry on as normal.
+	
 2004-08-21  Kjartan Maraas  <kmaraas gnome org>
 
 	* configure.in: Add �nb� to ALL_LINGUAS.
Index: gal/e-text/e-entry.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-text/e-entry.c,v
retrieving revision 1.59
diff -u -r1.59 e-entry.c
--- gal/e-text/e-entry.c	5 Aug 2004 18:26:55 -0000	1.59
+++ gal/e-text/e-entry.c	24 Aug 2004 01:22:40 -0000
@@ -503,9 +503,14 @@
 	if (pop == NULL)
 		return;
 
-	/* The async query can give us a result after the focus was lost by the
-	   widget.  In that case, we don't want to show the pop-up.   */
-	if (! GTK_WIDGET_HAS_FOCUS (entry->canvas))
+	/* The async query can give us a result after the focus was
+	   lost by the widget.  In that case, we don't want to show
+	   the pop-up.
+
+	   but only return early if we're popping *up* the completion
+	   view.  If we're trying to pop down the view, continue on
+	   regardless of whether or not the canvas has focus. */
+	if (visible && ! GTK_WIDGET_HAS_FOCUS (entry->canvas))
 		return;
 
 	if (visible) {