summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-11-25 17:45:32 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-11-25 17:45:32 +0000
commit5e17ddfb118d68185ad7fb8ca182ca13947eecfc (patch)
tree180c274edd4940f586042f0c7adc7534a1dce3c9
parent374f142ab7a3330ef63fdf3ab9a3e973e839bc7a (diff)
downloadgdk-pixbuf-5e17ddfb118d68185ad7fb8ca182ca13947eecfc.tar.gz
Remove code to grab the focus here, it is no longer needed since we focus
Mon Nov 25 12:34:44 2002 Owen Taylor <otaylor@redhat.com> * 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)
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-27
-rw-r--r--ChangeLog.pre-2-47
-rw-r--r--ChangeLog.pre-2-67
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gtk/gtkdialog.c7
7 files changed, 43 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 23dbe5ed7..b73e6c7c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 25 12:34:44 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <tml@iki.fi>
Merge from stable:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 23dbe5ed7..b73e6c7c5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon Nov 25 12:34:44 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <tml@iki.fi>
Merge from stable:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 23dbe5ed7..b73e6c7c5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Mon Nov 25 12:34:44 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <tml@iki.fi>
Merge from stable:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 23dbe5ed7..b73e6c7c5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Mon Nov 25 12:34:44 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <tml@iki.fi>
Merge from stable:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 23dbe5ed7..b73e6c7c5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon Nov 25 12:34:44 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <tml@iki.fi>
Merge from stable:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 23dbe5ed7..b73e6c7c5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon Nov 25 12:34:44 2002 Owen Taylor <otaylor@redhat.com>
+
+ * 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 <tml@iki.fi>
Merge from stable:
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 0d2d3ac6c..a2379aa19 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);
}