commit 1c78dd7cbc7dfd8ef8e2c2394fc92f6852f61204
Author: Nicolas Pennequin <nicolas@nicolas-laptop.(none)>
Date:   Sat Dec 15 19:58:30 2007 +0100

    Fix the fix for list navigation

diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c
index c0a6dd7..cbe80b7 100644
--- a/apps/plugins/pictureflow.c
+++ b/apps/plugins/pictureflow.c
@@ -46,6 +46,10 @@ const struct button_mapping *plugin_contexts[]
  || (CONFIG_KEYPAD == IPOD_3G_PAD) \
  || (CONFIG_KEYPAD == IPOD_4G_PAD) \
  || (CONFIG_KEYPAD == SANSA_E200_PAD)
+#define SCROLLWHEEL
+#endif
+
+#ifdef SCROLLWHEEL
 #define PICTUREFLOW_NEXT_ALBUM          PLA_UP
 #define PICTUREFLOW_NEXT_ALBUM_REPEAT   PLA_UP_REPEAT
 #define PICTUREFLOW_PREV_ALBUM          PLA_DOWN
@@ -55,11 +59,11 @@ const struct button_mapping *plugin_contexts[]
 #define PICTUREFLOW_NEXT_ALBUM_REPEAT   PLA_RIGHT_REPEAT
 #define PICTUREFLOW_PREV_ALBUM          PLA_LEFT
 #define PICTUREFLOW_PREV_ALBUM_REPEAT   PLA_LEFT_REPEAT
-#endif
 #define PICTUREFLOW_NEXT_TRACK          PLA_DOWN
 #define PICTUREFLOW_NEXT_TRACK_REPEAT   PLA_DOWN_REPEAT
 #define PICTUREFLOW_PREV_TRACK          PLA_UP
 #define PICTUREFLOW_PREV_TRACK_REPEAT   PLA_UP_REPEAT
+#endif
 #define PICTUREFLOW_MENU                PLA_MENU
 #define PICTUREFLOW_QUIT                PLA_QUIT
 #define PICTUREFLOW_SELECT_ALBUM        PLA_FIRE
@@ -2006,16 +2010,25 @@ int main(void)
 
         case PICTUREFLOW_NEXT_ALBUM:
         case PICTUREFLOW_NEXT_ALBUM_REPEAT:
+#ifdef SCROLLWHEEL
+            if ( pf_state == pf_show_tracks )
+                select_next_track();
+#endif
             if ( pf_state == pf_idle || pf_state == pf_scrolling )
                 show_next_slide();
             break;
 
         case PICTUREFLOW_PREV_ALBUM:
         case PICTUREFLOW_PREV_ALBUM_REPEAT:
+#ifdef SCROLLWHEEL
+            if ( pf_state == pf_show_tracks )
+                select_prev_track();
+#endif
             if ( pf_state == pf_idle || pf_state == pf_scrolling )
                 show_previous_slide();
             break;
 
+#ifndef SCROLLWHEEL
         case PICTUREFLOW_NEXT_TRACK:
         case PICTUREFLOW_NEXT_TRACK_REPEAT:
             if ( pf_state == pf_show_tracks )
@@ -2027,6 +2040,7 @@ int main(void)
             if ( pf_state == pf_show_tracks )
                 select_prev_track();
             break;
+#endif
 
         case PICTUREFLOW_SELECT_ALBUM:
             if ( pf_state == pf_idle )