Update icons when icon theme changes. Fixes: 1237749

2 files changed, 22 insertions, 11 deletions

diff --git a/lib/main.vala b/lib/main.vala
index 61036fd5..f012ecb0 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -59,6 +59,26 @@ public class Indicator.Keyboard.Service : Object {
 
 		if (use_gtk) {
 			use_gtk = Gtk.init_check (ref args);
+
+			Gtk.IconTheme? icon_theme = Gtk.IconTheme.get_default ();
+
+			if (icon_theme != null) {
+				((!) icon_theme).changed.connect (() => {
+					if (sources != null) {
+						foreach (var source in (!) sources) {
+							source.icon = null;
+						}
+					}
+
+					if (sources_menu != null) {
+						update_sources_menu ();
+					}
+
+					if (indicator_action != null) {
+						update_indicator_action ();
+					}
+				});
+			}
 		} else {
 			Gdk.init (ref args);
 		}
diff --git a/lib/source.vala b/lib/source.vala
index 1ee2650a..5fe7157d 100644
--- a/lib/source.vala
+++ b/lib/source.vala
@@ -51,7 +51,7 @@ public class Indicator.Keyboard.Source : Object {
 
 	public Icon? icon {
 		get { if (_icon == null) { _icon = _get_icon (); } return _icon; }
-		private set { _icon = value; }
+		set { _icon = value; }
 	}
 
 	public uint subscript {
@@ -424,16 +424,7 @@ public class Indicator.Keyboard.Source : Object {
 				Gtk.IconInfo? icon_info = icon_theme.lookup_icon (icon_name, 22, 0);
 
 				if (icon_info != null) {
-					string? file_name = ((!) icon_info).get_filename ();
-					var has_file_name = file_name != null && ((!) file_name).get_char () != '\0';
-
-					if (has_file_name) {
-						try {
-							icon = Icon.new_for_string ((!) file_name);
-						} catch (Error error) {
-							warning ("error: %s", error.message);
-						}
-					}
+					icon = new ThemedIcon (icon_name);
 				}
 			} else {
 				icon = new ThemedIcon (icon_name);