Merge branch 'master' into fix/linux-main-loop

This commit is contained in:
Hylke Bons 2018-02-11 16:58:57 +00:00 committed by GitHub
commit 1e3e595044
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View file

@ -16,6 +16,7 @@
using System;
using System.IO;
using System.Reflection;
using Gtk;
@ -52,6 +53,8 @@ namespace SparkleShare
application.Register (null);
application.Activated += ApplicationActivatedDelegate;
IconTheme.Default.AppendSearchPath (Path.Combine (UserInterface.AssetsPath, "icons"));
var label = new Label ();
Gdk.Color color = UserInterfaceHelpers.RGBAToColor (label.StyleContext.GetColor (StateFlags.Insensitive));
SecondaryTextColor = UserInterfaceHelpers.ColorToHex (color);