From f7675a244b0d1d52bfdf5a1ee0051b46e73f9f2e Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Sun, 22 Jul 2007 06:05:53 +0000
Subject: remove the need for action_signalscreenchange(). Fixes problems with
 targets where the ACTION_STD_CANCEL event is a combo

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13956 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/color_picker.c  | 1 -
 apps/gui/gwps-common.c   | 1 -
 apps/gui/gwps.c          | 6 ------
 apps/gui/option_select.c | 2 --
 apps/gui/quickscreen.c   | 2 --
 apps/gui/yesno.c         | 2 --
 6 files changed, 14 deletions(-)

(limited to 'apps/gui')

diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index 392ae54153..1116aaae23 100644
--- a/apps/gui/color_picker.c
+++ b/apps/gui/color_picker.c
@@ -408,6 +408,5 @@ bool set_color(struct screen *display, char *title, unsigned *color,
         }
     }
 
-    action_signalscreenchange();
     return false;
 }
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 4032d8b861..91f60d7d14 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -282,7 +282,6 @@ bool ffwd_rew(int button)
         if (!exit)
             button = get_action(CONTEXT_WPS,TIMEOUT_BLOCK);
     }
-    action_signalscreenchange();
     return usb;
 }
 
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index d726daef3f..714dfe8ee9 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -101,8 +101,6 @@ long gui_wps_show(void)
     bool update_track = false;
     int i;
     long last_left = 0, last_right = 0;
-
-    action_signalscreenchange();
     
     wps_state_init();
 
@@ -242,7 +240,6 @@ long gui_wps_show(void)
 #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
                 show_remote_main_backdrop();
 #endif
-                action_signalscreenchange();
                 if (onplay(wps_state.id3->path, FILE_ATTR_AUDIO, CONTEXT_WPS)
                      == ONPLAY_MAINMENU)
                     return GO_TO_ROOT;
@@ -268,7 +265,6 @@ long gui_wps_show(void)
 #endif
                 FOR_NB_SCREENS(i)
                     gui_wps[i].display->stop_scroll();
-                action_signalscreenchange();
                 return GO_TO_PREVIOUS_BROWSER;
                 break;
 
@@ -562,7 +558,6 @@ long gui_wps_show(void)
 #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
                 show_remote_main_backdrop();
 #endif
-                action_signalscreenchange();
                 if (1 == pitch_screen())
                     return SYS_USB_CONNECTED;
 #if LCD_DEPTH > 1
@@ -668,7 +663,6 @@ long gui_wps_show(void)
         }
 
         if (exit) {
-            action_signalscreenchange();
 #ifdef HAVE_LCD_CHARCELLS
             status_set_record(false);
             status_set_audio(false);
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index d104a6461d..11352fdee2 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -364,7 +364,6 @@ bool option_screen(struct settings_list *setting, bool use_temp_var)
     
     gui_synclist_limit_scroll(&lists, true);
     gui_synclist_draw(&lists);
-    action_signalscreenchange();
     /* talk the item */
     option_talk(setting, *variable);
     while (!done)
@@ -436,7 +435,6 @@ bool option_screen(struct settings_list *setting, bool use_temp_var)
         settings_save();
     }
     
-    action_signalscreenchange();
     return false;
 }
 
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index 310d48041f..008c6fa721 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -172,7 +172,6 @@ bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter)
     bool can_quit=false;
     gui_syncquickscreen_draw(qs);
     gui_syncstatusbar_draw(&statusbars, true);
-    action_signalscreenchange();
     while (true) {
         button = get_action(CONTEXT_QUICKSCREEN,TIMEOUT_BLOCK);
         if(default_event_handler(button) == SYS_USB_CONNECTED)
@@ -195,7 +194,6 @@ bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter)
             
         gui_syncstatusbar_draw(&statusbars, false);
     }
-    action_signalscreenchange();
     return false;
 }
 
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index 381d6d8c21..4f874df325 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -111,7 +111,6 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message,
         gui_yesno_set_display(&(yn[i]), &(screens[i]));
         gui_yesno_draw(&(yn[i]));
     }
-    action_signalscreenchange();
     while (result==-1)
     {
         button = get_action(CONTEXT_YESNOSCREEN,TIMEOUT_BLOCK);
@@ -130,7 +129,6 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message,
                 result = YESNO_NO;
         }
     }
-    action_signalscreenchange();
     FOR_NB_SCREENS(i)
         result_displayed=gui_yesno_draw_result(&(yn[i]), result);
     if(result_displayed)
-- 
cgit v1.2.3