Bustage fix #3 for bug 402742.

configure.in

@@ -5500,6 +5500,16 @@ done
 dnl ========================================================
 dnl Image decoders
 dnl ========================================================
+case "$MOZ_WIDGET_TOOLKIT" in
+beos|windows|os2|mac|cocoa)
+    ;;
+*)
+    if test -z "$MOZ_ENABLE_GTK2"; then
+       MOZ_IMG_DECODERS_DEFAULT=`echo $MOZ_IMG_DECODERS_DEFAULT | sed -e 's|icon||'`                
+    fi
+    ;;
+esac
+
 MOZ_ARG_ENABLE_STRING(image-decoders,
 [  --enable-image-decoders[={mod1,mod2,default,all,none}]
                           Enable specific image decoders],

toolkit/library/libxul-config.mk

@@ -277,9 +277,11 @@ STATIC_LIBS += gfxpsshar
 endif
 
 ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
+ifneq (gtk2,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DICON_DECODER
 COMPONENT_LIBS += imgicon
 endif
+endif
 
 ifdef MOZ_ENABLE_CAIRO_GFX
 STATIC_LIBS += thebes