This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch upstream/28.4.0 in repository pale-moon. commit f560671b66bd34b1f2271432adf945aee887c933 Author: wolfbeast <mcwerewolf@wolfbeast.com> Date: Tue Feb 5 11:00:30 2019 +0100 Include blankthumb in the correct file. --- toolkit/components/thumbnails/BackgroundPageThumbs.jsm | 3 +++ toolkit/components/thumbnails/PageThumbs.jsm | 3 --- toolkit/components/thumbnails/moz.build | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm index 3eec982..3ba0c34 100644 --- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm +++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm @@ -41,6 +41,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService", "resource://gre/modules/ContextualIdentityService.jsm"); const global = this; +// contains base64 version of a placeholder thumbnail +#include blankthumb.inc + const BackgroundPageThumbs = { /** diff --git a/toolkit/components/thumbnails/PageThumbs.jsm b/toolkit/components/thumbnails/PageThumbs.jsm index 5c7754b..b0affee 100644 --- a/toolkit/components/thumbnails/PageThumbs.jsm +++ b/toolkit/components/thumbnails/PageThumbs.jsm @@ -28,9 +28,6 @@ const MAX_THUMBNAIL_AGE_SECS = 172800; // 2 days == 60*60*24*2 == 172800 secs. */ const THUMBNAIL_DIRECTORY = "thumbnails"; -// contains base64 version of a placeholder thumbnail -#include blankthumb.inc - Cu.import("resource://gre/modules/XPCOMUtils.jsm", this); Cu.import("resource://gre/modules/PromiseWorker.jsm", this); Cu.import("resource://gre/modules/Promise.jsm", this); diff --git a/toolkit/components/thumbnails/moz.build b/toolkit/components/thumbnails/moz.build index d4003c6..e4a1789 100644 --- a/toolkit/components/thumbnails/moz.build +++ b/toolkit/components/thumbnails/moz.build @@ -13,13 +13,13 @@ EXTRA_COMPONENTS += [ ] EXTRA_JS_MODULES += [ - 'BackgroundPageThumbs.jsm', + 'PageThumbs.jsm', 'PageThumbsWorker.js', 'PageThumbUtils.jsm', ] EXTRA_PP_JS_MODULES += [ - 'PageThumbs.jsm', + 'BackgroundPageThumbs.jsm', ] -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git