From 6499391e0c4a604bd2338552549abbd69cd8b9af Mon Sep 17 00:00:00 2001
From: Padraig O'Briain <padraig.obriain@sun.com>
Date: Thu, 6 Nov 2003 08:48:11 +0000
Subject: [PATCH] Correct mnemonic widget for Window title font. Move
 declaration of

2003-11-06  Padraig O'Briain <padraig.obriain@sun.com>

	* font-properties.glade: Correct mnemonic widget for Window title font.
	Move declaration of GnomeFontPicker for applications to immediately
	after declaration of the label. This fixes bug #125689.
---
 capplets/font/ChangeLog             |  6 +++++
 capplets/font/font-properties.glade | 40 ++++++++++++++---------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog
index 31246497d..aa9c3b2b9 100644
--- a/capplets/font/ChangeLog
+++ b/capplets/font/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-06  Padraig O'Briain <padraig.obriain@sun.com>
+
+	* font-properties.glade: Correct mnemonic widget for Window title font.
+	Move declaration of GnomeFontPicker for applications to immediately
+	after declaration of the label. This fixes bug #125689.
+
 2003-10-28  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.0
diff --git a/capplets/font/font-properties.glade b/capplets/font/font-properties.glade
index d5dcee80e..52d9d40f3 100644
--- a/capplets/font/font-properties.glade
+++ b/capplets/font/font-properties.glade
@@ -100,6 +100,25 @@
 		</packing>
 	      </child>
 
+	      <child>
+		<widget class="GnomeFontPicker" id="application_font">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Set the font for applications</property>
+		  <property name="can_focus">True</property>
+		  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
+		  <property name="show_size">True</property>
+		  <property name="use_font_in_label">True</property>
+		  <property name="label_font_size">14</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="y_options">fill</property>
+		</packing>
+	      </child>
+
 	      <child>
 		<widget class="GtkLabel" id="label6">
 		  <property name="visible">True</property>
@@ -125,25 +144,6 @@
 		</packing>
 	      </child>
 
-	      <child>
-		<widget class="GnomeFontPicker" id="application_font">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Set the font for applications</property>
-		  <property name="can_focus">True</property>
-		  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
-		  <property name="show_size">True</property>
-		  <property name="use_font_in_label">True</property>
-		  <property name="label_font_size">14</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
 	      <child>
 		<widget class="GnomeFontPicker" id="desktop_font">
 		  <property name="visible">True</property>
@@ -177,7 +177,7 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">desktop_font</property>
+		  <property name="mnemonic_widget">window_title_font</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>