diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml index cc9caef0a..c846b9cef 100644 --- a/data/gnome-shell-theme.gresource.xml +++ b/data/gnome-shell-theme.gresource.xml @@ -18,7 +18,6 @@ message-indicator-symbolic.svg no-events.svg no-notifications.svg - noise-texture.png pad-osd.css eye-open-negative-filled-symbolic.svg eye-not-looking-symbolic.svg diff --git a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss index 2c45589ac..6928be9fb 100644 --- a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss +++ b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss @@ -55,8 +55,7 @@ } #lockDialogGroup { - background: lighten(#2e3436, 8%) url(resource:///org/gnome/shell/theme/noise-texture.png); - background-repeat: repeat; + background-color: lighten(#2e3436, 8%); } #unlockDialogNotifications { diff --git a/data/theme/noise-texture.png b/data/theme/noise-texture.png deleted file mode 100644 index 6b70a2d40..000000000 Binary files a/data/theme/noise-texture.png and /dev/null differ diff --git a/js/ui/background.js b/js/ui/background.js index f7506dec4..ddae0de87 100644 --- a/js/ui/background.js +++ b/js/ui/background.js @@ -504,12 +504,9 @@ var SystemBackground = GObject.registerClass({ Signals: { 'loaded': {} }, }, class SystemBackground extends Meta.BackgroundActor { _init() { - let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png'); - if (_systemBackground == null) { _systemBackground = new Meta.Background({ meta_display: global.display }); _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR); - _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER); } super._init({ @@ -518,22 +515,11 @@ var SystemBackground = GObject.registerClass({ background: _systemBackground, }); - let cache = Meta.BackgroundImageCache.get_default(); - let image = cache.load(file); - if (image.is_loaded()) { - image = null; - let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => { - this.emit('loaded'); - return GLib.SOURCE_REMOVE; - }); - GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded'); - } else { - let id = image.connect('loaded', () => { - this.emit('loaded'); - image.disconnect(id); - image = null; - }); - } + let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => { + this.emit('loaded'); + return GLib.SOURCE_REMOVE; + }); + GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded'); } });