[rhythmbox/f20] backport fix for import crash bug (RHBZ #1013858, BGO #724931)

[Adam Williamson]

commit 62a57d1a6999d40ffd22b9c9875365b54fc6cb40
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri May 23 13:11:02 2014 -0700

    backport fix for import crash bug (RHBZ #1013858, BGO #724931)

 ...ry-even-harder-to-not-expire-removed-task.patch |   27 ++++++++++++++++++++
 rhythmbox.spec                                     |   12 ++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/0001-task-list-try-even-harder-to-not-expire-removed-task.patch b/0001-task-list-try-even-harder-to-not-expire-removed-task.patch
new file mode 100644
index 0000000..5a10151
--- /dev/null
+++ b/0001-task-list-try-even-harder-to-not-expire-removed-task.patch
@@ -0,0 +1,27 @@
+From c2e5ffcbda972108a15824a69fe5f2b9c6228718 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan at d14n.org>
+Date: Fri, 23 May 2014 23:28:09 +1000
+Subject: [PATCH] task-list: try even harder to not expire removed tasks
+
+probably actually fixed https://bugzilla.gnome.org/show_bug.cgi?id=724931
+---
+ shell/rb-task-list.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/shell/rb-task-list.c b/shell/rb-task-list.c
+index b3816ef..c8405de 100644
+--- a/shell/rb-task-list.c
++++ b/shell/rb-task-list.c
+@@ -162,6 +162,9 @@ expire_task (RBTaskList *list, RBTaskProgress *task, gint seconds)
+ 	TaskExpiry *expiry;
+ 
+ 	cancel_expiry (list, task);
++	if (rb_list_model_find (list->model, task) == -1)
++		return;
++
+ 	expiry = g_new0 (TaskExpiry, 1);
+ 	expiry->task = task;
+ 	expiry->list = list;
+-- 
+1.9.3
+
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 84efce6..d98c7f4 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -4,7 +4,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 3.0.2
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -15,6 +15,12 @@ Source: http://download.gnome.org/sources/rhythmbox/3.0/%{name}-%{version}.tar.x
 # https://bugzilla.redhat.com/show_bug.cgi?id=1082543
 Patch0: 0001-Revert-display-page-menu-improve-menu-rebuilds.patch
 
+# Backported upstream crash-on-import fix
+# https://bugzilla.redhat.com/show_bug.cgi?id=1013858
+# https://bugzilla.gnome.org/show_bug.cgi?id=724931
+# https://git.gnome.org/browse/rhythmbox/commit/?id=c2e5ffcbda972108a15824a69fe5f2b9c6228718
+Patch1: 0001-task-list-try-even-harder-to-not-expire-removed-task.patch
+
 Requires: gnome-icon-theme-legacy
 Requires: gtk3%{?_isa} >= %{gtk3_version}
 Requires: libdmapsharing%{?_isa} >= %{libdmapsharing_version}
@@ -89,6 +95,7 @@ a Rhythmbox plugin.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -188,6 +195,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Fri May 23 2014 Adam Williamson <awilliam at redhat.com> - 3.0.2-1.2
+- backport fix for import crash bug (RHBZ #1013858, BGO #724931)
+
 * Wed Apr 02 2014 Kalev Lember <kalevlember at gmail.com> - 3.0.2-1.1
 - Revert a menu rebuilding optimization that triggers crashes with F20
   gtk3 (#1082543)