diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 2f8ff0669..610ffbc60 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-27  Richard Hult  <richard@imendio.com>
+
+	* gnome-keyboard-properties.c (setup_dialog): Use the right gconf
+	key for allow_postpone preference.
+
+	* gnome-keyboard-properties.glade: Remove warn time preference,
+	it's not used in the code.
+
 Thu Jun 26 16:31:41 2003  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnome-keyboard-properties.c (setup_dialog): use the correct
diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c
index 01d6ee2f6..02d3bca80 100644
--- a/capplets/keyboard/gnome-keyboard-properties.c
+++ b/capplets/keyboard/gnome-keyboard-properties.c
@@ -165,12 +165,10 @@ setup_dialog (GladeXML       *dialog,
 	gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("break_details_table"));
 	gconf_peditor_new_numeric_range
 		(changeset, "/desktop/gnome/typing_break/type_time", WID ("break_enabled_spin"), NULL);
-	gconf_peditor_new_numeric_range
-		(changeset, "/desktop/gnome/typing_break/warn_time", WID ("break_warning_spin"), NULL);
 	gconf_peditor_new_numeric_range
 		(changeset, "/desktop/gnome/typing_break/break_time", WID ("break_interval_spin"), NULL);
 	gconf_peditor_new_boolean
-		(changeset, "/desktop/gnome/typing_break/allow_unlock", WID ("break_postponement_toggle"), NULL);
+		(changeset, "/desktop/gnome/typing_break/allow_postpone", WID ("break_postponement_toggle"), NULL);
 	g_signal_connect (G_OBJECT (WID ("keyboard_dialog")), "response", (GCallback) dialog_response, changeset);
 }
 
diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade
index 5f29bad58..9e20d12cc 100644
--- a/capplets/keyboard/gnome-keyboard-properties.glade
+++ b/capplets/keyboard/gnome-keyboard-properties.glade
@@ -746,7 +746,7 @@
 			      <child>
 				<widget class="GtkTable" id="break_details_table">
 				  <property name="visible">True</property>
-				  <property name="n_rows">4</property>
+				  <property name="n_rows">3</property>
 				  <property name="n_columns">3</property>
 				  <property name="homogeneous">False</property>
 				  <property name="row_spacing">3</property>
@@ -775,54 +775,6 @@
 				    </packing>
 				  </child>
 
-				  <child>
-				    <widget class="GtkLabel" id="label40">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">minutes</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label38">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Warning time is</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">break_warning_spin</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
 				  <child>
 				    <widget class="GtkLabel" id="label39">
 				      <property name="visible">True</property>
@@ -871,29 +823,6 @@
 				    </packing>
 				  </child>
 
-				  <child>
-				    <widget class="GtkSpinButton" id="break_warning_spin">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Duration of warning before starting a break</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">1</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">False</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">False</property>
-				      <property name="wrap">False</property>
-				      <property name="adjustment">1 1 100000 1 10 10</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options"></property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
 				  <child>
 				    <widget class="GtkLabel" id="label30">
 				      <property name="visible">True</property>
@@ -912,8 +841,8 @@
 				    <packing>
 				      <property name="left_attach">0</property>
 				      <property name="right_attach">1</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
+				      <property name="top_attach">1</property>
+				      <property name="bottom_attach">2</property>
 				      <property name="x_options">fill</property>
 				      <property name="y_options"></property>
 				    </packing>
@@ -935,8 +864,8 @@
 				    <packing>
 				      <property name="left_attach">1</property>
 				      <property name="right_attach">2</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
+				      <property name="top_attach">1</property>
+				      <property name="bottom_attach">2</property>
 				      <property name="x_options">fill</property>
 				      <property name="y_options"></property>
 				    </packing>
@@ -959,8 +888,8 @@
 				    <packing>
 				      <property name="left_attach">2</property>
 				      <property name="right_attach">3</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
+				      <property name="top_attach">1</property>
+				      <property name="bottom_attach">2</property>
 				      <property name="x_options">fill</property>
 				      <property name="y_options"></property>
 				    </packing>
@@ -981,8 +910,8 @@
 				    <packing>
 				      <property name="left_attach">0</property>
 				      <property name="right_attach">3</property>
-				      <property name="top_attach">3</property>
-				      <property name="bottom_attach">4</property>
+				      <property name="top_attach">2</property>
+				      <property name="bottom_attach">3</property>
 				      <property name="x_options">fill</property>
 				      <property name="y_options"></property>
 				    </packing>