Merge lp:~cszikszoy/docky/fixfileinfoleak into lp:docky

[Chris S.]

[lp:~cszikszoy/docky/fixfileinfoleak]

1230. By Chris S. on 2010-04-07

fix emblems

=== modified file 'Docky.DBus/Docky.DBus/RemoteFileMenuEntry.cs'
--- Docky.DBus/Docky.DBus/RemoteFileMenuEntry.cs	2009-12-14 20:14:43 +0000
+++ Docky.DBus/Docky.DBus/RemoteFileMenuEntry.cs	2010-04-07 03:54:28 +0000
@@ -28,7 +28,7 @@
 	public class RemoteFileMenuEntry : RemoteMenuEntry
 	{
 
-		public RemoteFileMenuEntry (uint id, GLib.File file, string groupTitle) : base (id, file.Basename, "", groupTitle)
+		public RemoteFileMenuEntry (uint id, GLib.File file, string groupTitle) : base(id, file.Basename, "", groupTitle)
 		{
 			Clicked += delegate {
 				DockServices.System.Open (file);
@@ -36,11 +36,11 @@
 			
 			// only check the icon if it's mounted (ie: .Path != null)
 			if (!string.IsNullOrEmpty (file.Path)) {
-				string thumbnailPath = file.QueryStringAttr ("thumbnail::path");
-				if (string.IsNullOrEmpty (thumbnailPath))
-					Icon = DockServices.Drawing.IconFromGIcon (file.Icon ());
+				string thumbnailPath = file.QueryInfo<string> ("thumbnail::path");
+				if (!string.IsNullOrEmpty (thumbnailPath))
+					Icon = thumbnailPath;
 				else
-					Icon = thumbnailPath;
+					Icon = file.Icon ();
 			}
 			
 			if (string.IsNullOrEmpty (Icon))
 
=== modified file 'Docky.Items/Docky.Items/ApplicationDockItem.cs'
--- Docky.Items/Docky.Items/ApplicationDockItem.cs	2010-04-06 05:37:09 +0000
+++ Docky.Items/Docky.Items/ApplicationDockItem.cs	2010-04-07 03:54:28 +0000
@@ -159,7 +159,7 @@
 				return false;
 			
 			foreach (string uri in uris) {
-				string mime = GLib.FileFactory.NewForUri (uri).QueryStringAttr ("standard::content-type");
+				string mime = GLib.FileFactory.NewForUri (uri).QueryInfo<string> ("standard::content-type");
 				if (mimes.Any (m => GLib.Content.TypeIsA (mime, m) || GLib.Content.TypeEquals (mime, m)))
 					return true;
 			}
 
=== modified file 'Docky.Items/Docky.Items/FileDockItem.cs'
--- Docky.Items/Docky.Items/FileDockItem.cs	2010-01-06 05:14:55 +0000
+++ Docky.Items/Docky.Items/FileDockItem.cs	2010-04-07 03:54:28 +0000
@@ -97,10 +97,9 @@
 			
 			// only check the icon if it's mounted (ie: .Path != null)
 			if (!string.IsNullOrEmpty (OwnedFile.Path)) {
-				string customIconPath = OwnedFile.QueryStringAttr (CustomIconKey);
-				string thumbnailPath = OwnedFile.QueryStringAttr (ThumbnailPathKey);
-				// emblems are returned as [ e1, e2, e3 ], get those into a nice trimmed string array
-				string rawEmblems = OwnedFile.QueryStringAttr (EmblemsKey);
+				string customIconPath = OwnedFile.QueryInfo<string> (CustomIconKey);
+				string thumbnailPath = OwnedFile.QueryInfo<string> (ThumbnailPathKey);
+				string[] emblems = OwnedFile.QueryInfo<string[]> (EmblemsKey);
 				
 				// if the icon lives inside the folder (or one of its subdirs) then this
 				// is actually a relative path... not a file uri.
@@ -114,16 +113,13 @@
 				else if (!string.IsNullOrEmpty (thumbnailPath))
 					Icon = thumbnailPath;
 				else
-					SetIconFromGIcon (OwnedFile.Icon ());
+					Icon = OwnedFile.Icon ();
 				
-				if (!string.IsNullOrEmpty (rawEmblems)) {
-					rawEmblems = rawEmblems.Replace ("[", "").Replace ("]", "");
-					
+				// process the emblems
+				if (emblems.Length != 0) {
 					int [] emblemPositions = { 2, 1, 0, 3};
 					int i=0;
-					rawEmblems.Split (new [] {','})
-						.Select (e => e.Trim ())
-						.Reverse ()
+					emblems.Reverse ()
 						.Take (4)
 						.ToList ()
 						.ForEach (e => {
@@ -162,7 +158,7 @@
 			bool can_write;
 			// this could fail if we try to call it on an unmounted location
 			try {
-				can_write = OwnedFile.QueryBoolAttr ("access::can-write");
+				can_write = OwnedFile.QueryInfo<bool> ("access::can-write");
 			} catch {
 				can_write = false;
 			}
@@ -181,12 +177,12 @@
 					
 					// gather some information first
 					long fileSize = file.GetSize ();
-					ulong freeSpace = OwnedFile.QueryULongAttr (FilesystemFreeKey);
+					ulong freeSpace = OwnedFile.QueryInfo<ulong> (FilesystemFreeKey);
 					if ((ulong) fileSize > freeSpace)
 						throw new Exception (Catalog.GetString ("Not enough free space on destination."));
 					
-					string ownedFSID = OwnedFile.QueryStringAttr (FilesystemIDKey);
-					string destFSID = file.QueryStringAttr (FilesystemIDKey);
+					string ownedFSID = OwnedFile.QueryInfo<string> (FilesystemIDKey);
+					string destFSID = file.QueryInfo<string> (FilesystemIDKey);
 					
 					string nameAfterMove = file.NewFileName (OwnedFile);
 					
@@ -195,7 +191,7 @@
 						bool performing = true;
 						long cur = 0, tot = 10;
 						
-						note = Docky.Services.Log.Notify ("", DockServices.Drawing.IconFromGIcon (file.Icon ()), "{0}% " + Catalog.GetString ("Complete") + "...", cur / tot);
+						note = Docky.Services.Log.Notify ("", file.Icon (), "{0}% " + Catalog.GetString ("Complete") + "...", cur / tot);
 						GLib.Timeout.Add (250, () => {
 							note.Body = string.Format ("{0}% ", string.Format ("{0:00.0}", ((float) Math.Min (cur, tot) / tot) * 100)) + Catalog.GetString ("Complete") + "...";
 							return performing;
 
=== modified file 'Docky.Services/Docky.Services/Extensions/GLibFileExtension.cs'
--- Docky.Services/Docky.Services/Extensions/GLibFileExtension.cs	2010-01-21 03:43:55 +0000
+++ Docky.Services/Docky.Services/Extensions/GLibFileExtension.cs	2010-04-07 03:54:28 +0000
@@ -15,6 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // 
 using System;
+using IO = System.IO;
 using System.Linq;
 using System.Collections.Generic;
 
@@ -30,7 +31,6 @@
 			return file.Path == other.Path;
 		}
 
-
 		public int GetHashCode (File file)
 		{
 			return file.Path.GetHashCode ();
@@ -52,44 +52,77 @@
 			return NativeInterop.StrUri (file);
 		}
 		
-		public static FileInfo QueryInfoSimple (this GLib.File file, string attribute)
-		{
-			FileInfo info;
-			if (attribute.StartsWith ("filesystem::"))
-				info = file.QueryFilesystemInfo (attribute, null);
-			else
-				info = file.QueryInfo (attribute, FileQueryInfoFlags.None, null);
-			return info;
-		}
-		
-		public static GLib.Icon Icon (this GLib.File file)
-		{
-			return file.QueryInfoSimple ("standard::icon").Icon;
-		}
-		
-		public static string QueryStringAttr (this GLib.File file, string attribute)
-		{
-			return file.QueryInfoSimple (attribute).GetAttributeAsString (attribute);
-		}
-		
-		public static uint QueryUintAttr (this GLib.File file, string attribute)
-		{
-			return file.QueryInfoSimple (attribute).GetAttributeUInt (attribute);
-		}		
-		
-		public static bool QueryBoolAttr (this GLib.File file, string attribute)
-		{
-			return file.QueryInfoSimple (attribute).GetAttributeBoolean (attribute);
-		}
-		
-		public static ulong QueryULongAttr (this GLib.File file, string attribute)
-		{
-			return file.QueryInfoSimple (attribute).GetAttributeULong (attribute);
+		public static T QueryInfo<T> (this GLib.File file, string attribute)
+		{
+			IntPtr info = NativeInterop.GFileQueryInfo (file, attribute, FileQueryInfoFlags.None, null);
+						
+			Type returnType = typeof(T);
+			object ret;
+			
+			if (returnType == typeof(bool)) {
+				ret = QueryBoolAttr (info, attribute);
+			} else if (returnType == typeof(string)) {
+				ret = QueryStringAttr (info, attribute);
+			} else if (returnType == typeof(string[])) {
+				ret = QueryStringVAttr (info, attribute);
+			} else if (returnType == typeof(uint)) {
+				ret = QueryUIntAttr (info, attribute);
+			} else if (returnType == typeof(ulong)) {
+				ret = QueryULongAttr (info, attribute);
+			} else {
+				ret = default(T);
+			}
+			
+			NativeInterop.GObjectUnref (info);
+			
+			return (T) ret;
+		}
+		
+		public static string Icon (this GLib.File file)
+		{
+			IntPtr info = NativeInterop.GFileQueryInfo (file, "standard::icon", FileQueryInfoFlags.None, null);
+			GLib.Icon icon = NativeInterop.GFileInfoIcon (info);
+			string iconName = DockServices.Drawing.IconFromGIcon (icon);
+			NativeInterop.GObjectUnref (info);
+			return iconName;
+		}
+		
+		static long Size (this GLib.File file)
+		{
+			IntPtr info = NativeInterop.GFileQueryInfo (file, "standard::size", FileQueryInfoFlags.None, null);
+			long size = NativeInterop.GFileInfoSize (info);
+			NativeInterop.GObjectUnref (info);
+			return size;
+		}
+		
+		static string QueryStringAttr (IntPtr info, string attribute)
+		{
+			return NativeInterop.GFileInfoQueryString (info, attribute);
+		}
+			
+		static string[] QueryStringVAttr (IntPtr info, string Attribute)
+		{
+			return NativeInterop.GFileInfoQueryStringV (info, Attribute);
+		}
+		
+		static uint QueryUIntAttr (IntPtr info, string attribute)
+		{
+			return NativeInterop.GFileInfoQueryUInt (info, attribute);
+		}
+		
+		static bool QueryBoolAttr (IntPtr info, string attribute)
+		{
+			return NativeInterop.GFileInfoQueryBool (info, attribute);
+		}
+		
+		static ulong QueryULongAttr (IntPtr info, string attribute)
+		{
+			return NativeInterop.GFileInfoQueryULong (info, attribute);
 		}
 
 		public static FileType QueryFileType (this GLib.File file)
 		{
-			return file.QueryInfoSimple ("standard::type").FileType;
+			return file.QueryFileType (0, null);
 		}
 		
 		// Recursively list all of the subdirs for a given directory
@@ -101,28 +134,11 @@
 		// list all of the subdirs for a given directory
 		public static IEnumerable<GLib.File> SubDirs (this GLib.File file, bool recurse)
 		{
-			FileEnumerator enumerator = file.EnumerateChildren ("standard::type,standard::name,access::can-read", FileQueryInfoFlags.NofollowSymlinks, null);
-			
-			if (enumerator == null)
+			if (!IO.Directory.Exists (file.Path))
 				return Enumerable.Empty<GLib.File> ();
 			
-			FileInfo info;
-			List<GLib.File> dirs = new List<GLib.File> ();
-			
-			while ((info = enumerator.NextFile ()) != null) {
-				File child = file.GetChild (info.Name);
-				
-				if (info.FileType == FileType.Directory && info.GetAttributeBoolean ("access::can-read")) {
-					dirs.Add (child);
-					if (recurse)
-						dirs = dirs.Union (child.SubDirs ()).ToList ();
-				}
-			}
-			
-			if (info != null)
-				info.Dispose ();
-			enumerator.Close (null);
-			return dirs.AsEnumerable ();
+			return IO.Directory.GetDirectories (file.Path, "*", recurse == false ? IO.SearchOption.TopDirectoryOnly : IO.SearchOption.AllDirectories)
+				.Select (subdir => GLib.FileFactory.NewForPath (subdir));
 		}
 		
 		public static IEnumerable<GLib.File> GetFiles (this GLib.File file)
@@ -133,67 +149,76 @@
 		// gets all files under the given GLib.File (directory) with the extension of extension	
 		public static IEnumerable<GLib.File> GetFiles (this GLib.File file, string extension)
 		{
-			FileEnumerator enumerator = file.EnumerateChildren ("standard::type,standard::name", FileQueryInfoFlags.NofollowSymlinks, null);
-			
-			if (enumerator == null)
+			if (!IO.Directory.Exists (file.Path))
 				return Enumerable.Empty<GLib.File> ();
 			
-			FileInfo info;
-			List<GLib.File> files = new List<GLib.File> ();
-			
-			while ((info = enumerator.NextFile ()) != null) {
-				File child = file.GetChild (info.Name);
-				
-				if (info.FileType == FileType.Directory)
-					continue;
-				
-				if (child.Basename.EndsWith (extension))
-					files.Add (child);
-			}
-			
-			if (info != null)
-				info.Dispose ();
-			enumerator.Close (null);
-			return files.AsEnumerable ();
+			return IO.Directory.GetFiles (file.Path, string.Format ("*{0}", extension))
+				.Select (f => GLib.FileFactory.NewForPath (f));
 		}
 		
-		// This is the recursive equivalent to GLib.File.Delete ()
+		/// <summary>
+		/// Recursive equivalent to GLib.File.Delete () when called on a directory.
+		/// Functionally equivalent to GLib.File.Delete when called on files.
+		/// </summary>
+		/// <param name="file">
+		/// A <see cref="GLib.File"/>
+		/// </param>
 		public static void Delete_Recurse (this GLib.File file)
 		{
-			FileEnumerator enumerator = file.EnumerateChildren ("standard::type,standard::name,access::can-delete", FileQueryInfoFlags.NofollowSymlinks, null);
-			
-			if (enumerator == null)
+			if (IO.File.Exists (file.Path)) {
+				file.Delete ();
 				return;
-			
-			FileInfo info;
-			
-			while ((info = enumerator.NextFile ()) != null) {
-				File child = file.GetChild (info.Name);
-				
-				if (info.FileType == FileType.Directory)
-					Delete_Recurse (child);
-				
-				if (info.GetAttributeBoolean ("access::can-delete"))
-					child.Delete (null);
-			}
-			
-			if (info != null)
-				info.Dispose ();
-			enumerator.Close (null);
+			}
+			
+			IEnumerable<GLib.File> files = IO.Directory.GetFiles (file.Path, "*", IO.SearchOption.AllDirectories)
+				.Select (f => FileFactory.NewForPath (f));
+			
+			foreach (File f in files) {
+				if (f.QueryInfo<bool> ("access::can-delete"))
+					f.Delete ();
+			}
 		}
 		
 		// This is the recursive equivalent of GLib.File.Copy ()
+		/// <summary>
+		/// Recursive equivalent to GLib.File.Copy () when called on a directory.
+		/// Functionally equivalent to GLib.File.Copy () when called on files.
+		/// </summary>
+		/// <param name="source">
+		/// A <see cref="GLib.File"/>
+		/// </param>
+		/// <param name="dest">
+		/// A <see cref="GLib.File"/>
+		/// </param>
+		/// <param name="flags">
+		/// A <see cref="FileCopyFlags"/>
+		/// </param>
+		/// <param name="progress_cb">
+		/// A <see cref="FileProgressCallback"/>
+		/// </param>
 		public static void Copy_Recurse (this GLib.File source, GLib.File dest, FileCopyFlags flags, FileProgressCallback progress_cb)
 		{
 			long totalBytes = source.GetSize ();
 			long copiedBytes = 0;
 			
-			Recursive_Copy (source, dest, ref copiedBytes, totalBytes, progress_cb);
+			Recursive_Copy (source, dest, flags, ref copiedBytes, totalBytes, progress_cb);
 		}
 		
+		/// <summary>
+		/// Indicates whether or not a directory has files.
+		/// </summary>
+		/// <remarks>
+		/// Will return false if called on a file.
+		/// </remarks>
+		/// <param name="file">
+		/// A <see cref="GLib.File"/>
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.Boolean"/>
+		/// </returns>
 		public static bool DirectoryHasFiles (this GLib.File file)
 		{
-			System.IO.DirectoryInfo dir = new System.IO.DirectoryInfo (file.Path);
+			IO.DirectoryInfo dir = new IO.DirectoryInfo (file.Path);
 			
 			if (dir.GetFiles ().Count () > 0 || dir.GetDirectories ().Count () > 0)
 				return true;
@@ -222,79 +247,66 @@
 			}
 		}
 		
-		static void Recursive_Copy (GLib.File source, GLib.File dest, ref long copiedBytes, long totalBytes, FileProgressCallback progress_cb)
+		static void Recursive_Copy (GLib.File source, GLib.File dest, FileCopyFlags flags, ref long copiedBytes, long totalBytes, FileProgressCallback progress_cb)
 		{
-			if (source.QueryFileType () != FileType.Directory) {
-				source.Copy (dest, FileCopyFlags.AllMetadata | FileCopyFlags.NofollowSymlinks, null, (current, total) => {
-					 progress_cb.Invoke (current, totalBytes);
-				 });
-				return;
-			}
-			
-			FileEnumerator enumerator = source.EnumerateChildren ("standard::type,standard::name,standard::size", FileQueryInfoFlags.NofollowSymlinks, null);
-			
-			if (enumerator == null)
-				return;
-			
-			FileInfo info;
-			
-			while ((info = enumerator.NextFile ()) != null) {
-				File child = source.GetChild (info.Name);
+			if (IO.File.Exists (source.Path)) {
+				source.Copy (dest, flags, null, (current, total) => { 
+					progress_cb.Invoke (current, totalBytes); 
+				});
+				return;
+			}
+			
+			foreach (GLib.File subdir in source.SubDirs ()) {
+				dest.GetChild (subdir.Basename).MakeDirectoryWithParents (null);
+				// if it's a directory, continue the recursion
+				Recursive_Copy (subdir, dest.GetChild (subdir.Basename), flags, ref copiedBytes, totalBytes, progress_cb);
+			}
+			
+			foreach (File child in source.GetFiles ()) {
+				long copied = copiedBytes;
 				
-				if (info.FileType == FileType.Directory) {
-					// copy all of the children
-					Recursive_Copy (child, dest.GetChild (info.Name), ref copiedBytes, totalBytes, progress_cb);
-				} else {
-					// first create the directory at the destination if it doesn't exist
-					if (!dest.Exists)
-						dest.MakeDirectoryWithParents (null);
-					// this looks crazy making variables here, assigning in the delegate, then reassigning to
-					// copiedBytes, but c# won't let me use out or ref vars in a delegate func.
-					long copied = copiedBytes;
-					// copy
-					child.Copy (dest.GetChild (info.Name), FileCopyFlags.AllMetadata | FileCopyFlags.NofollowSymlinks, null, (current, total) => {
-						 progress_cb.Invoke (copied + current, totalBytes);
-					 });
-					copiedBytes += info.Size;
-				}
+				child.Copy (dest.GetChild (child.Basename), flags, null, (current, total) => {
+					progress_cb.Invoke (copied + current, totalBytes);
+				});
+				copiedBytes += child.GetSize ();
 			}
-			
-			if (info != null)
-				info.Dispose ();
-			enumerator.Close (null);
 		}
 		
 		// will recurse and get the total size in bytes
+		/// <summary>
+		/// Returns the size in bytes of this file.  If called on a directory will return the size
+		/// of all subsequent files recursively.
+		/// </summary>
+		/// <param name="file">
+		/// A <see cref="GLib.File"/>
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.Int64"/>
+		/// </returns>
 		public static long GetSize (this GLib.File file)
 		{
-			FileInfo fileInfo = file.QueryInfo ("standard::type,standard::size", FileQueryInfoFlags.NofollowSymlinks, null);
-			
-			if (fileInfo.FileType != FileType.Directory)
-				return fileInfo.Size;
-			
+			// if file is a regular file (not a directory), return the size
+			if (IO.File.Exists (file.Path))
+				return file.Size ();
+			
+			// otherwise treat it as a directory, and aggregate the size of all files in all subdirs (recursive)
 			long size = 0;
-			FileEnumerator enumerator = file.EnumerateChildren ("standard::type,standard::name,standard::size", FileQueryInfoFlags.NofollowSymlinks, null);
-			
-			if (enumerator == null)
-				return 0;
-			
-			FileInfo info;
-			
-			while ((info = enumerator.NextFile ()) != null) {
-				File child = file.GetChild (info.Name);
-				
-				if (info.FileType == FileType.Directory)
-					size += GetSize (child);
-				else
-					size += info.Size;
-			}
-			
-			if (info != null)
-				info.Dispose ();
-			enumerator.Close (null);
+			IEnumerable<GLib.File> files = IO.Directory.GetFiles (file.Path, "*", IO.SearchOption.AllDirectories)
+				.Select (f => FileFactory.NewForPath (f));
+			foreach (File f in files)
+				size += f.GetSize ();
 			return size;
 		}
 		
+		/// <summary>
+		/// The newline string for a particular input stream.
+		/// </summary>
+		/// <param name="stream">
+		/// A <see cref="GLib.DataInputStream"/>
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.String"/>
+		/// </returns>
 		public static string NewLineString (this GLib.DataInputStream stream)
 		{
 			switch (stream.NewlineType) {
@@ -310,6 +322,18 @@
 			}
 		}
 		
+		/// <summary>
+		/// Tries to mount a file with success and failure action callbacks.
+		/// </summary>
+		/// <param name="file">
+		/// A <see cref="GLib.File"/>
+		/// </param>
+		/// <param name="success">
+		/// A <see cref="Action"/> invoked when the mount was successful.
+		/// </param>
+		/// <param name="failed">
+		/// A <see cref="Action"/> invoked when the mount failed.
+		/// </param>
 		public static void MountWithActionAndFallback (this GLib.File file, Action success, Action failed)
 		{
 			// In rare instances creating a Gtk.MountOperation can fail so let's try to create it first
@@ -347,6 +371,15 @@
 			});
 		}
 		
+		/// <summary>
+		/// Add an action that gets invoked when a file gets mounted.
+		/// </summary>
+		/// <param name="file">
+		/// A <see cref="GLib.File"/>
+		/// </param>
+		/// <param name="action">
+		/// A <see cref="Action"/>
+		/// </param>
 		public static void AddMountAction (this GLib.File file, Action action)
 		{
 			if (!MountActions.ContainsKey (file))
@@ -354,6 +387,15 @@
 			MountActions [file].Add (action);
 		}
 		
+		/// <summary>
+		/// Removes an action from the mount actions list for this file.
+		/// </summary>
+		/// <param name="file">
+		/// A <see cref="GLib.File"/>
+		/// </param>
+		/// <param name="action">
+		/// A <see cref="Action"/>
+		/// </param>
 		public static void RemoveAction (this GLib.File file, Action action)
 		{
 			if (MountActions.ContainsKey (file) && MountActions [file].Contains (action))
 
=== modified file 'Docky.Services/Docky.Services/Helper.cs'
--- Docky.Services/Docky.Services/Helper.cs	2010-04-05 06:17:47 +0000
+++ Docky.Services/Docky.Services/Helper.cs	2010-04-07 03:54:28 +0000
@@ -101,9 +101,9 @@
 		void Start ()
 		{	
 			// if the execute bits aren't set, try to set
-			if (!File.QueryBoolAttr ("access::can-execute")) {
+			if (!File.QueryInfo<bool> ("access::can-execute")) {
 				Log<Helper>.Debug ("Execute permissions are not currently set for '{0}', attempting to set them.", File.Path);
-				uint currentPerm = File.QueryUintAttr ("unix::mode");
+				uint currentPerm = File.QueryInfo<uint> ("unix::mode");
 				try {
 					File.SetAttributeUint32 ("unix::mode", currentPerm | X_PERM, 0, null);
 				// if we can't log the error, and disable this script
 
=== modified file 'Docky.Services/Docky.Services/Logging/LogBase.cs'
--- Docky.Services/Docky.Services/Logging/LogBase.cs	2010-01-19 05:25:59 +0000
+++ Docky.Services/Docky.Services/Logging/LogBase.cs	2010-04-07 03:54:28 +0000
@@ -50,7 +50,8 @@
 			"GLib",
 			"GLib-GObject",
 			"Pango",
-			"GdkPixbuf"
+			"GdkPixbuf",
+			"GLib-GIO",
 		};
 
 		static LogBase ()
 
=== modified file 'Docky.Services/Docky.Services/NativeInterop.cs'
--- Docky.Services/Docky.Services/NativeInterop.cs	2010-03-25 17:34:22 +0000
+++ Docky.Services/Docky.Services/NativeInterop.cs	2010-04-07 03:54:28 +0000
@@ -16,14 +16,17 @@
 // 
 
 using System;
+using System.Linq;
 using System.Runtime.InteropServices;
 
 using GLib;
 
+using Mono.Unix;
+
 namespace Docky.Services
 {
 	
-	public class NativeInterop
+	internal class NativeInterop
 	{		
 		[DllImport ("gio-2.0")]
 		private static extern IntPtr g_file_get_uri (IntPtr fileHandle);
@@ -51,128 +54,286 @@
 		[DllImport("libgtk-x11-2.0", CallingConvention = CallingConvention.Cdecl)]
 		private static extern IntPtr gtk_icon_theme_lookup_by_gicon (IntPtr icon_theme, IntPtr icon, int size, int flags);
 
+		#region Workaround for GLib.FileInfo leaks...
+		
+		// some attributes must be looked up as bytestrings, not strings
+		static readonly string [] BYTE_STRING_VALS = new string [] {
+			"thumbnail::path",
+			"standard::name",
+			"standard::symlink-target",
+		};
+		
+		[DllImport("libgio-2.0")]
+		static extern int g_file_info_get_attribute_type(IntPtr raw, string attribute);
+		
+		[DllImport("libgobject-2.0")]
+		private static extern IntPtr g_object_ref (IntPtr @object);
+		
+		[DllImport("libgobject-2.0")]
+		private static extern void g_object_unref (IntPtr @object);
+		
+		[DllImport("libgobject-2.0")]
+		private static extern IntPtr g_file_info_get_name (IntPtr info);
+		
+		[DllImport("gio-2.0")]
+		private static extern IntPtr g_file_query_info (IntPtr file, string attributes, int flags, IntPtr cancellable, out IntPtr error);
+
+		[DllImport("gio-2.0")]
+		private static extern IntPtr g_file_query_filesystem_info(IntPtr file, string attributes, IntPtr cancellable, out IntPtr error);
+		
+		[DllImport("gio-2.0")]
+		private static extern IntPtr g_file_info_get_attribute_string (IntPtr info, string attribute);
+		
+		[DllImport("gio-2.0")]
+		private static extern IntPtr g_file_info_get_attribute_stringv (IntPtr info, string attribute);
+				
+		[DllImport("gio-2.0")]
+		private static extern IntPtr g_file_info_get_attribute_byte_string (IntPtr info, string attribute);
+		
+		[DllImport("gio-2.0")]
+		static extern uint g_file_info_get_attribute_uint32 (IntPtr info, string attribute);
+		
+		[DllImport("gio-2.0")]
+		static extern ulong g_file_info_get_attribute_uint64 (IntPtr info, string attribute);
+		
+		[DllImport("gio-2.0")]
+		static extern bool g_file_info_get_attribute_boolean (IntPtr info, string attribute);
+		
+		[DllImport("gio-2.0")]
+		static extern long g_file_info_get_size (IntPtr info);
+		
+		[DllImport("gio-2.0")]
+		static extern IntPtr g_file_info_get_icon (IntPtr info);
+		
+		#endregion
+		
+		static readonly string GIO_NOT_FOUND = Catalog.GetString ("Could not find gio-2.0, please report immediately.");
+		static readonly string GOBJECT_NOT_FOUND = Catalog.GetString ("Could not find gobject-2.0, please report immediately.");
+		static readonly string GTK_NOT_FOUND = Catalog.GetString ("Could not find gtk-2.0, please report immediately.");
+		
 		public static string StrUri (File file)
 		{
-			try {
+			return NativeHelper<string> (() => {
 				return GLib.Marshaller.PtrToStringGFree (g_file_get_uri (file.Handle));
-			} catch (DllNotFoundException e) {
-				Log<NativeInterop>.Fatal ("Could not find gio-2.0, please report immediately.");
-				Log<NativeInterop>.Info (e.StackTrace);
-				return "";
-			} catch (Exception e) {
-				Log<NativeInterop>.Error ("Failed to retrieve uri for file '{0}': {1}", file.Basename, e.Message);
-				Log<NativeInterop>.Info (e.StackTrace);
-				return "";
-			}
+			}, GIO_NOT_FOUND, 
+			string.Format ("Failed to retrieve uri for file '{0}': ", file.Path) + "{0}");
 		}
 
 		public static int prctl (int option, string arg2)
 		{
-			try {
+			return NativeHelper<int> (() => {
 				return prctl (option, System.Text.Encoding.ASCII.GetBytes (arg2 + "\0"), IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
-			} catch (DllNotFoundException e) {
-				Log<NativeInterop>.Fatal ("Could not find libc, please report immediately.");
-				Log<NativeInterop>.Info (e.StackTrace);
-				return -1;
-			} catch (Exception e) {
-				Log<NativeInterop>.Error ("Failed to set process name: {0}", e.Message);
-				Log<NativeInterop>.Info (e.StackTrace);
-				return -1;
-			}
+			}, -1, "Could not find libc, please report immediately.",
+			"Failed to set process name: {0}");
 		}
 		
 		public static void UnmountWithOperation (Mount mount, MountUnmountFlags flags, MountOperation op, 
 			Cancellable cancellable, AsyncReadyCallback cb)
 		{
-			try {
+			NativeHelper (() =>
+			{
 				GLibSharp.AsyncReadyCallbackWrapper cb_wrapper = new GLibSharp.AsyncReadyCallbackWrapper (cb);
 				g_mount_unmount_with_operation (mount.Handle, (int) flags, op == null ? IntPtr.Zero : op.Handle, 
 				cancellable == null ? IntPtr.Zero : cancellable.Handle, cb_wrapper.NativeDelegate, IntPtr.Zero);
-			} catch (DllNotFoundException e) {
-				Log<NativeInterop>.Fatal ("Could not find gio-2.0, please report immediately.");
-				Log<NativeInterop>.Info (e.StackTrace);
-				return;
-			} catch (Exception e) {
-				Log<NativeInterop>.Error ("Failed to unmount with operation name: {0}", e.Message);
-				Log<NativeInterop>.Info (e.StackTrace);
-				return;
-			}
+			}, GIO_NOT_FOUND,
+			"Failed to unmount with operation: {0}");
 		}
 		
 		public static void EjectWithOperation (Mount mount, MountUnmountFlags flags, MountOperation op, 
 			Cancellable cancellable, AsyncReadyCallback cb)
 		{
-			try {
+			NativeHelper (() =>
+			{
 				GLibSharp.AsyncReadyCallbackWrapper cb_wrapper = new GLibSharp.AsyncReadyCallbackWrapper (cb);
 				g_mount_eject_with_operation (mount.Handle, (int) flags, op == null ? IntPtr.Zero : op.Handle, 
 				cancellable == null ? IntPtr.Zero : cancellable.Handle, cb_wrapper.NativeDelegate, IntPtr.Zero);
-			} catch (DllNotFoundException e) {
-				Log<NativeInterop>.Fatal ("Could not find gio-2.0, please report immediately.");
-				Log<NativeInterop>.Info (e.StackTrace);
-				return;
-			} catch (Exception e) {
-				Log<NativeInterop>.Error ("Failed to eject with operation name: {0}", e.Message);
-				Log<NativeInterop>.Info (e.StackTrace);
-				return;
-			}
+			}, GIO_NOT_FOUND,
+			"Failed to eject with operation name: {0}");
 		}
 		
 		public static bool EjectWithOperationFinish (Mount mount, AsyncResult result)
 		{
-			try {
+			return NativeHelper<bool> (() =>
+			{
 				IntPtr error = IntPtr.Zero;
 				bool success = g_mount_eject_with_operation_finish (mount.Handle, result == null ? IntPtr.Zero : 
 				((result is GLib.Object) ? (result as GLib.Object).Handle : (result as GLib.AsyncResultAdapter).Handle), out error);
 				if (error != IntPtr.Zero)
 					throw new GLib.GException (error);
 				return success;
-			} catch (DllNotFoundException e) {
-				Log<NativeInterop>.Fatal ("Could not find gio-2.0, please report immediately.");
-				Log<NativeInterop>.Info (e.StackTrace);
-				return false;
-			} catch (Exception e) {
-				Log<NativeInterop>.Error ("Failed to eject with operation finish name: {0}", e.Message);
-				Log<NativeInterop>.Info (e.StackTrace);
-				return false;
-			}
+			}, false, GIO_NOT_FOUND,
+			"Failed to eject with operation finish name: {0}");
 		}
 		
 		public static bool UnmountWithOperation (Mount mount, AsyncResult result)
 		{
-			try {
+			return NativeHelper<bool> (() =>
+			{
 				IntPtr error = IntPtr.Zero;
 				bool success = g_mount_unmount_with_operation_finish (mount.Handle, result == null ? IntPtr.Zero : ((result is GLib.Object) ? (result as GLib.Object).Handle : (result as GLib.AsyncResultAdapter).Handle), out error);
 				if (error != IntPtr.Zero)
 					throw new GLib.GException (error);
 				return success;
-			} catch (DllNotFoundException e) {
-				Log<NativeInterop>.Fatal ("Could not find gio-2.0, please report immediately.");
-				Log<NativeInterop>.Info (e.StackTrace);
-				return false;
-			} catch (Exception e) {
-				Log<NativeInterop>.Error ("Failed to unmount with operation finish name: {0}", e.Message);
-				Log<NativeInterop>.Info (e.StackTrace);
-				return false;
-			}
+			}, false, GIO_NOT_FOUND,
+			"Failed to unmount with operation finish name: {0}");
 		}
 		
 		public static Gtk.IconInfo IconThemeLookUpByGIcon (Gtk.IconTheme theme, GLib.Icon icon, int size, int flags)
 		{
-			try {
-				IntPtr raw_ret = gtk_icon_theme_lookup_by_gicon(theme.Handle, 
+			return NativeHelper<Gtk.IconInfo> (() =>
+			{
+				IntPtr raw_ret = gtk_icon_theme_lookup_by_gicon (theme.Handle, 
 				    icon == null ? IntPtr.Zero : ((icon is GLib.Object) ? (icon as GLib.Object).Handle : (icon as GLib.IconAdapter).Handle),
 				    size, (int) flags);
-				Gtk.IconInfo ret = raw_ret == IntPtr.Zero ? null : (Gtk.IconInfo) GLib.Opaque.GetOpaque (raw_ret, typeof (Gtk.IconInfo), true);
+				Gtk.IconInfo ret = raw_ret == IntPtr.Zero ? null : (Gtk.IconInfo) GLib.Opaque.GetOpaque (raw_ret, typeof(Gtk.IconInfo), true);
+				return ret;
+			}, null, GTK_NOT_FOUND,
+			"Failed to lookup by GIcon: {0}");
+		}
+		
+		#region Workaround for GLib.FileInfo leaks...
+		
+		public static IntPtr GFileQueryInfo (GLib.File file, string attributes, FileQueryInfoFlags flags, Cancellable cancellable)
+		{
+			return NativeHelper<IntPtr> (() =>
+			{
+				IntPtr error;
+				IntPtr info;
+				if (attributes.StartsWith ("filesystem::"))
+					info = g_file_query_filesystem_info (file.Handle, attributes,
+					cancellable == null ? IntPtr.Zero : cancellable.Handle, out error);
+				else
+					info = g_file_query_info (file.Handle, attributes, (int) flags, 
+					cancellable == null ? IntPtr.Zero : cancellable.Handle, out error);
+				
+				if (error != IntPtr.Zero)
+					throw new GException (error);
+				return info;
+			}, IntPtr.Zero, GIO_NOT_FOUND,
+			string.Format ("Failed to query info for '{0}': ", file.Path) + "{0}");
+		}
+		
+		public static int GFileInfoQueryAttributeType (IntPtr info, string attribute)
+		{
+			return NativeHelper<int> (() =>
+			{
+				int type = g_file_info_get_attribute_type (info, attribute);
+				return type;
+			}, GIO_NOT_FOUND,
+			string.Format ("Failed to query attribute type '{0}': ", attribute) + "{0}");
+		}
+		
+		public static string GFileInfoQueryString (IntPtr info, string attribute)
+		{
+			return NativeHelper<string> (() =>
+			{
+				IntPtr str;
+				if (BYTE_STRING_VALS.Any (s => attribute.StartsWith (s)))
+					str = g_file_info_get_attribute_byte_string (info, attribute);
+				else
+					str = g_file_info_get_attribute_string (info, attribute);
+				return GLib.Marshaller.Utf8PtrToString (str);
+			}, GIO_NOT_FOUND,
+			string.Format ("Failed to query string '{0}': ", attribute) + "{0}");
+		}
+		
+		public static string[] GFileInfoQueryStringV (IntPtr info, string attribute)
+		{
+			return NativeHelper<string[]> (() =>
+			{
+				IntPtr strv;
+				strv = g_file_info_get_attribute_stringv (info, attribute);
+				return GLib.Marshaller.NullTermPtrToStringArray (strv, false);
+			}, GIO_NOT_FOUND,
+			string.Format ("Failed to query stringv '{0}': ", attribute) + "{0}");
+		}
+		
+		public static uint GFileInfoQueryUInt (IntPtr info, string attribute)
+		{
+			return NativeHelper<uint> (() =>
+			{
+				return g_file_info_get_attribute_uint32 (info, attribute);
+			}, GIO_NOT_FOUND,
+			string.Format ("Failed to query uint '{0}': ", attribute) + "{0}");
+		}
+		
+		public static ulong GFileInfoQueryULong (IntPtr info, string attribute)
+		{
+			return NativeHelper<ulong> (() =>
+			{
+				return g_file_info_get_attribute_uint64 (info, attribute);
+			}, GIO_NOT_FOUND,
+			string.Format ("Failed to query uint '{0}': ", attribute) + "{0}");
+		}		
+		
+		public static bool GFileInfoQueryBool (IntPtr info, string attribute)
+		{
+			return NativeHelper<bool> (() =>
+			{
+				return g_file_info_get_attribute_boolean (info, attribute);
+			}, GIO_NOT_FOUND,
+			string.Format ("Failed to query bool '{0}': ", attribute) + "{0}");
+		}
+		
+		public static Icon GFileInfoIcon (IntPtr info)
+		{
+			return NativeHelper<Icon> (() =>
+			{
+				IntPtr icon = g_file_info_get_icon (info);
+				return IconAdapter.GetObject (g_object_ref (icon), false);
+			}, GIO_NOT_FOUND,
+			"Failed to query icon {0}");
+		}
+		
+		public static long GFileInfoSize (IntPtr info)
+		{
+			return NativeHelper<long> (() =>
+			{
+				return g_file_info_get_size (info);
+			}, GIO_NOT_FOUND,
+			"Failed to query icon {0}");
+		}
+		
+		public static void GObjectUnref (IntPtr objectHandle)
+		{
+			NativeHelper (() =>
+			{
+				if (objectHandle == IntPtr.Zero)
+					return;
+				g_object_unref (objectHandle);
+			}, GOBJECT_NOT_FOUND,
+			"Could not unref object: {0}");
+		}
+		
+		#endregion
+	
+		static T NativeHelper<T> (Func<T> act, T errorReturn, string notFound, string error)
+		{
+			try {
+				T ret = act.Invoke ();
 				return ret;
 			} catch (DllNotFoundException e) {
-				Log<NativeInterop>.Fatal ("Could not find gtk-2.0, please report immediately.");
+				Log<NativeInterop>.Fatal (notFound);
 				Log<NativeInterop>.Info (e.StackTrace);
-				return null;
+				return errorReturn;
 			} catch (Exception e) {
-				Log<NativeInterop>.Error ("Failed to lookup by GIcon: {0}", e.Message);
+				Log<NativeInterop>.Error (error, e.Message);
 				Log<NativeInterop>.Info (e.StackTrace);
-				return null;
+				return errorReturn;
 			}
 		}
+		
+		static void NativeHelper (Action act, string notFound, string error)
+		{
+			NativeHelper<int> (() => {
+				act.Invoke ();
+				return -1;
+			}, notFound, error);
+		}
+		
+		static T NativeHelper<T> (Func<T> act, string notFound, string error)
+		{
+			return NativeHelper<T> (act, default(T), notFound, error);
+		}
 	}
 }
 
=== modified file 'StandardPlugins/Trash/src/TrashDockItem.cs'
--- StandardPlugins/Trash/src/TrashDockItem.cs	2010-03-31 04:28:28 +0000
+++ StandardPlugins/Trash/src/TrashDockItem.cs	2010-04-07 03:54:28 +0000
@@ -36,7 +36,7 @@
 	{
 		uint ItemsInTrash {
 			get {
-				return OwnedFile.QueryUintAttr ("trash::item-count");
+				return OwnedFile.QueryInfo<uint> ("trash::item-count");
 			}
 		}
 		
@@ -74,7 +74,7 @@
 			else
 				HoverText = string.Format (Catalog.GetPluralString ("{0} item in Trash", "{0} items in Trash", (int) itemsInTrash), itemsInTrash);
 			
-			SetIconFromGIcon (OwnedFile.Icon ());
+			Icon = OwnedFile.Icon ();
 		}
 		
 		public override string UniqueID ()