f-spot r3825 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon Apr 14 12:05:07 2008
New Revision: 3825
URL: http://svn.gnome.org/viewvc/f-spot?rev=3825&view=rev

Log:
2008-04-14  Stephane Delcroix  <sdelcroix novell com>

	* src/ImageFile.cs: adding a nullity check to avoid 
	GdkPixbuf-CRITICAL warnings.


Modified:
   trunk/ChangeLog
   trunk/src/ImageView.cs
   trunk/src/main.cs

Modified: trunk/src/ImageView.cs
==============================================================================
--- trunk/src/ImageView.cs	(original)
+++ trunk/src/ImageView.cs	Mon Apr 14 12:05:07 2008
@@ -81,7 +81,8 @@
 			return f_image_view_get_selection_xy_ratio (Handle);
 		}
 		set {
-			f_image_view_set_selection_xy_ratio (Handle, value);
+			if (Pixbuf != null)
+				f_image_view_set_selection_xy_ratio (Handle, value);
 		}
 	}
 

Modified: trunk/src/main.cs
==============================================================================
--- trunk/src/main.cs	(original)
+++ trunk/src/main.cs	Mon Apr 14 12:05:07 2008
@@ -1,4 +1,5 @@
 using Gtk;
+using GLib;
 using Gnome;
 using System;
 using System.Reflection;
@@ -68,6 +69,10 @@
 		bool slideshow = false;
 		string import_uri = null;
 		
+		// Debug GdkPixbuf critical warnings
+		//LogFunc logFunc = new GLib.LogFunc (GLib.Log.PrintTraceLogFunction);
+		//Log.SetLogHandler ("GdkPixbuf", GLib.LogLevelFlags.Critical, logFunc);
+
 		FSpot.Global.PhotoDirectory = (string) Preferences.Get(Preferences.STORAGE_PATH);
 
 		for (int i = 0; i < args.Length && !shutdown; i++) {