diff options
| author | Kamil Zbróg | 2014-01-27 21:43:05 +0100 |
|---|---|---|
| committer | Kamil Zbróg | 2014-01-27 21:43:05 +0100 |
| commit | 8eac80cfc59c34299899ebe18a3b0582ef76e0d2 (patch) | |
| tree | 5d02a8fba0559c16f2a2045b14e3e292509c6924 /backends/platform/sdl/posix/posix.cpp | |
| parent | 444934a0accec982f55db92c17ef65270fe18e66 (diff) | |
| parent | 0f5eeaed7b3c9d2f74eee7dff2114c5f4dc63f00 (diff) | |
| download | scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.gz scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.bz2 scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'backends/platform/sdl/posix/posix.cpp')
| -rw-r--r-- | backends/platform/sdl/posix/posix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp index 954f404ac6..1752153f29 100644 --- a/backends/platform/sdl/posix/posix.cpp +++ b/backends/platform/sdl/posix/posix.cpp @@ -50,7 +50,7 @@ void OSystem_POSIX::init() { // Initialze File System Factory _fsFactory = new POSIXFilesystemFactory(); -#if defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY) +#if defined(USE_TASKBAR) && defined(USE_UNITY) // Initialize taskbar manager _taskbarManager = new UnityTaskbarManager(); #endif @@ -67,7 +67,7 @@ void OSystem_POSIX::initBackend() { // Invoke parent implementation of this method OSystem_SDL::initBackend(); -#if defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY) +#if defined(USE_TASKBAR) && defined(USE_UNITY) // Register the taskbar manager as an event source (this is necessary for the glib event loop to be run) _eventManager->getEventDispatcher()->registerSource((UnityTaskbarManager *)_taskbarManager, false); #endif |