From 1e3603b9371204c88a60983cbfb61a4adcef0b94 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Tue, 26 Apr 2011 16:19:20 -0400
Subject: BACKENDS: Add define for Unity-specific taskbar code

---
 backends/platform/sdl/posix/posix.cpp    | 4 ++--
 backends/taskbar/unity/unity-taskbar.cpp | 2 +-
 backends/taskbar/unity/unity-taskbar.h   | 2 +-
 configure                                | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 94f8d95ffb..05c779a4e0 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)
+#if defined(USE_TASKBAR) && defined(USE_TASKBAR_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)
+#if defined(USE_TASKBAR) && defined(USE_TASKBAR_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 0045a6fdbd..49c56b746d 100644
--- a/backends/taskbar/unity/unity-taskbar.cpp
+++ b/backends/taskbar/unity/unity-taskbar.cpp
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(UNIX) && defined(USE_TASKBAR)
+#if defined(UNIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_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 ed40a6507e..9f14b44d8f 100644
--- a/backends/taskbar/unity/unity-taskbar.h
+++ b/backends/taskbar/unity/unity-taskbar.h
@@ -26,7 +26,7 @@
 #ifndef BACKEND_UNITY_TASKBAR_H
 #define BACKEND_UNITY_TASKBAR_H
 
-#if defined(UNIX) && defined(USE_TASKBAR)
+#if defined(UNIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY)
 
 #include "common/events.h"
 #include "common/str.h"
diff --git a/configure b/configure
index 37dfc807b7..6e39ad3667 100755
--- a/configure
+++ b/configure
@@ -2951,6 +2951,7 @@ if test "$_unity" = yes ; then
 	INCLUDES="$INCLUDES $UNITY_CFLAGS"
 fi
 define_in_config_h_if_yes "$_unity" 'USE_TASKBAR'
+define_in_config_h_if_yes "$_unity" 'USE_TASKBAR_UNITY'
 echo "$_unity"
 
 #
-- 
cgit v1.2.3