shell-global: Make saving of persistent state asynchronous

This is an expensive operation that is best avoided in the main loop. Given
the call doesn't care much about returning error or status, it can just
be made async within.

Every operation on a given file will be destructive wrt previous
operations on the same file, so we just cancel any pending operation on
it before batching the current one.

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

(cherry picked from commit 86a00b6872)

HACKING

@@ -1,16 +1,19 @@
-# Coding guide
+Coding guide
+============
 
 Our goal is to have all JavaScript code in GNOME follow a consistent style. In
 a dynamic language like JavaScript, it is essential to be rigorous about style
 (and unit tests), or you rapidly end up with a spaghetti-code mess.
 
-## A quick note
+A quick note
+------------
 
 Life isn't fun if you can't break the rules. If a rule seems unnecessarily
 restrictive while you're coding, ignore it, and let the patch reviewer decide
 what to do.
 
-## Indentation and whitespace
+Indentation and whitespace
+--------------------------
 
 Use four-space indents. Braces are on the same line as their associated
 statements.  You should only omit braces if *both* sides of the statement are
@@ -19,7 +22,7 @@ on one line.
 * One space after the `function` keyword.  No space between the function name
 * in a declaration or a call.  One space before the parens in the `if`
 * statements, or `while`, or `for` loops.
-```javascript
+
     function foo(a, b) {
         let bar;
 
@@ -36,20 +39,22 @@ on one line.
             print(20);
         }
     }
-```
 
-## Semicolons
+Semicolons
+----------
 
 JavaScript allows omitting semicolons at the end of lines, but don't. Always
 end statements with a semicolon.
 
-## js2-mode
+js2-mode
+--------
 
 If using Emacs, do not use js2-mode. It is outdated and hasn't worked for a
 while. emacs now has a built-in JavaScript mode, js-mode, based on
 espresso-mode. It is the de facto emacs mode for JavaScript.
 
-## File naming and creation
+File naming and creation
+------------------------
 
 For JavaScript files, use lowerCamelCase-style names, with a `.js` extension.
 
@@ -62,13 +67,14 @@ library name followed by a dash, e.g. `shell-app-system.c`. Create a
 `-private.h` header when you want to share code internally in the
 library. These headers are not installed, distributed or introspected.
 
-## Imports
+Imports
+-------
 
 Use UpperCamelCase when importing modules to distinguish them from ordinary
 variables, e.g.
-```javascript
+
     const GLib = imports.gi.GLib;
-```
+
 Imports should be categorized into one of two places. The top-most import block
 should contain only "environment imports". These are either modules from
 gobject-introspection or modules added by gjs itself.
@@ -79,7 +85,7 @@ e.g. `imports.ui.popupMenu`.
 
 Each import block should be sorted alphabetically. Don't import modules you
 don't use.
-```javascript
+
     const GLib = imports.gi.GLib;
     const Gio = imports.gi.Gio;
     const Lang = imports.lang;
@@ -89,22 +95,23 @@ don't use.
     const Params = imports.misc.params;
     const Tweener = imports.ui.tweener;
     const Util = imports.misc.util;
-```
+
 The alphabetical ordering should be done independently of the location of the
 location. Never reference `imports` in actual code.
 
-## Constants
+Constants
+---------
 
 We use CONSTANTS_CASE to define constants. All constants should be directly
 under the imports:
-```javascript
-    const MY_DBUS_INTERFACE = 'org.my.Interface';
-```
 
-## Variable declaration
+    const MY_DBUS_INTERFACE = 'org.my.Interface';
+
+Variable declaration
+--------------------
 
 Always use either `const` or `let` when defining a variable.
