Merge lp:~attente/indicator-keyboard/1237749 into lp:indicator-keyboard

[William Hua]

Update icons when icon theme changes.

Update icons when icon theme changes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/14/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/47/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Looks good to me, thanks.

review: Approve

=== modified file 'lib/main.vala'
--- lib/main.vala	2014-02-20 16:16:26 +0000
+++ lib/main.vala	2014-02-26 18:28:50 +0000
@@ -59,6 +59,26 @@
 
 		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);
 		}

=== modified file 'lib/source.vala'
--- lib/source.vala	2014-02-19 16:10:54 +0000
+++ lib/source.vala	2014-02-26 18:28:50 +0000
@@ -51,7 +51,7 @@
 
 	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 @@
 				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);