[banshee/cleanup] cleanup: Remove Gtk# 2.10 conditionals



commit c25f82758707e46200c0cad828c22960db66ada9
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Wed Apr 27 15:45:30 2011 -0500

    cleanup: Remove Gtk# 2.10 conditionals

 build/build.rules.mk                               |    2 +-
 .../Banshee.NotificationArea.csproj                |    2 +-
 .../GtkNotificationAreaBox.cs                      |    5 -----
 .../NotificationAreaService.cs                     |    2 --
 4 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/build/build.rules.mk b/build/build.rules.mk
index a42ae94..200aaa6 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -63,7 +63,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 		$(GMCS_FLAGS) \
 		$(ASSEMBLY_BUILD_FLAGS) \
 		-nowarn:0278 -nowarn:0078 $$warn \
-		-define:HAVE_GTK_2_10 -define:NET_2_0 \
+		-define:NET_2_0 \
 		-debug -target:$(TARGET) -out:$@ \
 		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(GTK3_FLAG) \
 		$(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
index c1c62fb..355ed86 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, HAVE_GTK_2_10</DefineConstants>
+    <DefineConstants>WIN32, INTERNAL_NOTIFY_SHARP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Banshee.Core\Banshee.Core.csproj">
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
index d2118d1..533a022 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if HAVE_GTK_2_10
-
 using System;
 using Mono.Unix;
 using Gtk;
@@ -86,6 +84,3 @@ namespace Banshee.NotificationArea
         }
     }
 }
-
-#endif
-
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
index 66d6fe2..ba43101 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
@@ -216,9 +216,7 @@ namespace Banshee.NotificationArea
             }
 
             if (notif_area == null) {
-                #if HAVE_GTK_2_10
                 notif_area = new GtkNotificationAreaBox (elements_service.PrimaryWindow);
-                #endif
             }
 
             if (notif_area == null) {



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