diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 1fd2a4ac8..a3560fedf 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-02  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-default-applications-properties.glade:
+        patch from Heikki Paajanen <hepaajan@iki.fi> (based on the patch
+        from Andrew Johnson <acjgenius@earthlink.net>)
+        to not set "close" as the default button (Closes: #98202).
+
 2004-11-30  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-default-applications-properties-structs.c: use the right name
diff --git a/capplets/default-applications/gnome-default-applications-properties.glade b/capplets/default-applications/gnome-default-applications-properties.glade
index 7b4c52d9a..5675786c8 100644
--- a/capplets/default-applications/gnome-default-applications-properties.glade
+++ b/capplets/default-applications/gnome-default-applications-properties.glade
@@ -30,7 +30,6 @@
 	    <widget class="GtkButton" id="button5">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog
index 449238f48..306fe05fe 100644
--- a/capplets/font/ChangeLog
+++ b/capplets/font/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-02  Sebastien Bacher  <seb128@debian.org>
+
+	* font-properties.glade:
+	patch from Heikki Paajanen <hepaajan@iki.fi> (based on the patch
+	from Andrew Johnson <acjgenius@earthlink.net>) 
+	to not set "close" as the default button (Closes: #98202).
+
 2004-11-09  Mark McLoughlin  <mark@skynet.ie>
 
 	* Makefile.am: install .desktop file in $(datadir)/applications.
diff --git a/capplets/font/font-properties.glade b/capplets/font/font-properties.glade
index 5ee862489..de72edb5f 100644
--- a/capplets/font/font-properties.glade
+++ b/capplets/font/font-properties.glade
@@ -41,9 +41,7 @@
 	    <widget class="GtkButton" id="closebutton1">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index ed3d434ae..c290631ad 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-02  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-keybinding-properties.glade:
+	patch from Heikki Paajanen <hepaajan@iki.fi> (based on the patch
+	from Andrew Johnson <acjgenius@earthlink.net>) 
+	to not set "close" as the default button (Closes: #98202).
+
 2004-11-30  Bastien Nocera  <hadess@hadess.net>
 
 	* eggcellrendererkeys.c: (grab_key_callback): Patch from
diff --git a/capplets/keybindings/gnome-keybinding-properties.glade b/capplets/keybindings/gnome-keybinding-properties.glade
index 48932cfb7..7842d28e6 100644
--- a/capplets/keybindings/gnome-keybinding-properties.glade
+++ b/capplets/keybindings/gnome-keybinding-properties.glade
@@ -40,7 +40,6 @@
 	    <widget class="GtkButton" id="closebutton1">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 5b47ffa40..14690840c 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-02  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-keyboard-properties.glade:
+	patch from Heikki Paajanen <hepaajan@iki.fi> (based on the patch
+	from Andrew Johnson <acjgenius@earthlink.net>) 
+	to not set "close" as the default button (Closes: #98202).
+
 2004-12-31  Sergey V. Udaltsov <svu@gnome.org>
 
 	* gnome-keyboard-properties-xkb.h,
diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade
index 73162dc00..f0da6ff56 100644
--- a/capplets/keyboard/gnome-keyboard-properties.glade
+++ b/capplets/keyboard/gnome-keyboard-properties.glade
@@ -119,9 +119,7 @@
 	    <widget class="GtkButton" id="button4">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 0ea122272..69ae16605 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-02  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-mouse-properties.glade:
+	patch from Heikki Paajanen <hepaajan@iki.fi> (based on the patch
+	from Andrew Johnson <acjgenius@earthlink.net>) 
+	to not set "close" as the default button (Closes: #98202).
+
 2004-11-09  Mark McLoughlin  <mark@skynet.ie>
 
 	* Makefile.am: install .desktop file in $(datadir)/applications
diff --git a/capplets/mouse/gnome-mouse-properties.glade b/capplets/mouse/gnome-mouse-properties.glade
index 574fead24..2445ff8b6 100644
--- a/capplets/mouse/gnome-mouse-properties.glade
+++ b/capplets/mouse/gnome-mouse-properties.glade
@@ -40,9 +40,7 @@
 	    <widget class="GtkButton" id="closebutton1">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog
index 709a83c41..cdff2e588 100644
--- a/capplets/network/ChangeLog
+++ b/capplets/network/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-02  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-network-preferences.glade:
+	patch from Heikki Paajanen <hepaajan@iki.fi> (based on the patch
+	from Andrew Johnson <acjgenius@earthlink.net>) 
+	to not set "close" as the default button (Closes: #98202).
+
 2004-12-15  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-network-preferences.desktop.in.in: changed the tooltip 
diff --git a/capplets/network/gnome-network-preferences.glade b/capplets/network/gnome-network-preferences.glade
index b343c5026..c050d4a22 100644
--- a/capplets/network/gnome-network-preferences.glade
+++ b/capplets/network/gnome-network-preferences.glade
@@ -41,7 +41,6 @@
 	    <widget class="GtkButton" id="closebutton1">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index ae45a30ab..f28ecbdf9 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-02  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-ui-properties.glade:
+	patch from Heikki Paajanen <hepaajan@iki.fi> (based on the patch
+	from Andrew Johnson <acjgenius@earthlink.net>) 
+	to not set "close" as the default button (Closes: #98202).
+
 2004-11-09  Mark McLoughlin  <mark@skynet.ie>
 
 	* Makefile.am: install .desktop file in $(datadir)/applications
diff --git a/capplets/ui-properties/gnome-ui-properties.glade b/capplets/ui-properties/gnome-ui-properties.glade
index ef465c698..e2caa2162 100644
--- a/capplets/ui-properties/gnome-ui-properties.glade
+++ b/capplets/ui-properties/gnome-ui-properties.glade
@@ -41,9 +41,7 @@
 	    <widget class="GtkButton" id="closebutton1">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index fe24e0193..fc336f4cf 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-02  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-window-properties.glade: 
+	patch from Heikki Paajanen <hepaajan@iki.fi> (based on the patch
+	from Andrew Johnson <acjgenius@earthlink.net>) 
+	to not set "close" as the default button (Closes: #98202).
+
 2004-12-15  Sebastien Bacher  <seb128@debian.org>
 
 	* window-properties.desktop.in.in: changed the tooltip to respect 
diff --git a/capplets/windows/gnome-window-properties.glade b/capplets/windows/gnome-window-properties.glade
index 65db292e6..e5af2b47d 100644
--- a/capplets/windows/gnome-window-properties.glade
+++ b/capplets/windows/gnome-window-properties.glade
@@ -41,7 +41,6 @@
 	    <widget class="GtkButton" id="closebutton1">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>