Remove some obsolete GNOME bindings, use more provided by gtk-sharp Index: Tiles/Tile.cs =================================================================== RCS file: /cvs/gnome/beagle/Tiles/Tile.cs,v retrieving revision 1.32 diff -u -B -p -r1.32 Tile.cs --- Tiles/Tile.cs 2 Aug 2005 22:24:44 -0000 1.32 +++ Tiles/Tile.cs 25 Oct 2005 16:37:03 -0000 @@ -169,12 +169,11 @@ namespace Beagle.Tile { command = "desktop-launch"; expects_uris = true; #else - BU.GnomeVFSMimeApplication app; - app = BU.GnomeIconLookup.GetDefaultAction (hit.MimeType); - - if (app.command != null) { - command = app.command; - expects_uris = (app.expects_uris != BU.GnomeVFSMimeApplicationArgumentType.Path); + Gnome.Vfs.MimeApplication app; + app = Gnome.Vfs.Mime.GetDefaultApplication (hit.MimeType); + if (app != null) { + command = app.Exec; + expects_uris = app.SupportsUris (); } #endif if (command == null) { Index: Tiles/TileFile.cs =================================================================== RCS file: /cvs/gnome/beagle/Tiles/TileFile.cs,v retrieving revision 1.26 diff -u -B -p -r1.26 TileFile.cs --- Tiles/TileFile.cs 16 Aug 2005 15:48:07 -0000 1.26 +++ Tiles/TileFile.cs 25 Oct 2005 16:37:03 -0000 @@ -28,10 +28,11 @@ using System; using System.Diagnostics; using System.IO; -using BU = Beagle.Util; +using Beagle.Util; using Gnome; using Gdk; +using Gtk; namespace Beagle.Tile { @@ -59,7 +60,7 @@ namespace Beagle.Tile { return; } - string quoted_uri = BU.StringFu.PathToQuotedFileUri (Hit.Uri.LocalPath); + string quoted_uri = StringFu.PathToQuotedFileUri (Hit.Uri.LocalPath); string thumbnail = Thumbnail.PathForUri (quoted_uri, ThumbnailSize.Normal); if (File.Exists (thumbnail)) @@ -70,9 +71,8 @@ namespace Beagle.Tile { if (pix == null) { thumb_factory.CreateFailedThumbnail (quoted_uri, fi.LastWriteTime); - Gtk.IconSize size = (Gtk.IconSize) 48; - string path = BU.GnomeIconLookup.LookupMimeIcon (Hit.MimeType, size); - string icon = Images.GetHtmlSource (path, BU.GnomeIconLookup.GetFileMimeType (path)); + string path = GnomeFu.GetMimeIconPath (Hit.MimeType); + string icon = Images.GetHtmlSource (path, GnomeFu.GetMimeType (path)); if (icon != null) Template ["Icon"] = icon; Index: Tiles/TileMailMessage.cs =================================================================== RCS file: /cvs/gnome/beagle/Tiles/TileMailMessage.cs,v retrieving revision 1.41 diff -u -B -p -r1.41 TileMailMessage.cs --- Tiles/TileMailMessage.cs 24 Oct 2005 23:03:34 -0000 1.41 +++ Tiles/TileMailMessage.cs 25 Oct 2005 16:37:03 -0000 @@ -29,7 +29,7 @@ using System.Collections; using System.Diagnostics; using System.Text; using System.Text.RegularExpressions; -using BU = Beagle.Util; +using Beagle.Util; using GMime; using Mono.Unix; @@ -130,11 +130,10 @@ namespace Beagle.Tile { if (IsAttachment (Hit)) { Template["Subject"] = Hit ["fixme:attachment_title"] + " [" + Catalog.GetString ("Email attachment") + "]"; Template["EmailSubject"] = str; - Gtk.IconSize size = (Gtk.IconSize) 48; - string path = BU.GnomeIconLookup.LookupMimeIcon (Hit.MimeType, size); - Template["Icon"] = Images.GetHtmlSource (path, BU.GnomeIconLookup.GetFileMimeType (path)); + string path = GnomeFu.GetMimeIconPath (Hit.MimeType); + Template["Icon"] = Images.GetHtmlSource (path, GnomeFu.GetMimeType (path)); } - + if (GetHitProperty (Hit, "fixme:isFlagged") != null) Template["FollowupIcon"] = Images.GetHtmlSourceForStock ("stock_mail-priority-high", 16); if (GetHitProperty (Hit, "fixme:hasAttachments") != null) @@ -150,7 +149,7 @@ namespace Beagle.Tile { #if ENABLE_GALAGO #if ENABLE_EVO_SHARP if (aim_name != null) { - string status = BU.GalagoTools.GetPresence ("aim", aim_name); + string status = GalagoTools.GetPresence ("aim", aim_name); if (status != null && status != "") Template ["Presence"] = status; } Index: Util/Makefile.am =================================================================== RCS file: /cvs/gnome/beagle/Util/Makefile.am,v retrieving revision 1.73 diff -u -B -p -r1.73 Makefile.am --- Util/Makefile.am 18 Oct 2005 15:37:37 -0000 1.73 +++ Util/Makefile.am 25 Oct 2005 16:37:05 -0000 @@ -60,7 +60,7 @@ CSFILES = \ $(srcdir)/FrequencyStatistics.cs \ $(srcdir)/FSpotTools.cs \ $(srcdir)/GeckoUtils.cs \ - $(srcdir)/gnome.cs \ + $(srcdir)/GnomeFu.cs \ $(srcdir)/GtkUtils.cs \ $(srcdir)/GuidFu.cs \ $(srcdir)/HigMessageDialog.cs \ @@ -90,7 +90,6 @@ CSFILES = \ $(srcdir)/UnixClient.cs \ $(srcdir)/UnixListener.cs \ $(srcdir)/UriFu.cs \ - $(srcdir)/Vfs.cs \ $(srcdir)/XKeybinder.cs \ $(srcdir)/XmlFu.cs Index: beagled/FilterFactory.cs =================================================================== RCS file: /cvs/gnome/beagle/beagled/FilterFactory.cs,v retrieving revision 1.16 diff -u -B -p -r1.16 FilterFactory.cs --- beagled/FilterFactory.cs 2 Sep 2005 19:18:58 -0000 1.16 +++ beagled/FilterFactory.cs 25 Oct 2005 16:37:05 -0000 @@ -118,7 +118,7 @@ namespace Beagle.Daemon { static public ICollection CreateFiltersFromPath (string path) { - string guessed_mime_type = Beagle.Util.VFS.Mime.GetMimeType (path); + string guessed_mime_type = GnomeFu.GetMimeType (path); string extension = Path.GetExtension (path); return CreateFilters (UriFu.PathToFileUri (path), extension, guessed_mime_type); } @@ -149,7 +149,7 @@ namespace Beagle.Daemon { static public TextReader FilterFile (string path, string mime_type) { if (mime_type == null) - mime_type = Beagle.Util.VFS.Mime.GetMimeType (path); + mime_type = GnomeFu.GetMimeType (path); if (mime_type == null) return null; @@ -221,7 +221,7 @@ namespace Beagle.Daemon { // Otherwise sniff the mime-type from the file if (indexable.MimeType == null) - indexable.MimeType = Beagle.Util.VFS.Mime.GetMimeType (path); + indexable.MimeType = GnomeFu.GetMimeType (path); if (filters == null || filters.Count == 0) { filters = CreateFiltersFromIndexable (indexable);