[banshee/cleanup: 5/10] cleanup: Remove ATK conditional; now required

[Gabriel Burt <gburt src gnome org>]

commit 13b9ab9347ce9c35c576e622fa0f2db6f8a349a0
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Tue Apr 26 21:35:55 2011 -0500

    cleanup: Remove ATK conditional; now required
    
    This bumps the Gtk# dep to 2.12.10 or higher.

 README                                             |    3 +--
 build/build.rules.mk                               |    6 +-----
 build/m4/banshee/gtk-sharp.m4                      |   17 +----------------
 configure.ac                                       |    1 -
 .../ColumnCellStatusIndicator.cs                   |    2 --
 .../Banshee.Gui/GtkBaseClient.cs                   |    2 --
 src/Core/Banshee.ThickClient/Makefile.am           |    4 ----
 src/Hyena                                          |    2 +-
 8 files changed, 4 insertions(+), 33 deletions(-)
---
diff --git a/README b/README
index f07103d..9390b6b 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ DEPENDENCIES
 
     * Mono 1.9.1 (.NET 2.0 Profile / gmcs)
     * SQlite 3.4
-    * Gtk# 2.12
+    * Gtk# 2.12.10
     * GStreamer 0.10.26
 
     * NDesk DBus (ndesk-dbus) 0.5
@@ -37,7 +37,6 @@ DEPENDENCIES
       * boo >= 0.8.1
       * GIO support requires glib >= 2.22, gio-sharp and gtk-sharp-beans
       * Library Watcher extension requires Mono >= 2.4.3
-      * Accessibilty for ListView and Rating widgets requires Gtk# >= 2.12.10
       * YouTube extension requires gdata-sharp-core and
         gdata-sharp-youtube >= 1.4
       * Amazon MP3 Store, Wikipedia Context Pane, and Miro Guide require
diff --git a/build/build.rules.mk b/build/build.rules.mk
index f946a7b..a42ae94 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -26,10 +26,6 @@ if HAVE_GTK3
     GTK3_FLAG = "-define:GTK3"
 endif
 
-if ENABLE_ATK
-    ENABLE_ATK_FLAG = "-define:ENABLE_ATK"
-endif
-
 FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
 DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
 
@@ -69,7 +65,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 		-nowarn:0278 -nowarn:0078 $$warn \
 		-define:HAVE_GTK_2_10 -define:NET_2_0 \
 		-debug -target:$(TARGET) -out:$@ \
-		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(GTK3_FLAG) $(ENABLE_ATK_FLAG) \
+		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(GTK3_FLAG) \
 		$(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
 	@if [ -e $(srcdir)/$(notdir $  config) ]; then \
 		cp $(srcdir)/$(notdir $  config) $(top_builddir)/bin; \
diff --git a/build/m4/banshee/gtk-sharp.m4 b/build/m4/banshee/gtk-sharp.m4
index 45660b2..b57140f 100644
--- a/build/m4/banshee/gtk-sharp.m4
+++ b/build/m4/banshee/gtk-sharp.m4
@@ -1,7 +1,7 @@
 AC_DEFUN([BANSHEE_CHECK_GTK_SHARP],
 [
 	GTKSHARP3_REQUIRED=2.99
-	GTKSHARP2_REQUIRED=2.12
+	GTKSHARP2_REQUIRED=2.12.10
 
 	dnl First check for gtk-sharp-3.0
 	PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED, have_gtk3=yes, have_gtk3=no)
@@ -13,12 +13,6 @@ AC_DEFUN([BANSHEE_CHECK_GTK_SHARP],
 
 		gtk_version=3
 		AM_CONDITIONAL(HAVE_GTK3, true)
-
-		HAVE_GLIBSHARP_2_12_7=yes
-		AM_CONDITIONAL(HAVE_GLIBSHARP_2_12_7, true)
-
-		gtksharp_with_a11y=yes
-		AM_CONDITIONAL(ENABLE_ATK, true)
 	else
 		dnl Fall back to gtk-sharp-2.0
 
@@ -28,15 +22,6 @@ AC_DEFUN([BANSHEE_CHECK_GTK_SHARP],
 		PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= $GTKSHARP2_REQUIRED)
 		AC_SUBST(GLIBSHARP_LIBS)
 
-		PKG_CHECK_MODULES(GLIBSHARP_2_12_7,
-			glib-sharp-2.0 >= 2.12.7,
-			HAVE_GLIBSHARP_2_12_7=yes,
-			HAVE_GLIBSHARP_2_12_7=no)
-		AM_CONDITIONAL(HAVE_GLIBSHARP_2_12_7, [test "$HAVE_GLIBSHARP_2_12_7" = "yes"])
-
-		PKG_CHECK_MODULES(GTKSHARP_A11Y, gtk-sharp-2.0 >= 2.12.10, gtksharp_with_a11y=yes, gtksharp_with_a11y=no)
-		AM_CONDITIONAL(ENABLE_ATK, test "x$gtksharp_with_a11y" = "xyes")
-
 		AM_CONDITIONAL(HAVE_GTK3, false)
 		gtk_version="2"
 	fi
diff --git a/configure.ac b/configure.ac
index 6196e64..fda0a3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -430,7 +430,6 @@ ${PACKAGE}-${VERSION}
     Unit Tests:            ${do_tests} (nunit >= ${NUNIT_REQUIRED})
     API Docs:              ${enable_docs} (monodocer and mdassembler)
     User Help:             ${enable_user_help} (gnome-doc-utils >= 0.17.3)
-    Custom a11y:           ${gtksharp_with_a11y} (gtk-sharp >= 2.12.10)
     Release Build:         ${enable_release}
     Vendor Build ID:       ${vendor_build_id}
 
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
index f569e23..d667a65 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
@@ -55,10 +55,8 @@ namespace Banshee.Collection.Gui
         {
             string new_image_description = cell.GetTextAlternative (bound_object);
 
-#if ENABLE_ATK
             if (image_description != new_image_description)
                 GLib.Signal.Emit (this, "visible-data-changed");
-#endif
 
             image_description = new_image_description;
         }
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
index 3b0c7b5..7d2c2aa 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
@@ -150,9 +150,7 @@ namespace Banshee.Gui
             ThreadAssist.ProxyToMainHandler = Banshee.ServiceStack.Application.Invoke;
 
             Gdk.Global.ProgramClass = Application.InternalName;
-#if HAVE_GLIBSHARP_2_12_7
             GLib.Global.ApplicationName = "Banshee";
-#endif
 
             if (ApplicationContext.Debugging) {
                 GLib.Log.SetLogHandler ("Gtk", GLib.LogLevelFlags.Critical, GLib.Log.PrintTraceLogFunction);
diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am
index acebf12..5a3fdee 100644
--- a/src/Core/Banshee.ThickClient/Makefile.am
+++ b/src/Core/Banshee.ThickClient/Makefile.am
@@ -3,10 +3,6 @@ TARGET = library
 ASSEMBLY_BUILD_FLAGS = -unsafe
 LINK = $(REF_BANSHEE_THICKCLIENT)
 
-if HAVE_GLIBSHARP_2_12_7
-BUILD_DEFINES = "-define:HAVE_GLIBSHARP_2_12_7"
-endif
-
 SOURCES =  \
 	Banshee.Addins.Gui/AddinView.cs \
 	Banshee.CairoGlyphs/BansheeLineLogo.cs \
diff --git a/src/Hyena b/src/Hyena
index ab29e32..037cdc3 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit ab29e32494561606532c542f94bc44338d4bb077
+Subproject commit 037cdc38b0e1b3afd1ee11ca28a4acac0c3e0f4e