[rhythmbox: 2/3] Backport upstream fix for the previous issue

[Kalev Lember]

commit dfdf84ed7793ce975b151426f3cf891e7fb7f486
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed May 7 16:15:17 2014 +0200

    Backport upstream fix for the previous issue

 ...t-display-page-menu-improve-menu-rebuilds.patch |  409 --------------------
 0001-display-page-menu-fix-off-by-one-errors.patch |   40 ++
 rhythmbox.spec                                     |    9 +-
 3 files changed, 46 insertions(+), 412 deletions(-)
---
diff --git a/0001-display-page-menu-fix-off-by-one-errors.patch b/0001-display-page-menu-fix-off-by-one-errors.patch
new file mode 100644
index 0000000..e55a0c3
--- /dev/null
+++ b/0001-display-page-menu-fix-off-by-one-errors.patch
@@ -0,0 +1,40 @@
+From 58bcbff4fcb9a4d6bb385dbbc53126f6b0074f61 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan at d14n.org>
+Date: Thu, 10 Apr 2014 22:43:40 +1000
+Subject: [PATCH] display-page-menu: fix off by one errors
+
+counting 0 when we only want to count up to 0 is not quite good
+enough.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=727437
+---
+ sources/rb-display-page-menu.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/sources/rb-display-page-menu.c b/sources/rb-display-page-menu.c
+index e0143bc..ed4b5b6 100644
+--- a/sources/rb-display-page-menu.c
++++ b/sources/rb-display-page-menu.c
+@@ -146,7 +146,7 @@ count_items (RBDisplayPageMenu *menu, int upto)
+ 
+ 	i = 0;
+ 	c = 0;
+-	do {
++	while (c < upto) {
+ 		RBDisplayPage *page;
+ 		gtk_tree_model_get (menu->priv->real_model,
+ 				    &iter,
+@@ -158,7 +158,9 @@ count_items (RBDisplayPageMenu *menu, int upto)
+ 		}
+ 		g_object_unref (page);
+ 		c++;
+-	} while ((c < upto) && gtk_tree_model_iter_next (menu->priv->real_model, &iter));
++		if (!gtk_tree_model_iter_next (menu->priv->real_model, &iter))
++			break;
++	}
+ 
+ 	return i;
+ }
+-- 
+1.9.0
+
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 84efce6..524512d 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -4,16 +4,16 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 3.0.2
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
 #VCS: git://git.gnome.org/rhythmbox
 Source: http://download.gnome.org/sources/rhythmbox/3.0/%{name}-%{version}.tar.xz
 
-# Revert a menu rebuilding optimization that triggers crashes with F20 gtk3
+# Backported crash fix from upstream
 # https://bugzilla.redhat.com/show_bug.cgi?id=1082543
-Patch0: 0001-Revert-display-page-menu-improve-menu-rebuilds.patch
+Patch0: 0001-display-page-menu-fix-off-by-one-errors.patch
 
 Requires: gnome-icon-theme-legacy
 Requires: gtk3%{?_isa} >= %{gtk3_version}
@@ -188,6 +188,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Wed May 07 2014 Kalev Lember <kalevlember at gmail.com> - 3.0.2-2
+- Backport upstream fix for the previous issue
+
 * 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)