[banshee/stable-2.6] Revert 3 commits that were accidentally cherry-picked to stable branch

[Andrés Aragoneses <aaragoneses src gnome org>]

commit 749351a63dc49bb1c339781db94f4fe43751cb33
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Sat Mar 15 16:42:07 2014 +0100

    Revert 3 commits that were accidentally cherry-picked to stable branch

 Makefile.am                         |   10 ++------
 build/m4/banshee/gio.m4             |   41 ++++++----------------------------
 src/Clients/Booter/banshee.linux.in |    4 ---
 3 files changed, 11 insertions(+), 44 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 28407be..1f47e59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,15 +57,11 @@ check-bootstrap-env:
                done; \
        fi
 
-PROFILE_DEFAULT=--profile=log:time=fast,calls,noalloc,maxframes=5
-PROFILE_HEAP=--profile=logging:heap=all,gc-dumps=-1
-PROFILE_GUI=--profile=gui-thread-check
-
 run: check-bootstrap-env $(MO_FILES)
-       (cd bin; $(MONO) --debug $(PROFILE_GUI) $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled 
$(BANSHEE_DEV_OPTIONS))
+       (cd bin; $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled 
$(BANSHEE_DEV_OPTIONS))
 
 run-profiled: check-bootstrap-env $(MO_FILES)
-       (cd bin; LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/local/lib $(MONO) --debug 
$(BANSHEE_DEV_MONO_OPTIONS) $(PROFILE_DEFAULT) Nereid.exe --uninstalled $(BANSHEE_DEV_OPTIONS))
+       (cd bin; LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/local/lib $(MONO) --debug 
$(BANSHEE_DEV_MONO_OPTIONS) --profile=log:time=fast,calls,noalloc,maxframes=5 Nereid.exe --uninstalled 
$(BANSHEE_DEV_OPTIONS))
 
 run-logged: check-bootstrap-env $(MO_FILES)
        (cd bin; $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled 
$(BANSHEE_DEV_OPTIONS) | tee last-run-log)
@@ -82,7 +78,7 @@ run-trace: $(MO_FILES)
                Nereid.exe --uninstalled $(BANSHEE_DEV_OPTIONS) > ../banshee.trace)
 
 run-profile-heap: $(MO_FILES)
-       (cd bin; $(MONO) $(PROFILE_HEAP) --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled 
$(BANSHEE_DEV_OPTIONS))
+       (cd bin; $(MONO) --profile=logging:heap=all,gc-dumps=-1 --debug $(BANSHEE_DEV_MONO_OPTIONS) 
Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS))
 
 query-trace:
        @echo "Did you set BANSHEE_DEV_MONO_OPTIONS to --trace=disabled?"; \
diff --git a/build/m4/banshee/gio.m4 b/build/m4/banshee/gio.m4
index b122473..269517a 100644
--- a/build/m4/banshee/gio.m4
+++ b/build/m4/banshee/gio.m4
@@ -1,32 +1,18 @@
 AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
 [
        GNOMESHARP_REQUIRED=2.8
-       GIOSHARP_REQUIRED=2.22.3
-
-       GUDEVSHARP_REQUIRED=0.1
-       GKEYFILESHARP_REQUIRED=0.1
        
        AC_ARG_ENABLE(gio, AC_HELP_STRING([--disable-gio], [Disable GIO for IO operations]), 
,enable_gio="yes")
        AC_ARG_ENABLE(gio_hardware, AC_HELP_STRING([--disable-gio-hardware], [Disable GIO Hardware backend]), 
,enable_gio_hardware="yes")
        
        if test "x$enable_gio" = "xyes"; then
-
-               has_gtk_beans=no
                PKG_CHECK_MODULES(GTKSHARP_BEANS,
                        gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED,
-                       has_gtk_beans=yes, has_gtk_beans=no)
-
-               if test "x$has_gtk_beans" = "xno"; then
-                       AC_MSG_ERROR([gtk-sharp-beans-2.0 was not found or is not up to date. Please install 
gtk-sharp-beans-2.0 of at least version $GNOMESHARP_REQUIRED, or disable GIO support by passing 
--disable-gio])
-               fi
+                       enable_gio=yes, enable_gio=no)
 
