diff options
| author | Lluis Sanchez <lluis@novell.com> | 2009-06-22 16:13:28 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2009-06-22 16:13:28 +0400 |
| commit | 0f2135db3a88bbaf7c6ead7a04a1c794dd7334d2 (patch) | |
| tree | 2208bcc618e3819f509f1da3bffe3e80b7c91976 /main/src/addins/GnomePlatform | |
| parent | 72d91052d157c26532e9907a0a8562f516314010 (diff) | |
* GnomePlatform.cs: Fallback to Vfs if Gio doesn't have mime type
info for a file.
svn path=/trunk/monodevelop/; revision=136588
Diffstat (limited to 'main/src/addins/GnomePlatform')
| -rw-r--r-- | main/src/addins/GnomePlatform/ChangeLog | 5 | ||||
| -rw-r--r-- | main/src/addins/GnomePlatform/GnomePlatform.cs | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/main/src/addins/GnomePlatform/ChangeLog b/main/src/addins/GnomePlatform/ChangeLog index 784c7b6089..866840c05c 100644 --- a/main/src/addins/GnomePlatform/ChangeLog +++ b/main/src/addins/GnomePlatform/ChangeLog @@ -1,3 +1,8 @@ +2009-06-22 Lluis Sanchez Gual <lluis@novell.com> + + * GnomePlatform.cs: Fallback to Vfs if Gio doesn't have mime + type info for a file. + 2009-04-29 Lluis Sanchez Gual <lluis@novell.com> * GnomePlatform.csproj: Don't require a specific gtk# version. diff --git a/main/src/addins/GnomePlatform/GnomePlatform.cs b/main/src/addins/GnomePlatform/GnomePlatform.cs index 1f424d9e2a..f24e8c8fb4 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.cs +++ b/main/src/addins/GnomePlatform/GnomePlatform.cs @@ -94,10 +94,12 @@ namespace MonoDevelop.Platform protected override string OnGetMimeTypeForUri (string uri) { - if (useGio) - return Gio.GetMimeTypeForUri (uri); - else - return uri != null ? Gnome.Vfs.MimeType.GetMimeTypeForUri (ConvertFileNameToVFS (uri)) : null; + if (useGio) { + string mt = Gio.GetMimeTypeForUri (uri); + if (mt != null) + return mt; + } + return uri != null ? Gnome.Vfs.MimeType.GetMimeTypeForUri (ConvertFileNameToVFS (uri)) : null; } protected override bool OnGetMimeTypeIsText (string mimeType) |