-```javascript
+
     // Iterating over an array
     for (let i = 0; i < arr.length; ++i) {
         let item = arr[i];
@@ -114,17 +121,17 @@ Always use either `const` or `let` when defining a variable.
     for (let prop in someobj) {
         ...
     }
-```
 
 If you use "var" then the variable is added to function scope, not block scope.
 See [What's new in JavaScript 1.7](https://developer.mozilla.org/en/JavaScript/New_in_JavaScript/1.7#Block_scope_with_let_%28Merge_into_let_Statement%29)
 
-## Classes
+Classes
+-------
 
 There are many approaches to classes in JavaScript. We use our own class framework
 (sigh), which is built in gjs. The advantage is that it supports inheriting from
 GObjects, although this feature isn't used very often in the Shell itself.
-```javascript
+
     var IconLabelMenuItem = new Lang.Class({
         Name: 'IconLabelMenuItem',
         Extends: PopupMenu.PopupMenuBaseItem,
@@ -139,7 +146,6 @@ GObjects, although this feature isn't used very often in the Shell itself.
             log("menu opened!");
         }
     });
-```
 
 * 'Name' is required. 'Extends' is optional. If you leave it out, you will
   automatically inherit from Object.
@@ -156,12 +162,13 @@ GObjects, although this feature isn't used very often in the Shell itself.
   still a giant function call, even though it may resemble a more
   conventional syntax.
 
-## GObject Introspection
+GObject Introspection
+---------------------
 
 GObject Introspection is a powerful feature that allows us to have native
 bindings for almost any library built around GObject. If a library requires
 you to inherit from a type to use it, you can do so:
-```javascript
+
     var MyClutterActor = new Lang.Class({
         Name: 'MyClutterActor',
         Extends: Clutter.Actor,
@@ -181,9 +188,9 @@ you to inherit from a type to use it, you can do so:
                             alloc.x2, alloc.y2);
         }
     });
-```
 
-## Translatable strings, `environment.js`
+Translatable strings, `environment.js`
+--------------------------------------
 
 We use gettext to translate the GNOME Shell into all the languages that GNOME
 supports. The `gettext` function is aliased globally as `_`, you do not need to
@@ -197,7 +204,8 @@ and "double quotes" for strings that the user may see. This allows us to
 quickly find untranslated or mistranslated strings by grepping through the
 sources for double quotes without a gettext call around them.
 
-## `actor` and `_delegate`
+`actor` and `_delegate`
+-----------------------
 
 gjs allows us to set so-called "expando properties" on introspected objects,
 allowing us to treat them like any other. Because the Shell was built before
@@ -206,7 +214,7 @@ that has a property called `actor`. We call this wrapper class the "delegate".
 
 We sometimes use expando properties to set a property called `_delegate` on
 the actor itself:
-```javascript
+
     var MyClass = new Lang.Class({
         Name: 'MyClass',
 
@@ -221,7 +229,6 @@ the actor itself:
             actor.set_label("You clicked the button!");
         }
     });
-```
 
 The 'delegate' property is important for anything which trying to get the
 delegate object from an associated actor. For instance, the drag and drop
@@ -229,14 +236,16 @@ system calls the `handleDragOver` function on the delegate of a "drop target"
 when the user drags an item over it. If you do not set the `_delegate`
 property, your actor will not be able to be dropped onto.
 
-## Functional style
+Functional style
+----------------
 
 JavaScript Array objects offer a lot of common functional programming
 capabilities such as forEach, map, filter and so on. You can use these when
 they make sense, but please don't have a spaghetti mess of function programming
 messed in a procedural style. Use your best judgment.
 
-## Closures
+Closures
+--------
 
 `this` will not be captured in a closure, it is relative to how the closure is
 invoked, not to the value of this where the closure is created, because "this"
@@ -245,16 +254,15 @@ variable that can be captured in closures.
 
 All closures should be wrapped with Function.prototype.bind or use arrow
 notation.
-```javascript
+
     const Lang = imports.lang;
 
     let closure1 = () => { this._fnorbate(); };
     let closure2 = this._fnorbate.bind(this);
-```
 
 A more realistic example would be connecting to a signal on a method of a
 prototype:
-```javascript
+
     const Lang = imports.lang;
     const FnorbLib = imports.fborbLib;
 
@@ -268,21 +276,19 @@ prototype:
             this._updateFnorb();
         }
     });
-```
 
-## Object literal syntax
+Object literal syntax
+---------------------
 
 In JavaScript, these are equivalent:
-```javascript
+
     foo = { 'bar': 42 };
     foo = { bar: 42 };
-```
 
 and so are these:
-```javascript
+
     var b = foo['bar'];
     var b = foo.bar;
-```
 
 If your usage of an object is like an object, then you're defining "member
 variables." For member variables, use the no-quotes no-brackets syntax: `{ bar:
@@ -292,13 +298,14 @@ If your usage of an object is like a hash table (and thus conceptually the keys
 can have special chars in them), don't use quotes, but use brackets: `{ bar: 42
 }`, `foo['bar']`.
 
-## Getters, setters, and Tweener
+Getters, setters, and Tweener
+-----------------------------
 
 Getters and setters should be used when you are dealing with an API that is
 designed around setting properties, like Tweener. If you want to animate an
 arbitrary property, create a getter and setter, and use Tweener to animate the
 property.
-```javascript
+
     var ANIMATION_TIME = 2000;
 
     var MyClass = new Lang.Class({
@@ -324,4 +331,3 @@ property.
                      { position: 100,
                        time: ANIMATION_TIME,
                        transition: 'easeOutQuad' });
-```

MAINTAINERS

@@ -0,0 +1,7 @@
+Owen Taylor
+E-mail: otaylor@redhat.com
+Userid: otaylor
+
+Colin Walters
+E-mail: walters@verbum.org
+Userid: walters

NEWS

@@ -1,156 +1,57 @@
-3.30.1
+3.28.4
 ======
-* Cancel search on overview hiding [Marco; !205]
-* Fix disappearing network icon [Iain; #140]
-* Improve switch-monitor shortcut handling [Daniel; !208]
-* Fix missing key information in keyring dialog [Florian; #574]
-* De-duplicate all entries in run command history [Pascal; #524]
-* Fix frozen disk unlock dialogs [Florian; #565]
-* Fix unresponsive-app dialog blocking input in other windows [Florian; #273]
-* Fix handling of forward-key-event input method signal [Carlos; #531]
-* Misc. bug fixes [Florian, Marco, Carlos, Pascal, Andrea; #520, #791233,
-  !188, #539, !217, #536, #537, #578, !236, #579, !228, #618, #471, !255]
-
-Contributors:
-  Andrea Azzarone, Jürg Billeter, Daniel Drake, Carlos Garnacho, Andre Klapper,
-  Iain Lane, Florian Müllner, Bastien Nocera, Pascal Nowack, Jakub Steiner,
-  Ray Strode, Will Thompson, Marco Trevisan (Treviño), Adam Williamson,
-  Andrew Zaborowski
-
-Translators:
-  Yuras Shumovich [be], Stas Solovey [ru], Justin van Steijn [nl],
-  Dušan Kazik [sk], Khaled Hosny [ar], Madis O [et], Mart Raudsepp [et],
-  Марко Костић [sr], Piotr Drąg [pl], Marek Černocký [cs], Fran Dieguez [gl],
-  Ask Hjorth Larsen [da], Balázs Meskó [hu], Jiri Grönroos [fi],
-  Cheng-Chia Tseng [zh_TW]
-
-3.30.0
-======
-
-Contributors:
-  Harry Mallon, Marco Trevisan (Treviño)
-
-Translators:
-  Fran Dieguez [gl], Trần Ngọc Quân [vi], Balázs Meskó [hu],
-  Rūdolfs Mazurs [lv], Jiri Grönroos [fi], Anders Jonsson [sv], gogo [hr],
-  Ask Hjorth Larsen [da]
-
-3.29.92
-=======
-* Choose some actors to cache on the GPU [Daniel; #792633]
-* inputMethod: Hide preedit text if requested [Takao; #431]
-* Fix forced fallback app-menus on wayland [Jonas; #276]
-
-Contributors:
-  Jonas Ådahl, Takao Fujiwara, Mohammed Sadiq, Marco Trevisan (Treviño),
-  Daniel van Vugt
-
-Translators:
-  Baurzhan Muftakhidinov [kk], Kukuh Syafaat [id], Milo Casagrande [it],
-  Changwoo Ryu [ko], Marek Cernocky [cs]
-
-3.29.91
-=======
-* Fix handling of 0/false options in ShowOSD D-Bus API [Florian; #791669]
+* Fix wrong window positions in overview on wayland [Marco; #776588]
 * overview: Fix handling of confirmation dialogs on wayland [verdre; !180]
 * Avoid some full relayout/redraws [Carlos; !197]
 * Keep workspace switcher slid out when workspaces are in use [Florian; !161]
-* Ignore auto-repeat for some keybindings [Andrea; #373]
-* Misc. bug fixes [Carlos, Florian, Pascal; #464, !189, !191, !192, !162]
+* Cancel search on overview hiding [Marco; !205]
+* Fix disappearing network icon [Iain; #140]
+* Improve performance of app icon animations [Daniel; !253]
+* notifications: Support icon theme names in 'image-path' hint [Marco; !285]
+* Avoid focus changes when updating keyboard options [Takao; #391]
+* Fix unresponsive-app dialog blocking input in other windows [Florian; #273]
+* Fix ellipsization in dialog subtitles/bodies [Marco; !531]
+* Misc. bug fixes [Marco, Andrea, Florian, Jasper, Sam, verdre, Jonas,
+  Cosimo, Carlos; #792681, #372, !112, !162, #414, #663461, #788882, #787260,
+  !188, #791233, #602, #632, !305, !286, !314, #781, #693, #618, #430, #799,
+  #783, !293, #298, #1015, #539, #1270]
 
 Contributors:
-  Andrea Azzarone, Olivier Blin, Carlos Garnacho, Florian Müllner,
-  Pascal Nowack, verdre
+  Jonas Ådahl, Andrea Azzarone, Cosimo Cecchi, Takao Fujiwara, Carlos Garnacho,
+  Iain Lane, Florian Müllner, Georges Basile Stavracas Neto, Jasper St. Pierre,
+  Sam Spilsbury, Ray Strode, Will Thompson, Marco Trevisan (Treviño), verdre,
+  Daniel van Vugt
 
 Translators:
-  Bruno Lopes da Silva [pt_BR], Matej Urbančič [sl], Piotr Drąg [pl],
-  Aurimas Černius [lt], Emin Tufan Çetin [tr], Fabio Tomat [fur],
-  Alexandre Franke [fr], Yi-Jyun Pan [zh_TW], Bernd Homuth [de],
-  Andre Klapper [cs], Jordi Mas [ca], Daniel Șerbănescu [ro],
-  Bruce Cowan [en_GB]
+  Marek Černocký [cs]
 
-3.29.90
-=======
-* Add remote access indication on wayland [Jonas; !160]
-* Fix wrong window positions in overview on wayland [Marco; #776588]
-* Add gesture to unfullscreen a window [Jan-Michael; !123]
-* Add PickColor method to screenshot D-Bus interface [Florian; #286]
-* Consider "new-window" action when opening new windows [Florian; #756844]
-* Make workspace switching gestures follow motion [Carlos; #788994]
-* Support audio volumes above 100% [Didier; #790280]
-* Misc. bug fixes [Florian, Daniel; #424, !132, !182, #433, !179, #786496]
-
-Contributors:
-  Jonas Ådahl, Jan-Michael Brummer, Piotr Drąg, Daniel Drake, Carlos Garnacho,
-  Florian Müllner, Georges Basile Stavracas Neto, Didier Roche, Jakub Steiner,
-  Marco Trevisan (Treviño)
-
-Translators:
-  Charles Monzat [fr], Daniel Mustieles [es]
-
-3.29.4
+3.28.3
 ======
-* Fix "Clear All" for calendar events [Florian; #325]
-* Allow cancelling direct switch operations [Xavier; #315]
-* Support being started by systemd --user [Iain; !137, !138]
-* Support key event forwarding required by some input methods [Carlos; #275]
-* Misc. bug fixes and cleanups [Jasper, Andrea, Florian; #663461, #372, !112,
-  #414, !151]
-
-Contributors:
-  Andrea Azzarone, Carlos Garnacho, Xavier Johnson, Iain Lane, Florian Müllner,
-  Jasper St. Pierre
-
-Translators:
-  Stas Solovey [ru]
-
-3.29.3
-======
-* Save creation time in screenshot metadata [Florian; #790481]
-* Improve consistency between ctrl- and middle-click on app icons [Xavier; #316]
-* Add support for font-feature-settings CSS property [Ryan; #34]
-* Adjust to MetaScreen removal [Jonas; #759538]
-* Misc. bug fixes [Florian, Marco, Sam; #298, #788931, #26, #76, !54, #788882,
-  #791233]
-
-Contributors:
-  Jonas Ådahl, Ryan Hendrickson, Xavier Johnson, Florian Müllner, Joe Rabinoff,
-  Sam Spilsbury, Marco Trevisan (Treviño)
-
-Translators:
-  Gun Chleoc [gd], Yi-Jyun Pan [zh_TW], Cédric Valmary [oc], Jordi Mas [ca]
-
-3.29.2
-======
-* Guard against untimely keyboard map changes [Carlos; #240]
-* Fix icons in search provider results [Florian; #249]
-* Fix blurriness of OSD under some resolutions [Silvère; #782011]
 * Fix lagging pointer when zoomed [Daniel; #682013]
-* Misc. bug fixes [Milan, Xiaoguang, Florian, Mario, Ole; #244, #787871,
-  #781471, #136, #214, #294]
+* Fix "Clear All" for calendar events [Florian; #325]
+* Misc. bug fixes [Florian, Mario, Marco; #136, #214, #788931, #791233]
 
 Contributors:
-  Ole Jørgen Brønner, Milan Crha, Carlos Garnacho, Yussuf Khalil,
-  Silvère Latchurié, Florian Müllner, Mario Sanchez Prada, Ray Strode,
-  Daniel van Vugt, Xiaoguang Wang
+  Carlos Garnacho, Florian Müllner, Mario Sanchez Prada, Joe Rabinoff,
+  Didier Roche, Marco Trevisan (Treviño), Daniel van Vugt
 
 Translators:
-  Rafael Fontenelle [pt_BR], Kukuh Syafaat [id], Marcos Lans [gl],
-  Anders Jonsson [sv], Mingcong Bai [zh_CN]
+  Pieter Schalk Schoeman [af], Gun Chleoc [gd]
 
-3.29.1
+3.28.2
 ======
-* Support icons in app-menu [Florian; #760985]
-* Misc. bug fixes [Marco, Florian, Lubomir; #792687, #221, !63]
+* Fix lock-up on cancelling polkit dialog [Florian; #221]
+* Guard against untimely keyboard map changes [Carlos; #240]
+* Fix blurriness of OSD under some resolutions [Silvère; #782011]
+* Fix icons in search provider results [Florian; #249]
+* Misc. bug fixes [Marco, Florian; #792687, #781471]
 
 Contributors:
-  Piotr Drąg, Takao Fujiwara, Christian Kellner, Florian Müllner,
-  Mario Sanchez Prada, Lubomir Rintel, Didier Roche, Marco Trevisan (Treviño),
-  verdre
+  Carlos Garnacho, Silvère Latchurié, Florian Müllner, Mario Sanchez Prada,
+  Ray Strode, Marco Trevisan (Treviño)
 
 Translators:
-  gogo [hr], Stas Solovey [ru], Matej Urbančič [sl], Daniel Șerbănescu [ro],
-  Fabio Tomat [fur], Marek Cernocky [cs], Daniel Mustieles [es]
+  Stas Solovey [ru], Rafael Fontenelle [pt_BR]
 
 3.28.1
 ======

README

@@ -1,4 +1,3 @@
-# GNOME Shell
 GNOME Shell provides core user interface functions for the GNOME 3 desktop,
 like switching to windows and launching applications. GNOME Shell takes
 advantage of the capabilities of modern graphics hardware and introduces
@@ -7,14 +6,15 @@ easy to use experience.
 
 For more information about GNOME Shell, including instructions on how
 to build GNOME Shell from source and how to get involved with the project,
-see the [project wiki][project-wiki].
+see:
 
-Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
+ https://wiki.gnome.org/Projects/GnomeShell
 
-## License
+Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
+product.
+
+License
+=======
 GNOME Shell is distributed under the terms of the GNU General Public License,
-version 2 or later. See the [COPYING][license] file for details.
+version 2 or later. See the COPYING file for details.
 
-[project-wiki]: https://wiki.gnome.org/Projects/GnomeShell
-[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell/issues
-[license]: COPYING

browser-plugin/README

@@ -4,14 +4,14 @@ the extensions repository to provide good integration, letting the website
 know which extensions are enabled and disabled, and allowing the website to
 enable, disable and install them.
 
-Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
+Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
+product.
 
-## License
+License
+=======
 The GNOME Shell Browser Plugin, like GNOME Shell itself is distributed under
 the GNU General Public License, version 2 or later. The plugin also contains
 header files from the "NPAPI SDK" project, tri-licensed under MPL 1.1, GPL 2.0
 and LGPL 2.1. These headers are third-party sources and can be retrieved from:
 
   http://code.google.com/p/npapi-sdk/
-
-[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell/issues

config.h.meson

@@ -24,9 +24,3 @@
 
 /* Define if _NL_TIME_FIRST_WEEKDATE is available */
 #mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
-
-/* Define if you have the `g_desktop_app_info_launch_uris_as_manager_with_fds` function */
-#mesondefine HAVE_GIO_DESKTOP_LAUNCH_URIS_WITH_FDS
-
-/* Define if fdwalk is available in libc */
-#mesondefine HAVE_FDWALK

data/00_org.gnome.shell.gschema.override

@@ -1,6 +0,0 @@
-[org.gnome.mutter:GNOME]
-attach-modal-dialogs=true
-edge-tiling=true
-dynamic-workspaces=true
-workspaces-only-on-primary=true
-focus-change-on-pointer-rest=true

data/dbus-interfaces/meson.build

@@ -1,9 +0,0 @@
-dbus_interfaces = [
-  'org.gnome.Shell.Extensions.xml',
-  'org.gnome.Shell.PadOsd.xml',
-  'org.gnome.Shell.Screencast.xml',
-  'org.gnome.Shell.Screenshot.xml',
-  'org.gnome.ShellSearchProvider.xml',
-  'org.gnome.ShellSearchProvider2.xml'
-]
-install_data(dbus_interfaces, install_dir: ifacedir)

data/dbus-interfaces/net.hadess.SensorProxy.xml

@@ -1,5 +0,0 @@
-<node>
-  <interface name="net.hadess.SensorProxy">
-    <property name="HasAccelerometer" type="b" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/net.hadess.SwitcherooControl.xml

@@ -1,5 +0,0 @@
-<node>
-  <interface name="net.hadess.SwitcherooControl">
-    <property name="HasDualGpu" type="b" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.Gtk.MountOperationHandler.xml

@@ -1,32 +0,0 @@
-<node>
-  <interface name="org.Gtk.MountOperationHandler">
-    <method name="AskPassword">
-      <arg type="s" direction="in" name="object_id"/>
-      <arg type="s" direction="in" name="message"/>
-      <arg type="s" direction="in" name="icon_name"/>
-      <arg type="s" direction="in" name="default_user"/>
-      <arg type="s" direction="in" name="default_domain"/>
-      <arg type="u" direction="in" name="flags"/>
-      <arg type="u" direction="out" name="response"/>
-      <arg type="a{sv}" direction="out" name="response_details"/>
-    </method>
-    <method name="AskQuestion">
-      <arg type="s" direction="in" name="object_id"/>
-      <arg type="s" direction="in" name="message"/>
-      <arg type="s" direction="in" name="icon_name"/>
-      <arg type="as" direction="in" name="choices"/>
-      <arg type="u" direction="out" name="response"/>
-      <arg type="a{sv}" direction="out" name="response_details"/>
-    </method>
-    <method name="ShowProcesses">
-      <arg type="s" direction="in" name="object_id"/>
-      <arg type="s" direction="in" name="message"/>
-      <arg type="s" direction="in" name="icon_name"/>
-      <arg type="ai" direction="in" name="application_pids"/>
-      <arg type="as" direction="in" name="choices"/>
-      <arg type="u" direction="out" name="response"/>
-      <arg type="a{sv}" direction="out" name="response_details"/>
-    </method>
-    <method name="Close"/>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.Application.xml

@@ -1,12 +0,0 @@
-<node>
-  <interface name="org.freedesktop.Application">
-    <method name="ActivateAction">
-      <arg type="s" direction="in"/>
-      <arg type="av" direction="in"/>
-      <arg type="a{sv}" direction="in"/>
-    </method>
-    <method name="Activate">
-      <arg type="a{sv}" direction="in"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.DBus.xml

@@ -1,16 +0,0 @@
-<node>
-  <interface name="org.freedesktop.DBus">
-    <method name="ListNames">
-      <arg type="as" direction="out" name="names"/>
-    </method>
-    <method name="GetConnectionUnixProcessID">
-      <arg type="s" direction="in"/>
-      <arg type="u" direction="out"/>
-    </method>
-    <signal name="NameOwnerChanged">
-      <arg type="s" direction="out" name="name"/>
-      <arg type="s" direction="out" name="oldOwner"/>
-      <arg type="s" direction="out" name="newOwner"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.GeoClue2.Agent.xml

@@ -1,11 +0,0 @@
-<node>
-  <interface name="org.freedesktop.GeoClue2.Agent">
-    <property name="MaxAccuracyLevel" type="u" access="read"/>
-    <method name="AuthorizeApp">
-      <arg name="desktop_id" type="s" direction="in"/>
-      <arg name="req_accuracy_level" type="u" direction="in"/>
-      <arg name="authorized" type="b" direction="out"/>
-      <arg name="allowed_accuracy_level" type="u" direction="out"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.GeoClue2.Manager.xml

@@ -1,9 +0,0 @@
-<node>
-  <interface name="org.freedesktop.GeoClue2.Manager">
-    <property name="InUse" type="b" access="read"/>
-    <property name="AvailableAccuracyLevel" type="u" access="read"/>
-    <method name="AddAgent">
-      <arg name="id" type="s" direction="in"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.ModemManager.Modem.Cdma.xml

@@ -1,13 +0,0 @@
-<node>
-  <interface name="org.freedesktop.ModemManager.Modem.Cdma">
-    <method name="GetSignalQuality">
-      <arg type="u" direction="out"/>
-    </method>
-    <method name="GetServingSystem">
-      <arg type="(usu)" direction="out"/>
-    </method>
-    <signal name="SignalQuality">
-      <arg type="u" direction="out"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.ModemManager.Modem.Gsm.Network.xml

@@ -1,19 +0,0 @@
-<node>
-  <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
-    <method name="GetRegistrationInfo">
-      <arg type="(uss)" direction="out"/>
-    </method>
-    <method name="GetSignalQuality">
-      <arg type="u" direction="out"/>
-    </method>
-    <property name="AccessTechnology" type="u" access="read"/>
-    <signal name="SignalQuality">
-      <arg type="u" direction="out"/>
-    </signal>
-    <signal name="RegistrationInfo">
-      <arg type="u" direction="out"/>
-      <arg type="s" direction="out"/>
-      <arg type="s" direction="out"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml

@@ -1,6 +0,0 @@
-<node>
-  <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp">
-    <property name="OperatorCode" type="s" access="read"/>
-    <property name="OperatorName" type="s" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.ModemManager1.Modem.ModemCdma.xml

@@ -1,5 +0,0 @@
-<node>
-  <interface name="org.freedesktop.ModemManager1.Modem.ModemCdma">
-    <property name="Sid" type="u" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.ModemManager1.Modem.xml

@@ -1,5 +0,0 @@
-<node>
-  <interface name="org.freedesktop.ModemManager1.Modem">
-    <property name="SignalQuality" type="(ub)" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.Notifications.xml

@@ -1,35 +0,0 @@
-<node>
-  <interface name="org.freedesktop.Notifications">
-    <method name="Notify">
-      <arg type="s" direction="in"/>
-      <arg type="u" direction="in"/>
-      <arg type="s" direction="in"/>
-      <arg type="s" direction="in"/>
-      <arg type="s" direction="in"/>
-      <arg type="as" direction="in"/>
-      <arg type="a{sv}" direction="in"/>
-      <arg type="i" direction="in"/>
-      <arg type="u" direction="out"/>
-    </method>
-    <method name="CloseNotification">
-      <arg type="u" direction="in"/>
-    </method>
-    <method name="GetCapabilities">
-      <arg type="as" direction="out"/>
-    </method>
-    <method name="GetServerInformation">
-      <arg type="s" direction="out"/>
-      <arg type="s" direction="out"/>
-      <arg type="s" direction="out"/>
-      <arg type="s" direction="out"/>
-    </method>
-    <signal name="NotificationClosed">
-      <arg type="u"/>
-      <arg type="u"/>
-    </signal>
-    <signal name="ActionInvoked">
-      <arg type="u"/>
-      <arg type="s"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.PackageKit.Offline.xml

@@ -1,13 +0,0 @@
-<node>
-  <interface name="org.freedesktop.PackageKit.Offline">
-    <property name="UpdatePrepared" type="b" access="read"/>
-    <property name="UpdateTriggered" type="b" access="read"/>
-    <property name="UpgradePrepared" type="b" access="read"/>
-    <property name="UpgradeTriggered" type="b" access="read"/>
-    <property name="PreparedUpgrade" type="a{sv}" access="read"/>
-    <method name="Trigger">
-      <arg type="s" name="action" direction="in"/>
-    </method>
-    <method name="Cancel"/>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.UPower.Device.xml

@@ -1,11 +0,0 @@
-<node>
-  <interface name="org.freedesktop.UPower.Device">
-    <property name="Type" type="u" access="read"/>
-    <property name="State" type="u" access="read"/>
-    <property name="Percentage" type="d" access="read"/>
-    <property name="TimeToEmpty" type="x" access="read"/>
-    <property name="TimeToFull" type="x" access="read"/>
-    <property name="IsPresent" type="b" access="read"/>
-    <property name="IconName" type="s" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.UPower.xml

@@ -1,5 +0,0 @@
-<node>
-  <interface name="org.freedesktop.UPower">
-    <property name="OnBattery" type="b" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.bolt1.Device.xml

@@ -1,18 +0,0 @@
-<node>
-  <interface name="org.freedesktop.bolt1.Device">
-    <property name="Uid" type="s" access="read"></property>
-    <property name="Name" type="s" access="read"></property>
-    <property name="Vendor" type="s" access="read"></property>
-    <property name="Type" type="s" access="read"></property>
-    <property name="Status" type="s" access="read"></property>
-    <property name="Parent" type="s" access="read"></property>
-    <property name="SysfsPath" type="s" access="read"></property>
-    <property name="Stored" type="b" access="read"></property>
-    <property name="Policy" type="s" access="read"></property>
-    <property name="Key" type="s" access="read"></property>
-    <property name="Label" type="s" access="read"></property>
-    <property name="ConnectTime" type="t" access="read"></property>
-    <property name="AuthorizeTime" type="t" access="read"></property>
-    <property name="StoreTime" type="t" access="read"></property>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.bolt1.Manager.xml

@@ -1,15 +0,0 @@
-<node>
-  <interface name="org.freedesktop.bolt1.Manager">
-    <property name="Probing" type="b" access="read"></property>
-    <property name="AuthMode" type="s" access="readwrite"></property>
-    <method name="EnrollDevice">
-      <arg type="s" name="uid" direction="in"/>
-      <arg type="s" name="policy" direction="in"/>
-      <arg type="s" name="flags" direction="in"/>
-      <arg name="device" direction="out" type="o"/>
-    </method>
-    <signal name="DeviceAdded">
-      <arg name="device" type="o"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.impl.portal.Access.xml

@@ -1,15 +0,0 @@
-<node>
-  <interface name="org.freedesktop.impl.portal.Access">
-    <method name="AccessDialog">
-      <arg type="o" name="handle" direction="in"/>
-      <arg type="s" name="app_id" direction="in"/>
-      <arg type="s" name="parent_window" direction="in"/>
-      <arg type="s" name="title" direction="in"/>
-      <arg type="s" name="subtitle" direction="in"/>
-      <arg type="s" name="body" direction="in"/>
-      <arg type="a{sv}" name="options" direction="in"/>
-      <arg type="u" name="response" direction="out"/>
-      <arg type="a{sv}" name="results" direction="out"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.impl.portal.PermissionStore.xml

@@ -1,24 +0,0 @@
-<node>
-  <interface name="org.freedesktop.impl.portal.PermissionStore">
-    <method name="Lookup">
-      <arg name="table" type="s" direction="in"/>
-      <arg name="id" type="s" direction="in"/>
-      <arg name="permissions" type="a{sas}" direction="out"/>
-      <arg name="data" type="v" direction="out"/>
-    </method>
-    <method name="Set">
-      <arg name="table" type="s" direction="in"/>
-      <arg name="create" type="b" direction="in"/>
-      <arg name="id" type="s" direction="in"/>
-      <arg name="app_permissions" type="a{sas}" direction="in"/>
-      <arg name="data" type="v" direction="in"/>
-    </method>
-    <signal name="Changed">
-      <arg name="table" type="s" direction="out"/>
-      <arg name="id" type="s" direction="out"/>
-      <arg name="deleted" type="b" direction="out"/>
-      <arg name="data" type="v" direction="out"/>
-      <arg name="permissions" type="a{sas}" direction="out"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.impl.portal.Request.xml

@@ -1,5 +0,0 @@
-<node>
-  <interface name="org.freedesktop.impl.portal.Request">
-    <method name="Close"/>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.login1.Manager.xml

@@ -1,27 +0,0 @@
-<node>
-  <interface name="org.freedesktop.login1.Manager">
-    <method name="Suspend">
-      <arg type="b" direction="in"/>
-    </method>
-    <method name="CanSuspend">
-      <arg type="s" direction="out"/>
-    </method>
-    <method name="Inhibit">
-      <arg type="s" direction="in"/>
-      <arg type="s" direction="in"/>
-      <arg type="s" direction="in"/>
-      <arg type="s" direction="in"/>
-      <arg type="h" direction="out"/>
-    </method>
-    <method name="GetSession">
-      <arg type="s" direction="in"/>
-      <arg type="o" direction="out"/>
-    </method>
-    <method name="ListSessions">
-      <arg name="sessions" type="a(susso)" direction="out"/>
-    </method>
-    <signal name="PrepareForSleep">
-      <arg type="b" direction="out"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.login1.Session.xml

@@ -1,15 +0,0 @@
-<node>
-  <interface name="org.freedesktop.login1.Session">
-    <signal name="Lock"/>
-    <signal name="Unlock"/>
-    <property name="Active" type="b" access="read"/>
-    <property name="Class" type="s" access="read"/>
-    <property name="Id" type="s" access="read"/>
-    <property name="Remote" type="b" access="read"/>
-    <property name="Type" type="s" access="read"/>
-    <property name="State" type="s" access="read"/>
-    <method name="SetLockedHint">
-      <arg type="b" direction="in"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.login1.User.xml

@@ -1,6 +0,0 @@
-<node>
-  <interface name="org.freedesktop.login1.User">
-    <property name="Display" type="(so)" access="read"/>
-    <property name="Sessions" type="a(so)" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.realmd.Provider.xml

@@ -1,13 +0,0 @@
-<node>
-  <interface name="org.freedesktop.realmd.Provider">
-    <property name="Name" type="s" access="read"/>
-    <property name="Version" type="s" access="read"/>
-    <property name="Realms" type="ao" access="read"/>
-    <method name="Discover">
-      <arg name="string" type="s" direction="in"/>
-      <arg name="options" type="a{sv}" direction="in"/>
-      <arg name="relevance" type="i" direction="out"/>
-      <arg name="realm" type="ao" direction="out"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.realmd.Realm.xml

@@ -1,20 +0,0 @@
-<node>
-  <interface name="org.freedesktop.realmd.Realm">
-    <property name="Name" type="s" access="read"/>
-    <property name="Configured" type="s" access="read"/>
-    <property name="Details" type="a(ss)" access="read"/>
-    <property name="LoginFormats" type="as" access="read"/>
-    <property name="LoginPolicy" type="s" access="read"/>
-    <property name="PermittedLogins" type="as" access="read"/>
-    <property name="SupportedInterfaces" type="as" access="read"/>
-    <method name="ChangeLoginPolicy">
-      <arg name="login_policy" type="s" direction="in"/>
-      <arg name="permitted_add" type="as" direction="in"/>
-      <arg name="permitted_remove" type="as" direction="in"/>
-      <arg name="options" type="a{sv}" direction="in"/>
-    </method>
-    <method name="Deconfigure">
-      <arg name="options" type="a{sv}" direction="in"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.freedesktop.realmd.Service.xml

@@ -1,15 +0,0 @@
-<node>
-  <interface name="org.freedesktop.realmd.Service">
-    <method name="Cancel">
-      <arg name="operation" type="s" direction="in"/>
-    </method>
-    <method name="Release"/>
-    <method name="SetLocale">
-      <arg name="locale" type="s" direction="in"/>
-    </method>
-    <signal name="Diagnostics">
-      <arg name="data" type="s"/>
-      <arg name="operation" type="s"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Magnifier.ZoomRegion.xml

@@ -1,26 +0,0 @@
-<node>
-  <interface name="org.gnome.Magnifier.ZoomRegion">
-    <method name="setMagFactor">
-      <arg type="d" direction="in"/>
-      <arg type="d" direction="in"/>
-    </method>
-    <method name="getMagFactor">
-      <arg type="d" direction="out"/>
-      <arg type="d" direction="out"/>
-    </method>
-    <method name="setRoi">
-      <arg type="ai" direction="in"/>
-    </method>
-    <method name="getRoi">
-      <arg type="ai" direction="out"/>
-    </method>
-    <method name="shiftContentsTo">
-      <arg type="i" direction="in"/>
-      <arg type="i" direction="in"/>
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="moveResize">
-      <arg type="ai" direction="in"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Magnifier.xml

@@ -1,54 +0,0 @@
-<node>
-  <interface name="org.gnome.Magnifier">
-    <method name="setActive">
-      <arg type="b" direction="in"/>
-    </method>
-    <method name="isActive">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="showCursor"/>
-    <method name="hideCursor"/>
-    <method name="createZoomRegion">
-      <arg type="d" direction="in"/>
-      <arg type="d" direction="in"/>
-      <arg type="ai" direction="in"/>
-      <arg type="ai" direction="in"/>
-      <arg type="o" direction="out"/>
-    </method>
-    <method name="addZoomRegion">
-      <arg type="o" direction="in"/>
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="getZoomRegions">
-      <arg type="ao" direction="out"/>
-    </method>
-    <method name="clearAllZoomRegions"/>
-    <method name="fullScreenCapable">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="setCrosswireSize">
-      <arg type="i" direction="in"/>
-    </method>
-    <method name="getCrosswireSize">
-      <arg type="i" direction="out"/>
-    </method>
-    <method name="setCrosswireLength">
-      <arg type="i" direction="in"/>
-    </method>
-    <method name="getCrosswireLength">
-      <arg type="i" direction="out"/>
-    </method>
-    <method name="setCrosswireClip">
-      <arg type="b" direction="in"/>
-    </method>
-    <method name="getCrosswireClip">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="setCrosswireColor">
-      <arg type="u" direction="in"/>
-    </method>
-    <method name="getCrosswireColor">
-      <arg type="u" direction="out"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.ScreenSaver.xml

@@ -1,18 +0,0 @@
-<node>
-  <interface name="org.gnome.ScreenSaver">
-    <method name="Lock"/>
-    <method name="GetActive">
-      <arg type="b" direction="out" name="active"/>
-    </method>
-    <method name="SetActive">
-      <arg type="b" direction="in" name="value"/>
-    </method>
-    <method name="GetActiveTime">
-      <arg type="u" direction="out" name="value"/>
-    </method>
-    <signal name="ActiveChanged">
-      <arg name="new_value" type="b"/>
-    </signal>
-    <signal name="WakeUpScreen"/>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.SessionManager.EndSessionDialog.xml

@@ -1,16 +0,0 @@
-<node>
-  <interface name="org.gnome.SessionManager.EndSessionDialog">
-    <method name="Open">
-      <arg type="u" direction="in"/>
-      <arg type="u" direction="in"/>
-      <arg type="u" direction="in"/>
-      <arg type="ao" direction="in"/>
-    </method>
-    <method name="Close"/>
-    <signal name="ConfirmedLogout"/>
-    <signal name="ConfirmedReboot"/>
-    <signal name="ConfirmedShutdown"/>
-    <signal name="Canceled"/>
-    <signal name="Closed"/>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.SessionManager.Inhibitor.xml

@@ -1,10 +0,0 @@
-<node>
-  <interface name="org.gnome.SessionManager.Inhibitor">
-    <method name="GetAppId">
-      <arg type="s" direction="out"/>
-    </method>
-    <method name="GetReason">
-      <arg type="s" direction="out"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.SessionManager.Presence.xml

@@ -1,11 +0,0 @@
-<node>
-  <interface name="org.gnome.SessionManager.Presence">
-    <method name="SetStatus">
-      <arg type="u" direction="in"/>
-    </method>
-    <property name="status" type="u" access="readwrite"/>
-    <signal name="StatusChanged">
-      <arg type="u" direction="out"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.SessionManager.xml

@@ -1,23 +0,0 @@
-<node>
-  <interface name="org.gnome.SessionManager">
-    <method name="Logout">
-      <arg type="u" direction="in"/>
-    </method>
-    <method name="Shutdown"/>
-    <method name="Reboot"/>
-    <method name="CanShutdown">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="IsInhibited">
-      <arg type="u" direction="in"/>
-      <arg type="b" direction="out"/>
-    </method>
-    <property name="SessionIsActive" type="b" access="read"/>
-    <signal name="InhibitorAdded">
-      <arg type="o" direction="out"/>
-    </signal>
-    <signal name="InhibitorRemoved">
-      <arg type="o" direction="out"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.SettingsDaemon.Color.xml

@@ -1,6 +0,0 @@
-<node>
-  <interface name="org.gnome.SettingsDaemon.Color">
-    <property name="DisabledUntilTomorrow" type="b" access="readwrite"/>
-    <property name="NightLightActive" type="b" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.SettingsDaemon.Power.Screen.xml

@@ -1,5 +0,0 @@
-<node>
-  <interface name="org.gnome.SettingsDaemon.Power.Screen">
-    <property name="Brightness" type="i" access="readwrite"/>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.SettingsDaemon.Rfkill.xml

@@ -1,10 +0,0 @@
-<node>
-  <interface name="org.gnome.SettingsDaemon.Rfkill">
-    <property name="AirplaneMode" type="b" access="readwrite"/>
-    <property name="HardwareAirplaneMode" type="b" access="read"/>
-    <property name="BluetoothAirplaneMode" type="b" access="readwrite"/>
-    <property name="BluetoothHasAirplaneMode" type="b" access="read"/>
-    <property name="BluetoothHardwareAirplaneMode" type="b" access="readwrite"/>
-    <property name="ShouldShowAirplaneMode" type="b" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.SettingsDaemon.Wacom.xml

@@ -1,13 +0,0 @@
-<node>
-<interface name="org.gnome.SettingsDaemon.Wacom">
-  <method name="SetGroupModeLED">
-    <arg name="device_path" direction="in" type="s"/>
-    <arg name="group" direction="in" type="u"/>
-    <arg name="mode" direction="in" type="u"/>
-  </method>
-  <method name="SetOLEDLabels">
-    <arg name="device_path" direction="in" type="s"/>
-    <arg name="labels" direction="in" type="as"/>
-  </method>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Shell.AudioDeviceSelection.xml

@@ -1,12 +0,0 @@
-<node>
-  <interface name="org.gnome.Shell.AudioDeviceSelection">
-    <method name="Open">
-      <arg name="devices" direction="in" type="as"/>
-    </method>
-    <method name="Close">
-    </method>
-    <signal name="DeviceSelected">
-      <arg name="device" type="s"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Shell.Extensions.xml

@@ -1,205 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Shell.Extensions:
-      @short_description: Extensions interface
-
-      The interface used to query and manage extensions.
-  -->
-  <interface name="org.gnome.Shell.Extensions">
-
-    <!--
-        ListExtensions:
-        @extensions: A dictionary of extension infos
-
-        Get a list of installed extensions. The returned @extensions
-        dictionary maps extension UUIDs to info vardicts. See
-        GetExtensionInfo() for documentation on possible keys.
-    -->
-    <method name="ListExtensions">
-      <arg type="a{sa{sv}}" direction="out" name="extensions"/>
-    </method>
-
-    <!--
-        GetExtensionInfo:
-        @uuid: The UUID of the extension
-        @info: The returned extension info
-
-        The information returned in the @info vardict depends on the
-        metadata the extension provides, however it is guaranteed to
-        contain the following keys:
-
-        <variablelist>
-          <varlistentry>
-            <term>uuid s</term>
-            <listitem><para>The UUID of the extension</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>name s</term>
-            <listitem><para>The name of the extension</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>description s</term>
-            <listitem><para>
-              A short summary that describes what the extension does
-            </para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>shell-version as</term>
-            <listitem><para>An array of support shell versions</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>type d</term>
-            <listitem><para>
-              The type of extension:
-              <simplelist>
-                <member>1: SYSTEM</member>
-                <member>2: PER_USER</member>
-              </simplelist>
-            </para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>state d</term>
-            <listitem><para>
-              The state the extension is in:
-              <simplelist>
-                <member>1: ENABLED</member>
-                <member>2: DISABLED</member>
-                <member>3: ERROR</member>
-                <member>4: OUT_OF_DATE</member>
-                <member>5: DOWNLOADING</member>
-                <member>6: INITIALIZED</member>
-                <member>99: UNINSTALLED</member>
-              </simplelist>
-            </para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>path s</term>
-            <listitem><para>The extension directory</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>error s</term>
-            <listitem><para>The most recent error caught in init(), enable() or disable()</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>hasPrefs b</term>
-            <listitem><para>Whether the extension includes preference UI</para></listitem>
-          </varlistentry>
-        </variablelist>
-
-        By convention, many extensions will also include the following keys:
-        <variablelist>
-          <varlistentry>
-            <term>version d</term>
-            <listitem><para>The extension version</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>url s</term>
-            <listitem><para>The URL to the extension homepage or repository</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>settings-schema s</term>
-            <listitem><para>The ID of a bundled GSettings schema</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>gettext-domain s</term>
-            <listitem><para>The domain used for translations</para></listitem>
-          </varlistentry>
-        </variablelist>
-    -->
-    <method name="GetExtensionInfo">
-      <arg type="s" direction="in" name="uuid"/>
-      <arg type="a{sv}" direction="out" name="info"/>
-    </method>
-
-    <!--
-        GetExtensionErrors:
-        @uuid: The UUID of the extension
-        @errors: The returned errors
-
-        Get the list of errors that caused the extension
-        to be in ERROR state.
-    -->
-    <method name="GetExtensionErrors">
-      <arg type="s" direction="in" name="uuid"/>
-      <arg type="as" direction="out" name="errors"/>
-    </method>
-
-    <!--
-        InstallRemoteExtension:
-        @uuid: The UUID of the extension
-        @result: The result of the operation
-
-        Download and install an extension.
-    -->
-    <method name="InstallRemoteExtension">
-      <arg type="s" direction="in" name="uuid"/>
-      <arg type="s" direction="out" name="result"/>
-    </method>
-
-    <!--
-        UninstallExtension:
-        @uuid: The UUID of the extension
-        @success: Whether the operation was successful
-
-        Uninstall an extension.
-    -->
-    <method name="UninstallExtension">
-      <arg type="s" direction="in" name="uuid"/>
-      <arg type="b" direction="out" name="success"/>
-    </method>
-
-    <!--
-        ReloadExtension:
-        @uuid: The UUID of the extension
-
-        Reload an extension.
-    -->
-    <method name="ReloadExtension">
-      <arg type="s" direction="in" name="uuid"/>
-    </method>
-
-    <!--
-        LaunchExtensionPrefs:
-        @uuid: The UUID of the extension
-
-        Launch preferences of an extension.
-    -->
-    <method name="LaunchExtensionPrefs">
-      <arg type="s" direction="in" name="uuid"/>
-    </method>
-
-    <!--
-        CheckForUpdates:
-        Update all extensions for which updates are available
-    -->
-    <method name="CheckForUpdates"/>
-
-    <signal name="ExtensionStatusChanged">
-      <arg type="s" name="uuid"/>
-      <arg type="i" name="state"/>
-      <arg type="s" name="error"/>
-    </signal>
-
-    <!--
-        ShellVersion:
-        The GNOME Shell version
-    -->
-    <property name="ShellVersion" type="s" access="read"/>
-
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Shell.HotplugSniffer.xml

@@ -1,8 +0,0 @@
-<node>
-  <interface name="org.gnome.Shell.HotplugSniffer">
-    <method name="SniffURI">
-      <arg type="s" direction="in"/>
-      <arg type="as" direction="out"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Shell.PerfHelper.xml

@@ -1,13 +0,0 @@
-<node>
-  <interface name="org.gnome.Shell.PerfHelper">
-    <method name="CreateWindow">
-      <arg type="i" direction="in"/>
-      <arg type="i" direction="in"/>
-      <arg type="b" direction="in"/>
-      <arg type="b" direction="in"/>
-      <arg type="b" direction="in"/>
-    </method>
-    <method name="WaitWindows"/>
-    <method name="DestroyWindows"/>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Shell.PortalHelper.xml

@@ -1,19 +0,0 @@
-<node>
-  <interface name="org.gnome.Shell.PortalHelper">
-    <method name="Authenticate">
-      <arg name="connection" type="o" direction="in"/>
-      <arg name="url" type="s" direction="in"/>
-      <arg name="timestamp" type="u" direction="in"/>
-    </method>
-    <method name="Close">
-      <arg name="connection" type="o" direction="in"/>
-    </method>
-    <method name="Refresh">
-      <arg name="connection" type="o" direction="in"/>
-    </method>
-    <signal name="Done">
-      <arg type="o" name="connection"/>
-      <arg type="u" name="result"/>
-    </signal>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Shell.Wacom.PadOsd.xml

@@ -1,8 +0,0 @@
-<node>
-  <interface name="org.gnome.Shell.Wacom.PadOsd">
-    <method name="Show">
-      <arg name="device_node" direction="in" type="o"/>
-      <arg name="edition_mode" direction="in" type="b"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.gnome.Shell.xml

@@ -1,44 +0,0 @@
-<node>
-  <interface name="org.gnome.Shell">
-    <method name="Eval">
-      <arg type="s" direction="in" name="script"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="result"/>
-    </method>
-    <method name="FocusSearch"/>
-    <method name="ShowOSD">
-      <arg type="a{sv}" direction="in" name="params"/>
-    </method>
-    <method name="ShowMonitorLabels">
-      <arg type="a{uv}" direction="in" name="params"/>
-    </method>
-    <method name="ShowMonitorLabels2">
-      <arg type="a{sv}" direction="in" name="params"/>
-    </method>
-    <method name="HideMonitorLabels"/>
-    <method name="FocusApp">
-      <arg type="s" direction="in" name="id"/>
-    </method>
-    <method name="ShowApplications"/>
-    <method name="GrabAccelerator">
-      <arg type="s" direction="in" name="accelerator"/>
-      <arg type="u" direction="in" name="flags"/>
-      <arg type="u" direction="out" name="action"/>
-    </method>
-    <method name="GrabAccelerators">
-      <arg type="a(su)" direction="in" name="accelerators"/>
-      <arg type="au" direction="out" name="actions"/>
-    </method>
-    <method name="UngrabAccelerator">
-      <arg type="u" direction="in" name="action"/>
-      <arg type="b" direction="out" name="success"/>
-    </method>
-    <signal name="AcceleratorActivated">
-      <arg name="action" type="u"/>
-      <arg name="parameters" type="a{sv}"/>
-    </signal>
-    <property name="Mode" type="s" access="read"/>
-    <property name="OverviewActive" type="b" access="readwrite"/>
-    <property name="ShellVersion" type="s" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.gtk.Notifications.xml

@@ -1,13 +0,0 @@
-<node>
-  <interface name="org.gtk.Notifications">
-    <method name="AddNotification">
-      <arg type="s" direction="in"/>
-      <arg type="s" direction="in"/>
-      <arg type="a{sv}" direction="in"/>
-    </method>
-    <method name="RemoveNotification">
-      <arg type="s" direction="in"/>
-      <arg type="s" direction="in"/>
-    </method>
-  </interface>
-</node>

data/dbus-interfaces/org.mpris.MediaPlayer2.Player.xml

@@ -1,12 +0,0 @@
-<node>
-  <interface name="org.mpris.MediaPlayer2.Player">
-    <method name="PlayPause"/>
-    <method name="Next"/>
-    <method name="Previous"/>
-    <property name="CanGoNext" type="b" access="read"/>
-    <property name="CanGoPrevious" type="b" access="read"/>
-    <property name="CanPlay" type="b" access="read"/>
-    <property name="Metadata" type="a{sv}" access="read"/>
-    <property name="PlaybackStatus" type="s" access="read"/>
-  </interface>
-</node>

data/dbus-interfaces/org.mpris.MediaPlayer2.xml

@@ -1,7 +0,0 @@
-<node>
-  <interface name="org.mpris.MediaPlayer2">
-    <method name="Raise"/>
-    <property name="CanRaise" type="b" access="read"/>
-    <property name="DesktopEntry" type="s" access="read"/>
-  </interface>
-</node>

data/gnome-shell-dbus-interfaces.gresource.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/shell/dbus-interfaces">
-    <file preprocess="xml-stripblanks">net.hadess.SensorProxy.xml</file>
-    <file preprocess="xml-stripblanks">net.hadess.SwitcherooControl.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.Application.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.bolt1.Device.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.bolt1.Manager.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.DBus.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.GeoClue2.Agent.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.GeoClue2.Manager.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.impl.portal.Access.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.impl.portal.PermissionStore.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.impl.portal.Request.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.login1.Manager.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.login1.Session.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.login1.User.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.ModemManager1.Modem.Modem3gpp.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.ModemManager1.Modem.ModemCdma.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.ModemManager1.Modem.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.ModemManager.Modem.Cdma.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.ModemManager.Modem.Gsm.Network.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.Notifications.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.PackageKit.Offline.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.realmd.Provider.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.realmd.Realm.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.realmd.Service.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.UPower.Device.xml</file>
-    <file preprocess="xml-stripblanks">org.freedesktop.UPower.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Magnifier.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Magnifier.ZoomRegion.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.ScreenSaver.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.SessionManager.EndSessionDialog.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.SessionManager.Inhibitor.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.SessionManager.Presence.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.SessionManager.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Color.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Power.Screen.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Rfkill.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Wacom.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.AudioDeviceSelection.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.Extensions.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.HotplugSniffer.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.PerfHelper.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.PortalHelper.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.Screencast.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.Screenshot.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.Wacom.PadOsd.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Shell.xml</file>
-    <file preprocess="xml-stripblanks">org.Gtk.MountOperationHandler.xml</file>
-    <file preprocess="xml-stripblanks">org.gtk.Notifications.xml</file>
-    <file preprocess="xml-stripblanks">org.mpris.MediaPlayer2.Player.xml</file>
-    <file preprocess="xml-stripblanks">org.mpris.MediaPlayer2.xml</file>
-  </gresource>
-</gresources>

data/gnome-shell-osk-layouts.gresource.xml

@@ -6,6 +6,7 @@
     <file>be.json</file>
     <file>bg.json</file>
     <file>by.json</file>
+    <file>ca.json</file>
     <file>cz.json</file>
     <file>de.json</file>
     <file>dk.json</file>
@@ -22,7 +23,6 @@
     <file>id.json</file>
     <file>il.json</file>
     <file>in+bolnagri.json</file>
-    <file>in+mal.json</file>
     <file>ir.json</file>
     <file>is.json</file>
     <file>it.json</file>

data/gnome-shell-overrides-migration.desktop.in

@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME settings overrides migration
-NoDisplay=true
-Exec=@libexecdir@/gnome-shell-overrides-migration.sh

data/gnome-shell-theme.gresource.xml

@@ -11,9 +11,12 @@
     <file>close-window.svg</file>
     <file>close-window-active.svg</file>
     <file>close-window-hover.svg</file>
+    <file>close.svg</file>
     <file>corner-ripple-ltr.png</file>
     <file>corner-ripple-rtl.png</file>
     <file>dash-placeholder.svg</file>
+    <file>filter-selected-ltr.svg</file>
+    <file>filter-selected-rtl.svg</file>
     <file>gnome-shell.css</file>
     <file>gnome-shell-high-contrast.css</file>
     <file>key-enter.svg</file>
@@ -22,6 +25,7 @@
     <file>key-shift.svg</file>
     <file>key-shift-uppercase.svg</file>
     <file>key-shift-latched-uppercase.svg</file>
+    <file>logged-in-indicator.svg</file>
     <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
     <file>no-events.svg</file>
     <file>no-notifications.svg</file>
@@ -32,11 +36,16 @@
     <file>page-indicator-checked.svg</file>
     <file>page-indicator-hover.svg</file>
     <file>process-working.svg</file>
+    <file>running-indicator.svg</file>
+    <file>source-button-border.svg</file>
+    <file>summary-counter.svg</file>
     <file>toggle-off-us.svg</file>
     <file>toggle-off-intl.svg</file>
     <file>toggle-off-hc.svg</file>
     <file>toggle-on-us.svg</file>
     <file>toggle-on-intl.svg</file>
     <file>toggle-on-hc.svg</file>
+    <file>ws-switch-arrow-up.png</file>
+    <file>ws-switch-arrow-down.png</file>
   </gresource>
 </gresources>

data/gnome-shell-wayland.target

@@ -1,5 +0,0 @@
-[Unit]
-Description=GNOME Shell (wayland sync point)
-After=gnome-shell.service
-BindsTo=gnome-shell.service
-Conflicts=gnome-shell-x11.target

data/gnome-shell-x11.target

@@ -1,5 +0,0 @@
-[Unit]
-Description=GNOME Shell (x11 sync point)
-After=gnome-shell.service
-BindsTo=gnome-shell.service
-Conflicts=gnome-shell-wayland.target

data/gnome-shell.service.in

@@ -1,11 +0,0 @@
-[Unit]
-Description=GNOME Shell
-Wants=gnome-session.service
-After=graphical-session-pre.target gnome-session-bus.target
-PartOf=graphical-session.target
-
-[Service]
-Type=dbus
-ExecStart=@bindir@/gnome-shell
-Restart=on-failure
-BusName=org.gnome.Shell

data/meson.build

@@ -41,25 +41,34 @@ foreach service_file : service_files
 endforeach
 
 
-subdir('dbus-interfaces')
+dbus_interfaces = [
+  'org.gnome.Shell.PadOsd.xml',
+  'org.gnome.Shell.Screencast.xml',
+  'org.gnome.Shell.Screenshot.xml',
+  'org.gnome.ShellSearchProvider.xml',
+  'org.gnome.ShellSearchProvider2.xml'
+]
+install_data(dbus_interfaces, install_dir: ifacedir)
+
+
 subdir('theme')
 
-data_resources = [
-  ['dbus-interfaces', []],
-  ['osk-layouts', []],
-  ['theme', theme_deps]
-]
-foreach resource : data_resources
-  gnome.compile_resources(
-    'gnome-shell-' + resource[0],
-    'gnome-shell-@0@.gresource.xml'.format(resource[0]),
-    source_dir: resource[0],
-    dependencies: resource[1],
-    gresource_bundle: true,
-    install: true,
-    install_dir: pkgdatadir
-  )
-endforeach
+theme_resources = gnome.compile_resources(
+  'gnome-shell-theme', 'gnome-shell-theme.gresource.xml',
+  source_dir: 'theme',
+  dependencies: theme_deps,
+  gresource_bundle: true,
+  install: true,
+  install_dir: pkgdatadir
+)
+
+osk_layout_resources = gnome.compile_resources(
+  'gnome-shell-osk-layouts', 'gnome-shell-osk-layouts.gresource.xml',
+  source_dir: 'osk-layouts',
+  gresource_bundle: true,
+  install: true,
+  install_dir: pkgdatadir
+)
 
 perfconf = configuration_data()
 perfconf.set('datadir', datadir)
@@ -83,33 +92,6 @@ schema = configure_file(
   configuration: schemaconf,
   install_dir: schemadir
 )
-install_data('00_org.gnome.shell.gschema.override', install_dir: schemadir)
-
-overrides_migration_conf = configuration_data()
-overrides_migration_conf.set('libexecdir', libexecdir)
-overrides_migration = configure_file(
-  input: 'gnome-shell-overrides-migration.desktop.in',
-  output: 'gnome-shell-overrides-migration.desktop',
-  configuration: overrides_migration_conf,
-  install_dir: autostartdir
-)
-
-if have_systemd
-  unitconf = configuration_data()
-  unitconf.set('bindir', bindir)
-
-  unit = configure_file(
-    input: 'gnome-shell.service.in',
-    output: 'gnome-shell.service',
-    configuration: unitconf,
-    install_dir: systemduserunitdir
-  )
-
-  units = files('gnome-shell-wayland.target',
-                'gnome-shell-x11.target')
-
-  install_data(units, install_dir: systemduserunitdir)
-endif
 
 # for unit tests - gnome.compile_schemas() only looks in srcdir
 custom_target('compile-schemas',

data/org.gnome.Shell.Screenshot.xml

@@ -91,23 +91,6 @@
       <arg type="s" direction="out" name="filename_used"/>
     </method>
 
-    <!--
-        PickColor:
-
-        Picks a color and returns the result.
-
-        The @result vardict contains:
-        <variablelist>
-          <varlistentry>
-            <term>color (ddd)</term>
-            <listitem><para>The color, RGB values in the range [0,1].</para></listitem>
-          </varlistentry>
-        </variablelist>
-    -->
-    <method name="PickColor">
-      <arg type="a{sv}" direction="out" name="result"/>
-    </method>
-
     <!--
         FlashArea:
         @x: the X coordinate of the area to flash

data/org.gnome.shell.gschema.xml.in

@@ -190,7 +190,6 @@
     </key>
   </schema>
 
-  <!-- unused, change 00_org.gnome.shell.gschema.override instead -->
   <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
 	  gettext-domain="@GETTEXT_PACKAGE@">
     <key name="attach-modal-dialogs" type="b">

data/osk-layouts/ca.json

@@ -6,109 +6,132 @@
       "rows": [
         [
           [
-            "െ"
+            "q"
           ],
           [
-            "ൌ"
+            "w"
           ],
           [
-            "ൈ"
+            "e",
+            "é",
+            "è",
+            "ê",
+            "ë",
+            "%",
+            "ę",
+            "ė",
+            "ē"
           ],
           [
-            "ാ"
+            "r"
           ],
           [
-            "ീ"
+            "t"
           ],
           [
-            "ൂ"
+            "y",
+            "%",
+            "ÿ"
           ],
           [
-            "ബ"
+            "u",
+            "ù",
+            "û",
+            "%",
+            "ü",
+            "ú",
+            "ū"
           ],
           [
-            "ഹ"
+            "i",
+            "î",
+            "%",
+            "ï",
+            "ì",
+            "í",
+            "į",
+            "ī"
           ],
           [
-            "ഗ"
+            "o",
+            "ô",
+            "œ",
+            "%",
+            "ö",
+            "ò",
+            "ó",
+            "õ",
+            "ø",
+            "ō",
+            "º"
           ],
           [
-            "ദ"
-          ],
-          [
-            "ജ"
-          ],
-          [
-            "ഡ"
-          ],
-          [
-            "‍"
+            "p"
           ]
         ],
         [
           [
-            "ോ"
+            "a",
+            "à",
+            "â",
+            "%",
+            "æ",
+            "á",
+            "ä",
+            "ã",
+            "å",
+            "ā",
+            "ª"
           ],
           [
-            "േ"
+            "s"
           ],
           [
-            "്"
+            "d"
           ],
           [
-            "ി"
+            "f"
           ],
           [
-            "ു"
+            "g"
           ],
           [
-            "പ"
+            "h"
           ],
           [
-            "ര"
+            "j"
           ],
           [
-            "ക"
+            "k"
           ],
           [
-            "ത"
-          ],
-          [
-            "ച"
-          ],
-          [
-            "ട"
+            "l"
           ]
         ],
         [
           [
-            "െ"
+            "z"
           ],
           [
-            "ം"
+            "x"
           ],
           [
-            "മ",
-            "ç"
+            "c",
+            "ç",
+            "ć",
+            "č"
           ],
           [
-            "ന"
+            "v"
           ],
           [
-            "വ"
+            "b"
           ],
           [
-            "ല",
-            "ñ"
+            "n"
           ],
           [
-            "സ"
-          ],
-          [
-            "ഷ"
-          ],
-          [
-            "യ"
+            "m"
           ]
         ],
         [
@@ -138,104 +161,132 @@
       "rows": [
         [
           [
-            "ഔ"
+            "Q"
           ],
           [
-            "ഐ"
+            "W"
           ],
           [
-            "ആ"
+            "E",
+            "É",
+            "È",
+            "Ê",
+            "Ë",
+            "%",
+            "Ę",
+            "Ė",
+            "Ē"
           ],
           [
-            "ഈ"
+            "R"
           ],
           [
-            "ഊ"
+            "T"
           ],
           [
-            "ഭ"
+            "Y",
+            "%",
+            "Ÿ"
           ],
           [
-            "ങ"
+            "U",
+            "Ù",
+            "Û",
+            "%",
+            "Ü",
+            "Ú",
+            "Ū"
           ],
           [
-            "ഘ"
+            "I",
+            "Î",
+            "%",
+            "Ï",
+            "Ì",
+            "Í",
+            "Į",
+            "Ī"
           ],
           [
-            "ധ"
+            "O",
+            "Ô",
+            "Œ",
+            "%",
+            "Ö",
+            "Ò",
+            "Ó",
+            "Õ",
+            "Ø",
+            "Ō",
+            "º"
           ],
           [
-            "ഝ"
-          ],
-          [
-            "ഢ"
-          ],
-          [
-            "ഞ"
+            "P"
           ]
         ],
         [
           [
-            "ഓ"
+            "A",
+            "À",
+            "Â",
+            "%",
+            "Æ",
+            "Á",
+            "Ä",
+            "Ã",
+            "Å",
+            "Ā",
+            "ª"
           ],
           [
-            "ഏ"
+            "S"
           ],
           [
-            "അ"
+            "D"
           ],
           [
-            "ഇ"
+            "F"
           ],
           [
-            "ഉ"
+            "G"
           ],
           [
-            "ഫ"
+            "H"
           ],
           [
-            "റ"
+            "J"
           ],
           [
-            "ഖ"
+            "K"
           ],
           [
-            "ഥ"
-          ],
-          [
-            "ഛ"
-          ],
-          [
-            "ഠ"
+            "L"
           ]
         ],
         [
           [
-            "എ"
+            "Z"
           ],
           [
-            "​"
+            "X"
           ],
           [
-            "ണ"
+            "C",
+            "Ç",
+            "Ć",
+            "Č"
           ],
           [
-            "ന"
+            "V"
           ],
           [
-            "ഴ"
+            "B"
           ],
           [
-            "ള"
+            "N"
           ],
           [
-            "ശ"
-          ],
-          [
-            "ഷ"
-          ],
-          [
-            "യ"
+            "M"
           ]
         ],
         [
@@ -265,7 +316,6 @@
       "rows": [
         [
           [
-            "൧",
             "1",
             "¹",
             "½",
@@ -274,47 +324,38 @@
             "⅛"
           ],
           [
-            "൨",
             "2",
             "²",
             "⅔"
           ],
           [
-            "൩",
             "3",
             "³",
             "¾",
             "⅜"
           ],
           [
-            "൪",
             "4",
             "⁴"
           ],
           [
-            "൫",
             "5",
             "⅝"
           ],
           [
-            "൬",
             "6"
           ],
           [
-            "൭",
             "7",
             "⅞"
           ],
           [
-            "൮",
             "8"
           ],
           [
-            "൯",
             "9"
           ],
           [
-            "൦",
             "0",
             "ⁿ",
             "∅"
@@ -328,7 +369,6 @@
             "#"
           ],
           [
-            "₹",
             "$",
             "¢",
             "£",
@@ -554,6 +594,6 @@
       ]
     }
   ],
-  "locale": "ml",
-  "name": "Malayalam"
-}
+  "locale": "fr-CA",
+  "name": "French Canada"
+}

data/osk-layouts/fr.json

@@ -6,10 +6,20 @@
       "rows": [
         [
           [
-            "q"
+            "a",
+            "à",
+            "â",
+            "%",
+            "æ",
+            "á",
+            "ä",
+            "ã",
+            "å",
+            "ā",
+            "ª"
           ],
           [
-            "w"
+            "z"
           ],
           [
             "e",
@@ -71,17 +81,7 @@
         ],
         [
           [
-            "a",
-            "à",
-            "â",
-            "%",
-            "æ",
-            "á",
-            "ä",
-            "ã",
-            "å",
-            "ā",
-            "ª"
+            "q"
           ],
           [
             "s"
@@ -106,11 +106,14 @@
           ],
           [
             "l"
+          ],
+          [
+            "m"
           ]
         ],
         [
           [
-            "z"
+            "w"
           ],
           [
             "x"
@@ -131,7 +134,11 @@
             "n"
           ],
           [
-            "m"
+            "'",
+            "‘",
+            "’",
+            "‹",
+            "›"
           ]
         ],
         [
@@ -161,10 +168,20 @@
       "rows": [
         [
           [
-            "Q"
+            "A",
+            "À",
+            "Â",
+            "%",
+            "Æ",
+            "Á",
+            "Ä",
+            "Ã",
+            "Å",
+            "Ā",
+            "ª"
           ],
           [
-            "W"
+            "Z"
           ],
           [
             "E",
@@ -226,17 +243,7 @@
         ],
         [
           [
-            "A",
-            "À",
-            "Â",
-            "%",
-            "Æ",
-            "Á",
-            "Ä",
-            "Ã",
-            "Å",
-            "Ā",
-            "ª"
+            "Q"
           ],
           [
             "S"
@@ -261,11 +268,14 @@
           ],
           [
             "L"
+          ],
+          [
+            "M"
           ]
         ],
         [
           [
-            "Z"
+            "W"
           ],
           [
             "X"
@@ -286,7 +296,11 @@
             "N"
           ],
           [
-            "M"
+            "'",
+            "‘",
+            "’",
+            "‹",
+            "›"
           ]
         ],
         [
@@ -369,10 +383,10 @@
             "#"
           ],
           [
-            "$",
+            "€",
             "¢",
             "£",
-            "€",
+            "$",
             "¥",
             "₱"
           ],
@@ -511,13 +525,14 @@
             "£"
           ],
           [
+            "¥"
+          ],
+          [
+            "$",
             "¢"
           ],
           [
-            "€"
-          ],
-          [
-            "¥"
+            "¢"
           ],
           [
             "^",
@@ -594,6 +609,6 @@
       ]
     }
   ],
-  "locale": "fr-CA",
-  "name": "French Canada"
+  "locale": "fr",
+  "name": "French"
 }

data/theme/HACKING

@@ -0,0 +1,3 @@
+To generate the css files, from the project directory:
+
+sass --sourcemap=none --update .

data/theme/README

@@ -0,0 +1,31 @@
+Summary
+-------
+
+* Do not edit the CSS directly, edit the source SCSS files and the CSS files will be generated
+  automatically when building with meson + ninja and left inside the build directory to be
+  incorporated into the gresource XML (you'll need to have sassc installed).
+
+How to tweak the theme
+----------------------
+
+Adwaita is a complex theme, so to keep it maintainable it's written and processed in SASS, the
+generated CSS is then transformed into a gresource file during gtk build and used at runtime in a 
+non-legible or editable form.
+
+It is very likely your change will happen in the _common.scss file. That's where all the widget 
+selectors are defined. Here's a rundown of the "supporting" stylesheets, that are unlikely to be the 
+right place for a drive by stylesheet fix:
+
+_colors.scss        - global color definitions. We keep the number of defined colors to a necessary minimum, 
+                      most colors are derived from a handful of basics. It is an exact copy of the gtk+ 
+                      counterpart. Light theme is used for the classic theme and dark is for GNOME3 shell 
+                      default.
+
+_drawing.scss       - drawing helper mixings/functions to allow easier definition of widget drawing under
+                      specific context. This is why Adwaita isn't 15000 LOC.
+
+_common.scss        - actual definitions of style for each widget. This is where you are likely to add/remove
+                      your changes.
+                      
+You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to the
+_common.scss file, you can run ninja to generate the final CSS files.

data/theme/README.md

@@ -1,32 +0,0 @@
-## Summary
-
-Do not edit the CSS directly, edit the source SCSS files and the CSS files
-will be generated automatically when building with meson + ninja and left
-inside the build directory to be incorporated into the gresource XML (you'll
-need to have sassc installed).
-
-## How to tweak the theme
-
-Adwaita is a complex theme, so to keep it maintainable it's written and
-processed in SASS, the generated CSS is then transformed into a gresource
-file during gtk build and used at runtime in a non-legible or editable form.
-
-It is very likely your change will happen in the [_common.scss][common] file.
-That's where all the widget selectors are defined. Here's a rundown of
-the "supporting" stylesheets, that are unlikely to be the right place
-for a drive by stylesheet fix:
-
-| File                     | Description       |
-| ------------------------ | ----------------- |
-| [_colors.scss][colors]   | global color definitions. We keep the number of defined colors to a necessary minimum,  most colors are derived from a handful of basics. It is an exact copy of the gtk+ counterpart. Light theme is used for the classic theme and dark is for GNOME3 shell default. |
-| [_drawing.scss][drawing] | drawing helper mixings/functions to allow easier definition of widget drawing under specific context. This is why Adwaita isn't 15000 LOC. |
-| [_common.scss][common]   | actual definitions of style for each widget. This is where you are likely to add/remove your changes. |
-
-You can read about SASS on its [web page][sass-web]. Once you make your
-changes to the [_common.scss][common] file, you can run ninja to generate the
-final CSS files.
-
-[common]: data/theme/gnome-shell-sass/_common.scss
-[colors]: data/theme/gnome-shell-sass/_colors.scss
-[drawing]: data/theme/gnome-shell-sass/_drawing.scss
-[sass-web]: http://sass-lang.com/documentation/

data/theme/close.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="x_circle_16.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata2399"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2397"><linearGradient
+     id="linearGradient3173"><stop
+       style="stop-color:#c4c4c4;stop-opacity:1;"
+       offset="0"
+       id="stop3175" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop3177" /></linearGradient><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 8 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="16 : 8 : 1"
+     inkscape:persp3d-origin="8 : 5.3333333 : 1"
+     id="perspective2401" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3173"
+     id="linearGradient3179"
+     x1="7.844358"
+     y1="16"
+     x2="7.7198443"
+     y2="-0.062256809"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   inkscape:window-height="713"
+   inkscape:window-width="1197"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="false"
+   inkscape:zoom="32.125"
+   inkscape:cx="8"
+   inkscape:cy="8"
+   inkscape:window-x="40"
+   inkscape:window-y="40"
+   inkscape:current-layer="Foreground" />
+<path
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   d="M10.5,3.5l2,2L10,8l2.5,2.5l-2,2L8,10l-2.5,2.5l-2-2L6,8L3.5,5.5l2-2L8,6L10.5,3.5  z M0,8c0-4.418,3.582-8,8-8s8,3.582,8,8s-3.582,8-8,8S0,12.418,0,8z"
+   id="path2394"
+   style="fill-opacity:1;fill:url(#linearGradient3179)" />
+</svg>

data/theme/filter-selected-ltr.svg

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="20"
+   id="svg10003"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="filter-selected.svg">
+  <defs
+     id="defs10005">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective10011" />
+    <inkscape:perspective
+       id="perspective9998"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="32"
+     inkscape:cy="10.181818"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="994"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata10008">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-44)">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/app-picker.png"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="rect34320"
+       d="m -0.18726572,54.181804 10.55634072,10.55636 10e-6,-21.11269 z"
+       style="opacity:0.21000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>

data/theme/filter-selected-rtl.svg

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="20"
+   id="svg10003"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="filter-selected-ltr.svg">
+  <defs
+     id="defs10005">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective10011" />
+    <inkscape:perspective
+       id="perspective9998"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="32.363636"
+     inkscape:cy="10.181818"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="839"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata10008">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-44)">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/app-picker.png"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="rect34320"
+       d="m 10.369085,54.181804 -10.55634072,10.55636 -1e-5,-21.11269 z"
+       style="opacity:0.21000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>

data/theme/gnome-shell-sass/HACKING

@@ -0,0 +1,6 @@
+--- Generating the css file ---
+
+You need sass to generate the css file.
+
+To generate them run from a command line in the project directory:
+sass --sourcemap=none --update ./

data/theme/gnome-shell-sass/README

@@ -0,0 +1,7 @@
+GNOME Shell Sass is a project intended to allow the sharing of the theme sources in sass between gnome-shell and other projects like gnome-shell-extensions.
+
+License
+=======
+GNOME Shell Sass is distributed under the terms of the GNU General Public License,
+version 2 or later. See the COPYING file for details.
+

data/theme/gnome-shell-sass/README.md

@@ -1,16 +0,0 @@
-# GNOME Shell Sass
-GNOME Shell Sass is a project intended to allow the sharing of the
-theme sources in sass between gnome-shell and other projects like
-gnome-shell-extensions.
-
-Any changes should be done in the [GNOME Shell subtree][shell-subtree]
-and not the stand-alone [gnome-shell-sass repository][sass-repo]. They
-will then be synchronized periodically before releases.
-
-## License
-GNOME Shell Sass is distributed under the terms of the GNU General Public
-License, version 2 or later. See the [COPYING][license] file for details.
-
-[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/master/data/theme/gnome-shell-sass
-[sass-repo]: https://gitlab.gnome.org/GNOME/gnome-shell-sass
-[license]: COPYING

data/theme/gnome-shell-sass/_common.scss

@@ -48,18 +48,17 @@ stage {
   padding: 4px 32px;
   @include button(normal);
   &:focus { @include button(focus); }
-  &:hover { @include button(hover); }
   &:insensitive { @include button(insensitive); }
   &:active { @include button(active); }
+
 }
 
 .modal-dialog-linked-button {
   border-right-width: 1px;
   @include button(normal);
   &:insensitive { @include button(insensitive); }
-  &:focus { @include button(focus); }
-  &:hover { @include button(hover); }
   &:active { @include button(active); }
+  &:focus { @include button(focus); }
   padding: 12px;
 
   &:first-child {
@@ -129,15 +128,12 @@ StScrollBar {
 
 .slider {
   height: 1em;
-  -barlevel-height: 0.3em;
-  -barlevel-background-color: $insensitive_bg_color; //background of the trough
-  -barlevel-border-color: $borders_color; //trough border color
-  -barlevel-active-background-color: $selected_bg_color; //active trough fill
-  -barlevel-active-border-color: darken($selected_bg_color,10%); //active trough border
-  -barlevel-overdrive-color: $destructive_color;
-  -barlevel-overdrive-border-color: darken($destructive_color,10%);
-  -barlevel-overdrive-separator-width: 0.2em;
-  -barlevel-border-width: 1px;
+  -slider-height: 0.3em;
+  -slider-background-color: $insensitive_bg_color; //background of the trough
+  -slider-border-color: $borders_color; //trough border color
+  -slider-active-background-color: $selected_bg_color; //active trough fill
+  -slider-active-border-color: darken($selected_bg_color,10%); //active trough border
+  -slider-border-width: 1px;
   -slider-handle-radius: 6px;
 }
 
@@ -589,11 +585,13 @@ StScrollBar {
   .osd-monitor-label { font-size: 3em; }
   .level {
     height: 0.6em;
-    -barlevel-height: 0.6em;
-    -barlevel-background-color: transparentize(darken($osd_bg_color,15%),0.5);
-    -barlevel-active-background-color: $osd_fg_color;
-    -barlevel-overdrive-color: $destructive_color;
-    -barlevel-overdrive-separator-width: 0.2em;
+    border-radius: 0.3em;
+    background-color: transparentize(darken($osd_bg_color,15%),0.5);
+    color: $osd_fg_color;
+  }
+  .level-bar {
+    background-color: $osd_fg_color;
+    border-radius: 0.3em;
   }
 }
 
@@ -689,6 +687,7 @@ StScrollBar {
     height: 50px;
     background-color: $selected_bg_color;
     color: $selected_fg_color;
+    //background-image: url("resource:///org/gnome/shell/theme/ws-switch-arrow-up.png");
     background-size: 32px;
     border-radius: 8px;
   }
@@ -734,7 +733,6 @@ StScrollBar {
   transition-duration: 500ms;
   font-weight: bold;
   height: 1.86em;
-  font-feature-settings: "tnum";
 
   &.unlock-screen,
   &.login-screen,
@@ -826,8 +824,6 @@ StScrollBar {
 
   .screencast-indicator { color: $warning_color; }
 
-  .remote-access-indicator { color: $warning_color; }
-
   &.solid {
     background-color: black;
     /* transition from transparent to solid */
@@ -962,7 +958,6 @@ StScrollBar {
       padding: 0.1em;
       margin: 2px;
       border-radius: 1.4em;
-      font-feature-settings: "tnum";
       &:hover,&:focus { background-color: lighten($bg_color,5%); }
       &:active,&:selected {
         color: lighten($selected_fg_color,5%);
@@ -1125,7 +1120,6 @@ StScrollBar {
   }
 
   .system-menu-action {
-    -st-icon-style: symbolic;
     color: $fg_color;
     border-radius: 32px; /* wish we could do 50% */
     padding: 13px;
@@ -1794,19 +1788,20 @@ StScrollBar {
   .login-dialog-user-list-view { -st-vfade-offset: 1em; }
   .login-dialog-user-list {
     spacing: 12px;
+    padding: .2em;
     width: 23em;
     &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
     &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
   }
   .login-dialog-user-list-item {
     border-radius: 5px;
-    padding: 6px;
+    padding: .2em;
     color: darken($osd_fg_color,30%);
-    &:ltr .user-widget { padding-right: 1em; }
-    &:rtl .user-widget { padding-left: 1em; }
+    &:ltr { padding-right: 1em; }
+    &:rtl { padding-left: 1em; }
     .login-dialog-timed-login-indicator {
       height: 2px;
-      margin-top: 6px;
+      margin: 2px 0 0 0;
       background-color: $osd_fg_color;
     }
     &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
@@ -1821,8 +1816,8 @@ StScrollBar {
     padding-left: 15px;
   }
     .user-widget-label {
-      &:ltr { padding-left: 14px; }
-      &:rtl { padding-right: 14px; }
+      &:ltr { padding-left: 18px; }
+      &:rtl { padding-right: 18px; }
     }
 
   .login-dialog-prompt-layout {
@@ -1873,7 +1868,6 @@ StScrollBar {
 .screen-shield-clock-time {
   font-size: 72pt;
   text-shadow: 0px 2px 2px rgba(0,0,0,0.4);
-  font-feature-settings: "tnum";
 }
 
 .screen-shield-clock-date { 

data/theme/gnome-shell-sass/_drawing.scss

@@ -150,8 +150,8 @@
   //
   // focused button
   //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
-                          lighten($osd_bg_color,3%));
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
+                          $osd_bg_color);
 
     color: $osd_fg_color;
     text-shadow: 0 1px black;
@@ -164,7 +164,7 @@
   // active osd button
   //
     $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
-                            lighten($osd_bg_color,3%));
+                            lighten($osd_bg_color,10%));
 
     color: white;
     border-color: $osd_borders_color;
@@ -182,7 +182,7 @@
 
     color: white;
     border-color: $osd_borders_color;
-    background-color: $selected_bg_color;
+    background-color: darken($_bg,5%);
     // This should be none, but it's creating some issues with borders, so to
     // workaround it for now, use inset wich goes through a different code path.
     // see https://bugzilla.gnome.org/show_bug.cgi?id=752934

data/theme/key-layout.svg

@@ -14,7 +14,7 @@
    id="svg7384"
    height="32"
    sodipodi:docname="key-layout.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -24,21 +24,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="3440"
-     inkscape:window-height="1376"
+     inkscape:window-width="1919"
+     inkscape:window-height="1011"
      id="namedview19"
      showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="46.246852"
-     inkscape:cy="17.474578"
+     inkscape:zoom="14.75"
+     inkscape:cx="1.220339"
+     inkscape:cy="11.842802"
      inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7384">
-    <inkscape:grid
-       type="xygrid"
-       id="grid861" />
-  </sodipodi:namedview>
+     inkscape:window-y="55"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
   <metadata
      id="metadata90">
     <rdf:RDF>
@@ -96,34 +92,23 @@
      style="display:inline"
      id="g4953" />
   <g
-     style="stroke-width:0.5;enable-background:new"
-     id="g3561"
      inkscape:label="preferences-desktop-locale"
-     transform="matrix(2,0,0,2,135.99464,-895.9793)">
-    <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path3535"
-       d="m -65,450 v 12"
-       style="fill:#e5e5e5;fill-opacity:1;fill-rule:evenodd;stroke:#e5e5e5;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       inkscape:connector-curvature="0"
-       id="path3537"
-       d="m -65,456 h 4 l 1,2 h 5 v -6 h -4 l -1,-2 h -5 z"
-       style="fill:none;fill-rule:evenodd;stroke:#e5e5e5;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="opacity:1;vector-effect:none;fill:#e5e5e5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m -65,456 h 4 l 1,2 h 5 v -6 h -4 l -1,-2 h -5 z"
-       id="path3539"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+     id="g11728"
+     transform="matrix(2,0,0,2,-522.0004,-1086)"
+     style="display:inline;stroke-width:1">
     <rect
-       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.89050001;marker:none;enable-background:new"
-       id="rect3543"
-       y="448"
-       x="-68"
+       style="fill:none;stroke:none;stroke-width:1"
+       id="rect11724"
+       width="16"
        height="16"
-       width="16" />
+       x="20"
+       y="326"
+       transform="translate(241.0002,217)" />
+    <path
+       style="fill:#e5e5e5;fill-opacity:1;stroke:none;stroke-width:1"
+       d="m 265.69612,545.23396 c -3.58218,0 -4.66582,1.39975 -4.66582,1.39975 v 10.04946 c 0,0 1.08364,-1.07673 4.66582,-1.07673 2.9161,0 4.47225,1.07673 7.17818,1.07673 2.08923,0 3.19429,-1.39975 3.19429,-1.39975 v -10.04946 c 0,0 -1.14095,1.04084 -3.23018,1.04084 -3.3734,0 -3.97619,-1.04084 -7.14229,-1.04084 z m 2.93145,2.77148 c 1.32876,0 2.375,1.08037 2.375,2.4375 0,1.35713 -1.04624,2.46875 -2.375,2.46875 -1.32876,0 -2.40625,-1.11162 -2.40625,-2.46875 0,-1.35713 1.07749,-2.4375 2.40625,-2.4375 z m -4.5625,0.96875 0.96875,1.03125 -0.9375,-0.0312 0.9375,1 -0.96875,-0.0312 0.96875,1.03125 -1,-0.0312 0.0312,-1 h -0.0312 l 0.0312,-0.9688 h -0.0312 z m 4.5625,0 c -0.794,0 -1.46875,0.6578 -1.46875,1.46875 0,0.81095 0.67475,1.46875 1.46875,1.46875 0.79399,0 1.4375,-0.6578 1.4375,-1.46875 0,-0.81095 -0.64351,-1.46875 -1.4375,-1.46875 z m 4.375,0 v 1 l 0.0312,0.96875 h -0.0312 l 0.0312,1 -1,0.0312 0.96875,-1.03125 -0.96875,0.0312 0.9375,-1 -0.9375,0.0312 z m -7.9375,2.96875 0.96875,1.03125 -1,-0.0312 z m 6.9375,0 0.0312,1 -1,0.0312 z m -5.9375,1 0.96875,1.03125 -1,-0.0312 z m 4.9375,0 0.0312,1 -1,0.0312 z"
+       id="path11726"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sccssccsssssssccccccccccccsssssccccccccccccccccccccccccccc" />
   </g>
 </svg>

data/theme/logged-in-indicator.svg

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="300"
+   height="80"
+   id="svg7355"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="logged-in-indicator.svg">
+  <metadata
+     id="metadata4175">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#2c1cff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="843"
+     id="namedview4173"
+     showgrid="false"
+     inkscape:zoom="2.8760889"
+     inkscape:cx="106.00403"
+     inkscape:cy="80.68078"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g30864" />
+  <defs
+     id="defs7357">
+    <radialGradient
+       xlink:href="#linearGradient36429"
+       id="radialGradient7461"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.5919312,0,0,0.57582113,-20.687059,48.400487)"
+       cx="47.428951"
+       cy="167.16817"
+       fx="47.428951"
+       fy="167.16817"
+       r="37" />
+    <linearGradient
+       id="linearGradient36429">
+      <stop
+         id="stop36431"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop36433"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient36471"
+       id="radialGradient7463"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891549,0,0,0.55513246,-9.281289,36.12653)"
+       cx="49.067139"
+       cy="242.50381"
+       fx="49.067139"
+       fy="242.50381"
+       r="37.00671" />
+    <linearGradient
+       id="linearGradient36471">
+      <stop
+         id="stop36473"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop36475"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="37.00671"
+       fy="242.50381"
+       fx="49.067139"
+       cy="242.50381"
+       cx="49.067139"
+       gradientTransform="matrix(3.4218418,0,0,0.03365337,-61.309005,138.5071)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7488"
+       xlink:href="#linearGradient36471" />
+  </defs>
+  <g
+     id="layer1"
+     transform="matrix(1.6213276,0,0,1.6213276,-431.6347,-272.5745)">
+    <g
+       style="display:inline"
+       id="g30864"
+       transform="translate(255.223,70.118091)">
+      <rect
+         ry="3.4593496"
+         rx="8.8641119"
+         y="76.159348"
+         x="12.596948"
+         height="71.116341"
+         width="182.22595"
+         id="rect14000"
+         style="opacity:0.371875;fill:url(#radialGradient7461);fill-opacity:1;stroke:none" />
+      <path
+         id="rect34520"
+         d="m 194.80022,146.83551 -182.559919,0"
+         style="opacity:0.35;fill:none;stroke:url(#radialGradient7488);stroke-width:0.61184424;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         connector-curvature="0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+</svg>

data/theme/no-notifications.svg

@@ -13,102 +13,10 @@
    height="64px"
    id="svg3393"
    version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="no-notifications.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 2">
   <defs
-     id="defs3395">
-    <clipPath
-       id="clipPath6262-0"
-       clipPathUnits="userSpaceOnUse">
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
-         id="rect6264-6"
-         width="3.8250003"
-         height="6.3750005"
-         x="26.849981"
-         y="220.75" />
-    </clipPath>
-    <clipPath
-       id="clipPath6258-0"
-       clipPathUnits="userSpaceOnUse">
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
-         id="rect6260-6"
-         width="2.8977275"
-         height="5.3129687"
-         x="26.965673"
-         y="221.28162" />
-    </clipPath>
-    <clipPath
-       id="clipPath6254-6"
-       clipPathUnits="userSpaceOnUse">
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
-         id="rect6256-6"
-         width="1.876245"
-         height="4.8783236"
-         x="26.998718"
-         y="221.50153" />
-    </clipPath>
-    <clipPath
-       id="clipPath8028-3"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -73,-30 -7,-7 v -4.5 h 16.5 v 4.5 l -7.5,7 z"
-         id="path8030-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6810-7-87-7">
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-         id="rect6812-2-4-5"
-         width="14"
-         height="11"
-         x="21"
-         y="281" />
-    </clipPath>
-    <clipPath
-       id="clipPath6262"
-       clipPathUnits="userSpaceOnUse">
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
-         id="rect6264"
-         width="3.8250003"
-         height="6.3750005"
-         x="26.849981"
-         y="220.75" />
-    </clipPath>
-    <clipPath
-       id="clipPath6258"
-       clipPathUnits="userSpaceOnUse">
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
-         id="rect6260"
-         width="2.8977275"
-         height="5.3129687"
-         x="26.965673"
-         y="221.28162" />
-    </clipPath>
-    <clipPath
-       id="clipPath6254"
-       clipPathUnits="userSpaceOnUse">
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
-         id="rect6256"
-         width="1.876245"
-         height="4.8783236"
-         x="26.998718"
-         y="221.50153" />
-    </clipPath>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3951"
-       is_visible="true" />
-  </defs>
+     id="defs3395" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -116,17 +24,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="125.08157"
-     inkscape:cy="-13.805087"
+     inkscape:zoom="5.5"
+     inkscape:cx="32"
+     inkscape:cy="32"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1664"
-     inkscape:window-height="1034"
-     inkscape:window-x="1479"
-     inkscape:window-y="252"
+     inkscape:window-width="697"
+     inkscape:window-height="613"
+     inkscape:window-x="100"
+     inkscape:window-y="77"
      inkscape:window-maximized="0" />
   <metadata
      id="metadata3398">
@@ -146,7 +54,7 @@
      inkscape:groupmode="layer">
     <g
        style="display:inline"
-       transform="matrix(4,0,0,4,-79.702662,-0.35415646)"
+       transform="matrix(4,0,0,4,0.29733827,-0.35415646)"
        id="g19245">
       <g
          id="g19247"
@@ -163,15 +71,15 @@
          transform="translate(-323.02908,-649.02581)">
         <path
            inkscape:connector-curvature="0"
-           d="m 331.9377,653 c 0.0187,0.16677 0.0625,0.32822 0.0625,0.5 0,2.48528 -2.01472,4.5 -4.5,4.5 -0.11769,0 -0.22834,-0.0224 -0.34375,-0.0312 v 2.21875 c 0,1.00412 0.80838,1.8125 1.8125,1.8125 l 1.54511,-5e-5 2,2.04688 2.0625,-2.04688 h 1.61114 c 1.00413,0 1.8125,-0.80838 1.8125,-1.8125 v -5.375 c 0,-1.00412 -0.80837,-1.8125 -1.8125,-1.8125 z"
+           d="m 331.9377,653 c 0.0187,0.16677 0.0625,0.32822 0.0625,0.5 0,2.48528 -2.01472,4.5 -4.5,4.5 -0.11769,0 -0.22834,-0.0224 -0.34375,-0.0312 l 0,2.21875 c 0,1.00412 0.80838,1.8125 1.8125,1.8125 l 1.54511,-5e-5 2,2.04688 2.0625,-2.04688 1.61114,0 c 1.00413,0 1.8125,-0.80838 1.8125,-1.8125 l 0,-5.375 c 0,-1.00412 -0.80837,-1.8125 -1.8125,-1.8125 z"
            id="path19253"
            sodipodi:nodetypes="csscsscccssssc"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#c3c3c3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+           style="opacity:0.5;color:#000000;fill:#c3c3c3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <path
            inkscape:connector-curvature="0"
-           d="m 327.5002,650 c -1.933,0 -3.5,1.567 -3.5,3.5 0,1.933 1.567,3.5 3.5,3.5 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m -0.53125,1 h 1.03125 l -0.0625,1.375 a 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.125,0.125 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 l 1.15625,-0.75 0.5,0.90625 -1.21875,0.625 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0.0937 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0625 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0312 l 1.25,0.625 -0.53125,0.90625 -1.15625,-0.781 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,0 0.19951718,0.19951718 0 0 0 -0.125,0.0937 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0,0.0625 L 328.0002,656 h -1.03125 l 0.0937,-1.375 a 0.19951718,0.19951718 0 0 0 -0.0312,-0.0937 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0937,0.0312 l -1.1875,0.78125 -0.5,-0.90625 1.25,-0.625 a 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0312,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 l -1.25,-0.625 0.5,-0.90625 1.1875,0.75 a 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 z"
+           d="m 327.5002,650 c -1.933,0 -3.5,1.567 -3.5,3.5 0,1.933 1.567,3.5 3.5,3.5 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m -0.53125,1 1.03125,0 -0.0625,1.375 a 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.125,0.125 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 l 1.15625,-0.75 0.5,0.90625 -1.21875,0.625 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0.0937 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0625 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0312 l 1.25,0.625 -0.53125,0.90625 -1.15625,-0.781 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,0 0.19951718,0.19951718 0 0 0 -0.125,0.0937 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0,0.0625 l 0.0625,1.3751 -1.03125,0 0.0937,-1.375 a 0.19951718,0.19951718 0 0 0 -0.0312,-0.0937 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0937,0.0312 l -1.1875,0.78125 -0.5,-0.90625 1.25,-0.625 a 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0312,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 l -1.25,-0.625 0.5,-0.90625 1.1875,0.75 a 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 L 326.96895,651 z"
            id="path19255"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate" />
+           style="color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       </g>
       <g
          id="g19257"
@@ -202,22 +110,5 @@
          style="display:inline"
          transform="translate(-323.02908,-649.02581)" />
     </g>
-    <g
-       style="opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
-       inkscape:label="preferences-system-notifications"
-       id="g13967"
-       transform="matrix(4,0,0,4,-1044.0008,-2172)">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 268.94244,544.94838 c -2.20914,0 -3.33013,1.5 -4,4 l -1,5 c -0.10831,0.54156 -0.44772,1 -1,1 v 1 h 12 v -1 c -0.55229,0 -0.89169,-0.45844 -1,-1 l -1,-5 c -0.53033,-2.5 -1.79086,-4 -4,-4 z"
-         id="path40220"
-         sodipodi:nodetypes="ccsccccscc"
-         style="opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 269.11822,556.94838 a 1.5,1.5 0 0 0 1.41211,1 1.5,1.5 0 0 0 1.41211,-1 z"
-         id="path40774"
-         style="opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal" />
-    </g>
   </g>
 </svg>

data/theme/source-button-border.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="21"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="source-button-border.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="44.8"
+     inkscape:cx="8.704132"
+     inkscape:cy="5.7029946"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="1145"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     guidetolerance="10000"
+     objecttolerance="10000">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3792"
+       empspacing="10"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3796"
+       width="19"
+       height="2"
+       x="1"
+       y="8" />
+  </g>
+</svg>

data/theme/summary-counter.svg

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="32"
+   height="32"
+   viewBox="0 0 23.272727 23.272727"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="summary-counter.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+     id="metadata2399"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs2397"><linearGradient
+       id="linearGradient3173"><stop
+         style="stop-color:#c4c4c4;stop-opacity:1;"
+         offset="0"
+         id="stop3175" /><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3177" /></linearGradient><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2401" /><filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter16494-4"
+       x="-0.20989846"
+       width="1.4197969"
+       y="-0.20903821"
+       height="1.4180764"><feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3282637"
+         id="feGaussianBlur16496-8" /></filter><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16498-6"
+       id="radialGradient16504-1"
+       cx="7.6582627"
+       cy="5.8191104"
+       fx="7.6582627"
+       fy="5.8191104"
+       r="8.6928644"
+       gradientTransform="matrix(1.0474339,0,0,1.0517402,-0.3632615,-0.42032492)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient16498-6"><stop
+         style="stop-color:#9FD0FF;stop-opacity:1"
+         offset="0"
+         id="stop16500-8" /><stop
+         style="stop-color:#3465A4;stop-opacity:1"
+         offset="1"
+         id="stop16502-0" /></linearGradient></defs><sodipodi:namedview
+     inkscape:window-height="709"
+     inkscape:window-width="1366"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#000000"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="11.313708"
+     inkscape:cx="15.386407"
+     inkscape:cy="13.739577"
+     inkscape:window-x="0"
+     inkscape:window-y="1179"
+     inkscape:current-layer="g16402-8"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="1"><inkscape:grid
+       type="xygrid"
+       id="grid11246"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><g
+     style="display:inline"
+     id="g16402-8"
+     transform="translate(4.7533483,2.8238929)"><g
+       id="g3175-4"
+       transform="translate(-0.89995416,0.94028614)"><path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0"
+         inkscape:original="M 7.65625 0.125 C 3.2589349 0.125 -0.3125 3.7070002 -0.3125 8.125 C -0.3125 12.543001 3.2589349 16.125 7.65625 16.125 C 12.053566 16.125 15.625 12.543001 15.625 8.125 C 15.625 3.7070002 12.053566 0.125 7.65625 0.125 z "
+         xlink:href="#path2394-32"
+         style="opacity:0.52994014;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.18181825;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16494-4);enable-background:accumulate"
+         id="path16480-5"
+         inkscape:href="#path2394-32"
+         d="m 7.65625,0.125 c -4.3973151,0 -7.96875,3.5820002 -7.96875,8 0,4.418001 3.5714349,8 7.96875,8 4.397316,0 7.96875,-3.581999 7.96875,-8 0,-4.4179998 -3.571434,-8 -7.96875,-8 z"
+         transform="translate(0,1.028519)" /><path
+         clip-rule="evenodd"
+         d="m -0.30428257,8.1237596 c 0,-4.4179998 3.56522987,-7.9999996 7.96254497,-7.9999996 4.3973156,0 7.9625456,3.5819998 7.9625456,7.9999996 0,4.4180014 -3.56523,8.0000004 -7.9625456,8.0000004 -4.3973151,0 -7.96254497,-3.581999 -7.96254497,-8.0000004 z"
+         id="path2394-32"
+         style="color:#000000;fill:url(#radialGradient16504-1);fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1.4545455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0" /><g
+         id="g3172-6" /></g></g></svg>

docs/reference/shell/meson.build

@@ -24,7 +24,7 @@ ifaces = [
 ]
 foreach iface : ifaces
   custom_target(iface[0] + ' docs',
-    input: '../../../data/dbus-interfaces/@0@.xml'.format(iface[0]),
+    input: '../../../data/@0@.xml'.format(iface[0]),
     output: 'doc-gen-' + iface[1],
     command: [
       'gdbus-codegen',
@@ -50,7 +50,8 @@ gnome.gtkdoc('shell',
     join_paths(meson.build_root(), 'src')
   ],
   scan_args: [
-    '--ignore-headers=' + ' '.join(private_headers + exclude_directories)
+    '--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+    '--rebuild-types'
   ],
   install: true
 )

docs/reference/st/meson.build

@@ -17,7 +17,8 @@ gnome.gtkdoc('st',
   ],
   scan_args: [
     '--ignore-headers=' + ' '.join(private_headers),
-    '--rebuild-sections'
+    '--rebuild-sections',
+    '--rebuild-types'
   ],
   install: true
 )

js/extensionPrefs/main.js

@@ -13,9 +13,17 @@ const _ = Gettext.gettext;
 
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
-const { loadInterfaceXML } = imports.misc.fileUtils;
 
-const GnomeShellIface = loadInterfaceXML('org.gnome.Shell.Extensions');
+const GnomeShellIface = '<node> \
+<interface name="org.gnome.Shell.Extensions"> \
+<signal name="ExtensionStatusChanged"> \
+    <arg type="s" name="uuid"/> \
+    <arg type="i" name="state"/> \
+    <arg type="s" name="error"/> \
+</signal> \
+</interface> \
+</node>';
+
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
 
 function stripPrefix(string, prefix) {

js/gdm/fingerprint.js

@@ -5,14 +5,13 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const FprintManagerIface = `
-<node>
-<interface name="net.reactivated.Fprint.Manager">
-<method name="GetDefaultDevice">
-    <arg type="o" direction="out" />
-</method>
-</interface>
-</node>`;
+const FprintManagerIface = '<node> \
+<interface name="net.reactivated.Fprint.Manager"> \
+<method name="GetDefaultDevice"> \
+    <arg type="o" direction="out" /> \
+</method> \
+</interface> \
+</node>';
 
 const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface);
 

js/gdm/loginDialog.js

@@ -25,6 +25,7 @@ const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
@@ -85,8 +86,7 @@ var UserListItem = new Lang.Class({
                                              GObject.BindingFlags.SYNC_CREATE);
 
         this._timedLoginIndicator = new St.Bin({ style_class: 'login-dialog-timed-login-indicator',
-                                                 scale_x: 0,
-                                                 visible: false });
+                                                 scale_x: 0 });
         layout.add(this._timedLoginIndicator);
 
         this.actor.connect('clicked', this._onClicked.bind(this));
@@ -126,8 +126,6 @@ var UserListItem = new Lang.Class({
 
         this.hideTimedLoginIndicator();
 
-        this._timedLoginIndicator.visible = true;
-
         let startTime = GLib.get_monotonic_time();
 
         this._timedLoginTimeoutId = GLib.timeout_add (GLib.PRIORITY_DEFAULT, 33,
@@ -154,8 +152,6 @@ var UserListItem = new Lang.Class({
             GLib.source_remove(this._timedLoginTimeoutId);
             this._timedLoginTimeoutId = 0;
         }
-
-        this._timedLoginIndicator.visible = false;
         this._timedLoginIndicator.scale_x = 0.;
     }
 });
@@ -995,81 +991,59 @@ var LoginDialog = new Lang.Class({
         return hold;
     },
 
+    _showTimedLoginAnimation() {
+        this._timedLoginItem.actor.grab_key_focus();
+        return this._timedLoginItem.showTimedLoginIndicator(this._timedLoginAnimationTime);
+    },
+
     _blockTimedLoginUntilIdle() {
+        // This blocks timed login from starting until a few
+        // seconds after the user stops interacting with the
+        // login screen.
+        //
+        // We skip this step if the timed login delay is very
+        // short.
+        if ((this._timedLoginDelay - _TIMED_LOGIN_IDLE_THRESHOLD) <= 0)
+          return null;
+
         let hold = new Batch.Hold();
 
-        this._timedLoginIdleTimeOutId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, _TIMED_LOGIN_IDLE_THRESHOLD,
+        this._timedLoginIdleTimeOutId = Mainloop.timeout_add_seconds(_TIMED_LOGIN_IDLE_THRESHOLD,
             () => {
-                this._timedLoginIdleTimeOutId = 0;
+                this._timedLoginAnimationTime -= _TIMED_LOGIN_IDLE_THRESHOLD;
                 hold.release();
                 return GLib.SOURCE_REMOVE;
             });
-        GLib.Source.set_name_by_id(this._timedLoginIdleTimeOutId, '[gnome-shell] this._timedLoginIdleTimeOutId');
+        GLib.Source.set_name_by_id(this._timedLoginIdleTimeOutId, '[gnome-shell] this._timedLoginAnimationTime');
         return hold;
     },
 
     _startTimedLogin(userName, delay) {
-        let firstRun = true;
-
-        // Cancel execution of old batch
-        if (this._timedLoginBatch) {
-            this._timedLoginBatch.cancel();
-            this._timedLoginBatch = null;
-            firstRun = false;
-        }
-
-        // Reset previous idle-timeout
-        if (this._timedLoginIdleTimeOutId) {
-            GLib.source_remove(this._timedLoginIdleTimeOutId);
-            this._timedLoginIdleTimeOutId = 0;
-        }
-
-        let loginItem = null;
-        let animationTime;
+        this._timedLoginItem = null;
+        this._timedLoginDelay = delay;
+        this._timedLoginAnimationTime = delay;
 
         let tasks = [() => this._waitForItemForUser(userName),
 
                      () => {
-                         loginItem = this._userList.getItemFromUserName(userName);
-
-                         // If there is an animation running on the item, reset it.
-                         loginItem.hideTimedLoginIndicator();
+                         this._timedLoginItem = this._userList.getItemFromUserName(userName);
                      },
 
                      () => {
-                         // If we're just starting out, start on the right item.
+                         // If we're just starting out, start on the right
+                         // item.
                          if (!this._userManager.is_loaded) {
-                             this._userList.jumpToItem(loginItem);
+                             this._userList.jumpToItem(this._timedLoginItem);
                          }
                      },
 
+                     this._blockTimedLoginUntilIdle,
+
                      () => {
-                         // This blocks the timed login animation until a few
-                         // seconds after the user stops interacting with the
-                         // login screen.
-
-                         // We skip this step if the timed login delay is very short.
-                         if (delay > _TIMED_LOGIN_IDLE_THRESHOLD) {
-                             animationTime = delay - _TIMED_LOGIN_IDLE_THRESHOLD;
-                             return this._blockTimedLoginUntilIdle();
-                         } else {
-                             animationTime = delay;
-                         }
+                         this._userList.scrollToItem(this._timedLoginItem);
                      },
 
-                     () => {
-                         // If idle timeout is done, make sure the timed login indicator is shown
-                         if (delay > _TIMED_LOGIN_IDLE_THRESHOLD &&
-                             this._authPrompt.actor.visible)
-                             this._authPrompt.cancel();
-
-                         if (delay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) {
-                             this._userList.scrollToItem(loginItem);
-                             loginItem.actor.grab_key_focus();
-                         }
-                     },
-
-                     () => loginItem.showTimedLoginIndicator(animationTime),
+                     this._showTimedLoginAnimation,
 
                      () => {
                          this._timedLoginBatch = null;
@@ -1081,17 +1055,37 @@ var LoginDialog = new Lang.Class({
         return this._timedLoginBatch.run();
     },
 
-    _onTimedLoginRequested(client, userName, seconds) {
-        if (this._timedLoginBatch)
-            return;
+    _resetTimedLogin() {
+        if (this._timedLoginBatch) {
+            this._timedLoginBatch.cancel();
+            this._timedLoginBatch = null;
+        }
 
+        if (this._timedLoginItem)
+            this._timedLoginItem.hideTimedLoginIndicator();
+
+        let userName = this._timedLoginItem.user.get_user_name();
+
+        if (userName)
+            this._startTimedLogin(userName, this._timedLoginDelay);
+    },
+
+    _onTimedLoginRequested(client, userName, seconds) {
         this._startTimedLogin(userName, seconds);
 
-        // Restart timed login on user interaction
         global.stage.connect('captured-event', (actor, event) => {
+           if (this._timedLoginDelay == undefined)
+               return Clutter.EVENT_PROPAGATE;
+
            if (event.type() == Clutter.EventType.KEY_PRESS ||
                event.type() == Clutter.EventType.BUTTON_PRESS) {
-               this._startTimedLogin(userName, seconds);
+               if (this._timedLoginBatch) {
+                   this._timedLoginBatch.cancel();
+                   this._timedLoginBatch = null;
+               }
+           } else if (event.type() == Clutter.EventType.KEY_RELEASE ||
+                      event.type() == Clutter.EventType.BUTTON_RELEASE) {
+               this._resetTimedLogin();
            }
 
            return Clutter.EVENT_PROPAGATE;

js/gdm/oVirt.js

@@ -4,14 +4,13 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 
-const OVirtCredentialsIface = `
-<node>
-<interface name="org.ovirt.vdsm.Credentials">
-<signal name="UserAuthenticated">
-    <arg type="s" name="token"/>
-</signal>
-</interface>
-</node>`;
+const OVirtCredentialsIface = '<node> \
+<interface name="org.ovirt.vdsm.Credentials"> \
+<signal name="UserAuthenticated"> \
+    <arg type="s" name="token"/> \
+</signal> \
+</interface> \
+</node>';
 
 const OVirtCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(OVirtCredentialsIface);
 

js/gdm/realmd.js

@@ -5,15 +5,58 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const { loadInterfaceXML } = imports.misc.fileUtils;
-
-const ProviderIface = loadInterfaceXML("org.freedesktop.realmd.Provider");
+const ProviderIface = '<node> \
+<interface name="org.freedesktop.realmd.Provider"> \
+    <property name="Name" type="s" access="read"/> \
+    <property name="Version" type="s" access="read"/> \
+    <property name="Realms" type="ao" access="read"/> \
+    <method name="Discover"> \
+        <arg name="string" type="s" direction="in"/> \
+        <arg name="options" type="a{sv}" direction="in"/> \
+        <arg name="relevance" type="i" direction="out"/> \
+        <arg name="realm" type="ao" direction="out"/> \
+    </method> \
+</interface> \
+</node>';
 const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface);
 
-const ServiceIface = loadInterfaceXML("org.freedesktop.realmd.Service");
+const ServiceIface = '<node> \
+<interface name="org.freedesktop.realmd.Service"> \
+    <method name="Cancel"> \
+        <arg name="operation" type="s" direction="in"/> \
+    </method> \
+    <method name="Release" /> \
+    <method name="SetLocale"> \
+        <arg name="locale" type="s" direction="in"/> \
+    </method> \
+    <signal name="Diagnostics"> \
+        <arg name="data" type="s"/> \
+        <arg name="operation" type="s"/> \
+    </signal> \
+</interface> \
+</node>';
 const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface);
 
-const RealmIface = loadInterfaceXML("org.freedesktop.realmd.Realm");
+const RealmIface = '<node> \
+<interface name="org.freedesktop.realmd.Realm"> \
+    <property name="Name" type="s" access="read"/> \
+    <property name="Configured" type="s" access="read"/> \
+    <property name="Details" type="a(ss)" access="read"/> \
+    <property name="LoginFormats" type="as" access="read"/> \
+    <property name="LoginPolicy" type="s" access="read"/> \
+    <property name="PermittedLogins" type="as" access="read"/> \
+    <property name="SupportedInterfaces" type="as" access="read"/> \
+    <method name="ChangeLoginPolicy"> \
+        <arg name="login_policy" type="s" direction="in"/> \
+        <arg name="permitted_add" type="as" direction="in"/> \
+        <arg name="permitted_remove" type="as" direction="in"/> \
+        <arg name="options" type="a{sv}" direction="in"/> \
+    </method> \
+    <method name="Deconfigure"> \
+        <arg name="options" type="a{sv}" direction="in"/> \
+    </method> \
+</interface> \
+</node>';
 const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);
 
 var Manager = new Lang.Class({

js/gdm/util.js

@@ -350,19 +350,16 @@ var ShellUserVerifier = new Lang.Class({
         try {
             this._clearUserVerifier();
             this._userVerifier = client.open_reauthentication_channel_finish(result);
-        } catch(e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                return;
-            if (e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+            return;
+        } catch(e if e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
                 !this._reauthOnly) {
-                // Gdm emits org.freedesktop.DBus.Error.AccessDenied when there
-                // is no session to reauthenticate. Fall back to performing
-                // verification from this login session
-                client.get_user_verifier(this._cancellable,
-                                         this._userVerifierGot.bind(this));
-                return;
-            }
-
+            // Gdm emits org.freedesktop.DBus.Error.AccessDenied when there is
+            // no session to reauthenticate. Fall back to performing verification
+            // from this login session
+            client.get_user_verifier(this._cancellable, this._userVerifierGot.bind(this));
+            return;
+        } catch(e) {
             this._reportInitError('Failed to open reauthentication channel', e);
             return;
         }
@@ -377,9 +374,9 @@ var ShellUserVerifier = new Lang.Class({
         try {
             this._clearUserVerifier();
             this._userVerifier = client.get_user_verifier_finish(result);
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+            return;
         } catch(e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                return;
             this._reportInitError('Failed to obtain user verifier', e);
             return;
         }
@@ -437,9 +434,9 @@ var ShellUserVerifier = new Lang.Class({
                                                                (obj, result) => {
                try {
                    obj.call_begin_verification_for_user_finish(result);
+               } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+                   return;
                } catch(e) {
-                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                       return;
                    this._reportInitError('Failed to start verification for user', e);
                    return;
                }
@@ -452,9 +449,9 @@ var ShellUserVerifier = new Lang.Class({
                                                       (obj, result) => {
                try {
                    obj.call_begin_verification_finish(result);
+               } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+                   return;
                } catch(e) {
-                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                       return;
                    this._reportInitError('Failed to start verification', e);
                    return;
                }

js/js-resources.gresource.xml

@@ -9,6 +9,8 @@
     <file>gdm/realmd.js</file>
     <file>gdm/util.js</file>
 
+    <file>extensionPrefs/main.js</file>
+
     <file>misc/config.js</file>
     <file>misc/extensionUtils.js</file>
     <file>misc/fileUtils.js</file>
@@ -31,6 +33,8 @@
     <file>perf/core.js</file>
     <file>perf/hwtest.js</file>
 
+    <file>portalHelper/main.js</file>
+
     <file>ui/accessDialog.js</file>
     <file>ui/altTab.js</file>
     <file>ui/animation.js</file>
@@ -39,7 +43,6 @@
     <file>ui/audioDeviceSelection.js</file>
     <file>ui/backgroundMenu.js</file>
     <file>ui/background.js</file>
-    <file>ui/barLevel.js</file>
     <file>ui/boxpointer.js</file>
     <file>ui/calendar.js</file>
     <file>ui/checkBox.js</file>
@@ -127,7 +130,6 @@
     <file>ui/status/rfkill.js</file>
     <file>ui/status/volume.js</file>
     <file>ui/status/bluetooth.js</file>
-    <file>ui/status/remoteAccess.js</file>
     <file>ui/status/screencast.js</file>
     <file>ui/status/system.js</file>
     <file>ui/status/thunderbolt.js</file>