From e0fe411a3e6e6a5769656062b32039d5053e8edf Mon Sep 17 00:00:00 2001
From: Jens Granseuer <jensgr@gmx.net>
Date: Mon, 25 Feb 2008 22:57:28 +0000
Subject: [PATCH] fix widget tab order (bug #339936)

2008-02-25  Jens Granseuer  <jensgr@gmx.net>

	* gnome-about-me.c: (about_me_setup_dialog):
	* gnome-about-me.glade: fix widget tab order (bug #339936)

svn path=/trunk/; revision=8524
---
 capplets/about-me/ChangeLog            |  5 +++++
 capplets/about-me/gnome-about-me.c     | 22 ++++++++++++++++++++++
 capplets/about-me/gnome-about-me.glade | 12 ++++--------
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog
index 5f07fa98e..8b43be83c 100644
--- a/capplets/about-me/ChangeLog
+++ b/capplets/about-me/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-25  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-about-me.c: (about_me_setup_dialog):
+	* gnome-about-me.glade: fix widget tab order (bug #339936)
+
 2008-02-16  Jens Granseuer  <jensgr@gmx.net>
 
 	* Makefile.am: don't distribute the .desktop.in file
diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
index 20e5356a1..dd696d29e 100644
--- a/capplets/about-me/gnome-about-me.c
+++ b/capplets/about-me/gnome-about-me.c
@@ -807,6 +807,7 @@ about_me_setup_dialog (void)
 	GtkIconInfo  *icon;
 	GladeXML     *dialog;
 	GError 	     *error = NULL;
+	GList        *chain;
 
 	struct passwd *pwent;
 	gchar *str;
@@ -935,6 +936,27 @@ about_me_setup_dialog (void)
 	g_signal_connect (G_OBJECT (widget), "changed",
 			  G_CALLBACK (about_me_image_changed_cb), me);
 
+	/* Address tab: set up the focus chains */
+	chain = g_list_prepend (NULL, WID ("addr-country-1"));
+	chain = g_list_prepend (chain, WID ("addr-po-1"));
+	chain = g_list_prepend (chain, WID ("addr-region-1"));
+	chain = g_list_prepend (chain, WID ("addr-code-1"));
+	chain = g_list_prepend (chain, WID ("addr-locality-1"));
+	chain = g_list_prepend (chain, WID ("addr-scrolledwindow-1"));
+	widget = WID ("addr-table-1");
+	gtk_container_set_focus_chain (GTK_CONTAINER (widget), chain);
+	g_list_free (chain);
+
+	chain = g_list_prepend (NULL, WID ("addr-country-2"));
+	chain = g_list_prepend (chain, WID ("addr-po-2"));
+	chain = g_list_prepend (chain, WID ("addr-region-2"));
+	chain = g_list_prepend (chain, WID ("addr-code-2"));
+	chain = g_list_prepend (chain, WID ("addr-locality-2"));
+	chain = g_list_prepend (chain, WID ("addr-scrolledwindow-2"));
+	widget = WID ("addr-table-2");
+	gtk_container_set_focus_chain (GTK_CONTAINER (widget), chain);
+	g_list_free (chain);
+
 	about_me_load_info (me);
 
 	gtk_widget_show_all (main_dialog);
diff --git a/capplets/about-me/gnome-about-me.glade b/capplets/about-me/gnome-about-me.glade
index 41c964463..7fe9a7a07 100644
--- a/capplets/about-me/gnome-about-me.glade
+++ b/capplets/about-me/gnome-about-me.glade
@@ -1223,7 +1223,7 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkTable" id="table126">
+				    <widget class="GtkTable" id="addr-table-1">
 				      <property name="visible">True</property>
 				      <property name="n_rows">4</property>
 				      <property name="n_columns">4</property>
@@ -1261,7 +1261,7 @@
 				      </child>
 
 				      <child>
-					<widget class="GtkScrolledWindow" id="scrolledwindow3">
+					<widget class="GtkScrolledWindow" id="addr-scrolledwindow-1">
 					  <property name="visible">True</property>
 					  <property name="can_focus">True</property>
 					  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
@@ -1472,7 +1472,6 @@
 					  <property name="max_length">0</property>
 					  <property name="text"></property>
 					  <property name="has_frame">True</property>
-					  <property name="activates_default">False</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">3</property>
@@ -1492,7 +1491,6 @@
 					  <property name="max_length">0</property>
 					  <property name="text"></property>
 					  <property name="has_frame">True</property>
-					  <property name="activates_default">False</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">3</property>
@@ -1512,7 +1510,6 @@
 					  <property name="max_length">0</property>
 					  <property name="text"></property>
 					  <property name="has_frame">True</property>
-					  <property name="activates_default">False</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">3</property>
@@ -1532,7 +1529,6 @@
 					  <property name="max_length">0</property>
 					  <property name="text"></property>
 					  <property name="has_frame">True</property>
-					  <property name="activates_default">False</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">3</property>
@@ -1634,7 +1630,7 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkTable" id="table127">
+				<widget class="GtkTable" id="addr-table-2">
 				  <property name="visible">True</property>
 				  <property name="n_rows">4</property>
 				  <property name="n_columns">4</property>
@@ -1672,7 +1668,7 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkScrolledWindow" id="scrolledwindow4">
+				    <widget class="GtkScrolledWindow" id="addr-scrolledwindow-2">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
 				      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>