# HG changeset patch # User Mike Hommey # Date 1536212353 -32400 # Node ID fc562d7babca8b94bade1c94d98c60428599c73d # Parent 5af7592ee05adc4fe78040227b0b3464e69788ec Bug 1489021 - Move Throbber-small.gif to toolkit/crashreporter/client. r=nalexander I was there, looking at a Firefox directory in my file manager while working on bug 1079662, when I noticed the `Throbber-small.gif` appearing first in the list, and wondering where it came from. And I found it's there for the crashreporter UI. Fair enough. But back when it was added in bug 404855, the file was also used for Firefox, which is why it's taken from the Firefox theme. Interestingly, back then, the file was duplicated in multiple themes, but was taken from the windows theme rather than the gnome theme. Figures. Anyways, later down the road, in bug 421595, Firefox replaced the gif throbber with an APNG version. Then even later, bug 418003 removed the unused gif throbber files, leaving the Windows one alone because it's used by the crashreporter client moz.build (Makefile, back then), but still removed the reference from the jar.mn. 9 years later, here we are, still using a file from the Windows theme, that is not actually part of the Windows theme, for the Linux crashreporter. diff --git a/toolkit/themes/windows/global/throbber/Throbber-small.gif b/toolkit/crashreporter/client/Throbber-small.gif rename from toolkit/themes/windows/global/throbber/Throbber-small.gif rename to toolkit/crashreporter/client/Throbber-small.gif diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build --- a/toolkit/crashreporter/client/moz.build +++ b/toolkit/crashreporter/client/moz.build @@ -81,17 +81,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk' ] OS_LIBS += CONFIG['TK_LIBS'] OS_LIBS += CONFIG['MOZ_GTHREAD_LIBS'] CXXFLAGS += CONFIG['TK_CFLAGS'] CXXFLAGS += CONFIG['MOZ_GTHREAD_CFLAGS'] if CONFIG['OS_ARCH'] == 'Linux' or CONFIG['OS_ARCH'] == 'SunOS': FINAL_TARGET_FILES += [ - '/toolkit/themes/windows/global/throbber/Throbber-small.gif', + 'Throbber-small.gif', ] DEFINES['BIN_SUFFIX'] = '"%s"' % CONFIG['BIN_SUFFIX'] RCINCLUDE = 'crashreporter.rc' # Don't use the STL wrappers in the crashreporter clients; they don't # link with -lmozalloc, and it really doesn't matter here anyway.