blob: d914fc495b8604f1636266ac8745a8c1b356969e (
plain)
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
|
From 12e9870bf9f41391f8de165d43196cb5b0cd5eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
Date: Mon, 10 Sep 2018 14:39:26 +0200
Subject: [PATCH] Use gtk status icon by default
---
SparkleShare/Linux/StatusIcon.cs | 2 +-
SparkleShare/Linux/UserInterface.cs | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/SparkleShare/Linux/StatusIcon.cs b/SparkleShare/Linux/StatusIcon.cs
index b64f49e5..113a41c0 100644
--- a/SparkleShare/Linux/StatusIcon.cs
+++ b/SparkleShare/Linux/StatusIcon.cs
@@ -31,7 +31,7 @@ namespace SparkleShare {
public class StatusIcon {
public StatusIconController Controller = new StatusIconController ();
- public static bool use_appindicator = true;
+ public static bool use_appindicator = false;
Gtk.StatusIcon status_icon;
diff --git a/SparkleShare/Linux/UserInterface.cs b/SparkleShare/Linux/UserInterface.cs
index 74fd5559..eac9b4ae 100644
--- a/SparkleShare/Linux/UserInterface.cs
+++ b/SparkleShare/Linux/UserInterface.cs
@@ -92,20 +92,9 @@ namespace SparkleShare
if (args.Length > 0)
Logger.LogInfo ("Environment", "Arguments: " + string.Join (" ", args));
- if (Array.IndexOf (args, "--status-icon=gtk") > -1)
- StatusIcon.use_appindicator = false;
-
#if HAVE_APP_INDICATOR
if (Array.IndexOf (args, "--status-icon=appindicator") > -1)
StatusIcon.use_appindicator = true;
- #else
- if (StatusIcon.use_appindicator) {
- Console.ForegroundColor = ConsoleColor.Red;
- Console.WriteLine ("error: AppIndicator not found. Install AppIndicator or run with --status-icon=gtk");
- Console.ResetColor ();
-
- Environment.Exit (-1);
- }
#endif
if (StatusIcon.use_appindicator)
--
2.18.0
|