Merge lp:~azzar1/unity/fix-lp-1310200 into lp:unity

[Andrea Azzarone]

Fix skype indicator blinking.

== Problem ==
Indicators disappear at the panel (clementine, dropbox, skype etc)

== Fix ==
Try to rescan the icon theme in case we don't find the icon.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3807
http://jenkins.qa.ubuntu.com/job/unity-ci/936/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/936/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Yeah!

review: Approve

=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2014-03-31 21:08:10 +0000
+++ panel/PanelIndicatorEntryView.cpp	2014-05-30 07:23:55 +0000
@@ -229,6 +229,13 @@
       {
         glib::Object<GIcon> icon(g_icon_new_for_string(proxy_->image_data().c_str(), nullptr));
         info = gtk_icon_theme_lookup_by_gicon(theme, icon, size, flags);
+
+        if (!info)
+        {
+          // Maybe the icon was just added to the theme, see if a rescan helps.
+          gtk_icon_theme_rescan_if_needed(theme);
+          info = gtk_icon_theme_lookup_by_gicon(theme, icon, size, flags);
+        }
       }
       else
       {