-               has_gio_sharp=no
                PKG_CHECK_MODULES(GIOSHARP,
-                       gio-sharp-2.0 >= $GIOSHARP_REQUIRED,
-                       has_gio_sharp=yes, has_gio_sharp=no)
-               if test "x$has_gio_sharp" = "xno"; then
-                       AC_MSG_ERROR([gio-sharp-2.0 was not found or is not up to date. Please install 
gio-sharp-2.0 of at least version $GIOSHARP_REQUIRED, or disable GIO support by passing --disable-gio])
-               fi
+                       gio-sharp-2.0 >= 2.22.3,
+                       enable_gio="$enable_gio", enable_gio=no)
 
                asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries 
gtk-sharp-beans-2.0`"
                for asm in $asms; do
@@ -45,24 +31,13 @@ AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
                        enable_gio="$enable_gio", enable_gio=no)
 
                if test "x$enable_gio_hardware" = "xyes"; then
-
-                       has_gudev_sharp=no
                        PKG_CHECK_MODULES(GUDEV_SHARP,
-                               gudev-sharp-1.0 >= $GUDEVSHARP_REQUIRED,
-                               has_gudev_sharp=yes, has_gudev_sharp=no)
-
-                       if test "x$has_gudev_sharp" = "xno"; then
-                               AC_MSG_ERROR([gudev-sharp-1.0 was not found or is not up to date. Please 
install gudev-sharp-1.0 of at least version $GUDEVSHARP_REQUIRED, or disable GIO Hardware support by passing 
--disable-gio-hardware])
-                       fi
+                               gudev-sharp-1.0 >= 0.1,
+                               enable_gio_hardware="$enable_gio", enable_gio_hardware=no)
 
-                       has_gkeyfile_sharp=no
                        PKG_CHECK_MODULES(GKEYFILE_SHARP,
-                               gkeyfile-sharp >= $GKEYFILESHARP_REQUIRED,
-                               has_gkeyfile_sharp=yes, has_gkeyfile_sharp=no)
-
-                       if test "x$has_gkeyfile_sharp" = "xno"; then
-                               AC_MSG_ERROR([gkeyfile-sharp was not found or is not up to date. Please 
install gkeyfile-sharp of at least version $GKEYFILESHARP_REQUIRED, or disable GIO Hardware support by 
passing --disable-gio-hardware])
-                       fi
+                               gkeyfile-sharp >= 0.1,
+                               enable_gio_hardware="$enable_gio_hardware", enable_gio_hardware=no)
 
                        if test "x$enable_gio_hardware" = "xno"; then
                                GUDEV_SHARP_LIBS=''
@@ -70,7 +45,7 @@ AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
                        fi
                fi
 
-               AM_CONDITIONAL(ENABLE_GIO, true)
+               AM_CONDITIONAL(ENABLE_GIO, test "x$enable_gio" = "xyes")
                AM_CONDITIONAL(ENABLE_GIO_HARDWARE, test "x$enable_gio_hardware" = "xyes")
        else
                enable_gio_hardware="no"
diff --git a/src/Clients/Booter/banshee.linux.in b/src/Clients/Booter/banshee.linux.in
index 724a6d7..a255940 100644
--- a/src/Clients/Booter/banshee.linux.in
+++ b/src/Clients/Booter/banshee.linux.in
@@ -44,10 +44,6 @@ if [ ! -z "$BANSHEE_CLIENT" ]; then
        BANSHEE_CLIENT="--client=${BANSHEE_CLIENT}"
 fi
 
-if [ "$BANSHEE_DEBUG" = "--debug" ] && [ "x$BANSHEE_PROFILE" = "x" ]; then
-       BANSHEE_PROFILE="--profile=gui-thread-check"
-fi
-
 # We were testing the SGen compacting GC; disabled for 2.0 release b/c there are serious
 # issues with sgen on Mono 2.8.0
 #export MONO_ENV_OPTIONS="--gc=sgen"