diff options
author | Kenneth Skovhede <kenneth@hexad.dk> | 2020-05-28 11:00:50 +0300 |
---|---|---|
committer | Kenneth Skovhede <kenneth@hexad.dk> | 2020-05-28 11:13:00 +0300 |
commit | f29444d75360828ab687070980addcac7e1d5f67 (patch) | |
tree | ec7ab220f458a11de27ad177961dbb335dbb8875 /Duplicati/GUI | |
parent | 3313f46b801fc2ef7e81417b7bd82fd27181dc34 (diff) |
Removed references to `__MonoCS__` as that compiler directive is no longer being setfeature/remove_monocs_compiler_directive
Diffstat (limited to 'Duplicati/GUI')
-rw-r--r-- | Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs | 2 | ||||
-rw-r--r-- | Duplicati/GUI/Duplicati.GUI.TrayIcon/GtkRunner.cs | 2 | ||||
-rw-r--r-- | Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs index 8f7f05725..332bec7a8 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -#if __MonoCS__ || __WindowsGTK__ || ENABLE_GTK
+#if __WindowsGTK__ || ENABLE_GTK
using System;
using AppIndicator;
using Gtk;
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/GtkRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/GtkRunner.cs index 21e1d21e2..be1943781 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/GtkRunner.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/GtkRunner.cs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#if __MonoCS__ || __WindowsGTK__ || ENABLE_GTK
+#if __WindowsGTK__ || ENABLE_GTK
using System;
using System.Collections.Generic;
using Duplicati.Library.Common;
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs index cc93a4bae..31b4025d9 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs @@ -47,7 +47,7 @@ namespace Duplicati.GUI.TrayIcon if (Platform.IsClientOSX)
return TOOLKIT_RUMPS;
-#if __MonoCS__ || __WindowsGTK__ || ENABLE_GTK
+#if __WindowsGTK__ || ENABLE_GTK
if (Platform.IsClientPosix)
{
if (SupportsAppIndicator)
@@ -115,7 +115,7 @@ namespace Duplicati.GUI.TrayIcon string toolkit;
if (!options.TryGetValue(TOOLKIT_OPTION, out toolkit))
{
-#if !(__MonoCS__ || __WindowsGTK__ || ENABLE_GTK)
+#if !(__WindowsGTK__ || ENABLE_GTK)
if (Platform.IsClientPosix && !Platform.IsClientOSX)
Console.WriteLine("Warning: this build does not support GTK, rebuild with ENABLE_GTK defined");
#endif
@@ -125,7 +125,7 @@ namespace Duplicati.GUI.TrayIcon {
if (TOOLKIT_WINDOWS_FORMS.Equals(toolkit, StringComparison.OrdinalIgnoreCase))
toolkit = TOOLKIT_WINDOWS_FORMS;
-#if __MonoCS__ || __WindowsGTK__ || ENABLE_GTK
+#if __WindowsGTK__ || ENABLE_GTK
else if (TOOLKIT_GTK.Equals(toolkit, StringComparison.OrdinalIgnoreCase))
toolkit = TOOLKIT_GTK;
else if (TOOLKIT_GTK_APP_INDICATOR.Equals(toolkit, StringComparison.OrdinalIgnoreCase))
@@ -296,7 +296,7 @@ namespace Duplicati.GUI.TrayIcon {
if (toolkit == TOOLKIT_WINDOWS_FORMS)
return GetWinformsInstance();
-#if __MonoCS__ || __WindowsGTK__ || ENABLE_GTK
+#if __WindowsGTK__ || ENABLE_GTK
else if (toolkit == TOOLKIT_GTK)
return GetGtkInstance();
else if (toolkit == TOOLKIT_GTK_APP_INDICATOR)
@@ -319,7 +319,7 @@ namespace Duplicati.GUI.TrayIcon [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static TrayIconBase GetWinformsInstance() { return new Windows.WinFormsRunner(); }
-#if __MonoCS__ || __WindowsGTK__ || ENABLE_GTK
+#if __WindowsGTK__ || ENABLE_GTK
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static TrayIconBase GetGtkInstance() { return new GtkRunner(); }
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
@@ -339,7 +339,7 @@ namespace Duplicati.GUI.TrayIcon [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static bool TryGetGtk()
{
-#if __MonoCS__ || __WindowsGTK__ || ENABLE_GTK
+#if __WindowsGTK__ || ENABLE_GTK
return typeof(Gtk.StatusIcon) != null && typeof(Gdk.Image) != null;
#else
return false;
@@ -355,7 +355,7 @@ namespace Duplicati.GUI.TrayIcon [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static bool TryGetAppIndicator()
{
-#if __MonoCS__ || __WindowsGTK__ || ENABLE_GTK
+#if __WindowsGTK__ || ENABLE_GTK
return typeof(AppIndicator.ApplicationIndicator) != null;
#else
return false;
|