Fix an infinite loop in gtk_dialog_map()

The new focus handling with links in labels tripped up the code
that tries to avoid focussing labels. Bug 612066
This commit is contained in:
Matthias Clasen 2010-03-08 10:36:11 -05:00 committed by Tristan Van Berkom
parent 248719c771
commit 0a12113d9d

View File

@ -414,12 +414,11 @@ gtk_dialog_map (GtkWidget *widget)
if (first_focus == NULL)
first_focus = window->focus_widget;
else if (first_focus == window->focus_widget)
break;
break;
if (!GTK_IS_LABEL (window->focus_widget))
break;
else
gtk_label_select_region (GTK_LABEL (window->focus_widget), 0, 0);
if (!gtk_label_get_current_uri (GTK_LABEL (window->focus_widget)))
gtk_label_select_region (GTK_LABEL (window->focus_widget), 0, 0);
}
while (TRUE);