Linux GTK: Block known-buggy image types from being thumbnailed in GDK-PixBuf.

This extends commit f50994b

1 files changed, 6 insertions, 5 deletions

diff --git a/widget/gtk2/nsAppShell.cpp b/widget/gtk2/nsAppShell.cpp
index 99d04391c..8b86668f2 100644
--- a/widget/gtk2/nsAppShell.cpp
+++ b/widget/gtk2/nsAppShell.cpp
@@ -84,17 +84,18 @@ nsAppShell::Init()
     if (PR_GetEnv("MOZ_DEBUG_PAINTS"))
         gdk_window_set_debug_updates(TRUE);
 
-    // Disable JasPer module in GDK-PixBuf.
+    // Disable JasPer module (jpeg2000) in GDK-PixBuf.
+    // Also disable known buggy TGA and icns formats
     GSList* pixbufFormats = gdk_pixbuf_get_formats();
     for (GSList* iter = pixbufFormats; iter; iter = iter->next) {
         GdkPixbufFormat* format = static_cast<GdkPixbufFormat*>(iter->data);
         gchar* name = gdk_pixbuf_format_get_name(format);
-        bool isJasper = strcmp(name, "jpeg2000") == 0;
-        g_free(name);
-        if (isJasper) {
+        if (strcmp(name, "jpeg2000") == 0 ||
+            strcmp(name, "tga") == 0 ||
+            strcmp(name, "icns") == 0) {
             gdk_pixbuf_format_set_disabled(format, TRUE);
-            break;
         }
+        g_free(name);
     }
     g_slist_free(pixbufFormats);