summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorTomer Shalev <shalev.tomer@gmail.com>2009-10-05 21:32:29 +0000
committerTomer Shalev <shalev.tomer@gmail.com>2009-10-05 21:32:29 +0000
commit5da75070c1fa6c86f2872aa148c859a3f2cc63b6 (patch)
treea465ac028f97da7e236802abc1d1611914ab76ab /apps
parent45f004de259654e659506fa731488aae7e0ebe0f (diff)
downloadrockbox-5da75070c1fa6c86f2872aa148c859a3f2cc63b6.tar.gz
rockbox-5da75070c1fa6c86f2872aa148c859a3f2cc63b6.zip
Fix red: Protect viewport RTL flag manipulation with #ifdef HAVE_LCD_BITMAP
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22973 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/viewport.c4
-rw-r--r--apps/language.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index bfdd1ce04a..1db1a810da 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -55,7 +55,9 @@
55#include "system.h" 55#include "system.h"
56#include "statusbar.h" 56#include "statusbar.h"
57#include "appevents.h" 57#include "appevents.h"
58#ifdef HAVE_LCD_BITMAP
58#include "language.h" 59#include "language.h"
60#endif
59 61
60static int statusbar_enabled = 0; 62static int statusbar_enabled = 0;
61 63
@@ -148,8 +150,10 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
148#endif 150#endif
149 viewport_set_fullscreen(vp, screen); 151 viewport_set_fullscreen(vp, screen);
150 152
153#ifdef HAVE_LCD_BITMAP
151 vp->flags &= ~VP_IS_RTL; 154 vp->flags &= ~VP_IS_RTL;
152 vp->flags |= lang_is_rtl() ? VP_IS_RTL : 0; 155 vp->flags |= lang_is_rtl() ? VP_IS_RTL : 0;
156#endif
153} 157}
154 158
155void viewportmanager_init(void) 159void viewportmanager_init(void)
diff --git a/apps/language.c b/apps/language.c
index fad136e479..0737a481be 100644
--- a/apps/language.c
+++ b/apps/language.c
@@ -25,7 +25,9 @@
25#include "lang.h" 25#include "lang.h"
26#include "debug.h" 26#include "debug.h"
27#include "string.h" 27#include "string.h"
28#ifdef HAVE_LCD_BITMAP
28#include "viewport.h" 29#include "viewport.h"
30#endif
29 31
30/* The following header is generated by the build system and only defines 32/* The following header is generated by the build system and only defines
31 MAX_LANGUAGE_SIZE to be the size of the largest currently available 33 MAX_LANGUAGE_SIZE to be the size of the largest currently available
@@ -114,7 +116,9 @@ int lang_load(const char *filename)
114 else 116 else
115 { 117 {
116 lang_options = lang_header[3]; 118 lang_options = lang_header[3];
119#ifdef HAVE_LCD_BITMAP
117 viewportmanager_theme_changed(THEME_UI_VIEWPORT); 120 viewportmanager_theme_changed(THEME_UI_VIEWPORT);
121#endif
118 } 122 }
119 return retcode; 123 return retcode;
120} 124}