Fixed no-icon (label-only) items

rilian-la-te · rilian-la-te · commit 2c0ea0d2cccb · 2015-03-11T14:31:22.000+06:00
diff --git a/src/snitem.vala b/src/snitem.vala
@@ -391,7 +391,7 @@ namespace StatusNotifier
 					overlay_icon = new Emblem(overlay_icon);
 				var icon = new EmblemedIcon((attention_icon != null && item.status == Status.NEEDS_ATTENTION) ? attention_icon
 												: (main_icon ?? (image.gicon as EmblemedIcon).gicon),overlay_icon as Emblem);
-				if (icon != null)
+				if ((attention_icon ?? main_icon ?? overlay_icon) != null)
 				{
 					image.set_from_gicon(icon,IconSize.INVALID);
 					image.show();

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ namespace StatusNotifier`
`391`	`391`	`overlay_icon = new Emblem(overlay_icon);`
`392`	`392`	`var icon = new EmblemedIcon((attention_icon != null && item.status == Status.NEEDS_ATTENTION) ? attention_icon`
`393`	`393`	`: (main_icon ?? (image.gicon as EmblemedIcon).gicon),overlay_icon as Emblem);`
`394`		`- if (icon != null)`
	`394`	`+ if ((attention_icon ?? main_icon ?? overlay_icon) != null)`
`395`	`395`	`{`
`396`	`396`	`image.set_from_gicon(icon,IconSize.INVALID);`
`397`	`397`	`image.show();`