[banshee/cleanup] cleanup: Remove unnecessary WIN32 checks/defines



commit cb841bdc1ba1b1d77bb2da05d8bf393c904fa68b
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Wed Apr 27 15:56:47 2011 -0500

    cleanup: Remove unnecessary WIN32 checks/defines

 .../Banshee.GStreamer/Banshee.GStreamer.csproj     |    1 -
 .../Banshee.GStreamerSharp.csproj                  |    2 +-
 src/Core/Banshee.Core/Banshee.Core.csproj          |    1 -
 .../Banshee.NotificationArea.csproj                |    2 +-
 .../NotificationAreaService.cs                     |   12 ++++++------
 5 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer.csproj b/src/Backends/Banshee.GStreamer/Banshee.GStreamer.csproj
index 6ba709a..16d08cd 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer.csproj
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer.csproj
@@ -31,7 +31,6 @@
     <OutputPath>..\..\..\bin\bin</OutputPath>
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
-    <DefineConstants>WIN32</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Posix">
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp.csproj b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp.csproj
index 7464ed5..b762ac9 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp.csproj
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp.csproj
@@ -26,7 +26,7 @@
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\bin\bin</OutputPath>
-    <DefineConstants>WIN32 ENABLE_GST_SHARP</DefineConstants>
+    <DefineConstants>ENABLE_GST_SHARP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/src/Core/Banshee.Core/Banshee.Core.csproj b/src/Core/Banshee.Core/Banshee.Core.csproj
index b26223e..c51a237 100644
--- a/src/Core/Banshee.Core/Banshee.Core.csproj
+++ b/src/Core/Banshee.Core/Banshee.Core.csproj
@@ -32,7 +32,6 @@
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\bin\bin</OutputPath>
-    <DefineConstants>WIN32</DefineConstants>
     <CustomCommands>
       <CustomCommands>
         <Command type="AfterBuild" command="..\..\..\build\windows\post-build.bat" workingdir="${SolutionDir}" />
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
index 355ed86..43fb2fe 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
@@ -32,7 +32,7 @@
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\bin\bin</OutputPath>
-    <DefineConstants>WIN32, INTERNAL_NOTIFY_SHARP</DefineConstants>
+    <DefineConstants>INTERNAL_NOTIFY_SHARP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Banshee.Core\Banshee.Core.csproj">
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
index ba43101..ef510df 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
@@ -326,12 +326,12 @@ namespace Banshee.NotificationArea
                 }
             }
 
-// Work around/fix bgo#641608 on Windows with this if/else/endif
-#if WIN32
-            menu.Popup (null, null, null, 3, Gtk.Global.CurrentEventTime);
-#else
-            menu.Popup (null, null, notif_area.PositionMenu, 3, Gtk.Global.CurrentEventTime);
-#endif
+            // Work around/fix bgo#641608 on Windows with this if/else/endif
+            if (PlatformDetection.IsWindows) {
+                menu.Popup (null, null, null, 3, Gtk.Global.CurrentEventTime);
+            } else {
+                menu.Popup (null, null, notif_area.PositionMenu, 3, Gtk.Global.CurrentEventTime);
+            }
         }
 
         private void CloseWindow (object o, EventArgs args)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]