From 4f802c0fa2274d1b8b2f75f0e52ed4de54c734c7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Oct 17 2009 21:18:57 +0000
Subject: Fix a possible crash in the accounts dialog


---

diff --git a/empathy.spec b/empathy.spec
index dd2fd02..d737f8c 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.0.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,6 +33,9 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
+# fixed upstream, https://bugzilla.gnome.org/show_bug.cgi?id=597416
+Patch6:         no-settings.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -136,6 +139,7 @@ bindings to the libempathy and libempathy-gtk libraries, respectively.
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
+%patch6 -p1 -b .no-settings
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -244,6 +248,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Sat Oct 17 2009 Matthias Clasen <mclasen@redhat.com> - 2.28.0.1-3
+- Include an upstream fix for a possible crash in the accounts dialog
+
 * Tue Oct 13 2009 Brian Pepple <bpepple@fedoraproject.org> - 2.28.0.1-2
 - Require tp-idle and tp-butterfly.
 
diff --git a/no-settings.patch b/no-settings.patch
new file mode 100644
index 0000000..ffb28b6
--- /dev/null
+++ b/no-settings.patch
@@ -0,0 +1,13 @@
+diff -up empathy-2.28.0.1/src/empathy-accounts-dialog.c.no-settings empathy-2.28.0.1/src/empathy-accounts-dialog.c
+--- empathy-2.28.0.1/src/empathy-accounts-dialog.c.no-settings	2009-10-17 17:14:40.775659867 -0400
++++ empathy-2.28.0.1/src/empathy-accounts-dialog.c	2009-10-17 17:14:58.266908666 -0400
+@@ -1223,6 +1223,9 @@ accounts_dialog_account_display_name_cha
+   display_name = empathy_account_get_display_name (account);
+   model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+   settings = accounts_dialog_model_get_selected_settings (dialog);
++  if (settings == NULL)
++    return;
++
+   selected_account = empathy_account_settings_get_account (settings);
+ 
+   if (accounts_dialog_get_account_iter (dialog, account, &iter))