From 409a27c3b863ece19520c975456139725e35fe2a Mon Sep 17 00:00:00 2001 From: Christopher Davis Date: Thu, 31 Jan 2019 10:39:50 -0500 Subject: [PATCH] weather: Change Weather app ID As of https://gitlab.gnome.org/GNOME/gnome-weather/commit/9f7f5a68d47c5aaa0d18453f51c92a629c88ed78 Weather uses org.gnome.Weather everywhere instead of org.gnome.Weather.Application. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/379 --- js/misc/weather.js | 6 +++--- js/ui/appFavorites.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/js/misc/weather.js b/js/misc/weather.js index ce50b2ff4..5e0ce315e 100644 --- a/js/misc/weather.js +++ b/js/misc/weather.js @@ -61,8 +61,8 @@ var WeatherClient = class { this.emit('changed'); }); - this._weatherAppMon = new Util.AppSettingsMonitor('org.gnome.Weather.Application.desktop', - 'org.gnome.Weather.Application'); + this._weatherAppMon = new Util.AppSettingsMonitor('org.gnome.Weather.desktop', + 'org.gnome.Weather'); this._weatherAppMon.connect('available-changed', () => { this.emit('changed'); }); this._weatherAppMon.watchSetting('automatic-location', this._onAutomaticLocationChanged.bind(this)); @@ -234,7 +234,7 @@ var WeatherClient = class { if (table != 'gnome' || id != 'geolocation') return; - let permission = perms['org.gnome.Weather.Application'] || ['NONE']; + let permission = perms['org.gnome.Weather'] || ['NONE']; let [accuracy] = permission; this._weatherAuthorized = accuracy != 'NONE'; diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js index cc3e3c32a..5f17c806d 100644 --- a/js/ui/appFavorites.js +++ b/js/ui/appFavorites.js @@ -36,13 +36,14 @@ const RENAMED_DESKTOP_IDS = { 'gnome-software.desktop': 'org.gnome.Software.desktop', 'gnome-terminal.desktop': 'org.gnome.Terminal.desktop', 'gnome-tweaks.desktop': 'org.gnome.tweaks.desktop', - 'gnome-weather.desktop': 'org.gnome.Weather.Application.desktop', + 'gnome-weather.desktop': 'org.gnome.Weather.desktop', 'gnomine.desktop': 'gnome-mines.desktop', 'gnotravex.desktop': 'gnome-tetravex.desktop', 'gnotski.desktop': 'gnome-klotski.desktop', 'gtali.desktop': 'tali.desktop', 'iagno.desktop': 'org.gnome.Iagno.desktop', 'nautilus.desktop': 'org.gnome.Nautilus.desktop', + 'org.gnome.Weather.Application.desktop': 'org.gnome.Weather.desktop', 'polari.desktop': 'org.gnome.Polari.desktop', 'totem.desktop': 'org.gnome.Totem.desktop', 'evince.desktop': 'org.gnome.Evince.desktop',