[f-spot] This removes a call to libgnomeui

[Stephen Shaw <sshaw src gnome org>]

commit afdd6e1ad77ec0e77ee612bbcb4692c665aed3d9
Author: Stephen Shaw <sshaw decriptor com>
Date:   Mon Mar 19 16:03:28 2012 -0600

    This removes a call to libgnomeui
    
    There shouldn't be anymore calls to
    libgnome or libgnomeui

 configure.ac                             |    5 ++---
 src/Clients/MainApp/PixbufUtils.cs       |   15 +++++----------
 src/Clients/MainApp/f-spot.exe.config.in |    2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b259944..465e5e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,8 +133,7 @@ fi
 
 dnl --- Required libraries
 
-LIBGNOME_REQUIRED=2.2
-LIBGNOMEUI_REQUIRED=2.2
+LIBGNOMEDESKTOP_REQUIRED=2.17
 GIO_REQUIRED=2.22.0
 GTKSHARPBEANS_REQUIRED=2.13.92
 GTK_REQUIRED=2.14
@@ -142,7 +141,7 @@ MONO_CAIRO_REQUIRED=1.2.5
 CAIRO_REQUIRED=1.4.0
 LCMS_REQUIRED=1.12
 
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
+PKG_CHECK_MODULES(F, gnome-desktop-2.0 >= $LIBGNOMEDESKTOP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
 AC_SUBST(F_CFLAGS)
 AC_SUBST(F_LIBS)
 
diff --git a/src/Clients/MainApp/PixbufUtils.cs b/src/Clients/MainApp/PixbufUtils.cs
index 09bb0b0..9a7138c 100644
--- a/src/Clients/MainApp/PixbufUtils.cs
+++ b/src/Clients/MainApp/PixbufUtils.cs
@@ -169,12 +169,7 @@ public static class PixbufUtils
 		}
 	}
 
-	public static Pixbuf ScaleToMaxSize (Pixbuf pixbuf, int width, int height)
-	{
-		return ScaleToMaxSize (pixbuf, width, height, true);
-	}
-
-	public static Pixbuf ScaleToMaxSize (Pixbuf pixbuf, int width, int height, bool upscale)
+	public static Pixbuf ScaleToMaxSize (Pixbuf pixbuf, int width, int height, bool upscale = true)
 	{
 		int scale_width = 0;
 		int scale_height = 0;
@@ -332,7 +327,7 @@ public static class PixbufUtils
 
 			// This is the other half of the progress so start and halfway
 			if (progressDialog != null)
-                progressDialog.Fraction = ((double)row / ((double) sourceHeight - 1) ) * 0.25 + 0.75;
+				progressDialog.Fraction = ((double)row / ((double) sourceHeight - 1) ) * 0.25 + 0.75;
 		}
 
 		return result;
@@ -519,12 +514,12 @@ public static class PixbufUtils
 		}
 	}
 
-	[DllImport("libgnomeui-2-0.dll")]
-	static extern IntPtr gnome_thumbnail_scale_down_pixbuf (IntPtr pixbuf, int dest_width, int dest_height);
+	[DllImport("libgnome-desktop-2-17.dll")]
+	static extern IntPtr gnome_desktop_thumbnail_scale_down_pixbuf (IntPtr pixbuf, int dest_width, int dest_height);
 
 	public static Gdk.Pixbuf ScaleDown (Gdk.Pixbuf src, int width, int height)
 	{
-		IntPtr raw_ret = gnome_thumbnail_scale_down_pixbuf (src.Handle, width, height);
+		IntPtr raw_ret = gnome_desktop_thumbnail_scale_down_pixbuf (src.Handle, width, height);
 		Gdk.Pixbuf ret;
 		if (raw_ret == IntPtr.Zero)
 			ret = null;
diff --git a/src/Clients/MainApp/f-spot.exe.config.in b/src/Clients/MainApp/f-spot.exe.config.in
index b5144ae..4a11dba 100644
--- a/src/Clients/MainApp/f-spot.exe.config.in
+++ b/src/Clients/MainApp/f-spot.exe.config.in
@@ -3,5 +3,5 @@
   <dllmap dll="libgdk-2.0-0.dll" target="libgdk-x11-2.0.so.0"/>
   <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0"/>
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
-  <dllmap dll="libgnomeui-2-0.dll" target="libgnomeui-2.so.0"/>
+  <dllmap dll="libgnome-desktop-2-17.dll" target="libgnome-desktop-2.so.17"/>
 </configuration>