Commit 602d2332 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Don't try to focus the default_widget if there is none. (#169881, Thomas

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)
parent f40bcdcf
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> Wed Mar 9 19:20:44 2005 Manish Singh <yosh@gimp.org>
* configure.in: Remove inadvertent gail references, require * configure.in: Remove inadvertent gail references, require
......
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> Wed Mar 9 19:20:44 2005 Manish Singh <yosh@gimp.org>
* configure.in: Remove inadvertent gail references, require * configure.in: Remove inadvertent gail references, require
......
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> Wed Mar 9 19:20:44 2005 Manish Singh <yosh@gimp.org>
* configure.in: Remove inadvertent gail references, require * configure.in: Remove inadvertent gail references, require
......
...@@ -359,15 +359,15 @@ gtk_dialog_map (GtkWidget *widget) ...@@ -359,15 +359,15 @@ gtk_dialog_map (GtkWidget *widget)
while (GTK_IS_LABEL (window->focus_widget)); while (GTK_IS_LABEL (window->focus_widget));
tmp_list = children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area)); tmp_list = children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area));
while (tmp_list) while (tmp_list)
{ {
GtkWidget *child = tmp_list->data; GtkWidget *child = tmp_list->data;
if (window->focus_widget == NULL || if ((window->focus_widget == NULL ||
(child == window->focus_widget && child == window->focus_widget) &&
child != window->default_widget && child != window->default_widget &&
window->default_widget)) window->default_widget)
{ {
gtk_widget_grab_focus (window->default_widget); gtk_widget_grab_focus (window->default_widget);
break; break;
...@@ -375,7 +375,7 @@ gtk_dialog_map (GtkWidget *widget) ...@@ -375,7 +375,7 @@ gtk_dialog_map (GtkWidget *widget)
tmp_list = tmp_list->next; tmp_list = tmp_list->next;
} }
g_list_free (children); g_list_free (children);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment