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

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 04f2539ca6860247524daca96f455671949d7b1a..d6b7bcd68252881409836a987c151b0855cd2772 100644 (file)
--- 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);