diff --git a/ChangeLog b/ChangeLog index 23dbe5ed79..b73e6c7c58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Nov 25 12:34:44 2002 Owen Taylor + + * gtk/gtkdialog.c (gtk_dialog_set_default_response): + Remove code to grab the focus here, it is no longer + needed since we focus a widget on map, and can cause + harm. (#99048, Daniel Elstner) + 2002-11-24 Tor Lillqvist Merge from stable: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 23dbe5ed79..b73e6c7c58 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Mon Nov 25 12:34:44 2002 Owen Taylor + + * gtk/gtkdialog.c (gtk_dialog_set_default_response): + Remove code to grab the focus here, it is no longer + needed since we focus a widget on map, and can cause + harm. (#99048, Daniel Elstner) + 2002-11-24 Tor Lillqvist Merge from stable: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 23dbe5ed79..b73e6c7c58 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Mon Nov 25 12:34:44 2002 Owen Taylor + + * gtk/gtkdialog.c (gtk_dialog_set_default_response): + Remove code to grab the focus here, it is no longer + needed since we focus a widget on map, and can cause + harm. (#99048, Daniel Elstner) + 2002-11-24 Tor Lillqvist Merge from stable: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 23dbe5ed79..b73e6c7c58 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Mon Nov 25 12:34:44 2002 Owen Taylor + + * gtk/gtkdialog.c (gtk_dialog_set_default_response): + Remove code to grab the focus here, it is no longer + needed since we focus a widget on map, and can cause + harm. (#99048, Daniel Elstner) + 2002-11-24 Tor Lillqvist Merge from stable: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 23dbe5ed79..b73e6c7c58 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Mon Nov 25 12:34:44 2002 Owen Taylor + + * gtk/gtkdialog.c (gtk_dialog_set_default_response): + Remove code to grab the focus here, it is no longer + needed since we focus a widget on map, and can cause + harm. (#99048, Daniel Elstner) + 2002-11-24 Tor Lillqvist Merge from stable: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 23dbe5ed79..b73e6c7c58 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Mon Nov 25 12:34:44 2002 Owen Taylor + + * gtk/gtkdialog.c (gtk_dialog_set_default_response): + Remove code to grab the focus here, it is no longer + needed since we focus a widget on map, and can cause + harm. (#99048, Daniel Elstner) + 2002-11-24 Tor Lillqvist Merge from stable: diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 0d2d3ac6c3..a2379aa196 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -717,12 +717,7 @@ gtk_dialog_set_default_response (GtkDialog *dialog, "gtk-dialog-response-data"); if (rd && rd->response_id == response_id) - { - gtk_widget_grab_default (widget); - - if (!GTK_WINDOW (dialog)->focus_widget) - gtk_widget_grab_focus (widget); - } + gtk_widget_grab_default (widget); tmp_list = g_list_next (tmp_list); }