From 04bb3c9a3ac86db762616c19547b4a6386affe70 Mon Sep 17 00:00:00 2001
From: Richard Hult <richard@imendio.com>
Date: Sun, 11 Jan 2004 17:20:00 +0000
Subject: [PATCH] Enable markup for the break enabled toggle with code instead
 of with a

2004-01-11  Richard Hult  <richard@imendio.com>

	* gnome-keyboard-properties.glade:
	* gnome-keyboard-properties.c (setup_dialog): Enable markup for
	the break enabled toggle with code instead of with a custom child
	for the toggle since that doesn't work with new libglade. Fixes
	bug #131122.
---
 capplets/keyboard/ChangeLog                      |  8 ++++++++
 capplets/keyboard/gnome-keyboard-properties.c    |  4 +++-
 .../keyboard/gnome-keyboard-properties.glade     | 16 ----------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 65ac4bf1f..7cac177c5 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-11  Richard Hult  <richard@imendio.com>
+
+	* gnome-keyboard-properties.glade:
+	* gnome-keyboard-properties.c (setup_dialog): Enable markup for
+	the break enabled toggle with code instead of with a custom child
+	for the toggle since that doesn't work with new libglade. Fixes
+	bug #131122.
+
 2003-12-30  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.1.1
diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c
index 67c7b192a..11c271c50 100644
--- a/capplets/keyboard/gnome-keyboard-properties.c
+++ b/capplets/keyboard/gnome-keyboard-properties.c
@@ -166,7 +166,9 @@ setup_dialog (GladeXML       *dialog,
 	gconf_peditor_new_boolean
 		(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);
-        
+	
+	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("break_enabled_toggle"))->child), TRUE);
+	
         setup_xkb_tabs(dialog,changeset);
 }
 
diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade
index 7a6d0cd53..a4592875f 100644
--- a/capplets/keyboard/gnome-keyboard-properties.glade
+++ b/capplets/keyboard/gnome-keyboard-properties.glade
@@ -788,22 +788,6 @@
 			  <property name="active">False</property>
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label41">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;_Lock screen to enforce typing break&lt;/b&gt;</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">True</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>