[banshee/gtk3: 8/8] Merge branch 'master' of github.com:knocte/banshee-gtk3 into gtk3

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

commit 98a7aefed139f93d3db1627414af24be39de7555
Merge: 589cf04 a1a9bee
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Sat Jun 11 02:28:16 2011 +0200

    Merge branch 'master' of github.com:knocte/banshee-gtk3 into gtk3
    
    Conflicts:
    	configure.ac
    	src/Hyena

 .gitmodules                                        |    2 +-
 build/build.environment.mk                         |    2 +-
 configure.ac                                       |    9 ++++-
 .../Banshee.Widgets/CustomActionProxy.cs           |    5 ++-
 .../Banshee.Widgets/Banshee.Widgets/DateButton.cs  |    2 +-
 .../Banshee.Widgets/DiscUsageDisplay.cs            |    5 +--
 .../Banshee.Widgets/HoverImageButton.cs            |    6 ++--
 .../Banshee.Widgets/LinearProgress.cs              |    6 ++--
 .../Banshee.Widgets/Banshee.Widgets/LinkLabel.cs   |   33 ++++++++++++++------
 .../Banshee.Widgets/Banshee.Widgets/SearchEntry.cs |   10 +++---
 .../Banshee.Widgets/StreamPositionLabel.cs         |   19 +++++++++--
 src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs   |    6 ++-
 .../Banshee.Widgets/VolumeButton.cs                |   25 ++++++++-------
 src/Core/Banshee.Widgets/Makefile.am               |    3 +-
 src/Hyena                                          |    2 +-
 .../Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs    |    9 ++---
 16 files changed, 88 insertions(+), 56 deletions(-)
---
diff --cc configure.ac
index 8f99dc3,0ab83b0..8f347ee
--- a/configure.ac
+++ b/configure.ac
@@@ -64,11 -71,18 +64,14 @@@ dnl User hel
  SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
  
  dnl Mono and gmcs
 -SHAMROCK_CHECK_MONO_MODULE(1.9.1)
 +SHAMROCK_CHECK_MONO_MODULE(2.4.3)
  SHAMROCK_FIND_MONO_2_0_COMPILER
  SHAMROCK_FIND_MONO_RUNTIME
- SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
 -SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([	
++SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
+ 	Mono.Posix
+ 	ICSharpCode.SharpZipLib
+ ])
  
 -dnl Check for mono >= 2.4.3 for LibraryWatcher extension, with fix for bnc#322330
 -PKG_CHECK_MODULES(MONO_2_4_3, mono >= 2.4.3, HAVE_MONO_2_4_3=yes, HAVE_MONO_2_4_3=no)
 -AM_CONDITIONAL(ENABLE_LIBRARY_WATCHER, test "x$HAVE_MONO_2_4_3" = "xyes")
 -
  dnl Check for GNOME >= 2.28 to see if we should remove
  dnl 'Media Player' from the app Name, bgo#596242, except
  dnl in MeeGo where GNOME >= 2.28, but we want the full name
diff --cc src/Hyena
index 761cf0c,925a0a9..04772e9
--- a/src/Hyena
+++ b/src/Hyena
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 761cf0cd9e127e1dba85c2fccf00c4b50ac6d430
 -Subproject commit 925a0a9684c256dae4e3220791df918fc475266b
++Subproject commit 04772e97847c1e23465f07e8285329d6b1923a12