From aa8dec9a722e1b85374a215cba9a7066040a5e6e Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Sat, 14 Jul 2012 23:39:28 -0500
Subject: MAEMO: Fix compile without keymapper

---
 backends/platform/maemo/maemo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform/maemo/maemo.cpp')

diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index e296d4787c..eb9b144ab2 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -180,6 +180,7 @@ void OSystem_SDL_Maemo::setupIcon() {
 	// http://bugzilla.libsdl.org/show_bug.cgi?id=586
 }
 
+#ifdef ENABLE_KEYMAPPER
 static const Common::KeyTableEntry maemoKeys[] = {
 	// Function keys
 	{"MENU", Common::KEYCODE_F11, 0, "Menu", false},
@@ -191,7 +192,6 @@ static const Common::KeyTableEntry maemoKeys[] = {
 	{0, Common::KEYCODE_INVALID, 0, 0, false}
 };
 
-#ifdef ENABLE_KEYMAPPER
 Common::HardwareInputSet *OSystem_SDL_Maemo::getHardwareInputSet() {
 	return new Common::HardwareInputSet(true, maemoKeys);
 }
-- 
cgit v1.2.3


From 6abb3501b50101760885efaf4a9721beadb18052 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Sat, 14 Jul 2012 23:42:28 -0500
Subject: MAEMO: Set defaults for fullscreen and aspect ratio correction

New installs now have fullscreen and aspect ratio correction on by default
---
 backends/platform/maemo/maemo.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'backends/platform/maemo/maemo.cpp')

diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index eb9b144ab2..61fe56e816 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -84,6 +84,10 @@ static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymap
 #endif
 
 void OSystem_SDL_Maemo::initBackend() {
+
+	ConfMan.registerDefault("fullscreen", true);
+	ConfMan.registerDefault("aspect_ratio", true);
+
 	// Create the events manager
 	if (_eventSource == 0)
 		_eventSource = new MaemoSdlEventSource();
-- 
cgit v1.2.3


From 848b6daeb980199a948fd5d067e5f199c1ee1593 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Sun, 15 Jul 2012 00:07:24 -0500
Subject: MAEMO: Minor whitespace fix

---
 backends/platform/maemo/maemo.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'backends/platform/maemo/maemo.cpp')

diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 61fe56e816..4e50d04715 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -84,7 +84,6 @@ static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymap
 #endif
 
 void OSystem_SDL_Maemo::initBackend() {
-
 	ConfMan.registerDefault("fullscreen", true);
 	ConfMan.registerDefault("aspect_ratio", true);
 
-- 
cgit v1.2.3


From 2f08f95e117dbeb3d4b0e431e73a1a49c9809f23 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Sun, 15 Jul 2012 00:18:49 -0500
Subject: MAEMO: Fix uninitialized member

---
 backends/platform/maemo/maemo.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform/maemo/maemo.cpp')

diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 4e50d04715..6bd229177b 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -43,6 +43,7 @@ namespace Maemo {
 
 OSystem_SDL_Maemo::OSystem_SDL_Maemo()
 	:
+	_eventObserver(0),
 	OSystem_POSIX() {
 }
 
-- 
cgit v1.2.3