1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
diff -rupN main.original/configure.in main/configure.in
--- main.original/configure.in 2015-07-18 14:09:27.934561734 +0200
+++ main/configure.in 2015-07-18 14:11:02.182316682 +0200
@@ -133,13 +133,6 @@ PKG_CHECK_MODULES(MONODOC, monodoc >= $M
AC_SUBST(MONODOC_LIBS)
dnl soft dependencies
-PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_sharp=yes], [gnome_sharp=no])
-AC_SUBST(GNOME_SHARP_LIBS)
-PKG_CHECK_MODULES(GNOME_VFS_SHARP, gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_vfs_sharp=yes], [gnome_vfs_sharp=no])
-AC_SUBST(GNOME_VFS_SHARP_LIBS)
-PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gconf_sharp=yes], [gconf_sharp=no])
-AC_SUBST(GCONF_SHARP_LIBS)
-
gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`"
AC_SUBST(gtksharp_prefix)
diff -rupN main.original/src/addins/GnomePlatform/GnomePlatform.cs main/src/addins/GnomePlatform/GnomePlatform.cs
--- main.original/src/addins/GnomePlatform/GnomePlatform.cs 2015-07-18 18:40:15.946222126 +0200
+++ main/src/addins/GnomePlatform/GnomePlatform.cs 2015-07-18 19:56:35.272686234 +0200
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gnome;
using MonoDevelop.Ide.Desktop;
using System;
using System.Collections.Generic;
@@ -40,44 +39,13 @@ namespace MonoDevelop.Platform
{
public class GnomePlatform : PlatformService
{
- static bool useGio;
-
- Gnome.ThumbnailFactory thumbnailFactory = new Gnome.ThumbnailFactory (Gnome.ThumbnailSize.Normal);
-
static GnomePlatform ()
{
try {
Gio.GetDefaultForType ("text/plain");
- useGio = true;
} catch (Exception ex) {
Console.WriteLine (ex);
}
- //apparently Gnome.Icon needs GnomeVFS initialized even when we're using GIO.
- Gnome.Vfs.Vfs.Initialize ();
- }
-
- DesktopApplication GetGnomeVfsDefaultApplication (string mimeType)
- {
- var app = Gnome.Vfs.Mime.GetDefaultApplication (mimeType);
- if (app != null)
- return (DesktopApplication) Marshal.PtrToStructure (app.Handle, typeof(DesktopApplication));
- else
- return null;
- }
-
- IEnumerable<DesktopApplication> GetGnomeVfsApplications (string mimeType)
- {
- var def = GetGnomeVfsDefaultApplication (mimeType);
- var list = new List<DesktopApplication> ();
- var apps = Gnome.Vfs.Mime.GetAllApplications (mimeType);
- foreach (var app in apps) {
- var dap = (GnomeVfsApp) Marshal.PtrToStructure (app.Handle, typeof(GnomeVfsApp));
- if (!string.IsNullOrEmpty (dap.Command) && !string.IsNullOrEmpty (dap.DisplayName) && !dap.Command.Contains ("monodevelop ")) {
- var isDefault = def != null && def.Id == dap.Command;
- list.Add (new GnomeDesktopApplication (dap.Command, dap.DisplayName, isDefault));
- }
- }
- return list;
}
public override IEnumerable<DesktopApplication> GetApplications (string filename)
@@ -88,10 +56,7 @@ namespace MonoDevelop.Platform
IEnumerable<DesktopApplication> GetApplicationsForMimeType (string mimeType)
{
- if (useGio)
- return Gio.GetAllForType (mimeType);
- else
- return GetGnomeVfsApplications (mimeType);
+ return Gio.GetAllForType (mimeType);
}
struct GnomeVfsApp {
@@ -100,23 +65,15 @@ namespace MonoDevelop.Platform
protected override string OnGetMimeTypeDescription (string mt)
{
- if (useGio)
- return Gio.GetMimeTypeDescription (mt);
- else
- return Gnome.Vfs.Mime.GetDescription (mt);
+ return Gio.GetMimeTypeDescription (mt);
}
protected override string OnGetMimeTypeForUri (string uri)
{
if (uri == null)
return null;
-
- if (useGio) {
- string mt = Gio.GetMimeTypeForUri (uri);
- if (mt != null)
- return mt;
- }
- return Gnome.Vfs.MimeType.GetMimeTypeForUri (ConvertFileNameToVFS (uri));
+
+ return Gio.GetMimeTypeForUri (uri);
}
protected override bool OnGetMimeTypeIsText (string mimeType)
@@ -128,19 +85,9 @@ namespace MonoDevelop.Platform
return base.OnGetMimeTypeIsText (mimeType);
}
-
- public override void ShowUrl (string url)
- {
- Gnome.Url.Show (url);
- }
-
public override string DefaultMonospaceFont {
get {
- try {
- return (string) (new GConf.Client ().Get ("/desktop/gnome/interface/monospace_font_name"));
- } catch (Exception) {
- return "Monospace 11";
- }
+ return "Monospace 11";
}
}
@@ -159,18 +106,8 @@ namespace MonoDevelop.Platform
filename = EscapeFileName (filename);
if (filename == null)
return "gnome-fs-regular";
-
- string icon = null;
- Gnome.IconLookupResultFlags result;
- try {
- icon = Gnome.Icon.LookupSync (IconTheme.Default, thumbnailFactory, filename, null,
- Gnome.IconLookupFlags.None, out result);
- } catch {}
- if (icon != null && icon.Length > 0)
- return icon;
- }
+ }
return "gnome-fs-regular";
-
}
protected override Xwt.Drawing.Image OnGetIconForFile (string filename)
|
GitWeb