rpms/empathy/F-12 no-settings.patch, NONE, 1.1 empathy.spec, 1.80, 1.81

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20372

Modified Files:
	empathy.spec 
Added Files:
	no-settings.patch 
Log Message:
Fix a possible crash in the accounts dialog


no-settings.patch:
 empathy-accounts-dialog.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE no-settings.patch ---
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))


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- empathy.spec	13 Oct 2009 15:03:55 -0000	1.80
+++ empathy.spec	17 Oct 2009 21:18:57 -0000	1.81
@@ -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 libempath
 %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 at 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 at fedoraproject.org> - 2.28.0.1-2
 - Require tp-idle and tp-butterfly.