From 0eb8e8b5d6514ab48220a282e7b1c00092d55e33 Mon Sep 17 00:00:00 2001
From: Diego Gonzalez <diego@pemas.net>
Date: Sat, 21 Jan 2006 16:59:38 +0000
Subject: [PATCH] fix crash 317315.

2006-01-21  Diego Gonzalez   <diego@pemas.net>

	* gnome-about-me.c (about_me_foucs_out): fix crash 317315.

2006-01-21  Diego Gonzalez   <diego@pemas.net>

	* gnome-about-me.glade: don't accept tabs in the address fields to
	  preserve the tab navigation on the dialog, as suggested by
	  Sebastien Bacher in bug 317468.
---
 capplets/about-me/ChangeLog            | 10 ++++++++++
 capplets/about-me/gnome-about-me.c     |  3 +++
 capplets/about-me/gnome-about-me.glade |  4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog
index 8cfdc6741..d725728a9 100644
--- a/capplets/about-me/ChangeLog
+++ b/capplets/about-me/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-21  Diego Gonzalez   <diego@pemas.net>
+
+	* gnome-about-me.c (about_me_foucs_out): fix crash 317315.
+
+2006-01-21  Diego Gonzalez   <diego@pemas.net>
+
+	* gnome-about-me.glade: don't accept tabs in the address fields to
+	  preserve the tab navigation on the dialog, as suggested by
+	  Sebastien Bacher in bug 317468.
+
 2005-11-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* gnome-about-me.c: Add a preview to the filechooser used for
diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
index 5debb89d1..ab69d9c8a 100644
--- a/capplets/about-me/gnome-about-me.c
+++ b/capplets/about-me/gnome-about-me.c
@@ -213,6 +213,9 @@ about_me_focus_out (GtkWidget *widget, GdkEventFocus *event, GnomeAboutMe *me)
 	gint i;
 	
 	wid = glade_get_widget_name (widget);
+
+	if (wid == NULL)
+		return FALSE;
 	
 	for (i = 0; ids[i].wid != NULL; i++)
 		if (g_ascii_strcasecmp (ids[i].wid, wid) == 0)
diff --git a/capplets/about-me/gnome-about-me.glade b/capplets/about-me/gnome-about-me.glade
index e4dbf17d1..2a1bcbabf 100644
--- a/capplets/about-me/gnome-about-me.glade
+++ b/capplets/about-me/gnome-about-me.glade
@@ -1298,7 +1298,7 @@
 					      <property name="can_focus">True</property>
 					      <property name="editable">True</property>
 					      <property name="overwrite">False</property>
-					      <property name="accepts_tab">True</property>
+					      <property name="accepts_tab">False</property>
 					      <property name="justification">GTK_JUSTIFY_LEFT</property>
 					      <property name="wrap_mode">GTK_WRAP_NONE</property>
 					      <property name="cursor_visible">True</property>
@@ -1714,7 +1714,7 @@
 					  <property name="can_focus">True</property>
 					  <property name="editable">True</property>
 					  <property name="overwrite">False</property>
-					  <property name="accepts_tab">True</property>
+					  <property name="accepts_tab">False</property>
 					  <property name="justification">GTK_JUSTIFY_LEFT</property>
 					  <property name="wrap_mode">GTK_WRAP_NONE</property>
 					  <property name="cursor_visible">True</property>