[rhythmbox] display-page-menu: fix off by one errors

[Jonathan Matthew <jmatthew src gnome org>]

commit 58bcbff4fcb9a4d6bb385dbbc53126f6b0074f61
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Apr 10 22:43:40 2014 +1000

    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 files 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;
 }