f-spot r4428 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon Sep 22 19:51:14 2008
New Revision: 4428
URL: http://svn.gnome.org/viewvc/f-spot?rev=4428&view=rev

Log:
merge the changes from the stable branch

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/TagStore.cs

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Sep 22 19:51:14 2008
@@ -1,4 +1,4 @@
-AC_INIT(F-Spot, 0.5.0)
+AC_INIT(F-Spot, 0.5.0.1)
 AC_CONFIG_SRCDIR(src/main.cs)
 
 AM_CONFIG_HEADER(config.h)

Modified: trunk/src/TagStore.cs
==============================================================================
--- trunk/src/TagStore.cs	(original)
+++ trunk/src/TagStore.cs	Mon Sep 22 19:51:14 2008
@@ -35,7 +35,7 @@
 	public static byte [] Serialize (Pixbuf pixbuf)
 	{
 		Pixdata pixdata = new Pixdata ();
-		IntPtr raw_pixdata = pixdata.FromPixbuf (pixbuf, true); // FIXME GTK# shouldn't this be a constructor or something?
+		IntPtr raw_pixdata = pixdata.FromPixbuf (pixbuf, false); // FIXME GTK# shouldn't this be a constructor or something?
 									//       It's probably because we need the IntPtr to free it afterwards
 
 		uint data_length;