window-tracker: check WM_CLASS for sandboxed apps before the app's ID

For sandboxed apps, the shell needs to consider the app's ID when
matching its windows against the right .desktop file, but that
check can't be done before having attempted to match using the
WM_CLASS property of the app's window, otherwise apps installing
multiple desktop files (e.g. LibreOffice) will always match every
single window against the same .desktop file, ignoring hints such
as the StartupWMClass key.

This commit moves the call to get_app_from_sandboxed_app_id() after
get_app_from_window_wmclass() and before get_app_from_window_pid(),
so that we only rely on the sandboxed app's ID when no match has
succeed using the WM_CLASS property, but before checking by PID to
prevent wrong groups that could be created when the PID of the app
inside the sandbox matches the one from a process outside of it.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/219

NEWS

@@ -1,17 +1,3 @@
-3.29.1
-======
-* Support icons in app-menu [Florian; #760985]
-* Misc. bug fixes [Marco, Florian, Lubomir; #792687, #221, !63]
-
-Contributors:
-  Piotr Drąg, Takao Fujiwara, Christian Kellner, Florian Müllner,
-  Mario Sanchez Prada, Lubomir Rintel, Didier Roche, Marco Trevisan (Treviño),
-  verdre
-
-Translators:
-  gogo [hr], Stas Solovey [ru], Matej Urbančič [sl], Daniel Șerbănescu [ro],
-  Fabio Tomat [fur], Marek Cernocky [cs], Daniel Mustieles [es]
-
 3.28.1
 ======
 * Fix compose characters in shell entries [Carlos; #115]

js/misc/keyboardManager.js

@@ -89,8 +89,6 @@ var KeyboardManager = new Lang.Class({
     },
 
     setUserLayouts(ids) {
-        let currentId = this._current ? this._current.id : null;
-        let currentGroupIndex = this._current ? this._current.groupIndex : null;
         this._current = null;
         this._layoutInfos = {};
 
@@ -117,9 +115,6 @@ var KeyboardManager = new Lang.Class({
             info.group = group;
             info.groupIndex = groupIndex;
 
-            if (currentId == id && currentGroupIndex == groupIndex)
-                this._current = info;
-
             i += 1;
         }
     },

js/perf/hwtest.js

@@ -136,7 +136,8 @@ function run() {
     global.frame_finish_timestamp = true;
 
     for (let k = 0; k < 5; k++)
-        yield Scripting.createTestWindow({ maximized: true });
+        yield Scripting.createTestWindow(640, 480,
+                                         { maximized: true });
     yield Scripting.waitTestWindows();
 
     yield Scripting.sleep(1000);
@@ -157,7 +158,8 @@ function run() {
     yield Scripting.destroyTestWindows();
     Main.overview.hide();
 
-    yield Scripting.createTestWindow({ maximized: true,
+    yield Scripting.createTestWindow(640, 480,
+                                     { maximized: true,
                                        redraws: true});
     yield Scripting.waitTestWindows();
 

js/ui/components/networkAgent.js

@@ -604,17 +604,12 @@ var NetworkAgent = new Lang.Class({
 
         this._native.connect('new-request', this._newRequest.bind(this));
         this._native.connect('cancel-request', this._cancelRequest.bind(this));
-
-        this._initialized = false;
-        this._native.init_async(GLib.PRIORITY_DEFAULT, null, (o, res) => {
-            try {
-                this._native.init_finish(res);
-                this._initialized = true;
-            } catch(e) {
-                this._native = null;
-                logError(e, 'error initializing the NetworkManager Agent');
-            }
-        });
+        try {
+            this._native.init(null);
+        } catch(e) {
+            this._native = null;
+            logError(e, 'error initializing the NetworkManager Agent');
+        }
     },
 
     enable() {
@@ -622,7 +617,7 @@ var NetworkAgent = new Lang.Class({
             return;
 
         this._native.auto_register = true;
-        if (this._initialized && !this._native.registered)
+        if (!this._native.registered)
             this._native.register_async(null, null);
     },
 
@@ -645,7 +640,7 @@ var NetworkAgent = new Lang.Class({
             return;
 
         this._native.auto_register = false;
-        if (this._initialized && this._native.registered)
+        if (this._native.registered)
             this._native.unregister_async(null, null);
     },
 
@@ -660,7 +655,7 @@ var NetworkAgent = new Lang.Class({
         switch (connectionType) {
         case '802-11-wireless':
             let wirelessSetting = connection.get_setting_wireless();
-            let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
+            let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid());
             title = _("Authentication required by wireless network");
             body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
             break;

js/ui/components/polkitAgent.js

@@ -201,9 +201,7 @@ var AuthenticationDialog = new Lang.Class({
     close(timestamp) {
         this.parent(timestamp);
 
-        if (this._sessionUpdatedId)
-            Main.sessionMode.disconnect(this._sessionUpdatedId);
-        this._sessionUpdatedId = 0;
+        Main.sessionMode.disconnect(this._sessionUpdatedId);
     },
 
     _ensureOpen() {

js/ui/osdWindow.js

@@ -204,7 +204,7 @@ var OsdWindow = new Lang.Class({
 
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         this._icon.icon_size = popupSize / (2 * scaleFactor);
-        this._box.translation_y = Math.round(monitor.height / 4);
+        this._box.translation_y = monitor.height / 4;
         this._boxConstraint.minSize = popupSize;
     }
 });

js/ui/remoteSearch.js

@@ -295,7 +295,7 @@ var RemoteSearchProvider = new Lang.Class({
                                name: metas[i]['name'],
                                description: metas[i]['description'],
                                createIcon: size => {
-                                   return this.createIcon(size, metas[i]);
+                                   this.createIcon(size, metas[i]);
                                },
                                clipboardText: metas[i]['clipboardText'] });
         }

js/ui/scripting.js

@@ -133,7 +133,7 @@ function _callRemote(obj, method, ...args) {
  * because of the normal X asynchronous mapping process, to actually wait
  * until the window has been mapped and exposed, use waitTestWindows().
  */
-function createTestWindow(params) {
+function createTestWindow(width, height, params) {
     params = Params.parse(params, { width: 640,
                                     height: 480,
                                     alpha: false,

js/ui/status/thunderbolt.js

@@ -56,11 +56,12 @@ const BoltDeviceProxy = Gio.DBusProxy.makeProxyWrapper(BoltDeviceInterface);
 
 var Status = {
     DISCONNECTED: 'disconnected',
-    CONNECTING: 'connecting',
     CONNECTED: 'connected',
     AUTHORIZING: 'authorizing',
     AUTH_ERROR: 'auth-error',
-    AUTHORIZED: 'authorized'
+    AUTHORIZED: 'authorized',
+    AUTHORIZED_SECURE: 'authorized-secure',
+    AUTHORIZED_NEWKEY: 'authorized-newkey'
 };
 
 var Policy = {
@@ -69,7 +70,7 @@ var Policy = {
     AUTO: 'auto'
 };
 
-var AuthCtrl = {
+var AuthFlags = {
     NONE: 'none',
 };
 
@@ -140,10 +141,9 @@ var Client = new Lang.Class({
     },
 
     enrollDevice(id, policy, callback) {
-	this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE,
+	this._proxy.EnrollDeviceRemote(id, policy, AuthFlags.NONE,
                                        (res, error) => {
 	    if (error) {
-		Gio.DBusError.strip_remote_error(error);
 		callback(null, error);
 		return;
 	    }
@@ -228,7 +228,7 @@ var AuthRobot = new Lang.Class({
 
     _onEnrollDone(device, error) {
 	if (error)
-	    this.emit('enroll-failed', device, error);
+	    this.emit('enroll-failed', error, device);
 
 	/* TODO: scan the list of devices to be authorized for children
 	 *  of this device and remove them (and their children and

js/ui/workspaceThumbnail.js

@@ -884,9 +884,6 @@ var ThumbnailsBox = new Lang.Class({
     },
 
     _destroyThumbnails() {
-        if (this._thumbnails.length == 0)
-            return;
-
         if (this._switchWorkspaceNotifyId > 0) {
             global.window_manager.disconnect(this._switchWorkspaceNotifyId);
             this._switchWorkspaceNotifyId = 0;

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.29.1',
+  version: '3.28.1',
   meson_version: '>= 0.42.0',
   license: 'GPLv2+'
 )
@@ -23,7 +23,7 @@ gi_req = '>= 1.49.1'
 gjs_req = '>= 1.47.0'
 gtk_req = '>= 3.15.0'
 json_glib_req = '>= 0.13.2'
-mutter_req = '>= 3.29.1'
+mutter_req = '>= 3.28.0'
 polkit_req = '>= 0.100'
 schemas_req = '>= 3.21.3'
 startup_req = '>= 0.11'
@@ -31,7 +31,7 @@ ibus_req = '>= 1.5.2'
 
 bt_req = '>= 3.9.0'
 gst_req = '>= 0.11.92'
-nm_req = '>= 1.10.4'
+nm_req = '>= 0.9.8'
 secret_req = '>= 0.18'
 
 gnome = import('gnome')

po/cs.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2018-04-13 19:54+0000\n"
-"PO-Revision-Date: 2018-04-24 17:32+0200\n"
+"POT-Creation-Date: 2018-02-26 12:57+0000\n"
+"PO-Revision-Date: 2018-02-26 17:57+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -332,7 +332,7 @@ msgstr ""
 "Nastala chyba při načítání dialogového okna předvoleb pro rozšíření %s:"
 
 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
-#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
 msgid "Cancel"
@@ -667,12 +667,12 @@ msgstr "Přidat mezi oblíbené"
 msgid "Show Details"
 msgstr "Zobrazit podrobnosti"
 
-#: js/ui/appFavorites.js:140
+#: js/ui/appFavorites.js:138
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s byl přidán mezi oblíbené."
 
-#: js/ui/appFavorites.js:174
+#: js/ui/appFavorites.js:172
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s byl odstraněn z oblíbených."
@@ -867,7 +867,7 @@ msgstr "Externí svazek odpojen"
 msgid "Open with %s"
 msgstr "Otevřít pomocí %s"
 
-#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -955,15 +955,15 @@ msgstr "Pro připojení k „%s“ je vyžadováno heslo."
 msgid "Network Manager"
 msgstr "Network Manager"
 
-#: js/ui/components/polkitAgent.js:48
+#: js/ui/components/polkitAgent.js:43
 msgid "Authentication Required"
 msgstr "Je vyžadováno ověření"
 
-#: js/ui/components/polkitAgent.js:76
+#: js/ui/components/polkitAgent.js:71
 msgid "Administrator"
 msgstr "Správce"
 
-#: js/ui/components/polkitAgent.js:156
+#: js/ui/components/polkitAgent.js:151
 msgid "Authenticate"
 msgstr "Ověřit"
 
@@ -971,7 +971,7 @@ msgstr "Ověřit"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327
+#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Ověření bohužel nebylo úspěšné. Zkuste to prosím znovu."
 
@@ -1021,7 +1021,7 @@ msgstr "Přidat světový čas…"
 msgid "World Clocks"
 msgstr "Světové hodiny"
 
-#: js/ui/dateMenu.js:227
+#: js/ui/dateMenu.js:225
 msgid "Weather"
 msgstr "Počasí"
 
@@ -1029,7 +1029,7 @@ msgstr "Počasí"
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:291
+#: js/ui/dateMenu.js:289
 #, javascript-format
 msgid "%s all day."
 msgstr "%s celý den."
@@ -1038,7 +1038,7 @@ msgstr "%s celý den."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:297
+#: js/ui/dateMenu.js:295
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s, později %s."
@@ -1047,30 +1047,30 @@ msgstr "%s, později %s."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:303
+#: js/ui/dateMenu.js:301
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, pak %s a později %s."
 
-#: js/ui/dateMenu.js:314
+#: js/ui/dateMenu.js:312
 msgid "Select a location…"
 msgstr "Vybrat místo…"
 
-#: js/ui/dateMenu.js:317
+#: js/ui/dateMenu.js:315
 msgid "Loading…"
 msgstr "Načítá se…"
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:323
+#: js/ui/dateMenu.js:321
 #, javascript-format
 msgid "Feels like %s."
 msgstr "Pocitově jako %s."
 
-#: js/ui/dateMenu.js:326
+#: js/ui/dateMenu.js:324
 msgid "Go online for weather information"
 msgstr "Připojit se kvůli informacím o počasí"
 
-#: js/ui/dateMenu.js:328
+#: js/ui/dateMenu.js:326
 msgid "Weather information is currently unavailable"
 msgstr "Informace o počasí nejsou nyní dostupné"
 
@@ -1986,16 +1986,16 @@ msgstr "Uspat do paměti"
 msgid "Power Off"
 msgstr "Vypnout"
 
-#: js/ui/status/thunderbolt.js:294
+#: js/ui/status/thunderbolt.js:272
 msgid "Thunderbolt"
 msgstr "Thunderbolt"
 
 #. we are done
-#: js/ui/status/thunderbolt.js:350
+#: js/ui/status/thunderbolt.js:328
 msgid "Unknown Thunderbolt device"
 msgstr "Neznámé zařízení Thunderbolt"
 
-#: js/ui/status/thunderbolt.js:351
+#: js/ui/status/thunderbolt.js:329
 msgid ""
 "New device has been detected while you were away. Please disconnect and "
 "reconnect the device to start using it."
@@ -2003,13 +2003,13 @@ msgstr ""
 "Zatímco jste byli pryč, bylo nalezeno nové zařízení. Odpojte jej prosím a "
 "znovu připojte, abyste jej mohli používat."
 
-#: js/ui/status/thunderbolt.js:356
+#: js/ui/status/thunderbolt.js:334
 msgid "Thunderbolt authorization error"
 msgstr "Chyba ověření Thunderbolt"
 
-#: js/ui/status/thunderbolt.js:357
+#: js/ui/status/thunderbolt.js:335
 #, javascript-format
-msgid "Could not authorize the Thunderbolt device: %s"
+msgid "Could not authorize the thunderbolt device: %s"
 msgstr "Nezdařilo se provést ověření zařízení Thunderbolt: %s"
 
 #: js/ui/status/volume.js:128
@@ -2233,3 +2233,15 @@ msgstr[2] "%u vstupů"
 #: subprojects/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "Systémové zvuky"
+
+#~ msgctxt "search-result"
+#~ msgid "Power off"
+#~ msgstr "Vypnout"
+
+#~ msgctxt "search-result"
+#~ msgid "Log out"
+#~ msgstr "Odhlásit se"
+
+#~ msgctxt "search-result"
+#~ msgid "Switch user"
+#~ msgstr "Přepnout uživatele"

po/es.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2018-04-13 19:54+0000\n"
-"PO-Revision-Date: 2018-04-25 12:54+0200\n"
+"POT-Creation-Date: 2018-02-22 09:24+0000\n"
+"PO-Revision-Date: 2018-02-23 08:26+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -346,7 +346,7 @@ msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Hubo un error al lanzar el diálogo de preferencias para %s:"
 
 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
-#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
 msgid "Cancel"
@@ -665,12 +665,12 @@ msgstr "Añadir a los favoritos"
 msgid "Show Details"
 msgstr "Mostrar detalles"
 
-#: js/ui/appFavorites.js:140
+#: js/ui/appFavorites.js:138
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "Se ha añadido %s a sus favoritos."
 
-#: js/ui/appFavorites.js:174
+#: js/ui/appFavorites.js:172
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "Se ha quitado %s de sus favoritos."
@@ -865,7 +865,7 @@ msgstr "Dispositivo externo desconectado"
 msgid "Open with %s"
 msgstr "Abrir con %s"
 
-#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -953,15 +953,15 @@ msgstr "Se requiere una contraseña para conectarse a «%s»."
 msgid "Network Manager"
 msgstr "Gestor de la red"
 
-#: js/ui/components/polkitAgent.js:48
+#: js/ui/components/polkitAgent.js:43
 msgid "Authentication Required"
 msgstr "Se necesita autenticación"
 
-#: js/ui/components/polkitAgent.js:76
+#: js/ui/components/polkitAgent.js:71
 msgid "Administrator"
 msgstr "Administrador"
 
-#: js/ui/components/polkitAgent.js:156
+#: js/ui/components/polkitAgent.js:151
 msgid "Authenticate"
 msgstr "Autenticar"
 
@@ -969,7 +969,7 @@ msgstr "Autenticar"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327
+#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Eso no ha funcionado. Inténtelo de nuevo."
 
@@ -1017,7 +1017,7 @@ msgstr "Añadir relojes del mundo…"
 msgid "World Clocks"
 msgstr "Relojes del mundo"
 
-#: js/ui/dateMenu.js:227
+#: js/ui/dateMenu.js:225
 msgid "Weather"
 msgstr "Meteorología"
 
@@ -1025,7 +1025,7 @@ msgstr "Meteorología"
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:291
+#: js/ui/dateMenu.js:289
 #, javascript-format
 msgid "%s all day."
 msgstr "%s todo el día."
@@ -1034,7 +1034,7 @@ msgstr "%s todo el día."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:297
+#: js/ui/dateMenu.js:295
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s, luego %s."
@@ -1043,30 +1043,30 @@ msgstr "%s, luego %s."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:303
+#: js/ui/dateMenu.js:301
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, luego %s seguido de %s."
 
-#: js/ui/dateMenu.js:314
+#: js/ui/dateMenu.js:312
 msgid "Select a location…"
 msgstr "Seleccionar ubicación…"
 
-#: js/ui/dateMenu.js:317
+#: js/ui/dateMenu.js:315
 msgid "Loading…"
 msgstr "Cargando…"
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:323
+#: js/ui/dateMenu.js:321
 #, javascript-format
 msgid "Feels like %s."
 msgstr "Sensación térmica de %s."
 
-#: js/ui/dateMenu.js:326
+#: js/ui/dateMenu.js:324
 msgid "Go online for weather information"
 msgstr "Conectarse para obtener la información meteorológica"
 
-#: js/ui/dateMenu.js:328
+#: js/ui/dateMenu.js:326
 msgid "Weather information is currently unavailable"
 msgstr "La información meteorológica no está disponible actualmente."
 
@@ -1968,16 +1968,16 @@ msgstr "Suspender"
 msgid "Power Off"
 msgstr "Apagar"
 
-#: js/ui/status/thunderbolt.js:294
+#: js/ui/status/thunderbolt.js:272
 msgid "Thunderbolt"
 msgstr "Thunderbolt"
 
 #. we are done
-#: js/ui/status/thunderbolt.js:350
+#: js/ui/status/thunderbolt.js:328
 msgid "Unknown Thunderbolt device"
 msgstr "Dispositivo Thunderbolt desconocido"
 
-#: js/ui/status/thunderbolt.js:351
+#: js/ui/status/thunderbolt.js:329
 msgid ""
 "New device has been detected while you were away. Please disconnect and "
 "reconnect the device to start using it."
@@ -1985,14 +1985,13 @@ msgstr ""
 "Se ha detectado un dispositivo nuevo mientras estaba fuera. Desconéctelo y "
 "vuélvalo a conectar para empezar a usarlo."
 
-#: js/ui/status/thunderbolt.js:356
+#: js/ui/status/thunderbolt.js:334
 msgid "Thunderbolt authorization error"
 msgstr "Error de autorización de Thunderbolt"
 
-#: js/ui/status/thunderbolt.js:357
+#: js/ui/status/thunderbolt.js:335
 #, javascript-format
-#| msgid "Could not authorize the thunderbolt device: %s"
-msgid "Could not authorize the Thunderbolt device: %s"
+msgid "Could not authorize the thunderbolt device: %s"
 msgstr "No se pudo autorizar el dispositivo Thunderbolt: %s"
 
 #: js/ui/status/volume.js:128

po/pt_BR.po

@@ -15,22 +15,22 @@
 # Georges Basile Stavracas Neto <georges.stavracas@gmail.com>, 2014.
 # Felipe Braga <fbobraga@gmail.com>, 2015.
 # Artur de Aquino Morais <artur.morais93@outlook.com>, 2016.
-# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2018.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2017.
 # Enrico Nicoletto <liverig@gmail.com>, 2013-2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2018-04-13 18:31+0000\n"
-"PO-Revision-Date: 2018-05-02 15:45-0200\n"
-"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"POT-Creation-Date: 2018-03-16 21:34+0000\n"
+"PO-Revision-Date: 2018-02-09 21:52-0200\n"
+"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Project-Style: gnome\n"
 
 #: data/50-gnome-shell-system.xml:6
@@ -356,7 +356,7 @@ msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Ocorreu um erro ao carregar o dialogo de preferências para %s:"
 
 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
-#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
 msgid "Cancel"
@@ -642,7 +642,7 @@ msgstr "Negar acesso"
 
 #: js/ui/accessDialog.js:64 js/ui/status/location.js:396
 msgid "Grant Access"
-msgstr "Conceder acesso"
+msgstr "Garantir acesso"
 
 #: js/ui/appDisplay.js:793
 msgid "Frequently used applications will appear here"
@@ -676,12 +676,12 @@ msgstr "Adicionar aos favoritos"
 msgid "Show Details"
 msgstr "Mostrar detalhes"
 
-#: js/ui/appFavorites.js:140
+#: js/ui/appFavorites.js:138
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s foi adicionado aos seus favoritos."
 
-#: js/ui/appFavorites.js:174
+#: js/ui/appFavorites.js:172
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s foi removido dos seus favoritos."
@@ -876,7 +876,7 @@ msgstr "Unidade externa desconectada"
 msgid "Open with %s"
 msgstr "Abrir com %s"
 
-#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
 msgid "Password:"
 msgstr "Senha:"
 
@@ -964,15 +964,15 @@ msgstr "Uma senha é necessária para se conectar a “%s”."
 msgid "Network Manager"
 msgstr "Gerenciador de rede"
 
-#: js/ui/components/polkitAgent.js:48
+#: js/ui/components/polkitAgent.js:43
 msgid "Authentication Required"
 msgstr "Autenticação necessária"
 
-#: js/ui/components/polkitAgent.js:76
+#: js/ui/components/polkitAgent.js:71
 msgid "Administrator"
 msgstr "Administrador"
 
-#: js/ui/components/polkitAgent.js:156
+#: js/ui/components/polkitAgent.js:151
 msgid "Authenticate"
 msgstr "Autenticação"
 
@@ -980,7 +980,7 @@ msgstr "Autenticação"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327
+#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Desculpe, isto não funcionou. Por favor, tente novamente."
 
@@ -1028,7 +1028,7 @@ msgstr "Adicionar relógios mundiais…"
 msgid "World Clocks"
 msgstr "Relógios mundiais"
 
-#: js/ui/dateMenu.js:227
+#: js/ui/dateMenu.js:225
 msgid "Weather"
 msgstr "Meteorologia"
 
@@ -1036,7 +1036,7 @@ msgstr "Meteorologia"
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:291
+#: js/ui/dateMenu.js:289
 #, javascript-format
 msgid "%s all day."
 msgstr "%s por todo o dia."
@@ -1045,7 +1045,7 @@ msgstr "%s por todo o dia."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:297
+#: js/ui/dateMenu.js:295
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s, depois %s mais tarde."
@@ -1054,30 +1054,30 @@ msgstr "%s, depois %s mais tarde."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:303
+#: js/ui/dateMenu.js:301
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, depois %s, seguido de %s mais tarde."
 
-#: js/ui/dateMenu.js:314
+#: js/ui/dateMenu.js:312
 msgid "Select a location…"
 msgstr "Selecione uma localização…"
 
-#: js/ui/dateMenu.js:317
+#: js/ui/dateMenu.js:315
 msgid "Loading…"
 msgstr "Carregando…"
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:323
+#: js/ui/dateMenu.js:321
 #, javascript-format
 msgid "Feels like %s."
 msgstr "Sensação térmica de %s."
 
-#: js/ui/dateMenu.js:326
+#: js/ui/dateMenu.js:324
 msgid "Go online for weather information"
 msgstr "Conecte-se à internet para obter as informações meteorológicas"
 
-#: js/ui/dateMenu.js:328
+#: js/ui/dateMenu.js:326
 msgid "Weather information is currently unavailable"
 msgstr "No momento as informações meteorológicas não estão disponíveis"
 

po/sl.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2018-04-17 15:11+0000\n"
-"PO-Revision-Date: 2018-04-17 18:32+0200\n"
+"POT-Creation-Date: 2018-03-18 10:36+0000\n"
+"PO-Revision-Date: 2018-03-19 21:42+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl\n"
@@ -66,19 +66,19 @@ msgstr "Upravljanje oken in zaganjanje programov"
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
 "Omogoči dostop do orodij razvijalcev in preizkuševalcev programske opreme "
-"prek vnosnega polja Alt-F2."
+"preko Alt-F2 vnosnega polja."
 
 #: data/org.gnome.shell.gschema.xml.in:9
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr ""
-"Dovoli dostop do razhroščevanja in drugih orodij nadzora prek vnosnega polja "
-"Alt-F2."
+"Dovoli dostop do razhroščevanja in drugih orodij nadzora preko Alt-F2 "
+"vnosnega polja."
 
 #: data/org.gnome.shell.gschema.xml.in:16
 msgid "UUIDs of extensions to enable"
-msgstr "Določila razširitev UUID, ki bodo omogočene"
+msgstr "Določila UUID razširitev, ki bodo omogočene"
 
 #: data/org.gnome.shell.gschema.xml.in:17
 msgid ""
@@ -87,9 +87,10 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension D-Bus methods on org.gnome.Shell."
 msgstr ""
-"Razširitve lupine GNOME imajo nastavljeno določilo UUID; ključ določa seznam "
-"razširitev, ki naj bodo naložene ob zagonu. Upravljanje seznama je mogoče "
-"tudi prek vodila D-BUs na org.gnome.Shell."
+"Razširitve lupine GNOME imajo določila UUID; ključ določa seznam razširitev, "
+"ki bodo naložene. Razširitev, ki se naj naloži, mora biti zavedena na tem "
+"seznamu. Upravljanje seznama je mogoče tudi preko vodila D-BUs na org.gnome."
+"Shell."
 
 #: data/org.gnome.shell.gschema.xml.in:26
 msgid "Disable user extensions"
@@ -114,8 +115,8 @@ msgid ""
 "load all extensions regardless of the versions they claim to support."
 msgstr ""
 "Lupina GNOME naloži le razširitve, ki so skladne z nameščeno različico. "
-"Izbrana možnost onemogoči preverjanje, zato so lahko naložene tudi "
-"razširitve, katerih skladnost ni potrjena."
+"Izbrana možnost onemogoči preverjanje skladnosti, zato so lahko naložene "
+"tudi razširitve, katerih skladnost ni potrjena."
 
 #: data/org.gnome.shell.gschema.xml.in:43
 msgid "List of desktop file IDs for favorite applications"
@@ -126,7 +127,7 @@ msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr ""
-"Programi, ki ustrezajo določilom, bodo prikazani v polju priljubljenih "
+"Programi določeni s temi določili bodo prikazani v območju priljubljenih "
 "programov"
 
 #: data/org.gnome.shell.gschema.xml.in:51
@@ -144,18 +145,18 @@ msgstr "Zgodovina pogovornega okna ukazov (Alt-F2)"
 #. Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass
 #: data/org.gnome.shell.gschema.xml.in:63
 msgid "History for the looking glass dialog"
-msgstr "Zgodovina za pogovorno okno povečevala"
+msgstr "Zgodovina za pogovorno okno povečevalnega stekla"
 
 #: data/org.gnome.shell.gschema.xml.in:67
 msgid "Always show the “Log out” menu item in the user menu."
-msgstr "Vedno pokaži možnost »Odjave« v uporabniškem meniju."
+msgstr "Vedno pokaži možnost »Odjava« v uporabniškem meniju."
 
 #: data/org.gnome.shell.gschema.xml.in:68
 msgid ""
 "This key overrides the automatic hiding of the “Log out” menu item in single-"
 "user, single-session situations."
 msgstr ""
-"Izbira prepiše možnost samodejnega skrivanja gumba za »Odjavo« na sistemskem "
+"Izbira prepiše možnost samodejnega skrivanja predmeta »Odjava« na sistemskem "
 "meniju pri eno-uporabniškem in eno-sejnem zagonu."
 
 #: data/org.gnome.shell.gschema.xml.in:75
@@ -173,8 +174,8 @@ msgid ""
 "state of the checkbox."
 msgstr ""
 "Za priklop oddaljenega datotečnega sistema ali šifrirane naprave bo po "
-"izbiri podana zahteva za vnos gesla. Na pogovornem oknu bo prikazana tudi "
-"možnost »Shrani geslo«. Ta možnost določa privzeto stanje izbirnega polja."
+"izbiri možnosti zahtevano geslo. Na pogovornem oknu bo prikazana možnost "
+"»Shrani geslo«. Ta možnost določa privzeto stanje izbirnega polja."
 
 #: data/org.gnome.shell.gschema.xml.in:85
 msgid ""
@@ -332,7 +333,7 @@ msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Prišlo je do napake med nalaganjem pogovornega okna z možnostmi za %s:"
 
 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
-#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
 msgid "Cancel"
@@ -663,12 +664,12 @@ msgstr "Dodaj med priljubljene"
 msgid "Show Details"
 msgstr "Pokaži besedilo"
 
-#: js/ui/appFavorites.js:140
+#: js/ui/appFavorites.js:138
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "Program »%s« je dodan med priljubljeno."
 
-#: js/ui/appFavorites.js:174
+#: js/ui/appFavorites.js:172
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "Program »%s« je odstranjen iz priljubljenih."
@@ -839,7 +840,7 @@ msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr ""
-"Lahko počakate, če se program morda začne spet odzivati, lahko pa vsilite "
+"Lahko še malo počakate, če začne morda program spet delovati, ali pa vsilite "
 "končanje delovanja."
 
 #: js/ui/closeDialog.js:61
@@ -863,13 +864,13 @@ msgstr "Zunanji pogon je odklopljen"
 msgid "Open with %s"
 msgstr "Odpri s programom %s"
 
-#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
 msgid "Password:"
 msgstr "Geslo:"
 
 #: js/ui/components/keyring.js:140
 msgid "Type again:"
-msgstr "Ponovni vpis:"
+msgstr "Vpišite znova:"
 
 #: js/ui/components/networkAgent.js:112 js/ui/status/network.js:245
 #: js/ui/status/network.js:336 js/ui/status/network.js:922
@@ -886,19 +887,19 @@ msgstr "Geslo:"
 #. static WEP
 #: js/ui/components/networkAgent.js:210
 msgid "Key: "
-msgstr "Ključ: "
+msgstr "Ključ:"
 
 #: js/ui/components/networkAgent.js:249
 msgid "Identity: "
-msgstr "_Istovetnost: "
+msgstr "_Istovetnost:"
 
 #: js/ui/components/networkAgent.js:251
 msgid "Private key password: "
-msgstr "Geslo zasebnega ključa: "
+msgstr "Geslo zasebnega ključa:"
 
 #: js/ui/components/networkAgent.js:263
 msgid "Service: "
-msgstr "Storitev: "
+msgstr "Storitev:"
 
 #: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:659
 msgid "Authentication required by wireless network"
@@ -919,7 +920,7 @@ msgstr "Žična overitev 802.1X"
 
 #: js/ui/components/networkAgent.js:299
 msgid "Network name: "
-msgstr "Naziv omrežja: "
+msgstr "Naziv omrežja:"
 
 #: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:667
 msgid "DSL authentication"
@@ -951,15 +952,15 @@ msgstr "Za povezavo z omrežjem »%s« je zahtevano geslo."
 msgid "Network Manager"
 msgstr "Upravljalnik omrežij"
 
-#: js/ui/components/polkitAgent.js:48
+#: js/ui/components/polkitAgent.js:43
 msgid "Authentication Required"
 msgstr "Zahtevana je overitev"
 
-#: js/ui/components/polkitAgent.js:76
+#: js/ui/components/polkitAgent.js:71
 msgid "Administrator"
 msgstr "Skrbnik"
 
-#: js/ui/components/polkitAgent.js:156
+#: js/ui/components/polkitAgent.js:151
 msgid "Authenticate"
 msgstr "Overi"
 
@@ -967,7 +968,7 @@ msgstr "Overi"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327
+#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Overitev je spodletela.. Poskusite znova."
 
@@ -1015,7 +1016,7 @@ msgstr "Dodaj svetovni čas ..."
 msgid "World Clocks"
 msgstr "Svetovni časi"
 
-#: js/ui/dateMenu.js:227
+#: js/ui/dateMenu.js:225
 msgid "Weather"
 msgstr "Vreme"
 
@@ -1023,7 +1024,7 @@ msgstr "Vreme"
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:291
+#: js/ui/dateMenu.js:289
 #, javascript-format
 msgid "%s all day."
 msgstr "%s – ves dan."
@@ -1032,7 +1033,7 @@ msgstr "%s – ves dan."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:297
+#: js/ui/dateMenu.js:295
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s, sledi %s."
@@ -1041,30 +1042,30 @@ msgstr "%s, sledi %s."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:303
+#: js/ui/dateMenu.js:301
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, sledi %s, kasneje tudi %s."
 
-#: js/ui/dateMenu.js:314
+#: js/ui/dateMenu.js:312
 msgid "Select a location…"
 msgstr "Izbor mesta ..."
 
-#: js/ui/dateMenu.js:317
+#: js/ui/dateMenu.js:315
 msgid "Loading…"
 msgstr "Poteka nalaganje ..."
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:323
+#: js/ui/dateMenu.js:321
 #, javascript-format
 msgid "Feels like %s."
 msgstr "Občuti se kot %s."
 
-#: js/ui/dateMenu.js:326
+#: js/ui/dateMenu.js:324
 msgid "Go online for weather information"
 msgstr "Preglej splet za podrobnosti o vremenu."
 
-#: js/ui/dateMenu.js:328
+#: js/ui/dateMenu.js:326
 msgid "Weather information is currently unavailable"
 msgstr "Podatki o vremenu trenutno niso na voljo."
 
@@ -2013,8 +2014,8 @@ msgstr "Napaka overitve naprave Thunderbolt"
 
 #: js/ui/status/thunderbolt.js:357
 #, javascript-format
-msgid "Could not authorize the Thunderbolt device: %s"
-msgstr "Naprave Thunderbolt ni mogoče overiti: %s"
+msgid "Could not authorize the thunderbolt device: %s"
+msgstr "Naprave thunderbolt ni mogoče overiti: %s"
 
 #: js/ui/status/volume.js:128
 msgid "Volume changed"

src/calendar-server/gnome-shell-calendar-server.c

@@ -590,11 +590,6 @@ app_load_events (App *app)
   g_list_free (app->live_views);
   app->live_views = NULL;
 
-  if (!app->since || !app->until)
-    {
-      print_debug ("Skipping load of events, no time interval set yet");
-      return;
-    }
   /* timezone could have changed */
   app_update_timezone (app);
 

src/gnome-shell-perf-tool.in

@@ -347,10 +347,10 @@ if options.perf == None:
         options.perf = 'core'
 
 if options.extra_filter is None:
-    options.extra_filter = []
-
-if options.perf == 'hwtest':
-    options.extra_filter.append('Gedit')
+    if options.hwtest:
+        options.extra_filter = ['Gedit']
+    else:
+        options.extra_filter = []
 
 if args:
     parser.print_usage()

src/shell-app.c

@@ -1190,37 +1190,12 @@ app_child_setup (gpointer user_data)
 }
 #endif
 
-static void
-_shell_app_watch_callback (GPid      pid,
-                           gint      status,
-                           ShellApp *app)
-{
-  if (app->state == SHELL_APP_STATE_STARTING)
-    {
-      ShellWindowTracker *tracker = shell_window_tracker_get_default ();
-      GSList *startup_sequences = shell_window_tracker_get_startup_sequences (tracker);
-      GSList *iter = NULL;
-
-      for (iter = startup_sequences; iter; iter = g_slist_next (iter))
-        {
-          ShellStartupSequence *sequence = (ShellStartupSequence*) iter->data;
-          ShellApp *startup_app = shell_startup_sequence_get_app (sequence);
-          if (startup_app == app)
-            shell_startup_sequence_complete (sequence);
-        }
-
-      shell_app_state_transition (app, SHELL_APP_STATE_STOPPED);
-    }
-
-  g_spawn_close_pid (pid);
-}
-
 static void
 wait_pid (GDesktopAppInfo *appinfo,
           GPid             pid,
-          ShellApp        *app)
+          gpointer         user_data)
 {
-  g_child_watch_add (pid, (GChildWatchFunc) _shell_app_watch_callback, app);
+  g_child_watch_add (pid, (GChildWatchFunc) g_spawn_close_pid, NULL);
 }
 
 /**
@@ -1267,8 +1242,7 @@ shell_app_launch (ShellApp     *app,
 #else
                                                    NULL, NULL,
 #endif
-                                                   (GDesktopAppLaunchCallback) wait_pid,
-                                                   app,
+                                                   wait_pid, NULL,
                                                    error);
   g_object_unref (context);
 

src/shell-window-tracker.c

@@ -395,13 +395,6 @@ get_app_for_window (ShellWindowTracker    *tracker,
   if (meta_window_is_remote (window))
     return _shell_app_new_for_window (window);
 
-  /* Check if the window was opened from within a sandbox; if this
-   * is the case, a corresponding .desktop file is guaranteed to match;
-   */
-  result = get_app_from_sandboxed_app_id (window);
-  if (result != NULL)
-    return result;
-
   /* Check if the window has a GApplication ID attached; this is
    * canonical if it does
    */
@@ -416,6 +409,15 @@ get_app_for_window (ShellWindowTracker    *tracker,
   if (result != NULL)
     return result;
 
+  /* Check if the window was opened from within a sandbox; if this
+   * is the case, a corresponding .desktop file is guaranteed to match;
+   * Do this after having checked by WM_CLASS so that sandboxed apps
+   * installing multiple .desktop files can properly match their windows.
+   */
+  result = get_app_from_sandboxed_app_id (window);
+  if (result != NULL)
+    return result;
+
   result = get_app_from_window_pid (tracker, window);
   if (result != NULL)
     return result;
@@ -906,11 +908,6 @@ shell_startup_sequence_create_icon (ShellStartupSequence *sequence, guint size)
   return texture;
 }
 
-void
-shell_startup_sequence_complete (ShellStartupSequence *sequence)
-{
-  sn_startup_sequence_complete ((SnStartupSequence*)sequence);
-}
 
 /**
  * shell_window_tracker_get_default:

src/shell-window-tracker.h

@@ -36,7 +36,6 @@ const char *shell_startup_sequence_get_name (ShellStartupSequence *sequence);
 gboolean shell_startup_sequence_get_completed (ShellStartupSequence *sequence);
 int shell_startup_sequence_get_workspace (ShellStartupSequence *sequence);
 ClutterActor *shell_startup_sequence_create_icon (ShellStartupSequence *sequence, guint size);
-void shell_startup_sequence_complete (ShellStartupSequence *sequence);
 
 G_END_DECLS
 

src/st/meson.build

@@ -142,7 +142,7 @@ libst_gir = gnome.generate_gir(libst,
   sources: st_gir_sources,
   nsversion: '1.0',
   namespace: 'St',
-  includes: ['Clutter-' + mutter_api_version, 'Cally-' + mutter_api_version, 'Gtk-3.0'],
+  includes: ['Clutter-' + mutter_api_version, 'Gtk-3.0'],
   dependencies: [mutter_dep],
   include_directories: include_directories('..'),
   extra_args: ['-DST_COMPILATION', '--quiet'],