Merge lp:~mvo/unity/lp1525186-icon-fallback into lp:unity

[Michael Vogt]

Display "image-missing" icon in the panel if for some reason a icon can not be loaded.

Fix icon loading in the panel to have a "image-missing" icon if the requested icon can not be loaded.

To reproduce:
- switch to high-contrast theme in unity-system-settings
- observe that there is no icon for the session-indicator

- rebuild with my patch
- observe that there is an icon now

Note that I see in the log:
"""
WARN 2015-12-11 13:01:35 unity.panel.indicator.entry PanelIndicatorEntryView.cp
p:253 failed to load: /org/gtk/libgtk/icons/24x24/status/image-missing.png
"""

So this indicates that the code that tries to find the icon is wrong in some way. However I still think there is value in having a fallback in the panel "if (!pixbuf)" even if this other issue gets fixed as e.g. the encoded icon might be wrong (and we do not check for the Gerror in this case).

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

Thanks for the MP. See my inline comments please.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4038
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mvo/unity/lp1525186-icon-fallback/+merge/280298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1374/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/26

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

review: Needs Fixing (continuous-integration)

[Michael Vogt (mvo)]

Thanks for the detailed review! I fixed the comments, please let me know if I missed anything :)

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

Looks good, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4039
http://jenkins.qa.ubuntu.com/job/unity-ci/1376/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/28

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

review: Approve (continuous-integration)

=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2015-10-05 16:52:24 +0000
+++ panel/PanelIndicatorEntryView.cpp	2015-12-11 16:37:21 +0000
@@ -40,6 +40,7 @@
 {
 DECLARE_LOGGER(logger, "unity.panel.indicator.entry");
 const int DEFAULT_SPACING = 3;
+const std::string IMAGE_MISSING = "image-missing";
 }
 
 using namespace indicator;
@@ -204,8 +205,12 @@
 glib::Object<GdkPixbuf> PanelIndicatorEntryView::MakePixbuf(int size)
 {
   glib::Object<GdkPixbuf> pixbuf;
+
+  // see if we need to do anything
+  if (!proxy_->image_visible() || proxy_->image_data().empty())
+    return pixbuf;
+
   auto image_type = proxy_->image_type();
-
   switch (image_type)
   {
     case GTK_IMAGE_PIXBUF:
@@ -248,6 +253,11 @@
       {
         auto* filename = gtk_icon_info_get_filename(info);
         pixbuf = gdk_pixbuf_new_from_file_at_size(filename, -1, size, nullptr);
+        // if that failed, whine and load fallback
+        if (!pixbuf)
+        {
+          LOG_WARN(logger) << "failed to load: " << filename;
+        }
       }
       else if (image_type == GTK_IMAGE_ICON_NAME)
       {
@@ -258,6 +268,14 @@
     }
   }
 
+  // have a generic fallback pixbuf if for whatever reason icon loading
+  // failed (see LP: #1525186)
+  if (!pixbuf)
+  {
+    GtkIconTheme* theme = gtk_icon_theme_get_default();
+    pixbuf = gtk_icon_theme_load_icon(theme, IMAGE_MISSING.c_str(), size, GTK_ICON_LOOKUP_FORCE_SIZE, nullptr);
+  }
+
   return pixbuf;
 }