diff options
| author | Cameron Cawley | 2019-07-02 19:30:38 +0100 |
|---|---|---|
| committer | Tarek Soliman | 2019-07-08 11:11:45 -0500 |
| commit | 6e690c5a8b73c33b64d38c04eac7732ed193de9a (patch) | |
| tree | b9ef6089474f78b9b70b53fe80994b22d5ae6e1e /backends/platform/maemo | |
| parent | 0334411d639fca4ab76b5c3c60efc9b66115b555 (diff) | |
| download | scummvm-rg350-6e690c5a8b73c33b64d38c04eac7732ed193de9a.tar.gz scummvm-rg350-6e690c5a8b73c33b64d38c04eac7732ed193de9a.tar.bz2 scummvm-rg350-6e690c5a8b73c33b64d38c04eac7732ed193de9a.zip | |
MAEMO: Minor cleanup
Diffstat (limited to 'backends/platform/maemo')
| -rw-r--r-- | backends/platform/maemo/maemo.cpp | 5 | ||||
| -rw-r--r-- | backends/platform/maemo/main.cpp | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index 326c35a28f..836102e2b9 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -129,8 +129,7 @@ void OSystem_SDL_Maemo::fatalError() { void OSystem_SDL_Maemo::setXWindowName(const char *caption) { SDL_SysWMinfo info; - SDL_VERSION(&info.version); - if (SDL_GetWMInfo(&info)) { + if (_window->getSDLWMInformation(&info)) { Display *dpy = info.info.x11.display; Window win; win = info.info.x11.fswindow; @@ -155,7 +154,7 @@ void OSystem_SDL_Maemo::setWindowCaption(const char *caption) { } } - SDL_WM_SetCaption(cap.c_str(), cap.c_str()); + _window->setWindowCaption(cap); Common::String cap2("ScummVM - "); // 2 lines in OS2008 task switcher, set first line cap = cap2 + cap; diff --git a/backends/platform/maemo/main.cpp b/backends/platform/maemo/main.cpp index 9d8b0f2e84..72253bb32c 100644 --- a/backends/platform/maemo/main.cpp +++ b/backends/platform/maemo/main.cpp @@ -22,14 +22,10 @@ #if defined(MAEMO) -#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h - #include "backends/platform/maemo/maemo.h" #include "backends/plugins/sdl/sdl-provider.h" #include "base/main.h" -#include <unistd.h> - int main(int argc, char* argv[]) { g_system = new Maemo::OSystem_SDL_Maemo(); assert(g_system); |