diff options
| author | Johannes Schickel | 2014-01-21 14:15:19 -0800 |
|---|---|---|
| committer | Johannes Schickel | 2014-01-21 14:15:19 -0800 |
| commit | f93ebdc936523984212fd3a150dc86efe80a4004 (patch) | |
| tree | 89d60bc8f4c1ba7696de9f96fbf53c297c47fabc /backends | |
| parent | 51c0f0e6971c43d210f985c8a5ae5d857fbf6f2a (diff) | |
| parent | db07a1cfacdb67be02a64dcecfb22e773a733fca (diff) | |
| download | scummvm-rg350-f93ebdc936523984212fd3a150dc86efe80a4004.tar.gz scummvm-rg350-f93ebdc936523984212fd3a150dc86efe80a4004.tar.bz2 scummvm-rg350-f93ebdc936523984212fd3a150dc86efe80a4004.zip | |
Merge pull request #421 from lordhoto/taskbar-cleanup
BUILD: Taskbar Cleanup/Fixes
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/sdl/posix/posix.cpp | 4 | ||||
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.cpp | 2 | ||||
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.h | 2 |
3 files changed, 4 insertions, 4 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 diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp index f36e2bf628..1b82e58c8a 100644 --- a/backends/taskbar/unity/unity-taskbar.cpp +++ b/backends/taskbar/unity/unity-taskbar.cpp @@ -24,7 +24,7 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_time_h #include "common/scummsys.h" -#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY) +#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_UNITY) #include "backends/taskbar/unity/unity-taskbar.h" diff --git a/backends/taskbar/unity/unity-taskbar.h b/backends/taskbar/unity/unity-taskbar.h index d1d9430bcd..d818ed9ff1 100644 --- a/backends/taskbar/unity/unity-taskbar.h +++ b/backends/taskbar/unity/unity-taskbar.h @@ -23,7 +23,7 @@ #ifndef BACKEND_UNITY_TASKBAR_H #define BACKEND_UNITY_TASKBAR_H -#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY) +#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_UNITY) #include "common/events.h" #include "common/str.h" |