f-spot r3834 - in branches/FSPOT_0_4_2_STABLE: . libgphoto2-sharp

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue Apr 15 12:02:19 2008
New Revision: 3834
URL: http://svn.gnome.org/viewvc/f-spot?rev=3834&view=rev

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

	backporting r3831 to the 042_STABLE branch


Modified:
   branches/FSPOT_0_4_2_STABLE/ChangeLog
   branches/FSPOT_0_4_2_STABLE/libgphoto2-sharp/CameraList.cs

Modified: branches/FSPOT_0_4_2_STABLE/libgphoto2-sharp/CameraList.cs
==============================================================================
--- branches/FSPOT_0_4_2_STABLE/libgphoto2-sharp/CameraList.cs	(original)
+++ branches/FSPOT_0_4_2_STABLE/libgphoto2-sharp/CameraList.cs	Tue Apr 15 12:02:19 2008
@@ -69,27 +69,27 @@
 		}
 		
 		[DllImport ("libgphoto2.so")]
-		internal static extern ErrorCode gp_list_get_name (HandleRef list, int index, out string name);
+		internal static extern ErrorCode gp_list_get_name (HandleRef list, int index, out IntPtr name);
 
 		public string GetName (int index)
 		{
-			string name;
+			IntPtr name;
 
 			Error.CheckError (gp_list_get_name(this.Handle, index, out name));
 
-			return name;
+			return Marshal.PtrToStringAnsi (name);
 		}
 		
 		[DllImport ("libgphoto2.so")]
-		internal static extern ErrorCode gp_list_get_value (HandleRef list, int index, out string value);
+		internal static extern ErrorCode gp_list_get_value (HandleRef list, int index, out IntPtr value);
 
 		public string GetValue (int index)
 		{
-			string value;
+			IntPtr value;
 
 			Error.CheckError (gp_list_get_value(this.Handle, index, out value));
 
-			return value;
+			return Marshal.PtrToStringAnsi (value);
 		}
 		
 		[DllImport ("libgphoto2.so")]