sparkleshare/trunk/0001-Use-gtk-status-icon-by-default.patch

   1 From 12e9870bf9f41391f8de165d43196cb5b0cd5eee Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
   3 Date: Mon, 10 Sep 2018 14:39:26 +0200
   4 Subject: [PATCH] Use gtk status icon by default
   5
   6 ---
   7  SparkleShare/Linux/StatusIcon.cs    | 2 +-
   8  SparkleShare/Linux/UserInterface.cs | 8 --------
   9  2 files changed, 1 insertion(+), 9 deletions(-)
  10
  11 diff --git a/SparkleShare/Linux/StatusIcon.cs b/SparkleShare/Linux/StatusIcon.cs
  12 index b64f49e5..113a41c0 100644
  13 --- a/SparkleShare/Linux/StatusIcon.cs
  14 +++ b/SparkleShare/Linux/StatusIcon.cs
  15 @@ -31,7 +31,7 @@ namespace SparkleShare {
  16      public class StatusIcon {
  17
  18          public StatusIconController Controller = new StatusIconController ();
  19 -        public static bool use_appindicator = true;
  20 +        public static bool use_appindicator = false;
  21
  22          Gtk.StatusIcon status_icon;
  23
  24 diff --git a/SparkleShare/Linux/UserInterface.cs b/SparkleShare/Linux/UserInterface.cs
  25 index 74fd5559..eac9b4ae 100644
  26 --- a/SparkleShare/Linux/UserInterface.cs
  27 +++ b/SparkleShare/Linux/UserInterface.cs
  28 @@ -92,20 +92,9 @@ namespace SparkleShare
  29              if (args.Length > 0)
  30                  Logger.LogInfo ("Environment", "Arguments: " + string.Join (" ", args));
  31
  32 -            if (Array.IndexOf (args, "--status-icon=gtk") > -1)
  33 -                StatusIcon.use_appindicator = false;
  34 -
  35              #if HAVE_APP_INDICATOR
  36              if (Array.IndexOf (args, "--status-icon=appindicator") > -1)
  37                  StatusIcon.use_appindicator = true;
  38 -            #else
  39 -            if (StatusIcon.use_appindicator) {
  40 -                Console.ForegroundColor = ConsoleColor.Red;
  41 -                Console.WriteLine ("error: AppIndicator not found. Install AppIndicator or run with --status-icon=gtk");
  42 -                Console.ResetColor ();
  43 -
  44 -                Environment.Exit (-1);
  45 -            }
  46              #endif
  47
  48              if (StatusIcon.use_appindicator)
  49 --
  50 2.18.0
  51