[Scummvm-cvs-logs] scummvm master -> c451bd4340cc8d76e1ba6bb55d3d75b67c38e4cf

tsoliman tarek at bashasoliman.com
Fri Nov 25 06:10:59 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c451bd4340 MAEMO: Make setupIcon do nothing


Commit: c451bd4340cc8d76e1ba6bb55d3d75b67c38e4cf
    https://github.com/scummvm/scummvm/commit/c451bd4340cc8d76e1ba6bb55d3d75b67c38e4cf
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2011-11-24T21:06:21-08:00

Commit Message:
MAEMO: Make setupIcon do nothing

It seems N900 is hit by SDL_WM_SetIcon bug (window cannot receive input)
http://bugzilla.libsdl.org/show_bug.cgi?id=586

This fix is based on the old 1.2.1 Maemo port code

Changed paths:
    backends/platform/maemo/maemo.cpp
    backends/platform/maemo/maemo.h



diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 3571039..a188503 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -108,6 +108,12 @@ const Maemo::Model OSystem_SDL_Maemo::detectModel() {
 	return *model;
 }
 
+void OSystem_SDL_Maemo::setupIcon() {
+	// no Maemo version needs setupIcon
+	// also N900 is hit by SDL_WM_SetIcon bug (window cannot receive input)
+	// http://bugzilla.libsdl.org/show_bug.cgi?id=586
+}
+
 } //namespace Maemo
 
 #endif
diff --git a/backends/platform/maemo/maemo.h b/backends/platform/maemo/maemo.h
index e42936d..32b5247 100644
--- a/backends/platform/maemo/maemo.h
+++ b/backends/platform/maemo/maemo.h
@@ -38,6 +38,7 @@ public:
 	virtual void quit();
 	virtual void fatalError();
 	virtual void setWindowCaption(const char *caption);
+	virtual void setupIcon();
 
 	Model getModel() { return _model; }
 






More information about the Scummvm-git-logs mailing list