[f-spot/FSPOT_0_6_0_STABLE] remove support for older cairo version

[Stephane Delcroix <sdelcroix src gnome org>]

commit 9c61aa6f334a94f077e63e3b82f1aeaa457dfe8a
Author: Christian Krause <chkr plauener de>
Date:   Sun Oct 4 20:30:18 2009 +0200

    remove support for older cairo version
    
    - remove DllImport of cairo since it is not needed anymore
    - remove special code for older cairo version
    - check for cairo >= 1.4.0 in configure.ac

 configure.ac     |    3 ++-
 src/SoftFocus.cs |   20 ++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 22fcd86..7f82d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,11 +69,12 @@ BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
+CAIRO_REQUIRED=1.4.0
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
 dnl -- LIBGPHOTO2_REQUIRED=2.1.4
 
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED)
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
 AC_SUBST(F_CFLAGS)
 AC_SUBST(F_LIBS)
 
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..7291d5a 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -107,20 +104,11 @@ namespace FSpot.Widgets {
 
 			RadialGradient circle;
 
-			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
-							     center.X * scale, center.Y * scale, radius * max + max * .2);
-
-				circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			} else {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max + max * .2,
-							     center.X * scale, center.Y * scale, radius * max * .7);
+			circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
+						     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-				circle.AddColorStop (1.0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			}
+			circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
+			circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
 			return circle;
 		}