Trap the case where there is no default widget and the entry is the focus

Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkentry.c (gtk_entry_real_activate): Trap the
        case where there is no default widget and the entry
        is the focus widget, since this also causes infinite
        recursion. (#69158)

ChangeLog

@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+	case where there is no default widget and the entry
+	is the focus widget, since this also causes infinite
+	recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

ChangeLog.pre-2-0

@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+	case where there is no default widget and the entry
+	is the focus widget, since this also causes infinite
+	recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

ChangeLog.pre-2-10

@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+	case where there is no default widget and the entry
+	is the focus widget, since this also causes infinite
+	recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

ChangeLog.pre-2-2

@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+	case where there is no default widget and the entry
+	is the focus widget, since this also causes infinite
+	recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

ChangeLog.pre-2-4

@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+	case where there is no default widget and the entry
+	is the focus widget, since this also causes infinite
+	recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

ChangeLog.pre-2-6

@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+	case where there is no default widget and the entry
+	is the focus widget, since this also causes infinite
+	recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

ChangeLog.pre-2-8

@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+	case where there is no default widget and the entry
+	is the focus widget, since this also causes infinite
+	recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

gtk/gtkentry.c

@@ -2229,7 +2229,9 @@ gtk_entry_real_activate (GtkEntry *entry)
 	{
 	  window = GTK_WINDOW (toplevel);
       
-	  if (window && window->default_widget != widget)
+	  if (window &&
+	      widget != window->default_widget &&
+	      !(!window->default_widget && widget == window->focus_widget))
 	    gtk_window_activate_default (window);
 	}
     }