From 0a12113d9d542d695ea6dd8b83f3070430085eb1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 8 Mar 2010 10:36:11 -0500 Subject: [PATCH] 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 --- gtk/gtkdialog.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 04f2539ca..d6b7bcd68 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -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); -- 2.43.2