diff --git a/ChangeLog b/ChangeLog
index 49ebcf448c..b4576a1d67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdialog.c (gtk_dialog_map): Don't
+	try to focus the default_widget if there is 
+	none.  (#169881, Thomas Leonard)
+
 Wed Mar  9 19:20:44 2005  Manish Singh  <yosh@gimp.org>
 
 	* configure.in: Remove inadvertent gail references, require
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 49ebcf448c..b4576a1d67 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-03-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdialog.c (gtk_dialog_map): Don't
+	try to focus the default_widget if there is 
+	none.  (#169881, Thomas Leonard)
+
 Wed Mar  9 19:20:44 2005  Manish Singh  <yosh@gimp.org>
 
 	* configure.in: Remove inadvertent gail references, require
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 49ebcf448c..b4576a1d67 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-03-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkdialog.c (gtk_dialog_map): Don't
+	try to focus the default_widget if there is 
+	none.  (#169881, Thomas Leonard)
+
 Wed Mar  9 19:20:44 2005  Manish Singh  <yosh@gimp.org>
 
 	* configure.in: Remove inadvertent gail references, require
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index da1ea326ba..a93ed7b8c7 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -359,15 +359,15 @@ gtk_dialog_map (GtkWidget *widget)
       while (GTK_IS_LABEL (window->focus_widget));
 
       tmp_list = children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area));
-
+      
       while (tmp_list)
 	{
 	  GtkWidget *child = tmp_list->data;
-
-	  if (window->focus_widget == NULL ||
-	      (child == window->focus_widget && 
-	       child != window->default_widget && 
-	       window->default_widget))
+	  
+	  if ((window->focus_widget == NULL || 
+	       child == window->focus_widget) && 
+	      child != window->default_widget &&
+	      window->default_widget)
 	    {
 	      gtk_widget_grab_focus (window->default_widget);
 	      break;
@@ -375,7 +375,7 @@ gtk_dialog_map (GtkWidget *widget)
 	  
 	  tmp_list = tmp_list->next;
 	}
-
+      
       g_list_free (children);
     }
 }