data: Add desktop autostart file for extension warning

Adding this file allows gnome-session to trigger the warning after it
disabled extensions in the non-systemd case.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/695

.eslintrc.json

@@ -0,0 +1,6 @@
+{
+    "extends": [
+        "./lint/eslintrc-gjs.json",
+        "./lint/eslintrc-shell.json"
+    ]
+}

.eslintrc.yml

@@ -1,3 +0,0 @@
-extends:
- - ./lint/eslintrc-gjs.yml
- - ./lint/eslintrc-shell.yml

.gitignore

@@ -21,8 +21,6 @@ data/org.gnome.shell.gschema.valid
 data/org.gnome.Shell.PortalHelper.desktop
 data/org.gnome.Shell.PortalHelper.service
 data/theme/.sass-cache
-data/theme/gnome-shell*.css.map
-data/theme/gnome-shell*.css
 docs/reference/*/*.args
 docs/reference/*/*.bak
 docs/reference/*/*.hierarchy

.gitlab-ci.yml

@@ -14,7 +14,7 @@ variables:
         - merge_requests
 
 check_commit_log:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v3
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: review
     variables:
         GIT_DEPTH: "100"
@@ -47,14 +47,14 @@ eslint:
         when: always
 
 build:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v3
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: build
     before_script:
         - .gitlab-ci/checkout-mutter.sh
         - meson mutter mutter/build --prefix=/usr -Dtests=false
         - ninja -C mutter/build install
     script:
-        - meson . build -Dbuiltype=debugoptimized -Dman=false --werror
+        - meson . build -Dbuiltype=debugoptimized -Dman=false
         - ninja -C build
         - ninja -C build install
     <<: *only_default
@@ -65,15 +65,14 @@ build:
             - build
 
 test:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v3
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: test
     variables:
         XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
-        NO_AT_BRIDGE: "1"
     before_script:
         - ninja -C mutter/build install
     script:
-        - dbus-run-session -- xvfb-run meson test -C build --no-rebuild
+        - xvfb-run meson test -C build --no-rebuild
     <<: *only_default
     artifacts:
         expire_in: 1 day
@@ -82,7 +81,7 @@ test:
         when: on_failure
 
 test-pot:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v3
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: test
     before_script:
         - ninja -C mutter/build install

.gitlab-ci/checkout-mutter.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/bash
 
+shell_branch=$(git describe --contains --all HEAD)
 mutter_target=
 
 git clone https://gitlab.gnome.org/GNOME/mutter.git
@@ -25,7 +26,8 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
 fi
 
 if [ -z "$mutter_target" ]; then
-  mutter_target=$(git branch -r -l origin/$CI_COMMIT_REF_NAME)
+  mutter_target=$(git branch -r -l origin/$shell_branch)
+  mutter_target=${mutter_target:-$(git branch -r -l ${shell_branch#remotes/})}
   mutter_target=${mutter_target:-origin/master}
   echo Using $mutter_target instead
 fi

.gitlab-ci/run-eslint.sh

@@ -13,17 +13,11 @@ is_empty() {
 }
 
 run_eslint() {
-  ARGS_LEGACY='--config lint/eslintrc-legacy.yml'
+  ARGS_LEGACY='--config lint/eslintrc-legacy.json'
 
   local extra_args=ARGS_$1
-  local output_var=OUTPUT_$1
+  local output=OUTPUT_$1
-  local output=${!output_var}
+  eslint -f unix ${!extra_args} -o ${!output} js
-
-  # ensure output exists even if eslint doesn't report any errors
-  mkdir -p $(dirname $output)
-  touch $output
-
-  eslint -f unix ${!extra_args} -o $output js
 }
 
 list_commit_range_additions() {
@@ -72,17 +66,10 @@ create_common() {
   rm $OUTPUT_FINAL.tmp
 }
 
-# Disable MR handling for now. We aren't ready to enforce
+if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
-# non-legacy style just yet ...
+  git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
-unset CI_MERGE_REQUEST_TARGET_BRANCH_NAME
-
-REMOTE=${1:-$CI_MERGE_REQUEST_PROJECT_URL.git}
-BRANCH_NAME=${2:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
-
-if [ "$BRANCH_NAME" ]; then
-  git fetch $REMOTE $BRANCH_NAME
   branch_point=$(git merge-base HEAD FETCH_HEAD)
-  commit_range=$branch_point...HEAD
+  commit_range=$branch_point...$CI_COMMIT_SHA
 
   list_commit_range_additions $commit_range > $LINE_CHANGES
 
@@ -99,16 +86,12 @@ run_eslint LEGACY
 echo Done.
 create_common
 
-if ! is_empty $OUTPUT_FINAL; then
-  cat $OUTPUT_FINAL
-  exit 1
-fi
-
 # Just show the report and succeed when not testing a MR
-if [ -z "$BRANCH_NAME" ]; then
+if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
+  cat $OUTPUT_FINAL
   exit 0
 fi
 
-copy_matched_lines $OUTPUT_REGULAR $LINE_CHANGES $OUTPUT_MR
+copy_matched_lines $OUTPUT_FINAL $LINE_CHANGES $OUTPUT_MR
 cat $OUTPUT_MR
 is_empty $OUTPUT_MR

.gitlab/issue_templates/Bug.md

@@ -1,55 +0,0 @@
-<!-- 
-Please read https://wiki.gnome.org/Community/GettingInTouch/BugReportingGuidelines
-first to ensure that you create a clear and specific issue.
--->
-
-### Affected version
-
-<!--
-Provide at least the following information:
-* Your OS and version
-* Affected GNOME Shell version
-* Does this issue appear in XOrg and/or Wayland
--->
-
-### Bug summary
-
-<!-- 
-Provide a short summary of the bug you encountered.
--->
-
-### Steps to reproduce
-
-<!-- 
-1. Step one
-2. Step two
-3. ...
--->
-
-### What happened
-
-<!-- 
-What did GNOME Shell do that was unexpected?
--->
-
-### What did you expect to happen
-
-<!-- 
-What did you expect GNOME Shell to do?
--->
-
-### Relevant logs, screenshots, screencasts etc.
-
-<!-- 
-If you have further information, such as technical documentation, logs,
-screenshots or screencasts related, please provide them here.
-
-If the bug is a crash, please obtain a stack trace with installed debug
-symbols (at least for GNOME Shell and Mutter) and attach it to
-this issue following the instructions on
-https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces.
--->
-
-
-<!-- Do not remove the following line. -->
-/label ~"1. Bug"

.gitlab/issue_templates/Feature.md

@@ -1,30 +0,0 @@
-<!-- 
-Please read https://wiki.gnome.org/Community/GettingInTouch/BugReportingGuidelines
-first to ensure that you create a clear and specific issue.
--->
-
-### Feature summary
-
-<!-- 
-Describe what you would like to be able to do with GNOME Shell
-that you currently cannot do.
--->
-
-### How would you like it to work
-
-<!-- 
-If you can think of a way GNOME Shell might be able to do this,
-let us know here.
--->
-
-### Relevant links, screenshots, screencasts etc.
-
-<!-- 
-If you have further information, such as technical documentation,
-code, mockups or a similar feature in another desktop environments,
-please provide them here.
--->
-
-
-<!-- Do not remove the following line. -->
-/label ~"1. Feature"

HACKING.md

@@ -29,8 +29,9 @@ what to do.
             bar = do_thing(b);
 
         if (var == 5) {
-            for (let i = 0; i < 10; i++)
+            for (let i = 0; i < 10; i++) {
                 print(i);
+            }
         } else {
             print(20);
         }
@@ -101,8 +102,9 @@ under the imports:
 Always use either `const` or `let` when defining a variable.
 ```javascript
     // Iterating over an array
-    for (let i = 0; i < arr.length; ++i)
+    for (let i = 0; i < arr.length; ++i) {
         let item = arr[i];
+    }
 
     // Iterating over an object's properties
     for (let prop in someobj) {
@@ -161,17 +163,11 @@ you to inherit from a type to use it, you can do so:
              return [100, 100];
         }
 
-        vfunc_paint(paintContext) {
+        vfunc_paint() {
-             let framebuffer = paintContext.get_framebuffer();
-             let coglContext = framebuffer.get_context();
              let alloc = this.get_allocation_box();
-
+             Cogl.set_source_color4ub(255, 0, 0, 255);
-             let pipeline = new Cogl.Pipeline(coglContext);
+             Cogl.rectangle(alloc.x1, alloc.y1,
-             pipeline.set_color4ub(255, 0, 0, 255);
+                            alloc.x2, alloc.y2);
-
-             framebuffer.draw_rectangle(pipeline,
-		 alloc.x1, alloc.y1,
-		 alloc.x2, alloc.y2);
         }
     });
 ```
@@ -190,27 +186,15 @@ 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` (deprecated) 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
-you could inherit from GTypes natively in JS, in some cases we have a wrapper
+you could inherit from GTypes natively in JS, we usually have a wrapper class
-class that has a property called `actor` (now deprecated). We call this
+that has a property called `actor`. We call this wrapper class the "delegate".
-wrapper class the "delegate".
 
 We sometimes use expando properties to set a property called `_delegate` on
 the actor itself:
-```javascript
-    var MyActor = GObject.registerClass(
-    class MyActor extends Clutter.Actor {
-        _init(params) {
-            super._init(params);
-            this._delegate = this;
-        }
-    });
-```
-
-Or using the deprecated `actor`:
 ```javascript
     var MyClass = class {
         constructor() {
@@ -231,7 +215,6 @@ delegate object from an associated actor. For instance, the drag and drop
 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.
-In case the class is an actor itself, the `_delegate` can be just set to `this`.
 
 ## Functional style
 
@@ -250,7 +233,7 @@ variable that can be captured in closures.
 All closures should be wrapped with Function.prototype.bind or use arrow
 notation.
 ```javascript
-    let closure1 = () => this._fnorbate();
+    let closure1 = () => { this._fnorbate(); };
     let closure2 = this._fnorbate.bind(this);
 ```
 

NEWS

@@ -1,169 +1,3 @@
-3.35.3
-======
-* Add discrete GPU support for NVidia drivers [Bastien; #1810]
-* Fix DND of window previews with tablet devices [Carlos; !897]
-* Update pad OSD actions dynamically on mode changes [Carlos; !898]
-* st: Add dedicated PasswordEntry widget [Umang; !619]
-* Allow stand-alone builds of gnome-extensions tool [Florian; !877]
-* extension-tool: Don't treat missing .js handler as error [Chuck; !905]
-* Disallow top bar menus without top bar [Florian; #2002]
-* Misc. bug fixes and cleanups [Georges, Florian, Robert, Umang; !901,
-  #789937, !909, !910, !911, !913, !916]
-
-Contributors:
-  Michael Catanzaro, Chuck, Carlos Garnacho, Umang Jain, Robert Mader,
-  Florian Müllner, Georges Basile Stavracas Neto, Bastien Nocera
-
-Translators:
-  Fabio Tomat [fur], Fran Dieguez [gl], Jordi Mas [ca], Daniel Mustieles [es]
-
-3.35.2
-======
-* Fix unredirection after cancelled animations [Florian; #1788]
-* Include shadow in window screenshots [Robert; !762]
-* Show indicator when microphone is active [Florian; !729]
-* Use inheritance instead of delegate pattern [Marco; !559]
-* Use cached coordinates for window sorting in overview [Andrew; !763]
-* Wiggle login/unlock password entries on failure [Georges; !769]
-* Update window titles in app menu [Florian; #1830]
-* Fix window animations getting stuck by workspace switches [Jonas D.; !784]
-* Fix not-responding dialog size when using geometry scaling [Jonas D.; !783]
-* Handle buggy MPRIS clients more gracefully [Philip; #1362]
-* Deprecate StBoxLayout's child properties [Florian; !780]
-* Remove StBin's align properties [Florian; !803]
-* Use correct timezones for events [Milan, Florian; !806, #1895]
-* Reduce overhead of tracking stylesheet changes [Carlos; !779]
-* Replace action icons in system menu with regular menu items [Florian; #270]
-* Refine polkit dialogs [Jonas D.; !788]
-* Fix battery icon glitch in "100% but charging" case [Philip; !814]
-* Fix windows getting stuck on screen if closed while animating [Florian; !815]
-* Use font from interface settings [Florian; #688288]
-* Show polkit confirmation dialog for users with no password
-  [Joaquim, Jonas D.; !829]
-* Use better OSK layout fallback for unsupported variants [Florian; #1907]
-* Hide stopped spinner in top bar [Joonas; !832]
-* Reuse existing icons when updating the app picker grid [Georges; !841]
-* Show switcher popups immediately on second key press [Florian; #1928]
-* Add position-based animation to page indicators [Alexander; !843]
-* Improve modifier-less keyboard navigation of switcher popups [Florian; #1883]
-* Improve weather integration [Florian; #1927, #1926]
-* Add back sound feedback when scrolling volume indicator [Florian; #53]
-* Fix creating app folders with no pre-existing folders [Jonas D.; #1652]
-* Improve DND page switching in app picker [Florian, Jonas D.; #1693]
-* Fix disable command of gnome-extensions tool [Florian; #1946]
-* Tweak styling of notifications/media constrols [Joonas; !855, !865]
-* Enable clean session shutdown after gnome-shell failure [Benjamin; !858]
-* Also remove scaled keys when texture cache is cleared [Daniel M.; !567]
-* Don't show overflow indicator in switchers that fit screen [Florian; #1834]
-* Move libcroco dependency in-tree [Federico; !861]
-* Move to app folder location when it is created/renamed [Georges; !883]
-* Dismiss switcher popups when a system modal dialogs opens [Florian; #1536]
-* Fix weather forecasts for automatic location when Weather is not sandboxed
-  [Florian; #1823]
-* Place launched applications into a systemd scope [Benjamin; !863]
-* Fixed crashes [Jonas D., Carlos; !787, !813]
-* Misc. bug fixes and cleanups [Marco, Georges, Daniel V., Florian, Robert,
-  Kalev, Philip, Jonas D., Will, Carlos, Jonas Å., cunidev, Joonas, Federico;
-  !747, !765, !421, !759, !749, !730, !770, #1799, !774, !773, !776, !777,
-  !782, !794, !778, !792, !790, !190, !796, !795, !797, !798, !800, !804, !808,
-  !807, !810, !811, !563, !809, !805, !817, !818, !822, !830, !828, !823, !835,
-  !840, !842, !833, !845, !846, !847, !851, #1916, !862, !866, #1979, !827,
-  #1976, !884, !873, !885, !799, !887, !891, !816]
-
-Contributors:
-  Marco Trevisan (Treviño), Benjamin Berg, Philip Chimento, Milan Crha,
-  Jonas Dreßler, Carlos Garnacho, Joonas Henriksson, Kalev Lember, Robert Mader,
-  Alexander Mikhaylenko, Daniel García Moreno, Florian Müllner,
-  Georges Basile Stavracas Neto, Federico Mena Quintero, Joaquim Rocha,
-  Will Thompson, Daniel van Vugt, Andrew Watson, cunidev, Jonas Ådahl
-
-Translators:
-  Daniel Mustieles [es], Goran Vidović [hr], Fabio Tomat [fur],
-  Danial Behzadi [fa], Andika Triwidada [id], Efstathios Iosifidis [el],
-  Ricardo Silva Veloso [pt_BR]
-
-3.35.1
-======
-* Misc. bug fixes and cleanups [Marco; Matthias; !758, #701212]
-
-Contributors:
-  Marco Trevisan (Treviño)
-
-3.34.1
-======
-* Fix "Frequent" view icons disappearing on hover [Jonas D.; #1502]
-* Allow editing app folder names [Georges, Marco; !675, !720]
-* Skip property transitions while hidden [Florian; !708]
-* Make menu animations more consistent [Florian, GB_2; #1595, !717]
-* Improve performance when enabling/disabling all extensions [Jonas D.; !96]
-* Fix extra icons appearing in "Frequent" view animation [Georges; !696]
-* Fix fading out desktop icons [Harshula; #1616]
-* Fix box-shadow glitch with prerendered resources [Daniel; #1186]
-* Fix accidentally skipped animations [Florian; #1572]
-* Fix screenshots and window animations when scaled [Robert; !728]
-* Don't leak NOTIFY_SOCKET environment variable to applications [Benjamin; !741]
-* Fix lock-up on X11 when ibus is already running on startup [Marco; #1712]
-* Fix screen dimming on idle [Marco; #1683]
-* Do not notify systemd before initialization is complete [Iain; !750]
-* Support SAE secrets in network agent [Lubomir; !751]
-* Fix various regressions with dynamic workspaces [Florian; #1497]
-* Fixed crashes [Florian, Marco; #1678, !746]
-* Misc. bug fixes and cleanups [Marco, Jonas D., Florian, Iain, Georges,
-  Jonas Å., Martin, Takao, Carlos; !700, !705, !709, !711, !707, #1538, !710,
-  !713, !699, !715, !718, !716, !719, !721, #1243, !725, !731, #1614, !683,
-  !732, !121, !735, !736, !740, #573, #1641, #1571]
-
-Contributors:
-  Marco Trevisan (Treviño), Benjamin Berg, Jonas Dreßler, Takao Fujiwara, GB_2,
-  Carlos Garnacho, Harshula Jayasuriya, Iain Lane, Robert Mader,
-  Daniel García Moreno, Florian Müllner, Georges Basile Stavracas Neto,
-  Lubomir Rintel, Martin Zurowietz, Jonas Ådahl
-
-Translators:
-  Rafael Fontenelle [pt_BR], Fran Dieguez [gl], Balázs Úr [hu],
-  Milo Casagrande [it], Daniel Șerbănescu [ro], Kukuh Syafaat [id],
-  Jiri Grönroos [fi], Daniel Mustieles [es], Piotr Drąg [pl],
-  Anders Jonsson [sv], Marek Černocký [cs], Jordi Mas [ca],
-  Aurimas Černius [lt], Christian Kirbach [de], Emin Tufan Çetin [tr],
-  Enrico Nicoletto [pt_BR], Danial Behzadi [fa], Марко Костић [sr],
-  Alexandre Franke [fr], Charles Monzat [fr], Kjartan Maraas [nb],
-  Ryuta Fujii [ja], Nathan Follens [nl], Dušan Kazik [sk], Fabio Tomat [fur],
-  Matej Urbančič [sl], Ask Hjorth Larsen [da], Alan Mortensen [da]
-
-3.34.0
-======
-* Handle startup/shutdown of misc X11 services [Carlos; !680]
-* Fix sound volume mute/unmute [Iain; #1557]
-* Correctly terminate pasted text [Carlos; #1570]
-
-Contributors:
-  Carlos Garnacho, Iain Lane
-
-Translators:
-  Tom Tryfonidis [el], Milo Casagrande [it], Ryuta Fujii [ja],
-  Efstathios Iosifidis [el], Carmen Bianca BAKKER [eo], Sabri Ünal [tr],
-  Dušan Kazik [sk], Balázs Meskó [hu], Claude Paroz [fr]
-
-3.33.92
-=======
-* Animate pointer a11y pie timer [Jonas D.; !688]
-* Fix restarting shell in systemd user session [Benjamin; !690]
-* Misc. bug fixes and cleanups [Florian, Jonas D., Jonas Å., Will;
-  !691, !689, !692, #1552, !698]
-
-Contributors:
-  Jonas Ådahl, Benjamin Berg, Piotr Drąg, Jonas Dreßler, Florian Müllner,
-  Will Thompson
-
-Translators:
-  Daniel Șerbănescu [ro], Danial Behzadi [fa], Daniel Mustieles [es],
-  Jiri Grönroos [fi], Asier Sarasua Garmendia [eu], Piotr Drąg [pl],
-  Rūdolfs Mazurs [lv], Anders Jonsson [sv], Fran Dieguez [gl], Jordi Mas [ca],
-  Matej Urbančič [sl], Zander Brown [en_GB], Ryuta Fujii [ja], Tim Sabsch [de],
-  Fabio Tomat [fur], Pawan Chitrakar [ne], A S Alam [pa], Changwoo Ryu [ko],
-  Aurimas Černius [lt], Daniel Rusek [cs], Marek Černocký [cs],
-  Kukuh Syafaat [id], Goran Vidović [hr], Rafael Fontenelle [pt_BR]
-
 3.33.91
 =======
 * Fix regression when adjusting brightness [Florian; #1500]

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

@@ -1,46 +1,5 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-
 <node>
-
-  <!--
-      net.hadess.SwitcherooControl:
-      @short_description: D-Bus proxy to access dual-GPU controls.
-
-      After checking the availability of two switchable GPUs in the machine,
-      check the value of net.hadess.SwitcherooControl.HasDualGpu to see
-      if running applications on the discrete GPU should be offered.
-
-      The object path will be "/net/hadess/SwitcherooControl".
-  -->
   <interface name="net.hadess.SwitcherooControl">
-    <!--
-        HasDualGpu:
-
-        Whether two switchable GPUs are present on the system. This property
-        has been obsoleted in favour of the "NumGPUs" property.
-    -->
     <property name="HasDualGpu" type="b" access="read"/>
-
-    <!--
-        NumGPUs:
-
-        The number of GPUs available on the system. Note that while having no
-        GPUs is unlikely, consumers of this API should probably not throw errors
-        if that were the case.
-    -->
-    <property name="NumGPUs" type="u" access="read"/>
-
-    <!--
-        GPUs:
-
-        An array of key-pair values representing each GPU. The key named "Name" (s)
-        will contain a user-facing name for the GPU, the "Environment" (as) key will
-        contain an array of even number of strings, each being an environment
-        variable to set to use the GPU, followed by its value, the "Default" (b) key
-        will tag the default (usually integrated) GPU.
-    -->
-    <property name="GPUs" type="aa{sv}" access="read"/>
-
   </interface>
 </node>

data/gnome-shell-disable-extensions.service

@@ -1,12 +1,11 @@
 [Unit]
 Description=Disable GNOME Shell extensions after failure
-# Note that this unit must not conflict with anything, and must
-# be able to run in parallel with the gnome-session-shutdown.target.
 DefaultDependencies=no
 
-# We want to disable extensions only if gnome-shell has flagged the extensions
+# Only disable extensions for a short period of time after login.
-# to be a likely cause of trouble.
+# This means we err on the side of failing the first login after a broken
-ConditionPathExists=%t/gnome-shell-disable-extensions
+# extension was installed.
+Requisite=gnome-session-stable.timer
 
 [Service]
 Type=simple

data/gnome-shell-extension-prefs.desktop.in.in

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=Shell Extensions
+Comment=Configure GNOME Shell Extensions
+Exec=@bindir@/gnome-shell-extension-prefs %u
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-shell
+X-GNOME-Bugzilla-Component=extensions
+X-GNOME-Bugzilla-Version=@VERSION@
+Categories=GNOME;GTK;
+OnlyShowIn=GNOME;
+NoDisplay=true

data/gnome-shell-extensions-disabled-warning.desktop.in.in

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Shell Extensions Disabled Warning
+Comment=Warning shown if extensions were disabled due to a failure
+Exec=@bindir@/gnome-shell-extension-prefs --disabled-warning
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-shell
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
+OnlyShowIn=GNOME;
+AutostartCondition=if-exists gnome-shell-extensions-disabled-warning
+X-GNOME-HiddenUnderSystemd=@systemd_hidden@

data/gnome-shell-extensions-disabled-warning.service.in

@@ -0,0 +1,13 @@
+[Unit]
+Description=Warn about GNOME Shell extensions being disabled
+ConditionPathExists=%E/gnome-shell-extensions-disabled-warning
+
+Requisite=gnome-session.target
+After=gnome-session.target
+
+[Service]
+Type=simple
+ExecStartPre=-/bin/rm %E/gnome-shell-extensions-disabled-warning
+ExecStart=@bindir@/gnome-shell-extension-prefs --disabled-warning
+Restart=no
+

data/gnome-shell-theme.gresource.xml

@@ -20,8 +20,6 @@
     <file>no-notifications.svg</file>
     <file>noise-texture.png</file>
     <file>pad-osd.css</file>
-    <file alias="icons/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
-    <file alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
     <file alias="icons/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
     <file alias="icons/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
     <file alias="icons/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>

data/gnome-shell-wayland.service.in

@@ -23,5 +23,3 @@ ExecStart=@bindir@/gnome-shell
 SuccessExitStatus=1
 # On wayland we cannot restart
 Restart=no
-# Kill any stubborn child processes after this long
-TimeoutStopSec=5

data/gnome-shell-wayland.target

@@ -8,3 +8,5 @@ Before=gnome-session-initialized.target
 
 Requires=gnome-shell-wayland.service
 After=gnome-shell-wayland.service
+
+Wants=gnome-shell-extensions-disabled-warning.service

data/gnome-shell-x11.service.in

@@ -29,5 +29,3 @@ SuccessExitStatus=1
 Restart=always
 # Do not wait before restarting the shell
 RestartSec=0ms
-# Kill any stubborn child processes after this long
-TimeoutStopSec=5

data/gnome-shell-x11.target

@@ -8,3 +8,5 @@ Before=gnome-session-initialized.target
 
 Requires=gnome-shell-x11.service
 After=gnome-shell-x11.service
+
+Wants=gnome-shell-extensions-disabled-warning.service

data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">
-<g id="surface43907">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(10.196079%,37.254903%,70.588237%);fill-opacity:1;" d="M 58.847656 15.683594 L 49.074219 30.632812 C 46.921875 33.84375 42.480469 36.65625 39.378906 35.300781 C 34.488281 33.164062 35.859375 28.144531 31.28125 25.292969 C 28.070312 23.292969 16.839844 20.449219 14.804688 27.644531 C 13.761719 31.339844 14.480469 37.410156 17.398438 41.019531 C 20.164062 44.441406 26.8125 43.355469 28.898438 47.230469 C 30.34375 49.925781 29.738281 51.628906 28.347656 54.351562 C 26.796875 57.375 22.839844 61.359375 19.265625 64.585938 C 17.480469 66.199219 13.273438 65.710938 12.03125 66.730469 C 11.753906 66.949219 12.511719 70.285156 12.511719 70.285156 C 12.511719 70.285156 19.90625 82.707031 25.539062 87.285156 C 27.773438 89.101562 30.089844 91.808594 32.742188 90.695312 C 36.035156 89.316406 35.304688 82.289062 37.644531 79.597656 C 41.976562 74.605469 50.292969 73.761719 55.582031 78.144531 C 61.277344 82.867188 60.882812 89.472656 57.941406 94.683594 C 55.175781 99.578125 49.472656 98.453125 47.484375 102.28125 C 46.730469 103.730469 47.578125 105.664062 48.765625 106.785156 C 54.628906 112.335938 71.210938 118.988281 71.210938 118.988281 L 81.605469 102.429688 C 83.757812 99.222656 86.707031 97.742188 90.011719 98.46875 C 94.605469 99.472656 95.160156 105.945312 98.914062 108.785156 C 103.195312 112.019531 110.546875 111.765625 114.351562 105.753906 C 117.128906 101.371094 116.761719 97.449219 113.765625 91.414062 C 111.808594 87.476562 103.253906 89.382812 101.171875 85.507812 C 99.722656 82.8125 99.992188 80.214844 101.859375 77.796875 C 106.332031 72 117.003906 62.699219 117.003906 62.699219 C 117.003906 62.699219 117.144531 60.824219 116.246094 59.363281 C 115.15625 57.589844 107.472656 49.273438 104.65625 46.984375 C 102.421875 45.167969 99.6875 41.921875 97.03125 43.035156 C 93.742188 44.414062 94.417969 51.058594 92.082031 53.753906 C 86.5 60.179688 78.4375 59.101562 73.914062 54.648438 C 68.644531 49.453125 68.511719 44.488281 71.453125 39.277344 C 74.222656 34.382812 79.921875 35.3125 81.910156 31.484375 C 82.664062 30.035156 81.484375 27.070312 80.597656 25.390625 C 79.277344 22.890625 65.976562 18.902344 58.847656 15.683594 Z M 58.847656 15.683594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(20.784314%,51.764709%,89.411765%);fill-opacity:1;" d="M 58.089844 12.347656 L 48.316406 27.300781 C 46.164062 30.507812 41.726562 33.320312 38.625 31.964844 C 33.734375 29.828125 35.101562 24.808594 30.523438 21.960938 C 27.3125 19.957031 19.445312 19.160156 15.683594 25.625 C 13.730469 28.976562 13.722656 34.074219 16.644531 37.6875 C 19.410156 41.105469 26.058594 40.023438 28.140625 43.898438 C 29.589844 46.589844 28.984375 48.292969 27.589844 51.015625 C 24.492188 57.066406 11.753906 66.949219 11.753906 66.949219 C 11.753906 66.949219 19.148438 79.371094 24.785156 83.949219 C 27.019531 85.765625 29.332031 88.472656 31.988281 87.363281 C 35.277344 85.984375 34.550781 78.957031 36.886719 76.261719 C 41.21875 71.273438 49.535156 70.425781 54.824219 74.8125 C 60.519531 79.53125 60.125 86.140625 57.183594 91.347656 C 54.417969 96.242188 48.714844 95.117188 46.726562 98.949219 C 45.976562 100.398438 46.824219 102.328125 48.011719 103.449219 C 53.871094 109 70.457031 115.652344 70.457031 115.652344 L 80.847656 99.097656 C 83 95.886719 85.953125 94.40625 89.257812 95.132812 C 93.847656 96.140625 94.402344 102.609375 98.160156 105.449219 C 102.4375 108.683594 109.789062 108.433594 113.597656 102.421875 C 116.375 98.035156 116.152344 94.195312 112.175781 89.128906 C 109.460938 85.667969 102.496094 86.046875 100.414062 82.171875 C 98.96875 79.480469 99.234375 76.878906 101.101562 74.460938 C 105.578125 68.667969 116.246094 59.363281 116.246094 59.363281 C 116.246094 59.363281 109.535156 48.226562 103.898438 43.648438 C 101.664062 41.835938 98.929688 38.585938 96.277344 39.699219 C 92.988281 41.078125 93.660156 47.726562 91.324219 50.417969 C 85.746094 56.84375 77.679688 55.769531 73.15625 51.3125 C 67.886719 46.121094 67.757812 41.152344 70.699219 35.945312 C 73.464844 31.046875 79.164062 31.980469 81.152344 28.148438 C 81.90625 26.699219 80.066406 24.476562 78.878906 23.355469 C 73.015625 17.804688 58.089844 12.347656 58.089844 12.347656 Z M 58.089844 12.347656 "/>
-</g>
-</svg>

data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M6.5 1C5.669 1 5 1.669 5 2.5V4H2c-.554 0-1 .446-1 1v3h1.5C3.331 8 4 8.669 4 9.5S3.331 11 2.5 11H1v3c0 .554.446 1 1 1h3v-1.5c0-.831.669-1.5 1.5-1.5s1.5.669 1.5 1.5V15h3c.554 0 1-.446 1-1v-3h1.5c.831 0 1.5-.669 1.5-1.5S14.331 8 13.5 8H12V5c0-.554-.446-1-1-1H8V2.5C8 1.669 7.331 1 6.5 1z" style="isolation:auto;mix-blend-mode:normal;marker:none" color="#000" overflow="visible" fill="#474747"/></svg>

data/icons/meson.build

@@ -1 +0,0 @@
-install_subdir('hicolor', install_dir: icondir)

data/meson.build

@@ -1,6 +1,6 @@
 desktop_files = [
   'org.gnome.Shell.desktop',
-  'org.gnome.Extensions.desktop',
+  'gnome-shell-extension-prefs.desktop'
 ]
 service_files = []
 
@@ -13,6 +13,7 @@ desktopconf = configuration_data()
 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
 desktopconf.set('bindir', bindir)
+desktopconf.set('VERSION', meson.project_version())
 desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
 
 foreach desktop_file : desktop_files
@@ -30,6 +31,19 @@ foreach desktop_file : desktop_files
   )
 endforeach
 
+i18n.merge_file('desktop',
+  input: configure_file(
+    input: 'gnome-shell-extensions-disabled-warning.desktop.in.in',
+    output: 'gnome-shell-extensions-disabled-warning.desktop.in',
+    configuration: desktopconf
+  ),
+  output: 'gnome-shell-extension-disabled-warning.desktop',
+  po_dir: po_dir,
+  install: true,
+  install_dir: autostartdir,
+  type: 'desktop'
+)
+
 serviceconf = configuration_data()
 serviceconf.set('libexecdir', libexecdir)
 foreach service_file : service_files
@@ -43,7 +57,6 @@ endforeach
 
 
 subdir('dbus-interfaces')
-subdir('icons')
 subdir('theme')
 
 data_resources = [

data/org.gnome.Extensions.desktop.in.in

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Extensions
-Icon=org.gnome.Extensions
-Comment=Configure GNOME Shell Extensions
-Exec=@bindir@/gnome-shell-extension-prefs %u
-Categories=GNOME;GTK;
-OnlyShowIn=GNOME;

data/org.gnome.Shell.desktop.in.in

@@ -3,6 +3,10 @@ Type=Application
 Name=GNOME Shell
 Comment=Window management and application launching
 Exec=@bindir@/gnome-shell
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-shell
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
 Categories=GNOME;GTK;Core;
 OnlyShowIn=GNOME;
 NoDisplay=true

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

@@ -50,7 +50,7 @@
       </description>
     </key>
     <key name="favorite-apps" type="as">
-      <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
+      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
       <summary>List of desktop file IDs for favorite applications</summary>
       <description>
         The applications corresponding to these identifiers

data/theme/eye-not-looking-symbolic.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M13.98 1.99a1 1 0 0 0-.687.303l-.984.984A8 8 0 0 0 8 2 8 8 0 0 0 .262 8.01a8 8 0 0 0 2.943 4.37l-.912.913a1 1 0 1 0 1.414 1.414l11-11a1 1 0 0 0-.727-1.717zM8 4a4 4 0 0 1 2.611.974l-1.42 1.42A2 2 0 0 0 8 6a2 2 0 0 0-2 2 2 2 0 0 0 .396 1.19l-1.42 1.42A4 4 0 0 1 4 8a4 4 0 0 1 4-4zm7.03 2.209l-3.344 3.343a4 4 0 0 1-2.127 2.127l-2.28 2.28a8 8 0 0 0 .721.04 8 8 0 0 0 7.738-6.01 8 8 0 0 0-.709-1.78zm-7.53.79a.5.5 0 0 1 .5.5.5.5 0 0 1-.5.5.5.5 0 0 1-.5-.5.5.5 0 0 1 .5-.5z" fill="#2e3436"/>
-</svg>
-

data/theme/eye-open-negative-filled-symbolic.svg

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" 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" width="16" viewBox="0 0 16 16" version="1.1" id="svg7384" height="16">
-  <metadata id="metadata90">
-    <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>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <title id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs id="defs7386">
-    <linearGradient osb:paint="solid" id="linearGradient7212">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop7214"/>
-    </linearGradient>
-  </defs>
-  <g transform="translate(-341.0002,-13.000323)" style="display:inline" id="layer9"/>
-  <g transform="translate(-100,-380.00032)" id="layer1"/>
-  <g transform="translate(-100,-380.00032)" style="display:inline" id="layer10">
-    <path d="m 108,382 a 8,8 0 0 0 -7.73828,6.00977 A 8,8 0 0 0 108,394 8,8 0 0 0 115.73828,387.99023 8,8 0 0 0 108,382 Z m 0,2 a 4,4 0 0 1 4,4 4,4 0 0 1 -4,4 4,4 0 0 1 -4,-4 4,4 0 0 1 4,-4 z" id="path2314" style="opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/>
-    <path id="path2318" d="m 110,388.00003 a 2,2 0 0 1 -2,2 2,2 0 0 1 -2,-2 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 z" style="vector-effect:none;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
-  </g>
-  <g transform="translate(-100,-380.00032)" id="g6387"/>
-  <g transform="translate(-100,-380.00032)" id="layer11"/>
-</svg>
-

data/theme/gnome-shell-high-contrast.scss

@@ -1,17 +1,16 @@
-$variant: 'dark';
+$variant: 'light';
 
 @import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";
-@import "gnome-shell-sass/_widgets";
 
 //force symbolic icons
 stage {
-	-st-icon-style: symbolic;
+  -st-icon-style: symbolic;
 }
 
 .toggle-switch { width: 48px; }
 .toggle-switch-us, .toggle-switch-intl {
-	background-image: url("resource:///org/gnome/shell/theme/toggle-off-hc.svg");
+  background-image: url("resource:///org/gnome/shell/theme/toggle-off-hc.svg");
-	&:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-hc.svg"); }
+  &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-hc.svg"); }
 }

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

@@ -1,15 +1,16 @@
 // When color definition differs for dark and light variant,
 // it gets @if ed depending on $variant
 
-$base_color: if($variant == 'light', #fff, lighten(desaturate(#241f31, 20%), 2%));
+
+$base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
 $bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
 $fg_color: if($variant == 'light', #2e3436, #eeeeec);
 
-$selected_fg_color: #fff;
+$selected_fg_color: #ffffff;
 $selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
-$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 8%));
+$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
-$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), transparentize($fg_color, 0.93));
+$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
 $link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
 $link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
 $top_hilight: $borders_edge;
@@ -19,20 +20,21 @@ $error_color: #ff8080;
 $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
 $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
 
-$osd_fg_color: $fg_color;
+$osd_fg_color: #eeeeec;
-$osd_text_color: if($variant == 'light', #000, #fff);
+$osd_text_color: white;
-$osd_bg_color: if($variant == 'light', rgba(255,255,255,0.9), transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04));
+$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
-$osd_borders_color: if($variant == 'light', rgba(255,255,255,0.1), rgba(0,0,0,0.7));
+$osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: if($variant == 'light', rgba(0,0,0,0.1), lighten($osd_bg_color, 7%));
+$osd_outer_borders_color: transparentize(white, 0.84);
 
-$shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
+$tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
 $insensitive_bg_color: mix($bg_color, $base_color, 60%);
-$insensitive_borders_color: mix($borders_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
 
 //colors for the backdrop state, derived from the main colors.
 $backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
@@ -40,4 +42,4 @@ $backdrop_bg_color: $bg_color;
 $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
 $backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
-$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);

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

@@ -2,7 +2,7 @@
 
 // generic drawing of more complex things
 
-@function draw_widget_edge($c:$borders_edge) {
+@function _widget_edge($c:$borders_edge) {
 // outer highlight "used" on most widgets
   @return 0 1px $c;
 }
@@ -13,7 +13,7 @@
   //font-size: ($size / $base) * 1rem;
 }
 
-@mixin draw_shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
+@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
 //
 // Helper function to stack up to 4 box-shadows;
 //
@@ -31,7 +31,8 @@
 //
 // $t: entry type
 // $fc: focus color
-// $edge: set to none to not draw the bottom edge or specify a color to not use the default one
+// $edge: set to none to not draw the bottom edge or specify a color to not
+//        use the default one
 //
 // possible $t values:
 // normal, focus, insensitive
@@ -44,9 +45,8 @@
   }
   @if $t==focus {
     border-color: if($fc==$selected_bg_color,
-              $selected_borders_color,
+                     $selected_borders_color,
-              darken($fc,35%));
+                     darken($fc,35%));
-    box-shadow: inset 0 0 0 1px $fc;
   }
   @if $t==hover { }
   @if $t==insensitive {
@@ -58,39 +58,36 @@
 
 // buttons
 
-@function draw_border_color ($c) {
+@function _border_color ($c) { @return darken($c,25%); } // colored buttons want
-  //
+                                                         // the border form the
-  // colored buttons want the border form the base color
+                                                         // base color
-  //
-  @return if($variant == 'light', darken($c, 18%), darken($c, 4%));
-}
 
-@function draw_text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
+@function _text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
 //
 // calculate the color of text shadows
 //
 // $tc is the text color
 // $bg is the background color
 //
-  $lbg: lightness($bg)/100%;
+  $_lbg: lightness($bg)/100%;
-  @if lightness($tc)<50% { @return rgba(255,255,255,$lbg/($lbg*1.3)); }
+  @if lightness($tc)<50% { @return transparentize(white,1-$_lbg/($_lbg*1.3)); }
-  @else { @return rgba(0,0,0,1-$lbg*0.8); }
+  @else { @return transparentize(black,$_lbg*0.8); }
 }
 
-@function draw_button_hilight_color($c) {
+@function _button_hilight_color($c) {
 //
 // calculate the right top hilight color for buttons
 //
 // $c: base color;
 //
   @if lightness($c)>90% { @return white; }
-  @else if lightness($c)>80% { @return rgba(255,255,255, 0.7); }
+  @else if lightness($c)>80% { @return transparentize(white, 0.3); }
-  @else if lightness($c)>50% { @return rgba(255,255,255, 0.5); }
+  @else if lightness($c)>50% { @return transparentize(white, 0.5); }
-  @else if lightness($c)>40% { @return rgba(255,255,255, 0.3); }
+  @else if lightness($c)>40% { @return transparentize(white, 0.7); }
-  @else { @return rgba(255,255,255, 0.1); }
+  @else { @return transparentize(white, 0.9); }
 }
 
-@mixin draw_button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
+@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
 //
 // helper function for the text emboss effect
 //
@@ -99,19 +96,19 @@
 // TODO: this functions needs a way to deal with special cases
 //
 
-  $shadow: draw_text_shadow_color($tc, $bg);
+  $_shadow: _text_shadow_color($tc, $bg);
 
   @if lightness($tc)<50% {
-    text-shadow: 0 1px $shadow;
+    text-shadow: 0 1px $_shadow;
-    icon-shadow: 0 1px $shadow;
+    icon-shadow: 0 1px $_shadow;
   }
   @else {
-    text-shadow: 0 -1px $shadow;
+    text-shadow: 0 -1px $_shadow;
-    icon-shadow: 0 -1px $shadow;
+    icon-shadow: 0 -1px $_shadow;
   }
 }
 
-@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge, $shadow: $shadow_color) {
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge) {
 //
 // Button drawing function
 //
@@ -120,8 +117,6 @@
 // $tc:   optional text color for colored* types
 // $edge: set to none to not draw the bottom edge or specify a color to not
 //        use the default one
-// $shadow: set to none to not draw the drop shadow or specify a color to not
-//          use the default one
 //
 // possible $t values:
 // normal, hover, active, insensitive, insensitive-active,
@@ -129,68 +124,79 @@
 // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
 //
 
-  $hilight_color: draw_button_hilight_color($c);
+  $_hilight_color: _button_hilight_color($c);
-  $button_edge: if($edge == none, none, draw_widget_edge($edge));
+  $_button_edge: if($edge == none, none, _widget_edge($edge));
-  $blank_edge: if($edge == none, none, draw_widget_edge(transparentize($edge,1)));
+  $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
-  $button_shadow: if($shadow == none, none, 0 1px 1px 0 $shadow);
+  $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
 
-  // normal button
   @if $t==normal {
-    color: $tc;
+  //
-    background-color: lighten($c, 3%) !important;
+  // normal button
-    border-color: draw_border_color($c);
+  //
-    @include draw_shadows($button_shadow);
-    // box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
-    text-shadow: 0 1px $text_shadow_color;
-    icon-shadow: 0 1px $text_shadow_color;
-  }
 
-  // focused button
-  @if $t==focus {
     color: $tc;
-    text-shadow: 0 1px $text_shadow_color;
+    background-color: $c;
-    icon-shadow: 0 1px $text_shadow_color;
+    border-color: $borders_color;
-    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.7);
+    box-shadow: $_button_shadow;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+  }
+  @if $t==focus {
+  //
+  // focused button
+  //  
+    color: $tc;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 2px $selected_bg_color;
     //border-color: $selected_bg_color;
   }
 
-  // hover button
   @else if $t==hover {
+  //
+  // active osd button
+  //
     color: $tc;
-    background-color: lighten($c, if($variant == 'light', 8%, 5%)) !important;
+    border-color: $borders_color;
-    border-color: if($variant == 'light', draw_border_color(lighten($c, 7%)), draw_border_color($c));
+    background-color: $c;
-    @include draw_shadows($button_shadow);
+    box-shadow: $_button_shadow;
-    text-shadow: 0 1px $text_shadow_color;
+    text-shadow: 0 1px black;
-    icon-shadow: 0 1px $text_shadow_color;
+    icon-shadow: 0 1px black;
-  }
 
-  // active button
+  }
   @else if $t==active {
+  //
+  // active osd button
+  //
     color: $tc;
-    background-color: darken($c,3%) !important;
+    border-color: $borders_color;
-    border-color: draw_border_color(if($variant == 'light', $c, darken($c,7%)));
+    background-color: $c;
     text-shadow: none;
     icon-shadow: none;
     box-shadow: none;
   }
-
-  // insensitive button
   @else if $t==insensitive {
+
     color: $insensitive_fg_color;
     border-color: $insensitive_borders_color;
-    background-color: $insensitive_bg_color !important;
+    background-color: $insensitive_bg_color;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
   }
-
-  // reset
   @else if $t==undecorated {
+  //
+  // reset
+  //
     border-color: transparent;
     background-color: transparent;
     background-image: none;
-    @include draw_shadows(inset 0 1px rgba(255,255,255,0),$blank_edge);
+
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      $_blank_edge);
+
     text-shadow: none;
     icon-shadow: none;
   }
 }
+

data/theme/gnome-shell-sass/_high-contrast-colors.scss

@@ -22,10 +22,11 @@ $destructive_color: darken(#ef2929,10%);
 
 $osd_fg_color: #eeeeec;
 $osd_bg_color: #2e3436;
-$osd_borders_color: rgba(0,0,0, 0.7);
+$osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: rgba(255,255,255, 0.1);
+$osd_outer_borders_color: transparentize(white, 0.9);
 
-$shadow_color: rgba(0,0,0, 0.1);
+$tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

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

@@ -1,38 +0,0 @@
-//
-// Shell widgets stylesheets are placed in separate .scss files
-// in 'widgets' and imported into the main stylesheet in this file.
-// To create or update a widget for the shell modify the list below.
-//
-
-/* WIDGETS */
-@import 'widgets/app-grid';
-@import 'widgets/app-switcher';
-@import 'widgets/buttons';
-@import 'widgets/calendar';
-@import 'widgets/check-box';
-@import 'widgets/corner-ripple';
-@import 'widgets/dash';
-@import 'widgets/dialogs';
-@import 'widgets/entries';
-@import 'widgets/hotplug';
-@import 'widgets/ibus-popup';
-@import 'widgets/keyboard';
-@import 'widgets/login-dialog';
-@import 'widgets/looking-glass';
-@import 'widgets/message-list';
-@import 'widgets/notifications';
-@import 'widgets/misc';
-@import 'widgets/network-dialog';
-@import 'widgets/osd';
-@import 'widgets/overview';
-@import 'widgets/panel';
-@import 'widgets/popovers';
-@import 'widgets/screen-shield';
-@import 'widgets/scrollbars';
-@import 'widgets/search-entry';
-@import 'widgets/search-results';
-@import 'widgets/slider';
-@import 'widgets/switches';
-@import 'widgets/tiled-previews';
-@import 'widgets/window-picker';
-@import 'widgets/workspace-switcher';

data/theme/gnome-shell-sass/widgets/_app-grid.scss

@@ -1,242 +0,0 @@
-/* App Grid */
-
-$app_icon_size: 96px;
-$app_icon_padding: 24px;
-
-// app icons
-.icon-grid {
-  -shell-grid-horizontal-item-size: $app_icon_size + $app_icon_padding * 2;
-  -shell-grid-vertical-item-size: $app_icon_size + $app_icon_padding * 2;
-  spacing: $base_spacing * 6;
-
-  .overview-icon {
-    icon-size: $app_icon_size;
-    StIcon { margin-bottom: $base_margin; } // margin on icon so label isn't close
-  }
-}
-
-//.app-display { spacing: 20px; }
-
-/* App Icons */
-
-$app_grid_fg_color: #fff;
-
-// Outline for low res icons
-.lowres-icon {
-  icon-shadow: 0 1px 2px rgba(0,0,0,0.3);
-}
-
-// Dropshadow for large icons
-.icon-dropshadow {
-  icon-shadow: 0 1px 2px rgba(0,0,0,0.4);
-}
-
-// Icon tiles in the app grid
-.app-well-app,
-.app-folder {
-
-  .overview-icon {
-    @extend %icon_tile;
-    color: $app_grid_fg_color !important;
-  }
-
-  &:selected {
-    .overview-icon {
-      background-color: transparentize($osd_bg_color,0.7);
-      color: $app_grid_fg_color;
-    }
-  }
-
-  &:hover,
-  &:focus,
-  &:selected {
-    .overview-icon {
-      background-color: transparentize($osd_fg_color,0.9);
-      color: $osd_fg_color;
-    }
-  }
-
-  &:focus {
-    .overview-icon {
-      background-color: transparentize($osd_fg_color,0.7  );
-      // border-color: $selected_bg_color;
-      color: $app_grid_fg_color;
-    }
-  }
-
-  &:drop {
-    .overview-icon {
-      background-color: transparentize($selected_bg_color,.15);
-    }
-  }
-
-  &:active,
-  &:checked {
-    .overview-icon {
-      background-color: transparentize(darken($osd_bg_color,10%), 0.5);
-    }
-  }
-}
-
-/* App Folders */
-.app-folder {
-  .overview-icon {
-    @extend %icon_tile;
-  }
-}
-
-// expanded folder
-.app-folder-dialog {
-  border-radius: $modal_radius * 1.5;
-  border: 1px solid $osd_outer_borders_color;
-  spacing: 12px;
-  background-color: transparentize(darken($osd_bg_color,10%), 0.05);
-
-  & .folder-name-container {
-    padding: 24px 36px 0;
-    spacing: 12px;
-
-    & .folder-name-label,
-    & .folder-name-entry {
-      font-size: 18pt;
-      font-weight: bold;
-    }
-
-    & .folder-name-entry { width: 300px }
-
-    /* FIXME: this is to keep the label in sync with the entry */
-    & .folder-name-label { padding: 5px 7px }
-
-    & .edit-folder-button {
-      @extend %button;
-
-      padding: 0;
-      width: 36px;
-      height: 36px;
-      border-radius: 18px;
-
-      & > StIcon { icon-size: 16px }
-    }
-  }
-
-  & StButton#vhandle,
-  & StButton#vhandle:hover,
-  & StButton#vhandle:active { background-color: transparent; }
-}
-.app-folder-dialog-container {
-  padding: 12px;
-  width: 800px;
-  height: 600px;
-}
-
-.app-folder-icon {
-  padding: $base_padding;
-  spacing-rows: $base_spacing;
-  spacing-columns: $base_spacing;
-}
-
-
-// Running app indicator (also shown in dash)
-.app-well-app-running-dot {
-  height: 5px;
-  width: 5px;
-  border-radius:5px;
-  background-color: $osd_fg_color;
-  margin-bottom: 1px;
-}
-
-// Rename popup for app folders
-.rename-folder-popup {
-  .rename-folder-popup-item {
-    spacing: $base_spacing;
-    &:ltr, &:rtl { padding: 0 $base_padding * 2; }
-  }
-}
-
-// right-click app menu
-.app-menu,
-.app-well-menu {
-  max-width: 27.25em;
-}
-
-// App Grid pagination indicators
-.page-indicator {
-  padding: 15px 20px;
-
-  .page-indicator-icon {
-    width: 10px;
-    height: 10px;
-    border-radius: 10px; // the same as height&width
-    background-color: white;
-  }
-}
-
-// Some hacks I don't even know
-.all-apps,
-.frequent-apps > StBoxLayout {
-  // horizontal padding to make sure scrollbars or dash don't overlap content
-  padding: 0px 88px 10px 88px;
-}
-
-.app-well-app > .overview-icon.overview-icon-with-label {
-  padding: 10px 8px 5px 8px;
-  spacing: $base_spacing;
-}
-
-// Label when no frequent apps
-.no-frequent-applications-label { @extend %status_text; }
-
-// shutdown and other actions in the grid
-.system-action-icon {
-  background-color: rgba(0,0,0,0.8);
-  color: #fff;
-  border-radius: 99px;
-  icon-size: $app_icon_size * 0.5;
-}
-
-/* Frequent | All toggle */
-
-// container
-.app-view-controls { 
-  padding-bottom: 32px;
-}
-
-// buttons
-.app-view-control { 
-  padding: $base_padding $base_padding*5;
-  margin: 0;
-  background-color: transparentize($osd_bg_color, 0.5);
-  border-width: 1px;
-  color: darken($osd_fg_color, 25%);
-
-  &:hover {
-    background-color: transparentize($osd_bg_color, 0.5) !important;
-    box-shadow:none !important;
-    color: darken($osd_fg_color, 25%);
-  }
-
-  &:active {
-    box-shadow: none;
-    background-color: $selected_bg_color !important;
-    &:hover {
-      background-color: lighten($selected_bg_color, 11%) !important;
-    }
-  }
-
-  &:checked {
-    background-color: $selected_bg_color !important;
-    color: $selected_fg_color;
-    box-shadow: none;
-    &:active { background-color: darken($selected_bg_color, 4%) !important; }
-    &:hover { background-color: lighten($selected_bg_color, 7%) !important; }
-  }
-
-  &:first-child {
-    border-right-width: 0 !important;
-    border-radius: $base_border_radius 0 0 $base_border_radius;
-  }
-
-  &:last-child {
-    border-radius: 0 $base_border_radius $base_border_radius 0;
-  }
-}

data/theme/gnome-shell-sass/widgets/_app-switcher.scss

@@ -1,55 +0,0 @@
-/* App Switcher */
-
-.switcher-popup {
-  padding: 8px;
-  spacing: $base_spacing * 4;
-}
-
-// switcher onscreen panel
-.switcher-list {
-  @extend %osd_panel;
-
-  .item-box {
-    padding: 8px;
-    border-radius: $base_border_radius + 1px;
-    border: 1px solid transparent;
-
-    &:outlined {
-      border: 1px solid darken($borders_color,5%);
-      background-color: transparentize($osd_fg_color, 0.9);
-      box-shadow: inset 0 2px 2px 0 rgba(0,0,0,0.4);
-    }
-
-    &:selected {
-      background-color: transparentize($osd_fg_color, 0.9);
-      color: $osd_fg_color;
-    }
-  }
-
-  // window thumbnails
-  .thumbnail-box {
-    padding: 2px;
-    spacing: $base_spacing;
-  }
-
-  .thumbnail {
-    width: 256px;
-  }
-
-  .separator {
-    width: 1px;
-    background: $borders_color;
-  }
-
-  .switcher-list-item-container {
-    spacing: $base_spacing * 2;
-  }
-}
-
-.switcher-arrow {
-  border-color: rgba(0,0,0,0);
-  color: transparentize($fg_color,0.2);
-  &:highlighted {
-    color: $fg_color;
-  }
-}

data/theme/gnome-shell-sass/widgets/_buttons.scss

@@ -1,5 +0,0 @@
-/* Buttons */
-
-.button {
-  @extend %button; // that's it
-}

data/theme/gnome-shell-sass/widgets/_calendar.scss

@@ -1,268 +0,0 @@
-/* Date/Time Menu */
-
-.clock-display-box { spacing: $base_spacing; }
-
-// overall menu
-#calendarArea {
-  padding:0;
-  margin:0;
-}
-
-// Calendar menu side column
-.datemenu-calendar-column {
-  spacing: 0;
-  border: 0 solid $bubble_borders_color;
-  padding: $base_padding * 2;
-  padding-bottom: 3em; // account for the notifications clear button
-  padding-top:0;
-
-  &:ltr {margin-right: $base_margin * 2; border-left-width: 1px; }
-  &:rtl {margin-left: $base_margin * 2; border-right-width: 1px; }
-
-  // today button (the date)
-  .datemenu-today-button {
-    padding: $base_padding * 1.5;
-    margin: $base_margin;
-    border: 1px solid transparent;
-    border-radius: $base_border_radius + 2px;
-
-    &:hover { @include button(hover);}
-    &:focus { @include button(focus);}
-
-    &:active {
-      @include button(active);
-    }
-
-    // weekday label
-    .day-label {
-      @include fontsize($base_font_size+1);
-      font-weight: bold;
-    }
-
-    // date label
-    .date-label {
-      @include fontsize($base_font_size+7);
-      font-weight: 1000;
-    }
-  }
-
-  // calendar
-  .calendar {
-    @extend %notification_bubble;
-    margin:$base_margin !important;
-    margin-bottom: $base_padding + $base_margin !important;
-    padding:$base_padding !important;
-
-    // more below for sub-elements
-  }
-
-  .datemenu-displays-section {
-    margin:0;
-  }
-
-  .datemenu-displays-box {
-    spacing: $base_spacing;
-    margin:0;
-
-    // world clocks and weather
-    .world-clocks-button,
-    .weather-button {
-      @extend %notification_bubble;
-      padding:$base_padding !important;
-    }
-  }
-}
-
-.events-section-title {
-  color: desaturate(darken($fg_color,40%), 10%);
-  font-weight: bold;
-  border-radius: 4px;
-  padding: .4em;
-}
-
-/* Calendar */
-.calendar {
-
-  // month
-  .calendar-month-label {
-    color: lighten($fg_color,5%);
-    font-weight: bold;
-    padding: 8px 0;
-    &:focus {}
-  }
-
-  // prev/next month icons
-  .calendar-change-month-back StIcon,
-  .calendar-change-month-forward StIcon {
-    icon-size: $base_icon_size;
-  }
-
-  .pager-button {
-    background-color: transparent;
-    height: 32px;
-    width: 32px;
-    border-radius: $base_border_radius;
-    &:hover, &:focus { background-color: lighten($hover_bg_color, 5%); }
-    &:active { background-color: $active_bg_color; }
-  }
-
-
-  $calendar_day_size: 32px;
-
-  .calendar-day-base {
-    @include fontsize($base_font_size - 3);
-    text-align: center;
-    width: $calendar_day_size;
-    height: $calendar_day_size;
-    padding: 0;
-    margin: 2px;
-    border-radius: $calendar_day_size * 0.5 + 2px;
-    border: 1px solid transparent; //avoid jumparound due to today
-    font-feature-settings: "tnum";
-    &:hover, &:focus { background-color: $hover_bg_color; }
-    &:active,&:selected {
-      color: lighten($fg_color,10%);
-      background-color: darken($bg_color,5%);
-    }
-
-    // day of week heading
-    &.calendar-day-heading {
-      color: lighten($fg_color,10%);
-      margin-top: 1em;
-      @include fontsize($base_font_size - 4);
-    }
-  }
-  .calendar-day { //border collapse hack - see calendar.js
-    border-width: 0;
-  }
-
-  .calendar-day-top {
-    border-top-width: 1px;
-  }
-
-  .calendar-day-left { border-left-width: 1px; }
-  .calendar-work-day {}
-  .calendar-nonwork-day {
-    color: $insensitive_fg_color;
-  }
-
-  // Today
-  .calendar-today {
-    font-weight: bold;
-    border: 1px solid transparent;
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-
-    &:hover,&:focus {
-      background-color:lighten($selected_bg_color, 3%);
-      color: $selected_fg_color;
-    }
-
-    &:active,&:selected {
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
-      &:hover,&:focus {
-        background-color:lighten($selected_bg_color, 3%);
-        color: $selected_fg_color;
-      }
-    }
-
-  }
-  .calendar-day-with-events {
-    color: lighten($fg_color,10%);
-    font-weight: bold;
-    background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
-  }
-
-  .calendar-other-month-day {
-    color: transparentize($fg_color ,0.5);
-    opacity: 0.5;
-  }
-
-  .calendar-week-number {
-    @include fontsize($base_font_size - 4);
-    font-weight: bold;
-    height: 1.8em;
-    width: 2.3em; 
-    border-radius: 2px;
-    padding: 0.5em 0 0;
-    margin: 6px;
-    background-color: darken($bg_color, 2%);
-    color: lighten($fg_color, 5%);
-  }
-}
-
-
-/* Weather */
-.weather-box {
-  spacing: $base_spacing;
-  padding:$base_padding;
-
-  .weather-header {
-    color: desaturate(darken($fg_color,40%), 10%);
-    font-weight: bold;
-    &.location {
-      font-weight: normal;
-      @include fontsize($base_font_size - 1);
-    }
-  }
-
-  .weather-grid {
-    margin-top: $base_margin;
-    spacing-rows: $base_spacing;
-    spacing-columns: $base_spacing * 2;
-  }
-
-  .weather-forecast-time {
-    color: darken($fg_color,30%);
-    font-feature-settings: "tnum";
-    @include fontsize($base_font_size - 2);
-    font-weight: normal;
-    padding-top: 0.2em;
-    padding-bottom: 0.4em;
-  }
-
-  .weather-forecast-icon {
-    icon-size: $base_icon_size * 2;
-  }
-
-  .weather-forecast-temp {
-    font-weight: bold;
-  }
-}
-
-/* World clocks */
-.world-clocks-grid {
-  padding:$base_padding;
-  spacing-rows: $base_spacing;
-  spacing-columns: $base_spacing * 2;
-
-  // title
-  .world-clocks-header {
-    color: desaturate(darken($fg_color,40%), 10%);
-    font-weight: bold;
-  }
-
-  // city label
-  .world-clocks-city {
-    color: $fg_color;
-    @include fontsize($base_font_size);
-    font-weight: normal;
-  }
-
-  // timezone time
-  .world-clocks-time {
-    font-weight: bold;
-    color: $fg_color;
-    font-feature-settings: "lnum";
-    @include fontsize($base_font_size);
-    text-align: right;
-  }
-
-  // timezone offset label
-  .world-clocks-timezone {
-    color: darken($fg_color,20%);
-    font-feature-settings: "tnum";
-    @include fontsize($base_font_size - 1);
-  }
-}

data/theme/gnome-shell-sass/widgets/_check-box.scss

@@ -1,18 +0,0 @@
-/* Check Boxes */
-
-// these are equal to the size of the SVG assets
-$check_height: 22px;
-$check_width: 24px;
-
-
-.check-box {
-  StBoxLayout { spacing: .8em; }
-  StBin {
-    width: $check_width;
-    height: $check_height;
-    background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg");
-  }
-  &:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
-  &:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
-  &:focus:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
-}

data/theme/gnome-shell-sass/widgets/_corner-ripple.scss

@@ -1,24 +0,0 @@
-/* Activities Ripple */
-
-$ripple_size: 50px;
-
-.ripple-box {
-  background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
-  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
-  // plus + 2px for the border (box-shadow)
-  width: $ripple_size + 2px;
-  height: $ripple_size + 2px;
-  border-radius: 0 0 $ripple_size + 2px 0; // radius equals the size of the box to give us the curve
-
-  // just a simple change to the border radius position
-  &:rtl { border-radius: 0 0 0 $ripple_size + 2px; }
-}
-
-// Pointer location
-.ripple-pointer-location {
-  width: $ripple_size;
-  height: $ripple_size;
-  border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
-  background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
-  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
-}

data/theme/gnome-shell-sass/widgets/_dash.scss

@@ -1,85 +0,0 @@
-/* Dash */
-
-$dash_placeholder_size: 32px;
-$dash_spacing: $base_padding + 4px;
-$dash_border_radius: $modal_radius * 1.5;
-
-#dash {
-  @extend %overview_panel;
-  @include fontsize($base_font_size - 2);
-  padding: ($dash_spacing / 2) 0;
-
-  //fixme: can't have non uniform borders :(
-  border-radius: 0 $dash_border_radius $dash_border_radius 0; 
-  border-left-width: 0 !important;
-  &:rtl { 
-    border-radius: $dash_border_radius 0 0 $dash_border_radius;
-    border-right-width: 0 !important;
-  }
-
-  .placeholder {
-    // background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
-    background-image:none;
-    background-size: contain;
-    height: $dash_placeholder_size;
-  }
-
-  .empty-dash-drop-target {
-    width: $dash_placeholder_size;
-    height: $dash_placeholder_size;
-  }
-}
-
-// Dash Items
-.dash-item-container > StWidget {
-  padding: ($dash_spacing / 2) $dash_spacing;
-}
-
-// OSD Tooltip
-.dash-label {
-  background-color: transparentize($osd_bg_color,0.05);
-  border-radius: $base_border_radius + 2px;
-  border:none;
-  box-shadow:0 0 0 1px $osd_outer_borders_color;
-  color: $osd_fg_color;
-  padding: $base_padding $base_padding + 2px;
-  text-align: center;
-  -x-offset: $base_margin * 2; // distance from the dash edge
-}
-
-// Show apps button
-.show-apps {
-  color: $osd_fg_color;
-
-  & .overview-icon {
-    @extend %icon_tile;
-    color: $osd_fg_color;
-  }
-
-  &:hover,
-  &:focus,
-  &:selected {
-    .overview-icon {
-      background-color: transparentize($osd_fg_color,0.9);
-      color: $osd_fg_color;
-    }
-  }
-
-  &:drop .overview-icon {
-    background-color: transparentize($selected_bg_color,.15);
-  }
-
-  &:active, &:checked {
-    .overview-icon {
-      background-color: darken($osd_bg_color,10%);
-    }
-  }
-
-  &:checked, &:focus {
-     .show-apps-icon {
-      color: $fg_color;
-      transition-duration: 100ms;
-    }
-  }
-}
-

data/theme/gnome-shell-sass/widgets/_dialogs.scss

@@ -1,169 +0,0 @@
-/* Modal Dialogs */
-
-.modal-dialog {
-  border-radius: $modal_radius;
-  @extend %bubble_panel;
-
-  .modal-dialog-content-box {
-    margin: 32px 40px;
-    spacing: 32px;
-    max-width: 28em;
-  }
-
-  .modal-dialog-linked-button {
-    @extend %bubble_button;
-  }
-}
-
-.mount-dialog-subject {
-  @include fontsize($base_font_size + 3);
-}
-
-/* End Session Dialog */
-
-.end-session-dialog {
-  width: 30em;
-
-  .end-session-dialog-battery-warning,
-  .dialog-list-title {
-    color: $warning_color;
-  }
-}
-
-/* Message Dialog */
-.message-dialog-content {
-  spacing: 18px;
-
-  .message-dialog-title {
-    text-align: center;
-    font-size: 18pt;
-    font-weight: 800;
-  }
-  .message-dialog-description { text-align: center; }
-}
-
-/* Dialog List */
-.dialog-list {
-  spacing: 18px;
-
-  .dialog-list-title {
-    text-align: center;
-    font-weight: bold;
-  }
-
-  .dialog-list-scrollview { max-height: 200px; }
-  .dialog-list-box {
-    spacing: 1em;
-
-    .dialog-list-item {
-      spacing: 1em;
-
-      .dialog-list-item-title { font-weight: bold; }
-      .dialog-list-item-description {
-        color: darken($fg_color,5%);
-        @include fontsize($base_font_size - 1);
-      }
-    }
-  }
-}
-
-/* Run Dialog */
-.run-dialog {
-  .modal-dialog-content-box {
-    margin-top: 24px;
-    margin-bottom: 14px;
-  }
-  .run-dialog-entry { width: 20em; }
-  .run-dialog-description {
-    @include fontsize($base_font_size - 1);
-    text-align: center;
-    color: darken($fg_color, 20%);
-  }
-}
-
-/* Password or Authentication Dialog */
-
-.prompt-dialog {
-  width: 28em;
-
-  .modal-dialog-content-box {
-    margin-bottom: 24px;
-  }
-}
-
-.prompt-dialog-password-grid {
-  spacing-rows: 8px;
-  spacing-columns: 4px;
-
-  .prompt-dialog-password-entry {
-    width: auto;
-
-    // 4px (spacing) + 16px (spinner-width)
-    &:ltr { margin-left: 20px; }
-    &:rtl { margin-right: 20px; }
-  }
-}
-
-.prompt-dialog-password-layout {
-  spacing: 8px;
-}
-
-.prompt-dialog-password-entry {
-  width: 20em;
-}
-
-.prompt-dialog-error-label,
-.prompt-dialog-info-label,
-.prompt-dialog-null-label {
-  text-align: center;
-  @include fontsize($base_font_size - 1);
-}
-
-.prompt-dialog-error-label {
-  color: $warning_color;
-}
-
-
-/* Polkit Dialog */
-
-.polkit-dialog-user-layout {
-  text-align: center;
-  spacing: 8px;
-  margin-bottom: 6px;
-
-  .polkit-dialog-user-icon {
-    border-radius: 99px;
-    background-size: contain;
-  }
-  .polkit-dialog-user-root-label { color: $warning_color; }
-}
-
-/* Audio selection dialog */
-.audio-device-selection-dialog {
-  .modal-dialog-content-box { margin-bottom: 28px; }
-  .audio-selection-box { spacing: 20px; }
-}
-
-.audio-selection-device {
-  border: 1px solid $bubble_borders_color;
-  border-radius: 12px;
-  &:hover,&:focus { background-color: $hover_bg_color; }
-  &:active { 
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
-}
-
-.audio-selection-device-box {
-  padding: 20px;
-  spacing: 20px;
-}
-
-.audio-selection-device-icon {
-  icon-size: $base_icon_size * 4;
-}
-
-/* Access Dialog */
-.access-dialog {
-  spacing: 30px;
-}

data/theme/gnome-shell-sass/widgets/_entries.scss

@@ -1,27 +0,0 @@
-/* Entries */
-
-StEntry {
-  border-radius: $base_border_radius;
-  padding: 8px;
-  border-width: 1px;
-  color: $fg_color;
-  @include entry(normal);
-  //&:hover { @include entry(hover);}
-  &:focus { @include entry(focus);}
-  &:insensitive { @include entry(insensitive);}
-  selection-background-color: $selected_bg_color;
-  selected-color: $selected_fg_color;
-  StIcon.capslock-warning {
-    icon-size: 16px;
-    warning-color: $warning_color;
-    padding: 0 4px;
-  }
-  StIcon.peek-password {
-    icon-size: $base_icon_size;
-    padding: 0 4px;
-  }
-  StLabel.hint-text {
-    margin-left: 2px;
-    color: transparentize($fg_color, 0.3);
-  }
-}

data/theme/gnome-shell-sass/widgets/_hotplug.scss

@@ -1,10 +0,0 @@
-// hotplug
-
-.hotplug-notification-item {
-  @extend %bubble_button;
-}
-
-.hotplug-notification-item-icon {
-  icon-size: 24px;
-  padding: 0 4px;
-}

data/theme/gnome-shell-sass/widgets/_ibus-popup.scss

@@ -1,30 +0,0 @@
-// IBus Candidate Popup
-.candidate-popup-content {
-  padding: 0.5em;
-  spacing: 0.3em;
-}
-
-.candidate-index {
-  padding: 0 0.5em 0 0;
-  color: darken($fg_color,10%);
-}
-
-.candidate-box {
-  padding: 0.3em 0.5em 0.3em 0.5em;
-  border-radius: $base_border_radius;
-  &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
-}
-
-.candidate-page-button-box {
-  height: 2em;
-  .vertical & { padding-top: 0.5em; }
-  .horizontal & { padding-left: 0.5em; }
-}
-
-.candidate-page-button {
-  padding: 4px;
-}
-
-.candidate-page-button-previous { border-radius: $base_border_radius 0px 0px $base_border_radius; border-right-width: 0; }
-.candidate-page-button-next { border-radius: 0px $base_border_radius $base_border_radius 0px;  }
-.candidate-page-button-icon { icon-size: 1em; }

data/theme/gnome-shell-sass/widgets/_keyboard.scss

@@ -1,124 +0,0 @@
-/* On-screen Keyboard */
-
-$key_size: 1.2em;
-$key_border_radius: $base_border_radius + 3px;
-$key_bg_color:  $bg_color;
-// $default_key_bg_color: darken($key_bg_color, 4%);
-$default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten($osd_bg_color, 2%));
-
-
-// draw keys using button function
-#keyboard {
-  background-color: transparentize(if($variant=='light', darken($bg_color, 5%), darken($bg_color, 8%)), 0.1);
-  box-shadow: inset 0 1px 0 0 $osd_outer_borders_color !important;
-
-  .page-indicator {
-    padding: $base_padding;
-
-    .page-indicator-icon {
-      width: 8px;
-      height: 8px;
-    }
-  }
-}
-
-// the container for individual keys
-.key-container {
-  padding: $base_margin;
-  spacing: $base_margin;
-}
-
-// the keys
-.keyboard-key {
-
-  @include button(normal, $c:$key_bg_color);
-
-  &:focus { @include button(focus);}
-  &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
-  &:active { @include button(active, $c: $key_bg_color); }
-
-  @include fontsize($base_font_size + 5);
-  min-height: $key_size;
-  min-width: $key_size;
-  border-width: 1px;
-  border-style: solid;
-  border-radius: $key_border_radius;
-
-  &:grayed { //FIXMEy
-    background-color: darken($bg_color, 3%);
-    color: $osd_fg_color;
-    border-color: $osd_borders_color;
-  }
-
-  // non-character keys
-  &.default-key {
-
-    // size of the icon asset
-    background-size: 24px;
-
-    @include button(normal, $c:$default_key_bg_color);
-    &:hover, &:checked {@include button(hover, $c: $default_key_bg_color);}
-    &:active { @include button(active, $c: $default_key_bg_color);}
-  }
-
-  // enter key is suggested-action
-  &.enter-key {
-    background-image: url("resource:///org/gnome/shell/theme/key-enter.svg");
-
-    @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
-    &:hover, &:checked { @include button(hover, $c: lighten($selected_bg_color, 3%));}
-    &:active {@include button(active, $c: darken($selected_bg_color, 2%));}
-  }
-
-  // key assets
-  &.shift-key-lowercase {background-image: url("resource:///org/gnome/shell/theme/key-shift.svg");}
-  &.shift-key-uppercase {background-image: url("resource:///org/gnome/shell/theme/key-shift-uppercase.svg");}
-  &.shift-key-uppercase:latched {background-image: url("resource:///org/gnome/shell/theme/key-shift-latched-uppercase.svg");}
-  &.hide-key {background-image: url("resource:///org/gnome/shell/theme/key-hide.svg");}
-  &.layout-key {background-image: url("resource:///org/gnome/shell/theme/key-layout.svg");}
-}
-
-// long press on a key popup
-.keyboard-subkeys {
-  color: $osd_fg_color;
-  -arrow-border-radius: $modal_radius;
-  -arrow-background-color: $osd_bg_color;
-  -arrow-border-width: 1px;
-  -arrow-border-color: lighten($osd_bg_color, 9%);
-  -arrow-base: 20px;
-  -arrow-rise: 10px;
-  -boxpointer-gap: $base_spacing;
-
-  .keyboard-key {
-    @include button(normal, $c:$key_bg_color);
-
-    &:focus { @include button(focus);}
-    &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
-    &:active { @include button(active, $c: $key_bg_color); }
-
-    border-radius:$base_border_radius;
-  }
-}
-
-// emoji
-.emoji-page {
-  .keyboard-key {
-    background-color: transparent;
-    border: none;
-    color: initial;
-  }
-}
-
-.emoji-panel {
-  .keyboard-key:latched {
-    border-color: lighten($selected_bg_color, 5%);
-    background-color: $selected_bg_color;
-  }
-}
-
-// suggestions
-.word-suggestions {
-  @include fontsize($base_font_size + 3);
-  spacing: 12px;
-  min-height: 20pt;
-}

data/theme/gnome-shell-sass/widgets/_login-dialog.scss

@@ -1,151 +0,0 @@
-/* Login Dialog */
-
-.login-dialog-banner-view {
-  padding-top: 24px;
-  max-width: 23em;
-}
-
-.login-dialog {
-  //reset
-  border: none;
-  background-color: transparent;
-
-  $_gdm_bg: lighten(#2e3436, 19%);
-
-  StEntry {
-    @if $variant=='dark' {
-      $_gdm_entry_bg: transparentize(lighten(desaturate(#241f31, 20%), 2%), 0.5);
-      background-color: $_gdm_entry_bg;
-      color: $osd_fg_color;
-    }
-  }
-
-  .modal-dialog-button-box { spacing: 3px; }
-  .modal-dialog-button {
-    padding: 4px 18px;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.2);
-    background-color: $_gdm_bg;
-    border-color: $_gdm_bg;
-    color: $fg_color;
-
-    $_hover_c: lighten($_gdm_bg, 5%);
-    &:hover, &:focus {
-      background-color: $_hover_c;
-      border-color: $_hover_c;
-    }
-    &:active {
-      $_active_c: darken($_gdm_bg, 5%);
-      box-shadow: none;
-      background-color: $_active_c;
-      border-color: $_active_c;
-    }
-    &:insensitive {
-      @include button(insensitive);
-      border-color: darken($_gdm_bg, 5%);
-      background-color: darken($_gdm_bg, 5%);
-      color: transparentize($fg_color, 0.3);
-    }
-    &:default {
-      @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
-      border-color: $selected_bg_color;
-      &:hover, &:focus { 
-        @include button(hover,$c:$selected_bg_color, $tc:$selected_fg_color);
-        $_def_hover_c: lighten($selected_bg_color, 5%);
-        background-color: $_def_hover_c;
-        border-color: $_def_hover_c;
-      }
-      &:active {
-        @include button(active,$c:$selected_bg_color, $tc:$selected_fg_color);
-        $_def_active_c: darken($selected_bg_color, 5%);
-        background-color: $_def_active_c;
-        border-color: $_def_active_c;
-      }
-      &:insensitive {
-        @include button(insensitive);
-        border-color: darken($selected_bg_color, 10%);
-        background-color: darken($selected_bg_color, 10%);
-        color: transparentize($selected_fg_color, 0.3);
-      }
-    }
-  }
-}
-
-.login-dialog-logo-bin { padding: 24px 0px; }
-.login-dialog-banner { color: darken($osd_fg_color,10%); }
-.login-dialog-button-box { spacing: 5px; }
-.login-dialog-message-warning { color: $warning_color; }
-.login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
-.login-dialog-user-selection-box { padding: 100px 0px; }
-.login-dialog-not-listed-label {
-  padding-left: 2px;
-  .login-dialog-not-listed-button:focus &,
-  .login-dialog-not-listed-button:hover & {
-    color: $osd_fg_color;
-  }
-}
-
-.login-dialog-not-listed-label {
-  @include fontsize($base_font_size - 1);
-  font-weight: bold;
-  color: darken($osd_fg_color,30%);
-  padding-top: 1em;
-}
-
-.login-dialog-user-list-view { -st-vfade-offset: 1em; }
-.login-dialog-user-list {
-  spacing: 12px;
-  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;
-  color: darken($osd_fg_color,30%);
-  &:ltr .user-widget { padding-right: 1em; }
-  &:rtl .user-widget { padding-left: 1em; }
-  .login-dialog-timed-login-indicator {
-    height: 2px;
-    margin-top: 6px;
-    background-color: $osd_fg_color;
-  }
-  &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
-}
-
-.login-dialog-username,
-.user-widget-label {
-  color: $osd_fg_color;
-  @include fontsize($base_font_size + 2);
-  font-weight: bold;
-  text-align: left;
-  padding-left: 15px;
-}
-
-.user-widget-label {
-  &:ltr { padding-left: 14px; }
-  &:rtl { padding-right: 14px; }
-}
-
-.login-dialog-prompt-layout {
-  padding-top: 24px;
-  padding-bottom: 12px;
-  spacing: $base_spacing * 2;
-  width: 23em;
-}
-
-.login-dialog-prompt-label {
-  color: darken($osd_fg_color, 20%);
-  @include fontsize($base_font_size + 1);
-  padding-top: 1em;
-}
-
-.login-dialog-session-list-button StIcon {
-  icon-size: 1.25em;
-}
-
-.login-dialog-session-list-button {
-  color: darken($osd_fg_color,30%);
-  &:hover,&:focus { color: $osd_fg_color; }
-  &:active { color: darken($osd_fg_color, 50%); }
-}

data/theme/gnome-shell-sass/widgets/_looking-glass.scss

@@ -1,97 +0,0 @@
-/* Looking Glass */
-
-// Dialog
-#LookingGlassDialog {
-  background-color: $osd_bg_color;
-  spacing: $base_spacing;
-  padding: 4px;
-  border: 2px solid transparentize($osd_fg_color, 0.8);
-  border-top-width:0;
-  border-radius: 0 0 $base_border_radius $base_border_radius;
-
-  & > #Toolbar {
-    border: none;
-    border-radius: $base_border_radius;
-    background-color: darken($osd_bg_color, 10%);
-  }
-
-  .labels { spacing: $base_spacing; }
-  .notebook-tab {
-    -natural-hpadding: $base_padding * 2;
-    -minimum-hpadding: 6px;
-    font-weight: bold;
-    color: $fg_color;
-    transition-duration: 100ms;
-    padding-left: .3em;
-    padding-right: .3em;
-    &:hover {
-      color: white;
-      text-shadow: black 0px 2px 2px;
-    }
-    &:selected {
-      border-bottom-width: 2px;
-      border-color: lighten($selected_bg_color,5%);
-      color: white;
-      text-shadow: black 0px 2px 2px;
-    }
-  }
-  StBoxLayout#EvalBox { padding: 4px; spacing: $base_spacing; }
-  StBoxLayout#ResultsArea { spacing: $base_spacing; }
-}
-
-.lg-dialog {
-  StEntry {
-    selection-background-color: #bbbbbb;
-    selected-color: $osd_bg_color;
-  }
-  .shell-link {
-    color: #999999;
-    &:hover { color: #dddddd; }
-   }
-}
-
-.lg-completions-text {
-    font-size: .9em;
-    font-style: italic;
-}
-
-.lg-obj-inspector-title {
-    spacing: $base_spacing;
-}
-
-.lg-obj-inspector-button {
-    border: 1px solid gray;
-    padding: 4px;
-    border-radius: $base_border_radius;
-    &:hover { border: 1px solid #ffffff; }
-}
-
-// Extensions
-#lookingGlassExtensions { padding: 4px; }
-
-.lg-extensions-list {
-    padding: 4px;
-    spacing: 6px;
-}
-
-.lg-extension {
-    border: 1px solid $osd_borders_color;
-    border-radius: $base_border_radius;
-    padding: 4px;
-}
-
-.lg-extension-name {
-    font-weight: bold;
-}
-
-.lg-extension-meta {
-    spacing: 6px;
-}
-
-// Inspector
-#LookingGlassPropertyInspector {
-  background: $osd_bg_color;
-  border: 1px solid $osd_borders_color;
-  border-radius: $base_border_radius;
-  padding: 6px;
-}

data/theme/gnome-shell-sass/widgets/_message-list.scss

@@ -1,147 +0,0 @@
-/* Message List */
-// a.k.a. notifications in the menu
-
-// main list
-.message-list {
-  width: 31.5em;
-  padding: 0 $base_padding * 2;
-
-  .message-list-placeholder { spacing: 12px; }
-}
-
-.message-list-sections {
-  spacing: $base_spacing;
-  margin: $base_margin * 4; // to account for scrollbar
-}
-
-.message-list-section,
-.message-list-section-list {
-  spacing: $base_spacing;
-}
-
-.message-list-section-list {
-  &:ltr {padding:0;}
-  &:rtl {padding:0;}
-}
-
-// do-not-disturb + clear button
-.message-list-controls {
-  margin: $base_margin $base_margin*2;
-  spacing: $base_spacing;
-}
-
-// message bubbles
-.message {
-  @extend %notification_bubble;
-
-  // title
-  .message-title {
-    color: $fg_color;
-    font-weight: bold;
-    margin-bottom:4px;
-  }
-
-  // content
-  .message-content {
-    color: darken($fg_color, 10%);
-    padding: $base_padding 0;
-    margin:$base_margin * 2;
-    &:ltr {
-      margin-left: $base_margin;
-      padding-right:$base_padding;
-    }
-    &:rtl {
-      margin-right: $base_margin;
-      padding-left:$base_padding;
-    }
-  }
-
-  // close button
-  .message-close-button {
-    color: lighten($fg_color, 15%);
-    &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
-    &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
-  }
-
-
-  // icon container
-  .message-icon-bin {
-    padding: $base_padding;
-    margin:$base_padding 0;
-
-    &:rtl {
-      // padding: $base_padding;
-    }
-
-    // icon size and color
-    > StIcon {
-      color: $fg_color;
-      icon-size: $base_icon_size*2; // 32px
-      -st-icon-style: symbolic;
-
-      padding:0;
-      margin:$base_padding;
-    }
-
-    // fallback
-    > .fallback-app-icon {
-      width: $base_icon_size;
-      height: $base_icon_size;
-    }
-  }
-
-  // secondary container in title box
-  .message-secondary-bin {
-    padding: 0;
-
-    // notification time stamp
-    > .event-time {
-      color: transparentize($fg_color, 0.5);
-      @include fontsize($base_font_size - 2);
-      text-align: right;
-      margin: 0 $base_margin * 2;
-      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
-      padding-bottom: $base_padding;
-    }
-  }
-
-}
-
-/* Media Controls */
-.message-media-control {
-  padding: $base_padding * 2 $base_padding * 4;
-  color: darken($fg_color, 15%);
-
-  // uses $hover_bg_color since the media controls are in a notification_bubble
-  &:hover {
-    background-color: lighten($hover_bg_color, 5%);
-    color: $fg_color;
-  }
-
-  &:active { 
-    background-color: darken($hover_bg_color, 2%);
-    color: $fg_color;
-  }
-
-  &:insensitive { color: darken($fg_color,40%); }
-  
-  // fix border-radius for last button on hover
-  &:last-child:ltr { &:hover {border-radius:  0 $base_border_radius+2 $base_border_radius+2 0;} }
-  &:last-child:rtl { &:hover {border-radius: $base_border_radius+2 0 0 $base_border_radius+2;} }
-}
-
-// album-art
-.media-message-cover-icon {
-  icon-size: $base_icon_size*2 !important; // 48px
-  border-radius: $base_border_radius;
-
-  // when there is no artwork
-  &.fallback {
-    color: darken($fg_color, 17%);
-    background-color: $bg_color;
-    border: 1px solid transparent;
-    border-radius: $base_border_radius;
-    icon-size: $base_icon_size * 2 !important;
-    padding: $base_padding * 2;
-  }
-}

data/theme/gnome-shell-sass/widgets/_misc.scss

@@ -1,67 +0,0 @@
-// Links/URLs
-.shell-link {
-  color: $link_color;
-  &:hover { color: lighten($link_color,10%); }
-}
-
-.url-highlighter { link-color: $link_color; }
-
-// Rubberband for select-area screenshots
-.select-area-rubberband {
-  background-color: transparentize($selected_bg_color,0.7);
-  border: 1px solid $selected_bg_color;
-}
-
-// Pointer accessibility notifications
-.pie-timer {
-  width: 60px;
-  height: 60px;
-  -pie-border-width: 3px;
-  -pie-border-color: $selected_bg_color;
-  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
-}
-
-// Screen zoom/Magnifier
-.magnifier-zoom-region {
-  border: 2px solid $selected_bg_color;
-  &.full-screen { border-width: 0; }
-}
-
-// User icon
-.user-icon {
-  background-size: contain;
-  color: $osd_fg_color;
-  border-radius: 99px;
-  &:hover {
-    color: lighten($osd_fg_color,30%);
-  }
-}
-
-// Input Source Switcher
-.input-source-switcher-symbol {
-  font-size: 34pt;
-  width: 96px;
-  height: 96px;
-}
-
-// Window cycler highlight
-.cycler-highlight {
-  border: 5px solid $selected_bg_color;
-}
-
-// Text
-.headline { @include fontsize($base_font_size + 1); }
-.lightbox { background-color: black; }
-.flashspot { background-color: white; }
-
-
-// Hidden
-.hidden { color: rgba(0,0,0,0);}
-
-// Caps-lock warning
-.caps-lock-warning-label {
-  text-align: center;
-  padding-bottom: 8px;
-  @include fontsize($base_font_size - 1);
-  color: $warning_color;
-}

data/theme/gnome-shell-sass/widgets/_network-dialog.scss

@@ -1,56 +0,0 @@
-/* Network Dialogs */
-.nm-dialog {
-  max-height: 34em;
-  min-height: 31em;
-  min-width: 32em;
-}
-
-.nm-dialog-content {
-  spacing: 20px;
-  padding: 24px;
-}
-
-.nm-dialog-airplane-box { spacing: 12px; }
-
-.nm-dialog-airplane-headline {
-  font-weight: bold;
-  text-align: center;
-}
-
-.nm-dialog-airplane-text { color: $fg_color; }
-
-// header
-.nm-dialog-header {
-  font-weight: bold;
-}
-.nm-dialog-header-icon {
-  icon-size: $base_icon_size * 2;
-}
-.nm-dialog-header-hbox { spacing: 10px; }
-
-// list of networks
-.nm-dialog-scroll-view {
-  border: 1px solid $borders_color;
-  padding:0;
-  background-color: darken($bg_color, 3%);
-}
-
-// list item
-.nm-dialog-item {
-  @include fontsize($base_font_size);
-  border-bottom: 1px solid $borders_color;
-  padding: $base_padding * 2;
-  spacing: 0px;
-  &:selected {
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
-}
-
-// icons in list
-.nm-dialog-icon { icon-size: $base_icon_size; }
-.nm-dialog-icons { spacing: $base_spacing * 2; }
-
-// no networks
-.no-networks-label { color: $insensitive_fg_color; }
-.no-networks-box { spacing: $base_padding; }

data/theme/gnome-shell-sass/widgets/_notifications.scss

@@ -1,90 +0,0 @@
-/* Notifications & Mesage Tray */
-
-$notification_banner_height: 64px;
-$notification_banner_width: 34em;
-
-// Banner notifications
-.notification-banner {
-  min-height: $notification_banner_height;
-  width: $notification_banner_width;
-  @include fontsize($base_font_size);
-  margin: $base_margin;
-  border-radius: $modal_radius;
-
-  .message-title { color: $fg_color }
-  .message-content { color: $fg_color; }
-
-  &:hover { background: $bg_color; }
-  &, &:focus, &:active {
-    background-color: $bg_color;
-    .message-title { color: $fg_color }
-    .message-content { color: $fg_color; }
-  }
-
-  // icon
-  .message-icon-bin > StIcon {
-    icon-size: $base_icon_size * 2;
-    color: $fg_color;
-  }
-
-  .notification-icon {
-    padding: 5px;
-  }
-
-  .notification-content {
-    padding: 5px;
-    spacing: 5px;
-  }
-
-  .secondary-icon { icon-size: $base_icon_size; }
-
-  .notification-actions {
-    padding-top: 0;
-    spacing: 0;
-  }
-
-  .notification-button {
-    @extend %bubble_button;
-  }
-}
-
-// counter
-.summary-source-counter {
-  font-size: $base_font_size - 1pt;
-  font-weight: bold;
-  height: 1.6em;
-  width: 1.6em;
-  -shell-counter-overlap-x: 3px;
-  -shell-counter-overlap-y: 3px;
-  background-color: $selected_bg_color;
-  color: $selected_fg_color;
-  border: 2px solid $fg_color;
-  box-shadow: 0 2px 2px rgba(0,0,0,0.5);
-  border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
-}
-
-.secondary-icon { icon-size: $base_icon_size; }
-
-// chat bubbles
-.chat-body { spacing: 5px; }
-.chat-response { margin: 5px; }
-.chat-log-message { color: darken($fg_color,10%); }
-.chat-new-group { padding-top: 1em; }
-.chat-received {
-  padding-left: 4px;
-  &:rtl { padding-left: 0px; padding-right: 4px; }
-}
-
-.chat-sent {
-  padding-left: 18pt;
-  color: lighten($fg_color, 15%);
-  &:rtl { padding-left: 0; padding-right: 18pt; }
-}
-
-.chat-meta-message {
-  padding-left: 4px;
-  @include fontsize($base_font_size - 2);
-  font-weight: bold;
-  color: lighten($fg_color,18%);
-  &:rtl { padding-left: 0; padding-right: 4px; }
-}

data/theme/gnome-shell-sass/widgets/_osd.scss

@@ -1,45 +0,0 @@
-/* OSD */
-
-$osd_levelbar_height:8px;
-
-.osd-window {
-  @extend %osd_panel;
-  text-align: center;
-  font-weight: bold;
-  spacing: $base_spacing * 2; // 12px
-  margin: $base_margin * 8; // 32px
-  min-width: 64px;
-  min-height: 64px;
-
-  StIcon {
-    icon-size:$base_icon_size * 6;
-  }
-
-  .osd-monitor-label { font-size: 3em; }
-  
-  .level {
-    height: $osd_levelbar_height;
-    -barlevel-height: $osd_levelbar_height;
-    -barlevel-background-color: transparentize($osd_fg_color, if($variant=='light', 0.7, 0.9));
-    -barlevel-active-background-color: $osd_fg_color;
-    -barlevel-overdrive-color: $destructive_color;
-    -barlevel-overdrive-separator-width: 3px;
-  }
-}
-
-/* Pad OSD */
-.pad-osd-window {
-  padding: 32px;
-  background-color: transparentize(#000, 0.2);
-
-  .pad-osd-title-box { spacing: 12px; }
-  .pad-osd-title-menu-box { spacing: 6px; }
-}
-
-.combo-box-label {
-  width: 15em;
-}
-
-.resize-popup {
-  @extend %osd_panel;
-}

data/theme/gnome-shell-sass/widgets/_overview.scss

@@ -1,10 +0,0 @@
-/* OVERVIEW */
-
-#overview {
-  spacing: 24px;
-  background-color: transparent;
-}
-
-.overview-controls {
-  padding-bottom: 32px;
-}

data/theme/gnome-shell-sass/widgets/_panel.scss

@@ -1,106 +0,0 @@
-/* Top Bar */
-// a.k.a. the panel
-
-$panel_corner_radius: $base_border_radius+1;
-$panel_bg_color: if($variant == 'light', rgba(0,0,0,0.9), #000);
-$panel_fg_color: if($variant == 'light', darken($fg_color, 15%), darken($fg_color, 10%));
-$panel_height: 1.86em;
-
-
-#panel {
-  background-color: $panel_bg_color;
-  font-weight: bold;
-  height: $panel_height;
-  font-feature-settings: "tnum";
-
-  // transparent panel on lock & login screens
-  &.unlock-screen,
-  &.login-screen,
-  &.lock-screen {
-    background-color: transparent;
-
-    .panel-corner {
-      -panel-corner-radius: 0;
-      -panel-corner-background-color: transparent;
-      -panel-corner-border-color: transparent;
-    }
-  }
-
-  // spacing between activities, app menu and such
-  #panelLeft, #panelCenter {
-    spacing: $base_spacing;
-  }
-
-  // the rounded outset corners
-  .panel-corner {
-    -panel-corner-radius: $panel_corner_radius;
-    -panel-corner-background-color: $panel_bg_color;
-    -panel-corner-border-width: 2px;
-    -panel-corner-border-color: transparent;
-
-    &:active, &:overview, &:focus {
-      -panel-corner-border-color: lighten($selected_bg_color,5%);
-    }
-  }
-
-  // panel menus
-  .panel-button {
-    font-weight: bold;
-    color: $panel_fg_color;
-    -natural-hpadding: $base_padding * 2;
-    -minimum-hpadding: $base_padding;
-
-    &:hover {
-      color: lighten($panel_fg_color, 20%);
-    }
-
-    &:active, &:overview, &:focus, &:checked {
-      background-color: $panel_bg_color; // Trick due to St limitations. It needs a background to draw a box-shadow
-      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
-
-      color: lighten($panel_fg_color, 20%);
-    }
-
-    // status area icons
-    .system-status-icon {
-      icon-size: $base_icon_size;
-      padding: $base_padding - 1px;
-    }
-
-    // app menu icon
-    .app-menu-icon {
-      margin-left: $base_margin;
-      margin-right: $base_margin;
-      -st-icon-style: symbolic;
-      // dimensions of the icon are hardcoded
-    }
-
-    // lock & login screen styles
-    .unlock-screen &,
-    .login-screen &,
-    .lock-screen & {
-      color: lighten($fg_color, 10%);
-      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
-    }
-  }
-
-  .panel-status-indicators-box,
-  .panel-status-menu-box {
-    spacing: 2px;
-  }
-
-  // spacing between power icon and (optional) percentage label
-  .power-status.panel-status-indicators-box {
-    spacing: 0;
-  }
-
-  // indicator for active
-  .screencast-indicator,
-  .remote-access-indicator { color: $warning_color; }
-}
-
-// App Menu
-#appMenu {
-  spacing: $base_spacing;
-  .label-shadow { color: transparent; }
-}

data/theme/gnome-shell-sass/widgets/_popovers.scss

@@ -1,121 +0,0 @@
-/* Popovers/Menus */
-
-$popover_arrow_height: 12px;
-
-//.the popover itself
-.popup-menu-boxpointer,
-.candidate-popup-boxpointer {
-  -arrow-border-radius: $base_border_radius+4;
-  -arrow-background-color: $bg_color;
-  -arrow-border-width: 1px;
-  -arrow-border-color: $borders_color;
-  -arrow-base: $popover_arrow_height * 2;
-  -arrow-rise: $popover_arrow_height;
-  -arrow-box-shadow: 0 1px 3px rgba(0,0,0,0.5); // dreaming bugzilla #689995
-}
-
-// container of the popover menu
-.popup-menu {
-  min-width: 15em;
-  color: $fg_color;
-
-  //.popup-status-menu-item { font-weight: normal;  color: pink; } //dunno what that is
-  &.panel-menu {
-    -boxpointer-gap: $base_margin; // distance from the panel
-    margin-bottom: 1.75em;
-  }
-}
-
-.popup-menu-content {
-  padding: $base_padding * 2 + $base_margin 0;
-}
-
-// menu items
-.popup-menu-item {
-  spacing: $base_padding;
-  padding: $base_padding;
-
-  &:ltr { padding-right:1.75em; padding-left: 0; }
-  &:rtl { padding-right: 0; padding-left:1.75em; }
-
-  &:checked {
-    background-color: lighten($bg_color, 2%);
-    box-shadow: none;
-  }
-
-  &.selected {
-    background-color: transparentize(white, if($variant=='light', 0.2, 0.9));
-    color: $fg_color;
-  }
-
-  &:active { 
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
-
-  &:insensitive { color: transparentize($fg_color,0.5);}
-}
-
-// all icons and other graphical elements
-.popup-inactive-menu-item {
-  color: $fg_color;
-
-  &:insensitive { color: transparentize($fg_color,0.5); }
-}
-
-// symbolic icons in popover
-.popup-menu-arrow,
-.popup-menu-icon { icon-size: $base_icon_size; }
-
-// popover submenus
-.popup-sub-menu {
-  background-color: darken($bg_color, 3%);
-  box-shadow: none;
-  border-top: 1px solid transparentize($borders_color, 0.2);
-  border-bottom: 1px solid transparentize($borders_color, 0.2);
-}
-
-// container for radio and check boxes
-.popup-menu-ornament {
-  text-align: right;
-  width: 1.2em;
-}
-
-// separator
-.popup-separator-menu-item {
-  //-margin-horizontal: 24px;
-  height: 1px; //not really the whole box
-  margin: 6px 64px;
-  background-color: lighten($borders_color, 2%);
-  border: none !important;
-}
-
-// desktop background menu
-.background-menu {
-  -boxpointer-gap: $base_margin;
-  -arrow-rise: 0px; // hide the beak on the menu
-}
-
-// system status menu
-.aggregate-menu {
-  min-width: 21em;
-
-  // lock screen, shutdown, etc. buttons
-  .popup-menu-icon { 
-    padding:0;
-    margin: 0 $base_margin;
-    -st-icon-style: symbolic;
-  }
-
-  .popup-sub-menu .popup-menu-item > :first-child {
-    // account for icons in submenus with padding
-    &:ltr {
-      padding-left: $base_padding + $base_margin * 2; 
-      margin-left: $base_icon_size;
-    }
-    &:rtl {
-      padding-right: $base_padding + $base_margin * 2; ;
-      margin-right: $base_icon_size;
-    }
-  }
-}

data/theme/gnome-shell-sass/widgets/_screen-shield.scss

@@ -1,83 +0,0 @@
-/* Screen Shield */
-
-$_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
-
-.screen-shield-arrows {
-  padding-bottom: 3em;
-}
-
-.screen-shield-arrows Gjs_Arrow {
-  color: white;
-  width: 80px;
-  height: 48px;
-  -arrow-thickness: 12px;
-  -arrow-shadow: $_screenshield_shadow;
-}
-
-.screen-shield-clock {
-  color: white;
-  text-shadow: $_screenshield_shadow;
-  font-weight: bold;
-  text-align: center;
-  padding-bottom: 1.5em;
-}
-
-.screen-shield-clock-time {
-  font-size: 72pt;
-  text-shadow: $_screenshield_shadow;
-  font-feature-settings: "tnum";
-}
-
-.screen-shield-clock-date { 
-  font-size: 28pt;
-  font-weight: normal;
-}
-
-.screen-shield-notifications-container {
-  spacing: 6px;
-  width: 30em;
-  background-color: transparent;
-  max-height: 500px;
-  .summary-notification-stack-scrollview {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-
-  .notification,
-  .screen-shield-notification-source {
-    padding: 12px 6px;
-    border: 1px solid $osd_outer_borders_color;
-    background-color: transparentize($osd_bg_color,0.5);
-    color: $osd_fg_color;
-    border-radius: 4px;
-  }
-  .notification { margin-right: 15px; } //compensate for space allocated to the scrollbar
-}
-
-
-.screen-shield-notification-label {
-  font-weight: bold;
-  padding: 0px 0px 0px 12px;
-}
-
-.screen-shield-notification-count-text { padding: 0px 0px 0px 12px; }
-
-#panel.lock-screen { background-color: transparentize($osd_bg_color, 0.5); }
-
-.screen-shield-background { //just the shadow, really
-  background: black;
-  box-shadow: 0px 2px 4px rgba(0,0,0,0.6);
-}
-
-#lockDialogGroup {
-  background: lighten(#2e3436, 8%) url(resource:///org/gnome/shell/theme/noise-texture.png);
-  background-repeat: repeat;
-}
-
-#screenShieldNotifications {
-  StButton#vhandle, StButton#hhandle {
-    background-color: transparentize($bg_color,0.7);
-    &:hover, &:focus { background-color: transparentize($bg_color,0.5); }
-    &:active { background-color: transparentize($selected_bg_color,0.5); }
-  }
-}

data/theme/gnome-shell-sass/widgets/_scrollbars.scss

@@ -1,29 +0,0 @@
-/* Scrollbars */
-
-StScrollView {
-  &.vfade { -st-vfade-offset: 68px; }
-  &.hfade { -st-hfade-offset: 68px; }
-}
-
-StScrollBar {
-  padding: 0;
-
-  StScrollView & {
-    min-width: 14px;
-    min-height: 14px;
-  }
-
-  StBin#trough {
-    border-radius: 0;
-    background-color: transparent;
-  }
-
-  StButton#vhandle, StButton#hhandle {
-    border-radius: 8px;
-    background-color: mix($fg_color, $bg_color, 60%);
-    //border: 3px solid transparent; //would be nice to margin or at least to transparent
-    margin: 3px;
-    &:hover { background-color: mix($fg_color, $bg_color, 80%); }
-    &:active { background-color: $selected_bg_color; }
-  }
-}

data/theme/gnome-shell-sass/widgets/_search-entry.scss

@@ -1,35 +0,0 @@
-// Search entry
-
-$search_entry_width: 320px;
-$search_entry_height: 36px;
-
-%search_entry,
-.search-entry {
-  width: $search_entry_width;
-  padding: $base_padding+1 $base_padding+3;
-  border-radius: $search_entry_height * 0.5; // half the height
-  color: transparentize($fg_color,0.3);
-  background-color: $bg_color;
-  border-color: $borders_color;
-
-  &:hover {
-    background-color: $hover_bg_color;
-    border-color: $hover_borders_color;
-    color: $hover_fg_color;
-  }
-
-  &:focus {
-    padding: $base_padding $base_padding+2; // 1px less to account for wider border
-    border-width: 2px;
-    border-style: solid;
-    border-color: $selected_bg_color;
-    color: $fg_color;
-    box-shadow: inset 0 1px 2px 1px rgba(0,0,0,0.2);
-  }
-
-  .search-entry-icon { 
-    icon-size: $base_icon_size;
-    padding: 0 4px;
-    color: inherit;
-  }
-}

data/theme/gnome-shell-sass/widgets/_search-results.scss

@@ -1,151 +0,0 @@
-/* Search */
-
-// search overview container
-#searchResultsContent {
-  max-width: 1024px;
-}
-
-// search results sections "the boxes"
-.search-section {
-  spacing: $base_margin * 2;
-  padding:0 !important;
-  margin:0 !important;
-  background-color:transparent;
-  box-shadow:none;
-  border:none;
-  // separator
-  .search-section-separator { 
-    // margin-top: $base_padding * 2;
-    // height: 1px;
-    // background-color: $osd_outer_borders_color;
-    height: 0;
-    background-color: transparent;
-  }
-}
-
-// content
-.search-section-content {
-  background-color: transparentize(lighten($osd_bg_color, 5%), 0.2);
-  border-radius: $modal_radius+3;
-  border: 1px solid $osd_outer_borders_color;
-  box-shadow: 0 2px 4px 0 $shadow_color;
-  text-shadow: 0 1px if($variant == 'light', rgba(255,255,255,0.2), rgba(0,0,0,0.2));
-  color: $osd_fg_color;
-  padding: $base_padding * 3;
-  margin: $base_margin 0;
-  spacing: 0;
-}
-
-// "no results" text
-.search-statustext {
-  @extend %status_text;
-}
-
-// Search results with icons
-.grid-search-result {
-  > .overview-icon {
-    @extend %icon_tile;
-    color: $osd_fg_color;
-  }
-
-  > .overview-icon.overview-icon-with-label {
-    padding: 10px 8px 5px 8px;
-    spacing: $base_spacing;
-  }
-
-  &:hover,
-  &:focus,
-  &:selected {
-    .overview-icon {
-      background-color: transparentize($osd_bg_color,0.8);
-      color: $osd_fg_color;
-    }
-  }
-
-  &:drop .overview-icon {
-    background-color: transparentize($selected_bg_color,.15);
-  }
-
-  &:active .overview-icon,
-  &:checked .overview-icon {
-    background-color: transparentize(darken($osd_bg_color,10%), 0.5);
-  }
-}
-
-// search result provider
-.search-provider-icon {
-  @extend %icon_tile;
-
-  padding: $base_padding;
-  spacing: 0;
-  margin-right: $base_margin * 2;
-
-  &:focus,
-  &:selected,
-  &:hover {
-    background-color: transparentize($osd_fg_color,.9);
-    transition-duration: 200ms;
-  }
-
-  &:active,
-  &:checked {
-    background-color: transparentize(darken($osd_bg_color,10%),.1);
-  }
-
-  // content
-  .list-search-provider-content {
-    spacing: $base_spacing * 2;
-
-    // provider labels
-    .list-search-provider-details {
-      width: 120px;
-      margin-top: 0;
-      color: darken($osd_fg_color, 8%);
-      // font-weight: bold;
-    }
-  }
-}
-
-// search results list
-.list-search-results {
-  spacing: $base_spacing;
-}
-
-// search result listitem
-.list-search-result {
-  @extend %icon_tile;
-  spacing: 0;
-  padding: $base_padding;
-  color: $osd_fg_color;
-
-  border-radius: $base_border_radius + 2px !important;
-
-  &:focus,
-  &:selected,
-  &:hover {
-    background-color: transparentize($osd_fg_color,.9);
-    transition-duration: 200ms;
-  }
-  &:active,
-  &:checked {
-    background-color: transparentize(darken($osd_bg_color,10%),.1);
-  }
-
-  // content
-  .list-search-result-content {
-    spacing: 0;
-  }
-
-  // list item title
-  .list-search-result-title {
-    color: $osd_fg_color;
-    spacing: $base_spacing * 2;
-    padding-right: $base_padding;
-    // font-weight: bold;
-  }
-
-  // list item description
-  .list-search-result-description {
-    color: darken($osd_fg_color, 30%);
-  }
-}

data/theme/gnome-shell-sass/widgets/_slider.scss

@@ -1,27 +0,0 @@
-/* Slider */
-
-$slider_size: 15px;
-
-.slider {
-  height: $slider_size;
-  // slider trough
-  -barlevel-height: 3px; // has to be an odd number
-  -barlevel-background-color: $borders_color; //background of the trough
-  -barlevel-border-width: 1px; 
-  -barlevel-border-color: $borders_color; // trough border color
-  // fill style
-  -barlevel-active-background-color: $selected_bg_color; //active trough fill
-  -barlevel-active-border-color: if($variant == 'light', darken($selected_bg_color, 4%), lighten($selected_bg_color, 2%)); //active trough border
-  // overfill style (red in this case)
-  -barlevel-overdrive-color: $destructive_color;
-  -barlevel-overdrive-border-color: if($variant == 'light', darken($destructive_color, 4%), lighten($destructive_color, 2%)); //trough border when red;
-  -barlevel-overdrive-separator-width:1px;
-  // slider hander
-  -slider-handle-radius: $slider_size * 0.5; // half the size of the size
-  -slider-handle-border-width: 1px;
-  -slider-handle-border-color: if($variant == 'light', $borders_color, $fg_color);
-
-  color: if($variant == 'light', lighten($bg_color, 10%), $fg_color);
-  &:hover { color: $hover_bg_color; }
-  &:active { color: $active_bg_color; }
-}

data/theme/gnome-shell-sass/widgets/_switches.scss

@@ -1,16 +0,0 @@
-/* Switches */
-
-// these are equal to the size of the SVG assets
-$switch_height: 22px;
-$switch_width: 46px;
-
-.toggle-switch {
-  color: $fg_color;
-  height: $switch_height;
-  width: $switch_width;
-  background-size: contain;
-  background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-off.svg"),url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"));
-  &:checked { 
-    background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-on.svg"),url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"));
-  }
-}

data/theme/gnome-shell-sass/widgets/_tiled-previews.scss

@@ -1,19 +0,0 @@
-
-/* Tiled window previews */
-$tile_corner_radius: $base_border_radius + 1px;
-.tile-preview {
-  background-color: transparentize($selected_bg_color,0.5);
-  border: 1px solid $selected_bg_color;
-}
-
-.tile-preview-left.on-primary {
-  border-radius: $tile_corner_radius 0 0 0;
-}
-
-.tile-preview-right.on-primary {
-  border-radius: 0 $tile_corner_radius 0 0;
-}
-
-.tile-preview-left.tile-preview-right.on-primary {
-  border-radius: $tile_corner_radius $tile_corner_radius 0 0;
-}

data/theme/gnome-shell-sass/widgets/_window-picker.scss

@@ -1,66 +0,0 @@
-/* Window Picker */
-
-$window_picker_spacing: $base_spacing * 8; // 48px
-$window_picker_padding: $base_padding * 10; // 60px
-
-$window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);
-
-$window_close_button_size: 24px;
-$window_close_button_padding: 3px;
-
-
-// Window picker
-.window-picker {
-  // Space between window thumbnails
-  -horizontal-spacing: $window_picker_spacing;
-  -vertical-spacing: $window_picker_spacing;
-  // Padding for container around window thumbnails
-  padding: $window_picker_padding;
-
-  &.external-monitor { padding: $window_picker_padding; }
-}
-
-// Borders on window thumbnails
-.window-clone-border {
-  border-width: 6px;
-  border-style: solid;
-  border-color: $window_thumbnail_border_color;
-  border-radius: $base_border_radius + 2;
-  // For window decorations with round corners we can't match
-  // the exact shape when the window is scaled. So apply a shadow
-  // to fix that case
-  box-shadow: inset 0 0 0 1px transparentize($borders_color, 0.8);
-}
-
-// Window titles
-.window-caption {
-  color: $osd_fg_color;
-  background-color: $osd_bg_color;
-  border:1px solid $osd_outer_borders_color;
-  border-radius: $base_border_radius + 1;
-  padding: $base_padding $base_padding * 2;
-  font-weight: bold;
-  @include fontsize($base_font_size + 1);
-}
-
-// Close button
-.window-close {
-  background-color: $selected_bg_color;
-  color: $selected_fg_color;
-  border: none;
-  border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
-  padding: $window_close_button_padding;
-  height: $window_close_button_size;
-  width: $window_close_button_size;
-  box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
-
-  -shell-close-overlap: $window_close_button_size * 0.5;
-
-  &:hover {
-    background-color: lighten($selected_bg_color, 5%);
-  }
-
-  &:active {
-    background-color: darken($selected_bg_color, 5%);
-  }
-}

data/theme/gnome-shell-sass/widgets/_workspace-switcher.scss

@@ -1,72 +0,0 @@
-/* Workspace Switcher */
-.workspace-switcher-group {
-  padding: $base_padding * 2;
-}
-
-.workspace-switcher-container {
-  @extend %osd_panel;
-}
-
-.workspace-switcher {
-  background: transparent;
-  border: none;
-  border-radius: 0;
-  padding: 0;
-  spacing: $base_spacing * 2;
-}
-
-.ws-switcher-box {
-  // background: transparent;
-  background: transparent;
-  height: 50px;
-  background-size: 32px;
-  border: 1px solid transparentize($osd_fg_color,0.9);
-  border-radius: $base_border_radius + 3px;
-}
-
-// active workspace in the switcher
-.ws-switcher-active-up,
-.ws-switcher-active-down,
-.ws-switcher-active-left,
-.ws-switcher-active-right {
-  background-color: $selected_bg_color;
-  border: 1px solid if($variant=='light', darken($selected_bg_color, 8%), lighten($selected_bg_color, 5%));
-  border-radius: $base_border_radius + 3px;
-  color: $selected_fg_color;
-}
-
-/* Workspace pager */
-
-// thumbnails in overview
-.workspace-thumbnails { 
-  @extend %overview_panel;
-  visible-width: 32px; //amount visible before hover
-  spacing: $base_spacing;
-  padding: $base_padding;
-
-  border-radius: $modal_radius 0 0 $modal_radius;
-  border-right-width: 0 !important;
-  //fixme: can't have non uniform borders :(
-  border-top-left-radius:0 !important;
-  border-bottom-left-radius:0 !important;
-
-  &:rtl { 
-    border-radius: 0 $modal_radius $modal_radius 0; 
-    border-left-width: 0 !important;
-  }
-
-  // drag and drop indicator
-  .placeholder {
-    background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
-    background-size: contain;
-    height: 24px;
-  }
-}
-
-// selected indicator
-.workspace-thumbnail-indicator {
-  border: 3px solid $selected_bg_color;
-  border-radius: 3px;
-  padding: 0px;
-  // background-color: transparentize($selected_bg_color, 0.9);
-}

data/theme/gnome-shell.scss

@@ -3,4 +3,3 @@ $variant: 'dark';
 @import "gnome-shell-sass/_colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";
-@import "gnome-shell-sass/_widgets";

data/theme/key-enter.svg

@@ -1,4 +1,109 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="keyboard-key" width="24" height="24">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <path overflow="visible" font-weight="400" style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" d="M10 23H8.5c-.398 0-.796-.14-1.079-.422L.345 15.5l7.078-7.078C7.704 8.14 8.102 8 8.5 8H10v1.5c0 .398-.14.796-.422 1.079L4.657 15.5l4.921 4.922c.282.282.422.68.422 1.078z" color="#000" font-family="Bitstream Vera Sans" fill="#fff"/>
+<svg
-    <path overflow="visible" d="M22 1.5v9a5 5 0 01-5 5H4" style="marker:none" color="#000" fill="none" stroke="#fff" stroke-width="3"/>
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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="32"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg7384"
+   height="32"
+   sodipodi:docname="key-enter.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1744"
+     inkscape:window-height="866"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="7.9322034"
+     inkscape:cy="14.554666"
+     inkscape:window-x="0"
+     inkscape:window-y="55"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient19282"
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)">
+      <stop
+         style="stop-color:#666666;stop-opacity:1;"
+         offset="0"
+         id="stop19284" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer9" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer10" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer11" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer13" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer14" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer15" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="g71291" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="g4953" />
+  <g
+     transform="matrix(2,0,0,2,-281.56285,-1615.0002)"
+     style="display:inline"
+     id="layer12">
+    <path
+       id="path16589"
+       d="m 148.00015,821.0002 h -1 c -0.26528,0 -0.53057,-0.093 -0.71875,-0.2812 l -3.71875,-3.7188 c 0,0 2.47917,-2.4792 3.71875,-3.7187 0.18817,-0.1882 0.45344,-0.2813 0.71875,-0.2813 h 1 v 1 c 0,0.2653 -0.0931,0.5306 -0.28125,0.7188 l -2.28125,2.2812 2.28125,2.2813 c 0.18811,0.1881 0.28129,0.4534 0.28125,0.7187 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#bebebe;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="m 154.0002,810 v 4.5 c 0,1.3807 -1.11929,2.5 -2.5,2.5 h -6.50005"
+       id="path16591"
+       inkscape:connector-curvature="0" />
+  </g>
 </svg>

data/theme/key-hide.svg

@@ -1,3 +1,114 @@
-<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <path d="M12 20.875L.562 9.438C.171 9.046 0 8.51 0 8V6h2c.511 0 1.046.17 1.438.563L12 15.125l8.563-8.562C20.953 6.17 21.488 6 22 6h2v2c0 .511-.17 1.046-.563 1.438z" fill="#e5e5e5"/>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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="32"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg7384"
+   height="32"
+   sodipodi:docname="key-hide.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1919"
+     inkscape:window-height="1011"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-12.338983"
+     inkscape:cy="14.554666"
+     inkscape:window-x="0"
+     inkscape:window-y="55"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient19282"
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)">
+      <stop
+         style="stop-color:#666666;stop-opacity:1;"
+         offset="0"
+         id="stop19284" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer9" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer10" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer11" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer13" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer14" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer15" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="g71291" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="g4953" />
+  <g
+     style="display:inline"
+     inkscape:label="go-down"
+     id="g11722"
+     transform="matrix(2,0,0,2,-362.0004,-1494)">
+    <rect
+       transform="rotate(90)"
+       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       id="rect11718"
+       y="-197.0002"
+       x="747"
+       height="16"
+       width="16" />
+    <path
+       style="display:inline;fill:#e5e5e5;fill-opacity:1;stroke:none"
+       d="m 189.0002,759.4375 -5.71875,-5.7187 C 183.08558,753.5229 183.0002,753.2556 183.0002,753 v -1 h 1 c 0.25562,0 0.52288,0.085 0.71875,0.2813 l 4.28125,4.2812 4.28125,-4.2812 C 193.47732,752.0854 193.74458,752 194.0002,752 h 1 v 1 c 0,0.2556 -0.0854,0.5229 -0.28125,0.7188 z"
+       id="path11720"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscsccsscscc" />
+  </g>
 </svg>

data/theme/key-layout.svg

@@ -1,5 +1,129 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="keyboard-key" width="24" height="24">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <path d="M4.5 2v21" fill="#e5e5e5" fill-rule="evenodd" stroke="#e5e5e5" stroke-width="3"/>
+<svg
-    <path d="M4 12h6l2 4h8V6h-6l-2-4H4z" fill="none" stroke="#e5e5e5" stroke-width="2" stroke-linejoin="round"/>
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-    <path d="M4 12h6l2 4h8V6h-6l-2-4H4z" fill="#e5e5e5" fill-rule="evenodd"/>
+   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="32"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg7384"
+   height="32"
+   sodipodi:docname="key-layout.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3440"
+     inkscape:window-height="1376"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="1"
+     inkscape:cx="46.246852"
+     inkscape:cy="17.474578"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid861" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient19282"
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)">
+      <stop
+         style="stop-color:#666666;stop-opacity:1;"
+         offset="0"
+         id="stop19284" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer9" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer10" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer11" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer13" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer14" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer15" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="g71291" />
+  <g
+     transform="translate(-141.0002,-791)"
+     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" />
+    <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"
+       height="16"
+       width="16" />
+  </g>
 </svg>

data/theme/key-shift-latched-uppercase.svg

@@ -1,3 +1,109 @@
-<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <path style="marker:none" d="M12 0L2 12h6v6h8v-6h6zM8 21v3h8v-3z" color="#000" overflow="visible" fill="#3584e4"/>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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="32"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg7384"
+   height="32"
+   sodipodi:docname="key-shift-latched-uppercase.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1791"
+     inkscape:window-height="984"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-0.77966097"
+     inkscape:cy="18.847458"
+     inkscape:window-x="0"
+     inkscape:window-y="55"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient19282"
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)">
+      <stop
+         style="stop-color:#666666;stop-opacity:1;"
+         offset="0"
+         id="stop19284" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer9" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer10" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer11" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer13" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer14" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer15" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="g71291" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="g4953" />
+  <g
+     transform="matrix(2,0,0,2,-282.0004,-1614.2187)"
+     style="display:inline;fill:#006098;fill-opacity:1"
+     id="layer12">
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#006098;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:new"
+       d="m 147,818 v -4 h -3.1248 l 5.125,-5.7813 5.125,5.7813 h -3.1875 v 4 z"
+       id="path16532"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path16534"
+       d="m 147,822 v -2 h 3.9377 v 2 z"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#006098;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:new"
+       inkscape:connector-curvature="0" />
+  </g>
 </svg>

data/theme/key-shift-uppercase.svg

@@ -1,3 +1,104 @@
-<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <path d="M8 22v-8H2L12 2l10 12h-6v8z" style="marker:none" color="#000" overflow="visible" fill="#3584e4"/>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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="32"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg7384"
+   height="32"
+   sodipodi:docname="key-shift-uppercase.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2160"
+     inkscape:window-height="1311"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-27.898305"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="55"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient19282"
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)">
+      <stop
+         style="stop-color:#666666;stop-opacity:1;"
+         offset="0"
+         id="stop19284" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer9" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer10" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer11" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer13" />
+  <g
+     transform="translate(-141.0002,-791)"
+     id="layer14" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="layer15" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="g71291" />
+  <g
+     transform="translate(-141.0002,-791)"
+     style="display:inline"
+     id="g4953" />
+  <g
+     transform="matrix(2,0,0,2,-282.0008,-1614.2187)"
+     style="display:inline;fill:#006098;fill-opacity:1"
+     id="layer12">
+    <path
+       id="path16548"
+       d="m 147.0002,820 v -4 h -3.1248 l 5.125,-5.7813 5.125,5.7813 h -3.1875 v 4 z"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#006098;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:new"
+       inkscape:connector-curvature="0" />
+  </g>
 </svg>

data/theme/key-shift.svg

@@ -1,3 +1,108 @@
-<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <path d="M8 22v-8H2L12 2l10 12h-6v8z" style="marker:none" color="#000" overflow="visible" fill="#bebebe"/>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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="32"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg7384"
+   height="32"
+   sodipodi:docname="key-shift.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1400"
+     inkscape:window-height="1034"
+     id="namedview4569"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="14.75"
+     inkscape:cx="1.5993763"
+     inkscape:cy="5"
+     inkscape:window-x="0"
+     inkscape:window-y="55"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient19282"
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)">
+      <stop
+         style="stop-color:#666666;stop-opacity:1;"
+         offset="0"
+         id="stop19284" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="translate(-143.8754,-788)"
+     style="display:inline"
+     id="layer9" />
+  <g
+     transform="translate(-143.8754,-788)"
+     style="display:inline"
+     id="layer10" />
+  <g
+     transform="translate(-143.8754,-788)"
+     id="layer11" />
+  <g
+     transform="translate(-143.8754,-788)"
+     style="display:inline"
+     id="layer13" />
+  <g
+     transform="translate(-143.8754,-788)"
+     id="layer14" />
+  <g
+     transform="translate(-143.8754,-788)"
+     style="display:inline"
+     id="layer15" />
+  <g
+     transform="translate(-143.8754,-788)"
+     style="display:inline"
+     id="g71291" />
+  <g
+     transform="translate(-143.8754,-788)"
+     style="display:inline"
+     id="g4953" />
+  <g
+     transform="matrix(2,0,0,2,-282.0008,-1614.2187)"
+     style="display:inline"
+     id="layer12">
+    <path
+       id="path16548"
+       d="m 147.0002,820 v -4 h -3.1248 l 5.125,-5.7813 5.125,5.7813 h -3.1875 v 4 z"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:new"
+       inkscape:connector-curvature="0" />
+  </g>
 </svg>

data/theme/meson.build

@@ -4,39 +4,7 @@ theme_sources = files([
   'gnome-shell-sass/_colors.scss',
   'gnome-shell-sass/_common.scss',
   'gnome-shell-sass/_drawing.scss',
-  'gnome-shell-sass/_high-contrast-colors.scss',
+  'gnome-shell-sass/_high-contrast-colors.scss'
-  'gnome-shell-sass/_widgets.scss',
-  'gnome-shell-sass/widgets/_app-grid.scss',
-  'gnome-shell-sass/widgets/_app-switcher.scss',
-  'gnome-shell-sass/widgets/_buttons.scss',
-  'gnome-shell-sass/widgets/_calendar.scss',
-  'gnome-shell-sass/widgets/_check-box.scss',
-  'gnome-shell-sass/widgets/_corner-ripple.scss',
-  'gnome-shell-sass/widgets/_dash.scss',
-  'gnome-shell-sass/widgets/_dialogs.scss',
-  'gnome-shell-sass/widgets/_entries.scss',
-  'gnome-shell-sass/widgets/_hotplug.scss',
-  'gnome-shell-sass/widgets/_ibus-popup.scss',
-  'gnome-shell-sass/widgets/_keyboard.scss',
-  'gnome-shell-sass/widgets/_login-dialog.scss',
-  'gnome-shell-sass/widgets/_looking-glass.scss',
-  'gnome-shell-sass/widgets/_message-list.scss',
-  'gnome-shell-sass/widgets/_misc.scss',
-  'gnome-shell-sass/widgets/_network-dialog.scss',
-  'gnome-shell-sass/widgets/_notifications.scss',
-  'gnome-shell-sass/widgets/_osd.scss',
-  'gnome-shell-sass/widgets/_overview.scss',
-  'gnome-shell-sass/widgets/_panel.scss',
-  'gnome-shell-sass/widgets/_popovers.scss',
-  'gnome-shell-sass/widgets/_screen-shield.scss',
-  'gnome-shell-sass/widgets/_scrollbars.scss',
-  'gnome-shell-sass/widgets/_search-entry.scss',
-  'gnome-shell-sass/widgets/_search-results.scss',
-  'gnome-shell-sass/widgets/_slider.scss',
-  'gnome-shell-sass/widgets/_switches.scss',
-  'gnome-shell-sass/widgets/_tiled-previews.scss',
-  'gnome-shell-sass/widgets/_window-picker.scss',
-  'gnome-shell-sass/widgets/_workspace-switcher.scss'
 ])
 
 styles = [
@@ -55,4 +23,3 @@ foreach style: styles
                               ],
                               depend_files: theme_sources)
 endforeach
-

gnome-shell.doap

@@ -31,34 +31,34 @@ its dependencies to build from tarballs.</description>
   <programming-language>JavaScript</programming-language>
   <programming-language>C</programming-language>
 
-  <author>
+  <maintainer>
     <foaf:Person>
       <foaf:name>William Jon McCann</foaf:name>
       <foaf:mbox rdf:resource="mailto:jmccann@redhat.com" />
       <gnome:userid>mccann</gnome:userid>
     </foaf:Person>
-  </author>
+  </maintainer>
-  <author>
+  <maintainer>
     <foaf:Person>
       <foaf:name>Owen Taylor</foaf:name>
       <foaf:mbox rdf:resource="mailto:otaylor@redhat.com" />
       <gnome:userid>otaylor</gnome:userid>
     </foaf:Person>
-  </author>
+  </maintainer>
-  <author>
+  <maintainer>
     <foaf:Person>
       <foaf:name>Colin Walters</foaf:name>
       <foaf:mbox rdf:resource="mailto:walters@verbum.org" />
       <gnome:userid>walters</gnome:userid>
     </foaf:Person>
-  </author>
+  </maintainer>
-  <author>
+  <maintainer>
     <foaf:Person>
       <foaf:name>Marina Zhurakhinskaya</foaf:name>
       <foaf:mbox rdf:resource="mailto:marinaz@redhat.com" />
       <gnome:userid>marinaz</gnome:userid>
     </foaf:Person>
-  </author>
+  </maintainer>
   <maintainer>
     <foaf:Person>
       <foaf:name>Florian Müllner</foaf:name>
@@ -66,11 +66,4 @@ its dependencies to build from tarballs.</description>
       <gnome:userid>fmuellner</gnome:userid>
     </foaf:Person>
   </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Georges Basile Stavracas Neto</foaf:name>
-      <foaf:mbox rdf:resource="mailto:gbsneto@gnome.org" />
-      <gnome:userid>gbsneto</gnome:userid>
-    </foaf:Person>
-  </maintainer>
 </Project>

js/extensionPrefs/css/application.css

@@ -1,11 +0,0 @@
-.details-button image {
-  transition: 250ms;
-}
-.details-button.expanded:dir(ltr) image {
-  -gtk-icon-transform: rotate(0.25turn);
-}
-.details-button.expanded:dir(rtl) image {
-  -gtk-icon-transform: rotate(-0.25turn);
-}
-
-image.warning { color: @warning_color; }

js/extensionPrefs/main.js

@@ -3,16 +3,16 @@ imports.gi.versions.Gdk = '3.0';
 imports.gi.versions.Gtk = '3.0';
 
 const Gettext = imports.gettext;
-const { Gdk, GLib, Gio, GObject, Gtk } = imports.gi;
+const { Gdk, GLib, Gio, GObject, Gtk, Pango } = imports.gi;
 const Format = imports.format;
 
 const _ = Gettext.gettext;
 
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
-const { loadInterfaceXML } = imports.misc.fileUtils;
+const { loadInterfaceXML, deleteGFile } = imports.misc.fileUtils;
 
-const { ExtensionState, ExtensionType } = ExtensionUtils;
+const { ExtensionState } = ExtensionUtils;
 
 const GnomeShellIface = loadInterfaceXML('org.gnome.Shell.Extensions');
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
@@ -23,149 +23,32 @@ function stripPrefix(string, prefix) {
     return string;
 }
 
-var Application = GObject.registerClass(
+var Application = GObject.registerClass({
-class Application extends Gtk.Application {
+    GTypeName: 'ExtensionPrefs_Application'
+}, class Application extends Gtk.Application {
     _init() {
         GLib.set_prgname('gnome-shell-extension-prefs');
         super._init({
-            application_id: 'org.gnome.Extensions',
+            application_id: 'org.gnome.shell.ExtensionPrefs',
-            flags: Gio.ApplicationFlags.HANDLES_COMMAND_LINE,
+            flags: Gio.ApplicationFlags.HANDLES_COMMAND_LINE
         });
+
+        this._startupUuid = null;
+        this._loaded = false;
+        this._skipMainWindow = false;
+        this._shellProxy = null;
     }
 
     get shellProxy() {
         return this._shellProxy;
     }
 
-    vfunc_activate() {
-        this._shellProxy.CheckForUpdatesRemote();
-        this._window.present();
-    }
-
-    vfunc_startup() {
-        super.vfunc_startup();
-
-        let provider = new Gtk.CssProvider();
-        let uri = 'resource:///org/gnome/shell/css/application.css';
-        try {
-            provider.load_from_file(Gio.File.new_for_uri(uri));
-        } catch (e) {
-            logError(e, 'Failed to add application style');
-        }
-        Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),
-            provider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
-        this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
-        this._window = new ExtensionsWindow({ application: this });
-    }
-
-    vfunc_command_line(commandLine) {
-        let args = commandLine.get_arguments();
-
-        if (args.length) {
-            let uuid = args[0];
-
-            // Strip off "extension:///" prefix which fakes a URI, if it exists
-            uuid = stripPrefix(uuid, 'extension:///');
-
-            this._window.openPrefs(uuid);
-        } else {
-            this.activate();
-        }
-        return 0;
-    }
-});
-
-var ExtensionsWindow = GObject.registerClass({
-    GTypeName: 'ExtensionsWindow',
-    Template: 'resource:///org/gnome/shell/ui/extensions-window.ui',
-    InternalChildren: [
-        'userList',
-        'systemList',
-        'killSwitch',
-        'mainBox',
-        'mainStack',
-        'scrolledWindow',
-        'updatesBar',
-        'updatesLabel',
-    ],
-}, class ExtensionsWindow extends Gtk.ApplicationWindow {
-    _init(params) {
-        super._init(params);
-
-        this._startupUuid = null;
-        this._loaded = false;
-        this._prefsDialog = null;
-        this._updatesCheckId = 0;
-
-        this._mainBox.set_focus_vadjustment(this._scrolledWindow.vadjustment);
-
-        let action;
-        action = new Gio.SimpleAction({ name: 'show-about' });
-        action.connect('activate', this._showAbout.bind(this));
-        this.add_action(action);
-
-        action = new Gio.SimpleAction({ name: 'logout' });
-        action.connect('activate', this._logout.bind(this));
-        this.add_action(action);
-
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-        this._settings.bind('disable-user-extensions',
-            this._killSwitch, 'active',
-            Gio.SettingsBindFlags.DEFAULT | Gio.SettingsBindFlags.INVERT_BOOLEAN);
-
-        this._userList.set_sort_func(this._sortList.bind(this));
-        this._userList.set_header_func(this._updateHeader.bind(this));
-
-        this._systemList.set_sort_func(this._sortList.bind(this));
-        this._systemList.set_header_func(this._updateHeader.bind(this));
-
-        this._shellProxy.connectSignal('ExtensionStateChanged',
-            this._onExtensionStateChanged.bind(this));
-
-        this._scanExtensions();
-    }
-
-    get _shellProxy() {
-        return this.application.shellProxy;
-    }
-
-    uninstall(uuid) {
-        let row = this._findExtensionRow(uuid);
-
-        let dialog = new Gtk.MessageDialog({
-            transient_for: this,
-            modal: true,
-            text: _('Remove “%s”?').format(row.name),
-            secondary_text: _('If you remove the extension, you need to return to download it if you want to enable it again'),
-        });
-
-        dialog.add_button(_('Cancel'), Gtk.ResponseType.CANCEL);
-        dialog.add_button(_('Remove'), Gtk.ResponseType.ACCEPT)
-            .get_style_context().add_class('destructive-action');
-
-        dialog.connect('response', (dlg, response) => {
-            if (response === Gtk.ResponseType.ACCEPT)
-                this._shellProxy.UninstallExtensionRemote(uuid);
-            dialog.destroy();
-        });
-        dialog.present();
-    }
-
-    openPrefs(uuid) {
-        if (!this._loaded)
-            this._startupUuid = uuid;
-        else if (!this._showPrefs(uuid))
-            this.present();
-    }
-
     _showPrefs(uuid) {
-        if (this._prefsDialog)
+        let row = this._extensionSelector.get_children().find(c => {
-            return false;
+            return c.uuid === uuid && c.hasPrefs;
+        });
 
-        let row = this._findExtensionRow(uuid);
+        if (!row)
-        if (!row || !row.hasPrefs)
             return false;
 
         let widget;
@@ -176,90 +59,50 @@ var ExtensionsWindow = GObject.registerClass({
             widget = this._buildErrorUI(row, e);
         }
 
-        this._prefsDialog = new Gtk.Window({
+        let dialog = new Gtk.Window({
-            application: this.application,
+            modal: !this._skipMainWindow,
-            default_width: 600,
+            type_hint: Gdk.WindowTypeHint.DIALOG
-            default_height: 400,
-            modal: this.visible,
-            type_hint: Gdk.WindowTypeHint.DIALOG,
-            window_position: Gtk.WindowPosition.CENTER,
         });
-
+        dialog.set_titlebar(new Gtk.HeaderBar({
-        this._prefsDialog.set_titlebar(new Gtk.HeaderBar({
             show_close_button: true,
             title: row.name,
-            visible: true,
+            visible: true
         }));
 
-        if (this.visible)
+        if (this._skipMainWindow) {
-            this._prefsDialog.transient_for = this;
+            this.add_window(dialog);
+            if (this._window)
+                this._window.destroy();
+            this._window = dialog;
+            this._window.window_position = Gtk.WindowPosition.CENTER;
+        } else {
+            dialog.transient_for = this._window;
+        }
 
-        this._prefsDialog.connect('destroy', () => {
+        dialog.set_default_size(600, 400);
-            this._prefsDialog = null;
+        dialog.add(widget);
-
+        dialog.show();
-            if (!this.visible)
-                this.destroy();
-        });
-
-        this._prefsDialog.add(widget);
-        this._prefsDialog.show();
 
         return true;
     }
 
-    _showAbout() {
-        let aboutDialog = new Gtk.AboutDialog({
-            authors: [
-                'Florian Müllner <fmuellner@gnome.org>',
-                'Jasper St. Pierre <jstpierre@mecheye.net>',
-                'Didier Roche <didrocks@ubuntu.com>',
-            ],
-            translator_credits: _('translator-credits'),
-            program_name: _('Extensions'),
-            comments: _('Manage your GNOME Extensions'),
-            license_type: Gtk.License.GPL_2_0,
-            logo_icon_name: 'org.gnome.Extensions',
-            version: Config.PACKAGE_VERSION,
-
-            transient_for: this,
-            modal: true,
-        });
-        aboutDialog.present();
-    }
-
-    _logout() {
-        this.application.get_dbus_connection().call(
-            'org.gnome.SessionManager',
-            '/org/gnome/SessionManager',
-            'org.gnome.SessionManager',
-            'Logout',
-            new GLib.Variant('(u)', [0]),
-            null,
-            Gio.DBusCallFlags.NONE,
-            -1,
-            null,
-            (o, res) => {
-                o.call_finish(res);
-            });
-    }
-
     _buildErrorUI(row, exc) {
         let scroll = new Gtk.ScrolledWindow({
             hscrollbar_policy: Gtk.PolicyType.NEVER,
-            propagate_natural_height: true,
+            propagate_natural_height: true
         });
 
         let box = new Gtk.Box({
             orientation: Gtk.Orientation.VERTICAL,
             spacing: 12,
             margin: 100,
-            margin_bottom: 60,
+            margin_bottom: 60
         });
         scroll.add(box);
 
         let label = new Gtk.Label({
             label: '<span size="x-large">%s</span>'.format(_("Something’s gone wrong")),
-            use_markup: true,
+            use_markup: true
         });
         label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
         box.add(label);
@@ -267,13 +110,13 @@ var ExtensionsWindow = GObject.registerClass({
         label = new Gtk.Label({
             label: _("We’re very sorry, but there’s been a problem: the settings for this extension can’t be displayed. We recommend that you report the issue to the extension authors."),
             justify: Gtk.Justification.CENTER,
-            wrap: true,
+            wrap: true
         });
         box.add(label);
 
         let expander = new Expander({
             label: _("Technical Details"),
-            margin_top: 12,
+            margin_top: 12
         });
         box.add(expander);
 
@@ -284,14 +127,14 @@ var ExtensionsWindow = GObject.registerClass({
 
         let buffer = new Gtk.TextBuffer({ text: errortext });
         let textview = new Gtk.TextView({
-            buffer,
+            buffer: buffer,
             wrap_mode: Gtk.WrapMode.WORD,
             monospace: true,
             editable: false,
             top_margin: 12,
             bottom_margin: 12,
             left_margin: 12,
-            right_margin: 12,
+            right_margin: 12
         });
 
         let toolbar = new Gtk.Toolbar();
@@ -307,7 +150,7 @@ var ExtensionsWindow = GObject.registerClass({
 
         let copyButton = new Gtk.ToolButton({
             icon_name: 'edit-copy-symbolic',
-            tooltip_text: _("Copy Error"),
+            tooltip_text: _("Copy Error")
         });
         toolbar.add(copyButton);
 
@@ -316,15 +159,15 @@ var ExtensionsWindow = GObject.registerClass({
             // markdown for pasting in gitlab issues
             let lines = [
                 `The settings of extension ${row.uuid} had an error:`,
-                '```', // '`' (xgettext throws up on odd number of backticks)
+                '```',
                 `${exc}`,
-                '```', // '`'
+                '```',
                 '',
                 'Stack trace:',
-                '```', // '`'
+                '```',
                 exc.stack.replace(/\n$/, ''), // stack without trailing newline
-                '```', // '`'
+                '```',
-                '',
+                ''
             ];
             clipboard.set_text(lines.join('\n'), -1);
         });
@@ -337,7 +180,7 @@ var ExtensionsWindow = GObject.registerClass({
             label: _("Homepage"),
             tooltip_text: _("Visit extension homepage"),
             no_show_all: true,
-            visible: row.url !== '',
+            visible: row.url != null
         });
         toolbar.add(urlButton);
 
@@ -347,7 +190,7 @@ var ExtensionsWindow = GObject.registerClass({
         });
 
         let expandedBox = new Gtk.Box({
-            orientation: Gtk.Orientation.VERTICAL,
+            orientation: Gtk.Orientation.VERTICAL
         });
         expandedBox.add(textview);
         expandedBox.add(toolbar);
@@ -358,6 +201,70 @@ var ExtensionsWindow = GObject.registerClass({
         return scroll;
     }
 
+    _buildUI() {
+        this._window = new Gtk.ApplicationWindow({ application: this,
+                                                   window_position: Gtk.WindowPosition.CENTER });
+
+        this._window.set_default_size(800, 500);
+
+        this._titlebar = new Gtk.HeaderBar({ show_close_button: true,
+                                             title: _("Shell Extensions") });
+        this._window.set_titlebar(this._titlebar);
+
+        let killSwitch = new Gtk.Switch({ valign: Gtk.Align.CENTER });
+        this._titlebar.pack_end(killSwitch);
+
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
+        this._settings.bind('disable-user-extensions', killSwitch, 'active',
+                            Gio.SettingsBindFlags.DEFAULT |
+                            Gio.SettingsBindFlags.INVERT_BOOLEAN);
+
+        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
+        this._window.add(vbox);
+
+        this.disabledInfobar = new Gtk.InfoBar({
+            message_type: Gtk.MessageType.ERROR,
+            revealed: false,
+            show_close_button: true
+        });
+        this.disabledInfobar.connect('response',  () => {
+            this.disabledInfobar.revealed = false;
+        });
+        let contentArea = this.disabledInfobar.get_content_area();
+        let label = new Gtk.Label({
+            label: _('A problem was detected and extensions were automatically disabled. It is recommended to disable or reconfigure any extensions that may have caused the issue before re-enabling them at the top.'),
+            ellipsize: Pango.EllipsizeMode.END,
+            wrap: true,
+            lines: 2,
+            xalign: 0,
+            margin: 6
+        });
+        contentArea.add(label);
+        vbox.add(this.disabledInfobar);
+
+        this._mainStack = new Gtk.Stack({
+            transition_type: Gtk.StackTransitionType.CROSSFADE
+        });
+        vbox.add(this._mainStack);
+
+        let scroll = new Gtk.ScrolledWindow({ hscrollbar_policy: Gtk.PolicyType.NEVER });
+
+        this._extensionSelector = new Gtk.ListBox({ selection_mode: Gtk.SelectionMode.NONE });
+        this._extensionSelector.set_sort_func(this._sortList.bind(this));
+        this._extensionSelector.set_header_func(this._updateHeader.bind(this));
+
+        scroll.add(this._extensionSelector);
+
+        this._mainStack.add_named(scroll, 'listing');
+        this._mainStack.add_named(new EmptyPlaceholder(), 'placeholder');
+
+        this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
+        this._shellProxy.connectSignal('ExtensionStateChanged',
+            this._onExtensionStateChanged.bind(this));
+
+        this._window.show_all();
+    }
+
     _sortList(row1, row2) {
         return row1.name.localeCompare(row2.name);
     }
@@ -371,32 +278,27 @@ var ExtensionsWindow = GObject.registerClass({
     }
 
     _findExtensionRow(uuid) {
-        return [
+        return this._extensionSelector.get_children().find(c => c.uuid === uuid);
-            ...this._userList.get_children(),
-            ...this._systemList.get_children(),
-        ].find(c => c.uuid === uuid);
     }
 
     _onExtensionStateChanged(proxy, senderName, [uuid, newState]) {
-        let extension = ExtensionUtils.deserializeExtension(newState);
         let row = this._findExtensionRow(uuid);
-
-        this._queueUpdatesCheck();
-
-        // the extension's type changed; remove the corresponding row
-        // and reset the variable to null so that we create a new row
-        // below and add it to the appropriate list
-        if (row && row.type !== extension.type) {
-            row.destroy();
-            row = null;
-        }
-
         if (row) {
-            if (extension.state === ExtensionState.UNINSTALLED)
+            let { state } = ExtensionUtils.deserializeExtension(newState);
+            if (state == ExtensionState.UNINSTALLED)
                 row.destroy();
             return; // we only deal with new and deleted extensions here
         }
-        this._addExtensionRow(extension);
+
+        this._shellProxy.GetExtensionInfoRemote(uuid, ([serialized]) => {
+            let extension = ExtensionUtils.deserializeExtension(serialized);
+            if (!extension)
+                return;
+            // check the extension wasn't added in between
+            if (this._findExtensionRow(uuid) != null)
+                return;
+            this._addExtensionRow(extension);
+        });
     }
 
     _scanExtensions() {
@@ -404,10 +306,10 @@ var ExtensionsWindow = GObject.registerClass({
             if (e) {
                 if (e instanceof Gio.DBusError) {
                     log(`Failed to connect to shell proxy: ${e}`);
+                    this._mainStack.add_named(new NoShellPlaceholder(), 'noshell');
                     this._mainStack.visible_child_name = 'noshell';
-                } else {
+                } else
                     throw e;
-                }
                 return;
             }
 
@@ -421,53 +323,72 @@ var ExtensionsWindow = GObject.registerClass({
 
     _addExtensionRow(extension) {
         let row = new ExtensionRow(extension);
+
+        row.prefsButton.connect('clicked', () => {
+            this._showPrefs(row.uuid);
+        });
+
         row.show_all();
-
+        this._extensionSelector.add(row);
-        if (row.type === ExtensionType.PER_USER)
-            this._userList.add(row);
-        else
-            this._systemList.add(row);
-    }
-
-    _queueUpdatesCheck() {
-        if (this._updatesCheckId)
-            return;
-
-        this._updatesCheckId = GLib.timeout_add_seconds(
-            GLib.PRIORITY_DEFAULT, 1, () => {
-                this._checkUpdates();
-
-                this._updatesCheckId = 0;
-                return GLib.SOURCE_REMOVE;
-            });
-    }
-
-    _checkUpdates() {
-        let nUpdates = this._userList.get_children().filter(c => c.hasUpdate).length;
-
-        this._updatesLabel.label = Gettext.ngettext(
-            '%d extension will be updated on next login.',
-            '%d extensions will be updated on next login.',
-            nUpdates).format(nUpdates);
-        this._updatesBar.visible = nUpdates > 0;
     }
 
     _extensionsLoaded() {
-        this._userList.visible = this._userList.get_children().length > 0;
+        if (this._extensionSelector.get_children().length > 0)
-        this._systemList.visible = this._systemList.get_children().length > 0;
+            this._mainStack.visible_child_name = 'listing';
-
-        if (this._userList.visible || this._systemList.visible)
-            this._mainStack.visible_child_name = 'main';
         else
             this._mainStack.visible_child_name = 'placeholder';
 
-        this._checkUpdates();
-
         if (this._startupUuid)
             this._showPrefs(this._startupUuid);
         this._startupUuid = null;
+        this._skipMainWindow = false;
         this._loaded = true;
     }
+
+    vfunc_activate() {
+        this._window.present();
+    }
+
+    vfunc_startup() {
+        super.vfunc_startup();
+
+        this._buildUI();
+        this._scanExtensions();
+    }
+
+    vfunc_command_line(commandLine) {
+        this.activate();
+        let args = commandLine.get_arguments();
+
+        if (args.length) {
+            if (args[0] == '--disabled-warning') {
+                if (!this._settings.is_writable('disable-user-extensions'))
+                    this.quit();
+
+                this.disabledInfobar.set_revealed(true);
+
+                let file = GLib.build_filenamev ([GLib.get_user_config_dir(), 'gnome-shell-extensions-disabled-warning']);
+                let gfile = Gio.File.new_for_path(file);
+                if (gfile.query_exists(null))
+                    deleteGFile(gfile);
+
+                return 0;
+            }
+
+            let uuid = args[0];
+
+            this._skipMainWindow = true;
+
+            // Strip off "extension:///" prefix which fakes a URI, if it exists
+            uuid = stripPrefix(uuid, "extension:///");
+
+            if (!this._loaded)
+                this._startupUuid = uuid;
+            else if (!this._showPrefs(uuid))
+                this._skipMainWindow = false;
+        }
+        return 0;
+    }
 });
 
 var Expander = GObject.registerClass({
@@ -476,20 +397,20 @@ var Expander = GObject.registerClass({
             'label', 'label', 'label',
             GObject.ParamFlags.READWRITE,
             null
-        ),
+        )
-    },
+    }
 }, class Expander extends Gtk.Box {
     _init(params = {}) {
         this._labelText = null;
 
         super._init(Object.assign(params, {
             orientation: Gtk.Orientation.VERTICAL,
-            spacing: 0,
+            spacing: 0
         }));
 
         this._frame = new Gtk.Frame({
             shadow_type: Gtk.ShadowType.IN,
-            hexpand: true,
+            hexpand: true
         });
 
         let eventBox = new Gtk.EventBox();
@@ -497,12 +418,12 @@ var Expander = GObject.registerClass({
 
         let hbox = new Gtk.Box({
             spacing: 6,
-            margin: 12,
+            margin: 12
         });
         eventBox.add(hbox);
 
         this._arrow = new Gtk.Image({
-            icon_name: 'pan-end-symbolic',
+            icon_name: 'pan-end-symbolic'
         });
         hbox.add(this._arrow);
 
@@ -512,7 +433,7 @@ var Expander = GObject.registerClass({
         this._revealer = new Gtk.Revealer();
 
         this._childBin = new Gtk.Frame({
-            shadow_type: Gtk.ShadowType.IN,
+            shadow_type: Gtk.ShadowType.IN
         });
         this._revealer.add(this._childBin);
 
@@ -530,7 +451,7 @@ var Expander = GObject.registerClass({
         this._gesture = new Gtk.GestureMultiPress({
             widget: this._frame,
             button: 0,
-            exclusive: true,
+            exclusive: true
         });
         this._gesture.connect('released', (gesture, nPress) => {
             if (nPress == 1)
@@ -569,19 +490,113 @@ var Expander = GObject.registerClass({
     }
 });
 
-var ExtensionRow = GObject.registerClass({
+var EmptyPlaceholder = GObject.registerClass(
-    GTypeName: 'ExtensionRow',
+class EmptyPlaceholder extends Gtk.Box {
-    Template: 'resource:///org/gnome/shell/ui/extension-row.ui',
+    _init() {
-    InternalChildren: [
+        super._init({
-        'nameLabel',
+            orientation: Gtk.Orientation.VERTICAL,
-        'descriptionLabel',
+            spacing: 6,
-        'versionLabel',
+            margin: 32
-        'authorLabel',
+        });
-        'updatesIcon',
+
-        'revealButton',
+        let image = new Gtk.Image({
-        'revealer',
+            icon_name: 'application-x-addon-symbolic',
-    ],
+            pixel_size: 96,
-}, class ExtensionRow extends Gtk.ListBoxRow {
+            visible: true,
+            vexpand: true,
+            valign: Gtk.Align.END
+        });
+        image.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
+        this.add(image);
+
+        let label = new Gtk.Label({
+            label: `<b><span size="x-large">${_("No Extensions Installed" )}</span></b>`,
+            use_markup: true,
+            visible: true
+        });
+        label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
+        this.add(label);
+
+        let appInfo = Gio.DesktopAppInfo.new('org.gnome.Software.desktop');
+
+        let desc = new Gtk.Label({
+            label: _("Extensions can be installed through Software or <a href=\"https://extensions.gnome.org\">extensions.gnome.org</a>."),
+            use_markup: true,
+            wrap: true,
+            justify: Gtk.Justification.CENTER,
+            visible: true,
+            max_width_chars: 50,
+            hexpand: true,
+            vexpand: (appInfo == null),
+            halign: Gtk.Align.CENTER,
+            valign: Gtk.Align.START
+        });
+        this.add(desc);
+
+        if (appInfo) {
+            let button = new Gtk.Button({
+                label: _("Browse in Software"),
+                image: new Gtk.Image({
+                    icon_name: "org.gnome.Software-symbolic"
+                }),
+                always_show_image: true,
+                margin_top: 12,
+                visible: true,
+                halign: Gtk.Align.CENTER,
+                valign: Gtk.Align.START,
+                vexpand: true
+            });
+            this.add(button);
+
+            button.connect('clicked', w => {
+                let context = w.get_display().get_app_launch_context();
+                appInfo.launch([], context);
+            });
+        }
+    }
+});
+
+var NoShellPlaceholder = GObject.registerClass(
+class NoShellPlaceholder extends Gtk.Box {
+    _init() {
+        super._init({
+            orientation: Gtk.Orientation.VERTICAL,
+            spacing: 12,
+            margin: 100,
+            margin_bottom: 60
+        });
+
+        let label = new Gtk.Label({
+            label: '<span size="x-large">%s</span>'.format(
+                _("Something’s gone wrong")),
+            use_markup: true
+        });
+        label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
+        this.add(label);
+
+        label = new Gtk.Label({
+            label: _("We’re very sorry, but it was not possible to get the list of installed extensions. Make sure you are logged into GNOME and try again."),
+            justify: Gtk.Justification.CENTER,
+            wrap: true
+        });
+        this.add(label);
+
+        this.show_all();
+    }
+});
+
+var DescriptionLabel = GObject.registerClass(
+class DescriptionLabel extends Gtk.Label {
+    vfunc_get_preferred_height_for_width(width) {
+        // Hack: Request the maximum height allowed by the line limit
+        if (this.lines > 0)
+            return super.vfunc_get_preferred_height_for_width(0);
+        return super.vfunc_get_preferred_height_for_width(width);
+    }
+});
+
+var ExtensionRow = GObject.registerClass(
+class ExtensionRow extends Gtk.ListBoxRow {
     _init(extension) {
         super._init();
 
@@ -589,77 +604,23 @@ var ExtensionRow = GObject.registerClass({
         this._extension = extension;
         this._prefsModule = null;
 
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this.insert_action_group('row', this._actionGroup);
-
-        let action;
-        action = new Gio.SimpleAction({
-            name: 'show-prefs',
-            enabled: this.hasPrefs,
-        });
-        action.connect('activate', () => this.get_toplevel().openPrefs(this.uuid));
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'show-url',
-            enabled: this.url !== '',
-        });
-        action.connect('activate', () => {
-            Gio.AppInfo.launch_default_for_uri(
-                this.url, this.get_display().get_app_launch_context());
-        });
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'uninstall',
-            enabled: this.type === ExtensionType.PER_USER,
-        });
-        action.connect('activate', () => this.get_toplevel().uninstall(this.uuid));
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'enabled',
-            state: new GLib.Variant('b', false),
-        });
-        action.connect('activate', () => {
-            let state = action.get_state();
-            action.change_state(new GLib.Variant('b', !state.get_boolean()));
-        });
-        action.connect('change-state', (a, state) => {
-            if (state.get_boolean())
-                this._app.shellProxy.EnableExtensionRemote(this.uuid);
-            else
-                this._app.shellProxy.DisableExtensionRemote(this.uuid);
-        });
-        this._actionGroup.add_action(action);
-
-        let name = GLib.markup_escape_text(this.name, -1);
-        this._nameLabel.label = name;
-
-        let desc = this._extension.metadata.description.split('\n')[0];
-        this._descriptionLabel.label = desc;
-
-        this._revealButton.connect('clicked', () => {
-            this._revealer.reveal_child = !this._revealer.reveal_child;
-        });
-        this._revealer.connect('notify::reveal-child', () => {
-            if (this._revealer.reveal_child)
-                this._revealButton.get_style_context().add_class('expanded');
-            else
-                this._revealButton.get_style_context().remove_class('expanded');
-        });
-
-        this.connect('destroy', this._onDestroy.bind(this));
-
         this._extensionStateChangedId = this._app.shellProxy.connectSignal(
             'ExtensionStateChanged', (p, sender, [uuid, newState]) => {
                 if (this.uuid !== uuid)
                     return;
 
                 this._extension = ExtensionUtils.deserializeExtension(newState);
-                this._updateState();
+                let state = (this._extension.state == ExtensionState.ENABLED);
+                this._switch.freeze_notify();
+                this._switch.state = state;
+                this._switch.active = this._extension.isRequested;
+                this._switch.sensitive = this._canToggle();
+                this._switch.thaw_notify();
             });
-        this._updateState();
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._buildUI();
     }
 
     get uuid() {
@@ -674,40 +635,8 @@ var ExtensionRow = GObject.registerClass({
         return this._extension.hasPrefs;
     }
 
-    get hasUpdate() {
-        return this._extension.hasUpdate || false;
-    }
-
-    get type() {
-        return this._extension.type;
-    }
-
-    get creator() {
-        return this._extension.metadata.creator || '';
-    }
-
     get url() {
-        return this._extension.metadata.url || '';
+        return this._extension.metadata.url;
-    }
-
-    get version() {
-        return this._extension.metadata.version || '';
-    }
-
-    _updateState() {
-        let state = this._extension.state === ExtensionState.ENABLED;
-
-        let action = this._actionGroup.lookup('enabled');
-        action.set_state(new GLib.Variant('b', state));
-        action.enabled = this._canToggle();
-
-        this._updatesIcon.visible = this.hasUpdate;
-
-        this._versionLabel.label = `${this.version}`;
-        this._versionLabel.visible = this.version !== '';
-
-        this._authorLabel.label = `${this.creator}`;
-        this._authorLabel.visible = this.creator !== '';
     }
 
     _onDestroy() {
@@ -719,17 +648,69 @@ var ExtensionRow = GObject.registerClass({
         this._extensionStateChangedId = 0;
     }
 
+    _buildUI() {
+        let hbox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL,
+                                 hexpand: true, margin_end: 24, spacing: 24,
+                                 margin: 12 });
+        this.add(hbox);
+
+        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL,
+                                 spacing: 6, hexpand: true });
+        hbox.add(vbox);
+
+        let name = GLib.markup_escape_text(this.name, -1);
+        let label = new Gtk.Label({ label: '<b>' + name + '</b>',
+                                    use_markup: true,
+                                    halign: Gtk.Align.START });
+        vbox.add(label);
+
+        let desc = this._extension.metadata.description.split('\n')[0];
+        label = new DescriptionLabel({ label: desc, wrap: true, lines: 2,
+                                       ellipsize: Pango.EllipsizeMode.END,
+                                       xalign: 0, yalign: 0 });
+        vbox.add(label);
+
+        let button = new Gtk.Button({ valign: Gtk.Align.CENTER,
+                                      visible: this.hasPrefs,
+                                      no_show_all: true });
+        button.set_image(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
+                                         icon_size: Gtk.IconSize.BUTTON,
+                                         visible: true }));
+        button.get_style_context().add_class('circular');
+        hbox.add(button);
+
+        this.prefsButton = button;
+
+        this._switch = new Gtk.Switch({
+            valign: Gtk.Align.CENTER,
+            sensitive: this._canToggle(),
+        });
+        this._switch.connect('notify::active', () => {
+            if (this._switch.active)
+                this._app.shellProxy.EnableExtensionRemote(this.uuid);
+            else
+                this._app.shellProxy.DisableExtensionRemote(this.uuid);
+        });
+        this._switch.connect('state-set', () => true);
+        this._switch.freeze_notify();
+        this._switch.state = this._extension.state === ExtensionState.ENABLED;
+        this._switch.active = this._extension.isRequested;
+        this._switch.thaw_notify();
+
+        hbox.add(this._switch);
+    }
+
     _canToggle() {
         return this._extension.canChange;
     }
 
     get prefsModule() {
-        // give extension prefs access to their own extension object
-        ExtensionUtils.getCurrentExtension = () => this._extension;
-
         if (!this._prefsModule) {
             ExtensionUtils.installImporter(this._extension);
 
+            // give extension prefs access to their own extension object
+            ExtensionUtils.getCurrentExtension = () => this._extension;
+
             this._prefsModule = this._extension.imports.prefs;
             this._prefsModule.init(this._extension.metadata);
         }
@@ -750,7 +731,7 @@ function initEnvironment() {
             log(`ERROR: ${s}`);
         },
 
-        userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell']),
+        userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])
     };
 
     String.prototype.format = Format.format;
@@ -759,5 +740,8 @@ function initEnvironment() {
 function main(argv) {
     initEnvironment();
 
+    Gettext.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
+    Gettext.textdomain(Config.GETTEXT_PACKAGE);
+
     new Application().run(argv);
 }

js/extensionPrefs/ui/extension-row.ui

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <template class="ExtensionRow" parent="GtkListBoxRow">
-    <property name="visible">True</property>
-    <property name="activatable">False</property>
-    <child>
-      <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="margin">12</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkLabel" id="nameLabel">
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkImage" id="updatesIcon">
-            <property name="no_show_all">True</property>
-            <property name="icon_name">software-update-available-symbolic</property>
-            <style>
-              <class name="warning"/>>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="hexpand">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="prefsButton">
-            <property name="no_show_all">True</property>
-            <property name="visible"
-                      bind-source="prefsButton"
-                      bind-property="sensitive"
-                      bind-flags="sync-create"/>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="valign">center</property>
-            <property name="action-name">row.show-prefs</property>
-            <style>
-              <class name="circular"/>>
-              <class name="image-button"/>>
-            </style>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="icon_name">emblem-system-symbolic</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSwitch">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="valign">center</property>
-            <property name="action-name">row.enabled</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-          </object>
-        </child>
-         <child>
-          <object class="GtkButton" id="revealButton">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="valign">center</property>
-            <style>
-              <class name="details-button"/>
-              <class name="image-button"/>
-              <class name="flat"/>
-            </style>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="icon_name">pan-end-symbolic</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkRevealer" id="revealer">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="margin_top">12</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Description</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="descriptionLabel">
-                    <property name="visible">True</property>
-                    <property name="ellipsize">end</property>
-                    <property name="max_width_chars">60</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible"
-                              bind-source="versionLabel"
-                              bind-property="visible"
-                              bind-flags="sync-create"/>
-                    <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">Version</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="versionLabel">
-                    <property name="no_show_all">True</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible"
-                              bind-source="authorLabel"
-                              bind-property="visible"
-                              bind-flags="sync-create"/>
-                    <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">Author</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="authorLabel">
-                    <property name="no_show_all">True</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Website</property>
-                    <property name="action_name">row.show-url</property>
-                    <property name="valign">end</property>
-                    <property name="margin-top">12</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="removeButton">
-                    <property name="visible"
-                              bind-source="removeButton"
-                              bind-property="sensitive"
-                              bind-flags="sync-create"/>
-                    <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">Remove…</property>
-                    <property name="action_name">row.uninstall</property>
-                    <property name="hexpand">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">end</property>
-                    <style>
-                      <class name="destructive-action"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">7</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

js/extensionPrefs/ui/extensions-window.ui

@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <menu id="primary-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Help</attribute>
-        <attribute name="action">win.show-help</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">About Extensions</attribute>
-        <attribute name="action">win.show-about</attribute>
-      </item>
-    </section>
-  </menu>
-  <object class="GtkPopover" id="infoPopover">
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="margin">12</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">To find and add extensions, visit &lt;a href="https://extensions.gnome.org"&gt;extensions.gnome.org&lt;/a&gt;.</property>
-            <property name="use_markup">True</property>
-            <property name="xalign">0</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Warning</property>
-            <property name="xalign">0</property>
-            <property name="margin_top">6</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Extensions can cause system issues, including performance problems. If you encounter problems with your system, it is recommended to disable all extensions.</property>
-            <property name="wrap">True</property>
-            <property name="max_width_chars">40</property>
-            <property name="xalign">0</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-  <template class="ExtensionsWindow" parent="GtkApplicationWindow">
-    <property name="default_width">800</property>
-    <property name="default_height">500</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="visible">True</property>
-        <property name="title" translatable="yes">Extensions</property>
-        <property name="show_close_button">True</property>
-        <child>
-          <object class="GtkMenuButton">
-            <property name="visible">True</property>
-            <property name="popover">infoPopover</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="icon_name">dialog-information-symbolic</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkMenuButton" id="menuButton">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="menu_model">primary-menu</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="icon_name">open-menu-symbolic</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSwitch" id="killSwitch">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkStack" id="mainStack">
-            <property name="visible">True</property>
-            <property name="transition_type">crossfade</property>
-            <property name="vexpand">True</property>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledWindow">
-                <property name="visible">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <child>
-                  <object class="GtkViewport">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkBox" id="mainBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="halign">center</property>
-                        <property name="margin">36</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="visible"
-                                      bind-source="userList"
-                                      bind-property="visible"
-                                      bind-flags="sync-create"/>
-                            <property name="halign">start</property>
-                            <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Manually Installed</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkListBox" id="userList">
-                            <property name="visible">True</property>
-                            <property name="selection_mode">none</property>
-                            <property name="margin_bottom">24</property>
-                            <style>
-                              <class name="frame"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="visible"
-                                      bind-source="systemList"
-                                      bind-property="visible"
-                                      bind-flags="sync-create"/>
-                            <property name="halign">start</property>
-                            <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Built-In</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkListBox" id="systemList">
-                            <property name="visible">True</property>
-                            <property name="selection_mode">none</property>
-                            <style>
-                              <class name="frame"/>
-                            </style>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="name">main</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">vertical</property>
-                <property name="margin">32</property>
-                <property name="spacing">6</property>
-                <property name="valign">center</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="pixel_size">96</property>
-                    <property name="icon_name">org.gnome.Extensions-symbolic</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">No Installed Extensions</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="scale" value="1.44"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="name">placeholder</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="margin_left">100</property>
-                <property name="margin_right">100</property>
-                <property name="margin_top">100</property>
-                <property name="margin_bottom">60</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Something’s gone wrong</property>
-                    <attributes>
-                      <attribute name="scale" value="1.44"/>
-                    </attributes>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">We’re very sorry, but it was not possible to get the list of installed extensions. Make sure you are logged into GNOME and try again.</property>
-                    <property name="justify">center</property>
-                    <property name="wrap">True</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="name">noshell</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkActionBar" id="updatesBar">
-            <property name="no_show_all">True</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="pixel-size">24</property>
-                <property name="margin">6</property>
-                <property name="icon_name">software-update-available-symbolic</property>
-                <style>
-                  <class name="warning"/>>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="halign">start</property>
-                    <property name="label">Extension Updates Ready</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="updatesLabel">
-                    <property name="visible">True</property>
-                    <property name="halign">start</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">Logout…</property>
-                <property name="visible">True</property>
-                <property name="valign">center</property>
-                <property name="action-name">win.logout</property>
-                <property name="receives_default">True</property>
-                <style>
-                  <class name="suggested-action"/>
-                </style>
-              </object>
-              <packing>
-                <property name="pack_type">end</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

js/gdm/authPrompt.js

@@ -1,12 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported AuthPrompt */
 
-const { Clutter, GObject, Pango, Shell, St } = imports.gi;
+const { Clutter, Pango, Shell, St } = imports.gi;
+const Signals = imports.signals;
 
 const Animation = imports.ui.animation;
 const Batch = imports.gdm.batch;
 const GdmUtil = imports.gdm.util;
-const Util = imports.misc.util;
 const Params = imports.misc.params;
 const ShellEntry = imports.ui.shellEntry;
 const UserWidget = imports.ui.userWidget;
@@ -19,36 +18,23 @@ var MESSAGE_FADE_OUT_ANIMATION_TIME = 500;
 
 var AuthPromptMode = {
     UNLOCK_ONLY: 0,
-    UNLOCK_OR_LOG_IN: 1,
+    UNLOCK_OR_LOG_IN: 1
 };
 
 var AuthPromptStatus = {
     NOT_VERIFYING: 0,
     VERIFYING: 1,
     VERIFICATION_FAILED: 2,
-    VERIFICATION_SUCCEEDED: 3,
+    VERIFICATION_SUCCEEDED: 3
 };
 
 var BeginRequestType = {
     PROVIDE_USERNAME: 0,
-    DONT_PROVIDE_USERNAME: 1,
+    DONT_PROVIDE_USERNAME: 1
 };
 
-var AuthPrompt = GObject.registerClass({
+var AuthPrompt = class {
-    Signals: {
+    constructor(gdmClient, mode) {
-        'cancelled': {},
-        'failed': {},
-        'next': {},
-        'prompted': {},
-        'reset': { param_types: [GObject.TYPE_UINT] },
-    },
-}, class AuthPrompt extends St.BoxLayout {
-    _init(gdmClient, mode) {
-        super._init({
-            style_class: 'login-dialog-prompt-layout',
-            vertical: true,
-        });
-
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
 
         this._gdmClient = gdmClient;
@@ -60,7 +46,7 @@ var AuthPrompt = GObject.registerClass({
         else if (this._mode == AuthPromptMode.UNLOCK_OR_LOG_IN)
             reauthenticationOnly = false;
 
-        this._userVerifier = new GdmUtil.ShellUserVerifier(this._gdmClient, { reauthenticationOnly });
+        this._userVerifier = new GdmUtil.ShellUserVerifier(this._gdmClient, { reauthenticationOnly: reauthenticationOnly });
 
         this._userVerifier.connect('ask-question', this._onAskQuestion.bind(this));
         this._userVerifier.connect('show-message', this._onShowMessage.bind(this));
@@ -74,80 +60,70 @@ var AuthPrompt = GObject.registerClass({
         this.connect('next', () => {
             this.updateSensitivity(false);
             this.startSpinning();
-            if (this._queryingService)
+            if (this._queryingService) {
                 this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-            else
+            } else {
                 this._preemptiveAnswer = this._entry.text;
+            }
         });
 
-        this.connect('destroy', this._onDestroy.bind(this));
+        this.actor = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
-
+                                        vertical: true });
-        this._userWell = new St.Bin({
+        this.actor.connect('destroy', this._onDestroy.bind(this));
-            x_expand: true,
+        this.actor.connect('key-press-event', (actor, event) => {
-            y_expand: true,
+            if (event.get_key_symbol() == Clutter.KEY_Escape)
-        });
+                this.cancel();
-        this.add_child(this._userWell);
+            return Clutter.EVENT_PROPAGATE;
-        this._label = new St.Label({
-            style_class: 'login-dialog-prompt-label',
-            x_expand: false,
-            y_expand: true,
         });
 
-        this.add_child(this._label);
+        this._userWell = new St.Bin({ x_fill: true,
+                                      x_align: St.Align.START });
+        this.actor.add(this._userWell,
+                       { x_align: St.Align.START,
+                         x_fill: true,
+                         y_fill: true,
+                         expand: true });
+        this._label = new St.Label({ style_class: 'login-dialog-prompt-label' });
 
-        let entryParams = {
+        this.actor.add(this._label,
-            style_class: 'login-dialog-prompt-entry',
+                       { expand: true,
-            can_focus: true,
+                         x_fill: false,
-            x_expand: false,
+                         y_fill: true,
-            y_expand: true,
+                         x_align: St.Align.START });
-        };
+        this._entry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
+                                     can_focus: true });
+        ShellEntry.addContextMenu(this._entry, { isPassword: true, actionMode: Shell.ActionMode.NONE });
 
-        this._entry = null;
+        this.actor.add(this._entry,
-
+                       { expand: true,
-        this._textEntry = new St.Entry(entryParams);
+                         x_fill: true,
-        ShellEntry.addContextMenu(this._textEntry, { actionMode: Shell.ActionMode.NONE });
+                         y_fill: false,
-
+                         x_align: St.Align.START });
-        this._passwordEntry = new St.PasswordEntry(entryParams);
-        ShellEntry.addContextMenu(this._passwordEntry, { actionMode: Shell.ActionMode.NONE });
-
-        this._entry = this._passwordEntry;
-        this.add_child(this._entry);
 
         this._entry.grab_key_focus();
 
-        this._capsLockWarningLabel = new ShellEntry.CapsLockWarning();
+        this._message = new St.Label({ opacity: 0,
-        this.add_child(this._capsLockWarningLabel);
+                                       styleClass: 'login-dialog-message' });
-
-        this._message = new St.Label({
-            opacity: 0,
-            styleClass: 'login-dialog-message',
-            x_expand: false,
-            y_expand: true,
-            y_align: Clutter.ActorAlign.START,
-        });
         this._message.clutter_text.line_wrap = true;
         this._message.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this.add_child(this._message);
+        this.actor.add(this._message, { x_fill: false, x_align: St.Align.START, y_align: St.Align.START });
 
-        this._buttonBox = new St.BoxLayout({
+        this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
-            style_class: 'login-dialog-button-box',
+                                             vertical: false });
-            vertical: false,
+        this.actor.add(this._buttonBox,
-            y_align: Clutter.ActorAlign.END,
+                       { expand: true,
-        });
+                         x_align: St.Align.MIDDLE,
-        this.add_child(this._buttonBox);
+                         y_align: St.Align.END });
 
-        this._defaultButtonWell = new St.Widget({
+        this._defaultButtonWell = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-            layout_manager: new Clutter.BinLayout(),
+        this._defaultButtonWellActor = null;
-            x_align: Clutter.ActorAlign.END,
-            y_align: Clutter.ActorAlign.CENTER,
-        });
 
         this._initButtons();
 
         this._spinner = new Animation.Spinner(DEFAULT_BUTTON_WELL_ICON_SIZE);
-        this._spinner.opacity = 0;
+        this._spinner.actor.opacity = 0;
-        this._spinner.show();
+        this._spinner.actor.show();
-        this._defaultButtonWell.add_child(this._spinner);
+        this._defaultButtonWell.add_child(this._spinner.actor);
     }
 
     _onDestroy() {
@@ -155,39 +131,39 @@ var AuthPrompt = GObject.registerClass({
         this._userVerifier = null;
     }
 
-    vfunc_key_press_event(keyPressEvent) {
-        if (keyPressEvent.keyval == Clutter.KEY_Escape)
-            this.cancel();
-        return Clutter.EVENT_PROPAGATE;
-    }
-
     _initButtons() {
-        this.cancelButton = new St.Button({
+        this.cancelButton = new St.Button({ style_class: 'modal-dialog-button button',
-            style_class: 'modal-dialog-button button',
+                                            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                            reactive: true,
-            reactive: true,
+                                            can_focus: true,
-            can_focus: true,
+                                            label: _("Cancel") });
-            label: _("Cancel"),
-            x_expand: true,
-            x_align: Clutter.ActorAlign.START,
-            y_align: Clutter.ActorAlign.END,
-        });
         this.cancelButton.connect('clicked', () => this.cancel());
-        this._buttonBox.add_child(this.cancelButton);
+        this._buttonBox.add(this.cancelButton,
+                            { expand: false,
+                              x_fill: false,
+                              y_fill: false,
+                              x_align: St.Align.START,
+                              y_align: St.Align.END });
 
-        this._buttonBox.add_child(this._defaultButtonWell);
+        this._buttonBox.add(this._defaultButtonWell,
-        this.nextButton = new St.Button({
+                            { expand: true,
-            style_class: 'modal-dialog-button button',
+                              x_fill: false,
-            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                              y_fill: false,
-            reactive: true,
+                              x_align: St.Align.END,
-            can_focus: true,
+                              y_align: St.Align.MIDDLE });
-            label: _("Next"),
+        this.nextButton = new St.Button({ style_class: 'modal-dialog-button button',
-            x_align: Clutter.ActorAlign.END,
+                                          button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-            y_align: Clutter.ActorAlign.END,
+                                          reactive: true,
-        });
+                                          can_focus: true,
+                                          label: _("Next") });
         this.nextButton.connect('clicked', () => this.emit('next'));
         this.nextButton.add_style_pseudo_class('default');
-        this._buttonBox.add_child(this.nextButton);
+        this._buttonBox.add(this.nextButton,
+                            { expand: false,
+                              x_fill: false,
+                              y_fill: false,
+                              x_align: St.Align.END,
+                              y_align: St.Align.END });
 
         this._updateNextButtonSensitivity(this._entry.text.length > 0);
 
@@ -203,18 +179,7 @@ var AuthPrompt = GObject.registerClass({
         });
     }
 
-    _updateEntry(secret) {
+    _onAskQuestion(verifier, serviceName, question, passwordChar) {
-        if (secret && (this._entry != this._passwordEntry)) {
-            this.replace_child(this._entry, this._passwordEntry);
-            this._entry = this._passwordEntry;
-        } else if (!secret && (this._entry != this._textEntry)) {
-            this.replace_child(this._entry, this._textEntry);
-            this._entry = this._textEntry;
-        }
-        this._capsLockWarningLabel.visible = secret;
-    }
-
-    _onAskQuestion(verifier, serviceName, question, secret) {
         if (this._queryingService)
             this.clear();
 
@@ -224,11 +189,10 @@ var AuthPrompt = GObject.registerClass({
             this._preemptiveAnswer = null;
             return;
         }
-
+        this.setPasswordChar(passwordChar);
-        this._updateEntry(secret);
         this.setQuestion(question);
 
-        if (secret) {
+        if (passwordChar) {
             if (this._userVerifier.reauthenticating)
                 this.nextButton.label = _("Unlock");
             else
@@ -277,8 +241,6 @@ var AuthPrompt = GObject.registerClass({
         this.updateSensitivity(canRetry);
         this.setActorInDefaultButtonWell(null);
         this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
-
-        Util.wiggle(this._entry);
     }
 
     _onVerificationComplete() {
@@ -307,13 +269,13 @@ var AuthPrompt = GObject.registerClass({
             oldActor.remove_all_transitions();
 
         let wasSpinner;
-        if (oldActor == this._spinner)
+        if (oldActor == this._spinner.actor)
             wasSpinner = true;
         else
             wasSpinner = false;
 
         let isSpinner;
-        if (actor == this._spinner)
+        if (actor == this._spinner.actor)
             isSpinner = true;
         else
             isSpinner = false;
@@ -337,7 +299,7 @@ var AuthPrompt = GObject.registerClass({
                             if (this._spinner)
                                 this._spinner.stop();
                         }
-                    },
+                    }
                 });
             }
         }
@@ -346,23 +308,22 @@ var AuthPrompt = GObject.registerClass({
             if (isSpinner)
                 this._spinner.play();
 
-            if (!animate) {
+            if (!animate)
                 actor.opacity = 255;
-            } else {
+            else
                 actor.ease({
                     opacity: 255,
                     duration: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
                     delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                    mode: Clutter.AnimationMode.LINEAR,
+                    mode: Clutter.AnimationMode.LINEAR
                 });
-            }
         }
 
         this._defaultButtonWellActor = actor;
     }
 
     startSpinning() {
-        this.setActorInDefaultButtonWell(this._spinner, true);
+        this.setActorInDefaultButtonWell(this._spinner.actor, true);
     }
 
     stopSpinning() {
@@ -374,6 +335,11 @@ var AuthPrompt = GObject.registerClass({
         this.stopSpinning();
     }
 
+    setPasswordChar(passwordChar) {
+        this._entry.clutter_text.set_password_char(passwordChar);
+        this._entry.menu.isPassword = passwordChar != '';
+    }
+
     setQuestion(question) {
         this._label.set_text(question);
 
@@ -403,7 +369,7 @@ var AuthPrompt = GObject.registerClass({
         this._message.ease({
             opacity: 0,
             duration: MESSAGE_FADE_OUT_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
         });
     }
 
@@ -438,9 +404,9 @@ var AuthPrompt = GObject.registerClass({
         this._entry.clutter_text.editable = sensitive;
     }
 
-    vfunc_hide() {
+    hide() {
         this.setActorInDefaultButtonWell(null, true);
-        super.vfunc_hide();
+        this.actor.hide();
         this._message.opacity = 0;
 
         this.setUser(null);
@@ -456,8 +422,7 @@ var AuthPrompt = GObject.registerClass({
 
         if (user) {
             let userWidget = new UserWidget.UserWidget(user);
-            userWidget.x_align = Clutter.ActorAlign.START;
+            this._userWell.set_child(userWidget.actor);
-            this._userWell.set_child(userWidget);
         }
     }
 
@@ -536,10 +501,11 @@ var AuthPrompt = GObject.registerClass({
     }
 
     cancel() {
-        if (this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED)
+        if (this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
             return;
-
+        }
         this.reset();
         this.emit('cancelled');
     }
-});
+};
+Signals.addSignalMethods(AuthPrompt.prototype);

js/gdm/batch.js

@@ -112,12 +112,13 @@ var Batch = class extends Task {
         for (let i = 0; i < tasks.length; i++) {
             let task;
 
-            if (tasks[i] instanceof Task)
+            if (tasks[i] instanceof Task) {
                 task = tasks[i];
-            else if (typeof tasks[i] == 'function')
+            } else if (typeof tasks[i] == 'function') {
                 task = new Task(scope, tasks[i]);
-            else
+            } else {
                 throw new Error('Batch tasks must be functions or Task, Hold or Batch objects');
+            }
 
             this.tasks.push(task);
         }
@@ -128,8 +129,9 @@ var Batch = class extends Task {
     }
 
     runTask() {
-        if (!(this._currentTaskIndex in this.tasks))
+        if (!(this._currentTaskIndex in this.tasks)) {
             return null;
+        }
 
         return this.tasks[this._currentTaskIndex].run();
     }
@@ -177,8 +179,9 @@ var ConcurrentBatch = class extends Batch {
     process() {
         let hold = this.runTask();
 
-        if (hold)
+        if (hold) {
             this.hold.acquireUntilAfter(hold);
+        }
 
         // Regardless of the state of the just run task,
         // fire off the next one, so all the tasks can run
@@ -199,6 +202,7 @@ var ConsecutiveBatch = class extends Batch {
                 hold.disconnect(signalId);
                 this.nextTask();
             });
+            return;
         } else {
             // This task finished, process the next one
             this.nextTask();

js/gdm/fingerprint.js

@@ -20,7 +20,7 @@ function FprintManager() {
                                    g_interface_info: FprintManagerInfo,
                                    g_name: 'net.reactivated.Fprint',
                                    g_object_path: '/net/reactivated/Fprint/Manager',
-                                   g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
 
     try {
         self.init(null);

js/gdm/loginDialog.js

@@ -19,6 +19,7 @@
 
 const { AccountsService, Atk, Clutter, Gdm, Gio,
         GLib, GObject, Meta, Pango, Shell, St } = imports.gi;
+const Signals = imports.signals;
 
 const AuthPrompt = imports.gdm.authPrompt;
 const Batch = imports.gdm.batch;
@@ -38,81 +39,72 @@ const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
 const _LOGO_ICON_HEIGHT = 48;
 const _MAX_BOTTOM_MENU_ITEMS = 5;
 
-var UserListItem = GObject.registerClass({
+var UserListItem = class {
-    Signals: { 'activate': {} },
+    constructor(user) {
-}, class UserListItem extends St.Button {
-    _init(user) {
-        let layout = new St.BoxLayout({
-            vertical: true,
-            x_align: Clutter.ActorAlign.START,
-        });
-        super._init({
-            style_class: 'login-dialog-user-list-item',
-            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-            can_focus: true,
-            x_expand: true,
-            child: layout,
-            reactive: true,
-        });
-
         this.user = user;
         this._userChangedId = this.user.connect('changed',
                                                 this._onUserChanged.bind(this));
 
-        this.connect('destroy', this._onDestroy.bind(this));
+        let layout = new St.BoxLayout({ vertical: true });
-        this.connect('notify::hover', () => {
+        this.actor = new St.Button({ style_class: 'login-dialog-user-list-item',
-            this._setSelected(this.hover);
+                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                     can_focus: true,
+                                     child: layout,
+                                     reactive: true,
+                                     x_align: St.Align.START,
+                                     x_fill: true });
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+
+        this.actor.connect('key-focus-in', () => {
+            this._setSelected(true);
+        });
+        this.actor.connect('key-focus-out', () => {
+            this._setSelected(false);
+        });
+        this.actor.connect('notify::hover', () => {
+            this._setSelected(this.actor.hover);
         });
 
         this._userWidget = new UserWidget.UserWidget(this.user);
-        layout.add(this._userWidget);
+        layout.add(this._userWidget.actor);
 
-        this._userWidget.bind_property('label-actor', this, 'label-actor',
+        this._userWidget.actor.bind_property('label-actor', this.actor, 'label-actor',
-                                       GObject.BindingFlags.SYNC_CREATE);
+                                             GObject.BindingFlags.SYNC_CREATE);
 
         this._timedLoginIndicator = new St.Bin({ style_class: 'login-dialog-timed-login-indicator',
                                                  scale_x: 0,
                                                  visible: false });
         layout.add(this._timedLoginIndicator);
 
+        this.actor.connect('clicked', this._onClicked.bind(this));
         this._onUserChanged();
     }
 
-    vfunc_key_focus_in() {
-        super.vfunc_key_focus_in();
-        this._setSelected(true);
-    }
-
-    vfunc_key_focus_out() {
-        super.vfunc_key_focus_out();
-        this._setSelected(false);
-    }
-
     _onUserChanged() {
         this._updateLoggedIn();
     }
 
     _updateLoggedIn() {
         if (this.user.is_logged_in())
-            this.add_style_pseudo_class('logged-in');
+            this.actor.add_style_pseudo_class('logged-in');
         else
-            this.remove_style_pseudo_class('logged-in');
+            this.actor.remove_style_pseudo_class('logged-in');
     }
 
     _onDestroy() {
         this.user.disconnect(this._userChangedId);
     }
 
-    vfunc_clicked() {
+    _onClicked() {
         this.emit('activate');
     }
 
     _setSelected(selected) {
         if (selected) {
-            this.add_style_pseudo_class('selected');
+            this.actor.add_style_pseudo_class('selected');
-            this.grab_key_focus();
+            this.actor.grab_key_focus();
         } else {
-            this.remove_style_pseudo_class('selected');
+            this.actor.remove_style_pseudo_class('selected');
         }
     }
 
@@ -125,7 +117,7 @@ var UserListItem = GObject.registerClass({
 
         let startTime = GLib.get_monotonic_time();
 
-        this._timedLoginTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 33,
+        this._timedLoginTimeoutId = GLib.timeout_add (GLib.PRIORITY_DEFAULT, 33,
             () => {
                 let currentTime = GLib.get_monotonic_time();
                 let elapsedTime = (currentTime - startTime) / GLib.USEC_PER_SEC;
@@ -153,33 +145,23 @@ var UserListItem = GObject.registerClass({
         this._timedLoginIndicator.visible = false;
         this._timedLoginIndicator.scale_x = 0.;
     }
-});
+};
+Signals.addSignalMethods(UserListItem.prototype);
 
-var UserList = GObject.registerClass({
+var UserList = class {
-    Signals: {
+    constructor() {
-        'activate': { param_types: [UserListItem.$gtype] },
+        this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view' });
-        'item-added': { param_types: [UserListItem.$gtype] },
+        this.actor.set_policy(St.PolicyType.NEVER,
-    },
+                              St.PolicyType.AUTOMATIC);
-}, class UserList extends St.ScrollView {
-    _init() {
-        super._init({
-            style_class: 'login-dialog-user-list-view',
-            x_expand: true,
-            y_expand: true,
-        });
-        this.set_policy(St.PolicyType.NEVER,
-                        St.PolicyType.AUTOMATIC);
 
         this._box = new St.BoxLayout({ vertical: true,
                                        style_class: 'login-dialog-user-list',
                                        pseudo_class: 'expanded' });
 
-        this.add_actor(this._box);
+        this.actor.add_actor(this._box);
         this._items = {};
-    }
 
-    vfunc_key_focus_in() {
+        this.actor.connect('key-focus-in', this._moveFocusToItems.bind(this));
-        this._moveFocusToItems();
     }
 
     _moveFocusToItems() {
@@ -188,10 +170,10 @@ var UserList = GObject.registerClass({
         if (!hasItems)
             return;
 
-        if (global.stage.get_key_focus() != this)
+        if (global.stage.get_key_focus() != this.actor)
             return;
 
-        let focusSet = this.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
+        let focusSet = this.actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
         if (!focusSet) {
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
                 this._moveFocusToItems();
@@ -212,26 +194,26 @@ var UserList = GObject.registerClass({
 
         for (let userName in this._items) {
             let item = this._items[userName];
-            item.sync_hover();
+            item.actor.sync_hover();
         }
     }
 
     scrollToItem(item) {
-        let box = item.get_allocation_box();
+        let box = item.actor.get_allocation_box();
 
-        let adjustment = this.get_vscroll_bar().get_adjustment();
+        let adjustment = this.actor.get_vscroll_bar().get_adjustment();
 
         let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
         adjustment.ease(value, {
             mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            duration: _SCROLL_ANIMATION_TIME,
+            duration: _SCROLL_ANIMATION_TIME
         });
     }
 
     jumpToItem(item) {
-        let box = item.get_allocation_box();
+        let box = item.actor.get_allocation_box();
 
-        let adjustment = this.get_vscroll_bar().get_adjustment();
+        let adjustment = this.actor.get_vscroll_bar().get_adjustment();
 
         let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
 
@@ -269,14 +251,14 @@ var UserList = GObject.registerClass({
         this.removeUser(user);
 
         let item = new UserListItem(user);
-        this._box.add_child(item);
+        this._box.add(item.actor, { x_fill: true });
 
         this._items[userName] = item;
 
         item.connect('activate', this._onItemActivated.bind(this));
 
         // Try to keep the focused item front-and-center
-        item.connect('key-focus-in', () => this.scrollToItem(item));
+        item.actor.connect('key-focus-in', () => this.scrollToItem(item));
 
         this._moveFocusToItems();
 
@@ -297,37 +279,33 @@ var UserList = GObject.registerClass({
         if (!item)
             return;
 
-        item.destroy();
+        item.actor.destroy();
         delete this._items[userName];
     }
 
     numItems() {
         return Object.keys(this._items).length;
     }
-});
+};
+Signals.addSignalMethods(UserList.prototype);
 
-var SessionMenuButton = GObject.registerClass({
+var SessionMenuButton = class {
-    Signals: { 'session-activated': { param_types: [GObject.TYPE_STRING] } },
+    constructor() {
-}, class SessionMenuButton extends St.Bin {
-    _init() {
         let gearIcon = new St.Icon({ icon_name: 'emblem-system-symbolic' });
-        let button = new St.Button({
+        this._button = new St.Button({ style_class: 'login-dialog-session-list-button',
-            style_class: 'login-dialog-session-list-button',
+                                       reactive: true,
-            reactive: true,
+                                       track_hover: true,
-            track_hover: true,
+                                       can_focus: true,
-            can_focus: true,
+                                       accessible_name: _("Choose Session"),
-            accessible_name: _("Choose Session"),
+                                       accessible_role: Atk.Role.MENU,
-            accessible_role: Atk.Role.MENU,
+                                       child: gearIcon });
-            child: gearIcon,
-        });
 
-        super._init({ child: button });
+        this.actor = new St.Bin({ child: this._button });
-        this._button = button;
 
         let side = St.Side.TOP;
         let align = 0;
         if (Gdm.get_session_ids().length > _MAX_BOTTOM_MENU_ITEMS) {
-            if (this.text_direction == Clutter.TextDirection.RTL)
+            if (this.actor.text_direction == Clutter.TextDirection.RTL)
                 side = St.Side.RIGHT;
             else
                 side = St.Side.LEFT;
@@ -406,13 +384,15 @@ var SessionMenuButton = GObject.registerClass({
             });
         }
     }
-});
+};
+Signals.addSignalMethods(SessionMenuButton.prototype);
 
 var LoginDialog = GObject.registerClass({
     Signals: { 'failed': {} },
 }, class LoginDialog extends St.Widget {
     _init(parentActor) {
-        super._init({ style_class: 'login-dialog', visible: false });
+        super._init({ style_class: 'login-dialog',
+                      visible: false });
 
         this.get_accessible().set_role(Atk.Role.WINDOW);
 
@@ -446,35 +426,38 @@ var LoginDialog = GObject.registerClass({
         this.add_child(this._userSelectionBox);
 
         this._userList = new UserList();
-        this._userSelectionBox.add_child(this._userList);
+        this._userSelectionBox.add(this._userList.actor,
+                                   { expand: true,
+                                     x_fill: true,
+                                     y_fill: true });
 
         this._authPrompt = new AuthPrompt.AuthPrompt(this._gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
         this._authPrompt.connect('prompted', this._onPrompted.bind(this));
         this._authPrompt.connect('reset', this._onReset.bind(this));
         this._authPrompt.hide();
-        this.add_child(this._authPrompt);
+        this.add_child(this._authPrompt.actor);
 
         // translators: this message is shown below the user list on the
         // login screen. It can be activated to reveal an entry for
         // manually entering the username.
-        let notListedLabel = new St.Label({
+        let notListedLabel = new St.Label({ text: _("Not listed?"),
-            text: _("Not listed?"),
+                                            style_class: 'login-dialog-not-listed-label' });
-            style_class: 'login-dialog-not-listed-label',
+        this._notListedButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
-            x_align: Clutter.ActorAlign.START,
+                                                button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-        });
+                                                can_focus: true,
-        this._notListedButton = new St.Button({
+                                                child: notListedLabel,
-            style_class: 'login-dialog-not-listed-button',
+                                                reactive: true,
-            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                                x_align: St.Align.START,
-            can_focus: true,
+                                                x_fill: true });
-            child: notListedLabel,
-            reactive: true,
-        });
 
         this._notListedButton.connect('clicked', this._hideUserListAskForUsernameAndBeginVerification.bind(this));
 
         this._notListedButton.hide();
 
-        this._userSelectionBox.add_child(this._notListedButton);
+        this._userSelectionBox.add(this._notListedButton,
+                                   { expand: false,
+                                     x_align: St.Align.START,
+                                     x_fill: true });
 
         this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
                                                opacity: 0,
@@ -509,11 +492,11 @@ var LoginDialog = GObject.registerClass({
         this._sessionMenuButton = new SessionMenuButton();
         this._sessionMenuButton.connect('session-activated',
             (list, sessionId) => {
-                this._greeter.call_select_session_sync(sessionId, null);
+                this._greeter.call_select_session_sync (sessionId, null);
             });
-        this._sessionMenuButton.opacity = 0;
+        this._sessionMenuButton.actor.opacity = 0;
-        this._sessionMenuButton.show();
+        this._sessionMenuButton.actor.show();
-        this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton);
+        this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton.actor);
 
         this._disableUserList = undefined;
         this._userListLoaded = false;
@@ -596,8 +579,8 @@ var LoginDialog = GObject.registerClass({
 
         let authPromptAllocation = null;
         let authPromptWidth = 0;
-        if (this._authPrompt.visible) {
+        if (this._authPrompt.actor.visible) {
-            authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt);
+            authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);
             authPromptWidth = authPromptAllocation.x2 - authPromptAllocation.x1;
         }
 
@@ -702,11 +685,12 @@ var LoginDialog = GObject.registerClass({
         }
 
         // Finally hand out the allocations
-        if (bannerAllocation)
+        if (bannerAllocation) {
             this._bannerView.allocate(bannerAllocation, flags);
+        }
 
         if (authPromptAllocation)
-            this._authPrompt.allocate(authPromptAllocation, flags);
+            this._authPrompt.actor.allocate(authPromptAllocation, flags);
 
         if (userSelectionAllocation)
             this._userSelectionBox.allocate(userSelectionAllocation, flags);
@@ -776,7 +760,7 @@ var LoginDialog = GObject.registerClass({
         this._bannerView.ease({
             opacity: 255,
             duration: _FADE_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
         });
     }
 
@@ -810,7 +794,7 @@ var LoginDialog = GObject.registerClass({
     _onPrompted() {
         if (this._shouldShowSessionMenuButton()) {
             this._sessionMenuButton.updateSensitivity(true);
-            this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton);
+            this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton.actor);
         } else {
             this._sessionMenuButton.updateSensitivity(false);
         }
@@ -819,9 +803,9 @@ var LoginDialog = GObject.registerClass({
 
     _resetGreeterProxy() {
         if (GLib.getenv('GDM_GREETER_TEST') != '1') {
-            if (this._greeter)
+            if (this._greeter) {
                 this._greeter.run_dispose();
-
+            }
             this._greeter = this._gdmClient.get_greeter_sync(null);
 
             this._defaultSessionChangedId = this._greeter.connect('default-session-name-changed',
@@ -870,14 +854,14 @@ var LoginDialog = GObject.registerClass({
     }
 
     _showPrompt() {
-        if (this._authPrompt.visible)
+        if (this._authPrompt.actor.visible)
             return;
-        this._authPrompt.opacity = 0;
+        this._authPrompt.actor.opacity = 0;
-        this._authPrompt.show();
+        this._authPrompt.actor.show();
-        this._authPrompt.ease({
+        this._authPrompt.actor.ease({
             opacity: 255,
             duration: _FADE_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
         });
         this._fadeInBannerView();
     }
@@ -896,6 +880,7 @@ var LoginDialog = GObject.registerClass({
     }
 
     _askForUsernameAndBeginVerification() {
+        this._authPrompt.setPasswordChar('');
         this._authPrompt.setQuestion(_("Username: "));
 
         this._showRealmLoginHint(this._realmManager.loginFormat);
@@ -936,7 +921,7 @@ var LoginDialog = GObject.registerClass({
             return;
 
         this._bindOpacity();
-        this.ease({
+        this.actor.ease({
             opacity: 255,
             duration: _FADE_ANIMATION_TIME,
             mode: Clutter.AnimationMode.EASE_OUT_QUAD,
@@ -944,7 +929,7 @@ var LoginDialog = GObject.registerClass({
                 if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
                     this._authPrompt.reset();
                 this._unbindOpacity();
-            },
+            }
         });
     }
 
@@ -959,14 +944,14 @@ var LoginDialog = GObject.registerClass({
 
     _startSession(serviceName) {
         this._bindOpacity();
-        this.ease({
+        this.actor.ease({
             opacity: 0,
             duration: _FADE_ANIMATION_TIME,
             mode: Clutter.AnimationMode.EASE_OUT_QUAD,
             onComplete: () => {
                 this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
                 this._unbindOpacity();
-            },
+            }
         });
     }
 
@@ -983,7 +968,7 @@ var LoginDialog = GObject.registerClass({
         let hold = new Batch.Hold();
         let signalId = this._userList.connect('item-added',
             () => {
-                item = this._userList.getItemFromUserName(userName);
+                let item = this._userList.getItemFromUserName(userName);
 
                 if (item)
                     hold.release();
@@ -1037,8 +1022,9 @@ var LoginDialog = GObject.registerClass({
 
                      () => {
                          // If we're just starting out, start on the right item.
-                         if (!this._userManager.is_loaded)
+                         if (!this._userManager.is_loaded) {
                              this._userList.jumpToItem(loginItem);
+                         }
                      },
 
                      () => {
@@ -1059,12 +1045,12 @@ var LoginDialog = GObject.registerClass({
                      () => {
                          // If idle timeout is done, make sure the timed login indicator is shown
                          if (delay > _TIMED_LOGIN_IDLE_THRESHOLD &&
-                             this._authPrompt.visible)
+                             this._authPrompt.actor.visible)
                              this._authPrompt.cancel();
 
                          if (delay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) {
                              this._userList.scrollToItem(loginItem);
-                             loginItem.grab_key_focus();
+                             loginItem.actor.grab_key_focus();
                          }
                      },
 
@@ -1089,8 +1075,9 @@ var LoginDialog = GObject.registerClass({
         // Restart timed login on user interaction
         global.stage.connect('captured-event', (actor, event) => {
             if (event.type() == Clutter.EventType.KEY_PRESS ||
-                event.type() == Clutter.EventType.BUTTON_PRESS)
+               event.type() == Clutter.EventType.BUTTON_PRESS) {
                 this._startTimedLogin(userName, seconds);
+            }
 
             return Clutter.EVENT_PROPAGATE;
         });
@@ -1124,7 +1111,7 @@ var LoginDialog = GObject.registerClass({
         this._sessionMenuButton.close();
         this._setUserListExpanded(true);
         this._notListedButton.show();
-        this._userList.grab_key_focus();
+        this._userList.actor.grab_key_focus();
     }
 
     _beginVerificationForItem(item) {
@@ -1133,7 +1120,8 @@ var LoginDialog = GObject.registerClass({
         let userName = item.user.get_user_name();
         let hold = new Batch.Hold();
 
-        this._authPrompt.begin({ userName, hold });
+        this._authPrompt.begin({ userName: userName,
+                                 hold: hold });
         return hold;
     }
 
@@ -1196,8 +1184,9 @@ var LoginDialog = GObject.registerClass({
 
         let users = this._userManager.list_users();
 
-        for (let i = 0; i < users.length; i++)
+        for (let i = 0; i < users.length; i++) {
             this._userList.addUser(users[i]);
+        }
 
         this._updateDisableUserList();
 
@@ -1230,7 +1219,7 @@ var LoginDialog = GObject.registerClass({
                                         _("Login Window"),
                                         'dialog-password-symbolic',
                                         { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
-        this._userList.grab_key_focus();
+        this._userList.actor.grab_key_focus();
         this.show();
         this.opacity = 0;
 
@@ -1239,7 +1228,7 @@ var LoginDialog = GObject.registerClass({
         this.ease({
             opacity: 255,
             duration: 1000,
-            mode: Clutter.AnimationMode.EASE_IN_QUAD,
+            mode: Clutter.AnimationMode.EASE_IN_QUAD
         });
 
         return true;

js/gdm/oVirt.js

@@ -23,7 +23,7 @@ function OVirtCredentials() {
                                    g_interface_info: OVirtCredentialsInfo,
                                    g_name: 'org.ovirt.vdsm.Credentials',
                                    g_object_path: '/org/ovirt/vdsm/Credentials',
-                                   g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
     self.init(null);
     return self;
 }

js/gdm/realmd.js

@@ -21,7 +21,6 @@ var Manager = class {
                                            '/org/freedesktop/realmd',
                                            this._reloadRealms.bind(this));
         this._realms = {};
-        this._loginFormat = null;
 
         this._signalId = this._aggregateProvider.connect('g-properties-changed',
             (proxy, properties) => {
@@ -87,7 +86,7 @@ var Manager = class {
     }
 
     get loginFormat() {
-        if (this._loginFormat)
+        if (this._loginFormat !== undefined)
             return this._loginFormat;
 
         this._updateLoginFormat();

js/gdm/util.js

@@ -37,7 +37,7 @@ var MessageType = {
     NONE: 0,
     ERROR: 1,
     INFO: 2,
-    HINT: 3,
+    HINT: 3
 };
 
 function fadeInActor(actor) {
@@ -58,7 +58,7 @@ function fadeInActor(actor) {
         onComplete: () => {
             this.set_height(-1);
             hold.release();
-        },
+        }
     });
 
     return hold;
@@ -81,7 +81,7 @@ function fadeOutActor(actor) {
             this.hide();
             this.set_height(-1);
             hold.release();
-        },
+        }
     });
     return hold;
 }
@@ -109,7 +109,7 @@ function cloneAndFadeOutActor(actor) {
         onComplete: () => {
             clone.destroy();
             hold.release();
-        },
+        }
     });
     return hold;
 }
@@ -272,7 +272,7 @@ var ShellUserVerifier = class {
         let interval = this._getIntervalForMessage(message);
 
         this.hasPendingMessages = true;
-        this._messageQueue.push({ text: message, type: messageType, interval });
+        this._messageQueue.push({ text: message, type: messageType, interval: interval });
         this._queueMessageTimeout();
     }
 
@@ -485,7 +485,7 @@ var ShellUserVerifier = class {
         if (!this.serviceIsForeground(serviceName))
             return;
 
-        this.emit('ask-question', serviceName, question, false);
+        this.emit('ask-question', serviceName, question, '');
     }
 
     _onSecretInfoQuery(client, serviceName, secretQuestion) {
@@ -498,7 +498,7 @@ var ShellUserVerifier = class {
             return;
         }
 
-        this.emit('ask-question', serviceName, secretQuestion, true);
+        this.emit('ask-question', serviceName, secretQuestion, '\u25cf');
     }
 
     _onReset() {
@@ -544,7 +544,6 @@ var ShellUserVerifier = class {
                 });
             }
         } else {
-            // eslint-disable-next-line no-lonely-if
             if (!this.hasPendingMessages) {
                 this._cancelAndReset();
             } else {
@@ -572,8 +571,9 @@ var ShellUserVerifier = class {
         // if the password service fails, then cancel everything.
         // But if, e.g., fingerprint fails, still give
         // password authentication a chance to succeed
-        if (this.serviceIsForeground(serviceName))
+        if (this.serviceIsForeground(serviceName)) {
             this._verificationFailed(true);
+        }
     }
 };
 Signals.addSignalMethods(ShellUserVerifier.prototype);

js/js-resources.gresource.xml

@@ -98,7 +98,6 @@
     <file>ui/shellEntry.js</file>
     <file>ui/shellMountOperation.js</file>
     <file>ui/slider.js</file>
-    <file>ui/swipeTracker.js</file>
     <file>ui/switcherPopup.js</file>
     <file>ui/switchMonitor.js</file>
     <file>ui/tweener.js</file>

js/misc/extensionUtils.js

@@ -15,7 +15,7 @@ const Config = imports.misc.config;
 
 var ExtensionType = {
     SYSTEM: 1,
-    PER_USER: 2,
+    PER_USER: 2
 };
 
 var ExtensionState = {
@@ -28,27 +28,18 @@ var ExtensionState = {
 
     // Used as an error state for operations on unknown extensions,
     // should never be in a real extensionMeta object.
-    UNINSTALLED: 99,
+    UNINSTALLED: 99
 };
 
-const SERIALIZED_PROPERTIES = [
+const SERIALIZED_PROPERTIES = ['type', 'state', 'path', 'error', 'hasPrefs', 'canChange', 'isRequested'];
-    'type',
-    'state',
-    'path',
-    'error',
-    'hasPrefs',
-    'hasUpdate',
-    'canChange',
-];
 
 /**
  * getCurrentExtension:
  *
- * @returns {?object} - The current extension, or null if not called from
+ * Returns the current extension, or null if not called from an extension.
- * an extension.
  */
 function getCurrentExtension() {
-    let stack = new Error().stack.split('\n');
+    let stack = (new Error()).stack.split('\n');
     let extensionStackLine;
 
     // Search for an occurrence of an extension stack frame
@@ -93,7 +84,7 @@ function getCurrentExtension() {
 
 /**
  * initTranslations:
- * @param {string=} domain - the gettext domain to use
+ * @domain: (optional): the gettext domain to use
  *
  * Initialize Gettext to load translations from extensionsdir/locale.
  * If @domain is not provided, it will be taken from metadata['gettext-domain']
@@ -117,8 +108,7 @@ function initTranslations(domain) {
 
 /**
  * getSettings:
- * @param {string=} schema - the GSettings schema id
+ * @schema: (optional): the GSettings schema id
- * @returns {Gio.Settings} - a new settings object for @schema
  *
  * Builds and returns a GSettings schema for @schema, using schema files
  * in extensionsdir/schemas. If @schema is omitted, it is taken from
@@ -138,13 +128,12 @@ function getSettings(schema) {
     // SYSTEM extension that has been installed in the same prefix as the shell
     let schemaDir = extension.dir.get_child('schemas');
     let schemaSource;
-    if (schemaDir.query_exists(null)) {
+    if (schemaDir.query_exists(null))
         schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
                                                  GioSSS.get_default(),
                                                  false);
-    } else {
+    else
         schemaSource = GioSSS.get_default();
-    }
 
     let schemaObj = schemaSource.lookup(schema, true);
     if (!schemaObj)
@@ -155,9 +144,8 @@ function getSettings(schema) {
 
 /**
  * versionCheck:
- * @param {string[]} required - an array of versions we're compatible with
+ * @required: an array of versions we're compatible with
- * @param {string} current - the version we have
+ * @current: the version we have
- * @returns {bool} - true if @current is compatible with @required
  *
  * Check if a component is compatible for an extension.
  * @required is an array, and at least one version must match.
@@ -177,8 +165,8 @@ function versionCheck(required, current) {
         let requiredArray = required[i].split('.');
         if (requiredArray[0] == major &&
             requiredArray[1] == minor &&
-            ((requiredArray[2] === undefined && parseInt(minor) % 2 == 0) ||
+            (requiredArray[2] == point ||
-             requiredArray[2] == point))
+             (requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
             return true;
     }
     return false;

js/misc/fileUtils.js

@@ -1,5 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported collectFromDatadirs, recursivelyDeleteDir,
+/* exported collectFromDatadirs, deleteGFile, recursivelyDeleteDir,
             recursivelyMoveDir, loadInterfaceXML */
 
 const { Gio, GLib } = imports.gi;
@@ -29,6 +29,11 @@ function collectFromDatadirs(subdir, includeUserDir, processFile) {
     }
 }
 
+function deleteGFile(file) {
+    // Work around 'delete' being a keyword in JS.
+    return file['delete'](null);
+}
+
 function recursivelyDeleteDir(dir, deleteParent) {
     let children = dir.enumerate_children('standard::name,standard::type',
                                           Gio.FileQueryInfoFlags.NONE, null);
@@ -38,13 +43,13 @@ function recursivelyDeleteDir(dir, deleteParent) {
         let type = info.get_file_type();
         let child = dir.get_child(info.get_name());
         if (type == Gio.FileType.REGULAR)
-            child.delete(null);
+            deleteGFile(child);
         else if (type == Gio.FileType.DIRECTORY)
             recursivelyDeleteDir(child, true);
     }
 
     if (deleteParent)
-        dir.delete(null);
+        deleteGFile(dir);
 }
 
 function recursivelyMoveDir(srcDir, destDir) {
@@ -70,14 +75,14 @@ let _ifaceResource = null;
 function loadInterfaceXML(iface) {
     if (!_ifaceResource) {
         // don't use global.datadir so the method is usable from tests/tools
-        let dir = GLib.getenv('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
+        let dir = GLib.getenv ('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
-        let path = `${dir}/gnome-shell-dbus-interfaces.gresource`;
+        let path = dir + '/gnome-shell-dbus-interfaces.gresource';
         _ifaceResource = Gio.Resource.load(path);
         _ifaceResource._register();
     }
 
     let xml = null;
-    let uri = `resource:///org/gnome/shell/dbus-interfaces/${iface}.xml`;
+    let uri = 'resource:///org/gnome/shell/dbus-interfaces/' + iface + '.xml';
     let f = Gio.File.new_for_uri(uri);
 
     try {

js/misc/gnomeSession.js

@@ -11,7 +11,7 @@ var PresenceStatus = {
     AVAILABLE: 0,
     INVISIBLE: 1,
     BUSY: 2,
-    IDLE: 3,
+    IDLE: 3
 };
 
 var PresenceProxy = Gio.DBusProxy.makeProxyWrapper(PresenceIface);

js/misc/history.js

@@ -28,7 +28,7 @@ var HistoryManager = class {
         this._entry = params.entry;
 
         if (this._entry) {
-            this._entry.connect('key-press-event',
+            this._entry.connect('key-press-event', 
                                 this._onEntryKeyPress.bind(this));
         }
     }
@@ -82,11 +82,11 @@ var HistoryManager = class {
 
     _onEntryKeyPress(entry, event) {
         let symbol = event.get_key_symbol();
-        if (symbol == Clutter.KEY_Up)
+        if (symbol == Clutter.KEY_Up) {
             return this._setPrevItem(entry.get_text());
-        else if (symbol == Clutter.KEY_Down)
+        } else if (symbol == Clutter.KEY_Down) {
             return this._setNextItem(entry.get_text());
-
+        }
         return Clutter.EVENT_PROPAGATE;
     }
 

js/misc/ibusManager.js

@@ -2,6 +2,7 @@
 /* exported getIBusManager */
 
 const { Gio, GLib, IBus } = imports.gi;
+const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
 const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
@@ -18,9 +19,9 @@ function _checkIBusVersion(requiredMajor, requiredMinor, requiredMicro) {
          IBus.MICRO_VERSION >= requiredMicro))
         return;
 
-    throw "Found IBus version %d.%d.%d but required is %d.%d.%d"
+    throw "Found IBus version %d.%d.%d but required is %d.%d.%d".
-        .format(IBus.MAJOR_VERSION, IBus.MINOR_VERSION, IBus.MINOR_VERSION,
+        format(IBus.MAJOR_VERSION, IBus.MINOR_VERSION, IBus.MINOR_VERSION,
-                requiredMajor, requiredMinor, requiredMicro);
+               requiredMajor, requiredMinor, requiredMicro);
 }
 
 function getIBusManager() {
@@ -58,30 +59,16 @@ var IBusManager = class {
         this._spawn();
     }
 
-    _spawn(extraArgs = []) {
+    _spawn() {
         try {
-            let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs];
+            Gio.Subprocess.new(['ibus-daemon', '--xim', '--panel', 'disable'],
-            Gio.Subprocess.new(cmdLine, Gio.SubprocessFlags.NONE);
+                               Gio.SubprocessFlags.NONE);
         } catch (e) {
             log(`Failed to launch ibus-daemon: ${e.message}`);
         }
     }
 
-    restartDaemon(extraArgs = []) {
-        this._spawn(['-r', ...extraArgs]);
-    }
-
     _clear() {
-        if (this._cancellable) {
-            this._cancellable.cancel();
-            this._cancellable = null;
-        }
-
-        if (this._preloadEnginesId) {
-            GLib.source_remove(this._preloadEnginesId);
-            this._preloadEnginesId = 0;
-        }
-
         if (this._panelService)
             this._panelService.destroy();
 
@@ -93,44 +80,33 @@ var IBusManager = class {
         this._currentEngineName = null;
 
         this.emit('ready', false);
+
+        this._spawn();
     }
 
     _onConnected() {
-        this._cancellable = new Gio.Cancellable();
+        this._ibus.list_engines_async(-1, null, this._initEngines.bind(this));
-        this._ibus.list_engines_async(-1, this._cancellable,
-            this._initEngines.bind(this));
         this._ibus.request_name_async(IBus.SERVICE_PANEL,
-            IBus.BusNameFlag.REPLACE_EXISTING, -1, this._cancellable,
+                                      IBus.BusNameFlag.REPLACE_EXISTING,
-            this._initPanelService.bind(this));
+                                      -1, null,
+                                      this._initPanelService.bind(this));
     }
 
     _initEngines(ibus, result) {
-        try {
+        let enginesList = this._ibus.list_engines_async_finish(result);
-            let enginesList = this._ibus.list_engines_async_finish(result);
+        if (enginesList) {
             for (let i = 0; i < enginesList.length; ++i) {
                 let name = enginesList[i].get_name();
                 this._engines.set(name, enginesList[i]);
             }
             this._updateReadiness();
-        } catch (e) {
+        } else {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                return;
-
-            logError(e);
             this._clear();
         }
     }
 
     _initPanelService(ibus, result) {
-        let success = false;
+        let success = this._ibus.request_name_async_finish(result);
-        try {
-            success = !!this._ibus.request_name_async_finish(result);
-        } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                return;
-            logError(e);
-        }
-
         if (success) {
             this._panelService = new IBus.PanelService({ connection: this._ibus.get_connection(),
                                                          object_path: IBus.PATH_PANEL });
@@ -142,7 +118,7 @@ var IBusManager = class {
             });
             this._panelService.connect('focus-in', (panel, path) => {
                 if (!GLib.str_has_suffix(path, '/InputContext_1'))
-                    this.emit('focus-in');
+                    this.emit ('focus-in');
             });
             this._panelService.connect('focus-out', () => this.emit('focus-out'));
 
@@ -157,10 +133,10 @@ var IBusManager = class {
             } catch (e) {
             }
             // If an engine is already active we need to get its properties
-            this._ibus.get_global_engine_async(-1, this._cancellable, (_bus, res) => {
+            this._ibus.get_global_engine_async(-1, null, (i, result) => {
                 let engine;
                 try {
-                    engine = this._ibus.get_global_engine_async_finish(res);
+                    engine = this._ibus.get_global_engine_async_finish(result);
                     if (!engine)
                         return;
                 } catch (e) {
@@ -229,18 +205,8 @@ var IBusManager = class {
             return;
         }
 
-        this._ibus.set_global_engine_async(id,
+        this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
-            this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
+                                           null, callback || null);
-            this._cancellable, (_bus, res) => {
-                try {
-                    this._ibus.set_global_engine_async_finish(res);
-                } catch (e) {
-                    if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                        logError(e);
-                }
-                if (callback)
-                    callback();
-            });
     }
 
     preloadEngines(ids) {
@@ -248,23 +214,21 @@ var IBusManager = class {
             return;
 
         if (this._preloadEnginesId != 0) {
-            GLib.source_remove(this._preloadEnginesId);
+            Mainloop.source_remove(this._preloadEnginesId);
             this._preloadEnginesId = 0;
         }
 
         this._preloadEnginesId =
-            GLib.timeout_add_seconds(
+            Mainloop.timeout_add_seconds(this._PRELOAD_ENGINES_DELAY_TIME,
-                GLib.PRIORITY_DEFAULT,
+                                         () => {
-                this._PRELOAD_ENGINES_DELAY_TIME,
+                                             this._ibus.preload_engines_async(
-                () => {
+                                                 ids,
-                    this._ibus.preload_engines_async(
+                                                 -1,
-                        ids,
+                                                 null,
-                        -1,
+                                                 null);
-                        this._cancellable,
+                                             this._preloadEnginesId = 0;
-                        null);
+                                             return GLib.SOURCE_REMOVE;
-                    this._preloadEnginesId = 0;
+                                         });
-                    return GLib.SOURCE_REMOVE;
-                });
     }
 };
 Signals.addSignalMethods(IBusManager.prototype);

js/misc/inputMethod.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported InputMethod */
-const { Clutter, GLib, Gio, GObject, IBus } = imports.gi;
+const { Clutter, GLib, GObject, IBus } = imports.gi;
 
 const Keyboard = imports.ui.status.keyboard;
 
@@ -36,7 +36,15 @@ class InputMethod extends Clutter.InputMethod {
     }
 
     _updateCapabilities() {
-        let caps = IBus.Capabilite.PREEDIT_TEXT | IBus.Capabilite.FOCUS | IBus.Capabilite.SURROUNDING_TEXT;
+        let caps = 0;
+
+        if (this.can_show_preedit)
+            caps |= IBus.Capabilite.PREEDIT_TEXT;
+
+        if (this._currentFocus)
+            caps |= IBus.Capabilite.FOCUS | IBus.Capabilite.SURROUNDING_TEXT;
+        else
+            caps |= IBus.Capabilite.PREEDIT_TEXT | IBus.Capabilite.AUXILIARY_TEXT | IBus.Capabilite.LOOKUP_TABLE | IBus.Capabilite.PROPERTY;
 
         if (this._context)
             this._context.set_capabilities(caps);
@@ -47,39 +55,23 @@ class InputMethod extends Clutter.InputMethod {
     }
 
     _onConnected() {
-        this._cancellable = new Gio.Cancellable();
+        this._ibus.create_input_context_async ('gnome-shell', -1, null,
-        this._ibus.create_input_context_async('gnome-shell', -1,
+                                               this._setContext.bind(this));
-            this._cancellable, this._setContext.bind(this));
     }
 
     _setContext(bus, res) {
-        try {
+        this._context = this._ibus.create_input_context_async_finish(res);
-            this._context = this._ibus.create_input_context_async_finish(res);
-        } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                logError(e);
-                this._clear();
-            }
-            return;
-        }
-
         this._context.connect('commit-text', this._onCommitText.bind(this));
         this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
         this._context.connect('update-preedit-text', this._onUpdatePreeditText.bind(this));
         this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
         this._context.connect('hide-preedit-text', this._onHidePreeditText.bind(this));
         this._context.connect('forward-key-event', this._onForwardKeyEvent.bind(this));
-        this._context.connect('destroy', this._clear.bind(this));
 
         this._updateCapabilities();
     }
 
     _clear() {
-        if (this._cancellable) {
-            this._cancellable.cancel();
-            this._cancellable = null;
-        }
-
         this._context = null;
         this._hints = 0;
         this._purpose = 0;
@@ -129,7 +121,7 @@ class InputMethod extends Clutter.InputMethod {
 
     _onForwardKeyEvent(_context, keyval, keycode, state) {
         let press = (state & IBus.ModifierType.RELEASE_MASK) == 0;
-        state &= ~IBus.ModifierType.RELEASE_MASK;
+        state &= ~(IBus.ModifierType.RELEASE_MASK);
 
         let curEvent = Clutter.get_current_event();
         let time;
@@ -145,6 +137,7 @@ class InputMethod extends Clutter.InputMethod {
         this._currentFocus = focus;
         if (this._context) {
             this._context.focus_in();
+            this._updateCapabilities();
             this._emitRequestSurrounding();
         }
 
@@ -156,8 +149,10 @@ class InputMethod extends Clutter.InputMethod {
 
     vfunc_focus_out() {
         this._currentFocus = null;
-        if (this._context)
+        if (this._context) {
             this._context.focus_out();
+            this._updateCapabilities();
+        }
 
         if (this._preeditStr) {
             // Unset any preedit text
@@ -260,22 +255,17 @@ class InputMethod extends Clutter.InputMethod {
         if (event.type() == Clutter.EventType.KEY_RELEASE)
             state |= IBus.ModifierType.RELEASE_MASK;
 
-        this._context.process_key_event_async(
+        this._context.process_key_event_async(event.get_key_symbol(),
-            event.get_key_symbol(),
+                                              event.get_key_code() - 8, // Convert XKB keycodes to evcodes
-            event.get_key_code() - 8, // Convert XKB keycodes to evcodes
+                                              state, -1, null,
-            state, -1, this._cancellable,
+                                              (context, res) => {
-            (context, res) => {
+                                                  try {
-                if (context != this._context)
+                                                      let retval = context.process_key_event_async_finish(res);
-                    return;
+                                                      this.notify_key_event(event, retval);
-
+                                                  } catch (e) {
-                try {
+                                                      log(`Error processing key on IM: ${e.message}`);
-                    let retval = context.process_key_event_async_finish(res);
+                                                  }
-                    this.notify_key_event(event, retval);
+                                              });
-                } catch (e) {
-                    if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                        log(`Error processing key on IM: ${e.message}`);
-                }
-            });
         return true;
     }
 });

js/misc/introspect.js

@@ -40,15 +40,6 @@ var IntrospectService = class {
                         });
 
         this._syncRunningApplications();
-
-        this._whitelistMap = new Map();
-        APP_WHITELIST.forEach(appName => {
-            Gio.DBus.watch_name(Gio.BusType.SESSION,
-                appName,
-                Gio.BusNameWatcherFlags.NONE,
-                (conn, name, owner) => this._whitelistMap.set(name, owner),
-                (conn, name) => this._whitelistMap.delete(name));
-        });
     }
 
     _isStandaloneApp(app) {
@@ -60,7 +51,7 @@ var IntrospectService = class {
     }
 
     _isSenderWhitelisted(sender) {
-        return [...this._whitelistMap.values()].includes(sender);
+        return APP_WHITELIST.includes(sender);
     }
 
     _getSandboxedAppId(app) {
@@ -79,7 +70,7 @@ var IntrospectService = class {
 
         for (let app of apps) {
             let appInfo = {};
-            let isAppActive = focusedApp == app;
+            let isAppActive = (focusedApp == app);
 
             if (!this._isStandaloneApp(app))
                 continue;
@@ -113,10 +104,10 @@ var IntrospectService = class {
             return false;
 
         let type = window.get_window_type();
-        return type == Meta.WindowType.NORMAL ||
+        return (type == Meta.WindowType.NORMAL ||
                 type == Meta.WindowType.DIALOG ||
                 type == Meta.WindowType.MODAL_DIALOG ||
-                type == Meta.WindowType.UTILITY;
+                type == Meta.WindowType.UTILITY);
     }
 
     GetRunningApplicationsAsync(params, invocation) {
@@ -136,8 +127,7 @@ var IntrospectService = class {
         let apps = this._appSystem.get_running();
         let windowsList = {};
 
-        if (!this._isIntrospectEnabled() &&
+        if (!this._isIntrospectEnabled()) {
-            !this._isSenderWhitelisted(invocation.get_sender())) {
             invocation.return_error_literal(Gio.DBusError,
                                             Gio.DBusError.ACCESS_DENIED,
                                             'App introspection not allowed');
@@ -161,9 +151,9 @@ var IntrospectService = class {
                     'app-id': GLib.Variant.new('s', app.get_id()),
                     'client-type': GLib.Variant.new('u', window.get_client_type()),
                     'is-hidden': GLib.Variant.new('b', window.is_hidden()),
-                    'has-focus': GLib.Variant.new('b', window == focusWindow),
+                    'has-focus': GLib.Variant.new('b', (window == focusWindow)),
                     'width': GLib.Variant.new('u', frameRect.width),
-                    'height': GLib.Variant.new('u', frameRect.height),
+                    'height': GLib.Variant.new('u', frameRect.height)
                 };
 
                 // These properties may not be available for all windows:
@@ -173,10 +163,9 @@ var IntrospectService = class {
                 if (wmClass != null)
                     windowsList[windowId]['wm-class'] = GLib.Variant.new('s', wmClass);
 
-                if (sandboxedAppId != null) {
+                if (sandboxedAppId != null)
                     windowsList[windowId]['sandboxed-app-id'] =
                         GLib.Variant.new('s', sandboxedAppId);
-                }
             }
         }
         invocation.return_value(new GLib.Variant('(a{ta{sv}})', [windowsList]));

js/misc/jsParse.js

@@ -11,8 +11,9 @@ function getCompletions(text, commandHeader, globalCompletionList) {
     let methods = [];
     let expr_, base;
     let attrHead = '';
-    if (globalCompletionList == null)
+    if (globalCompletionList == null) {
         globalCompletionList = [];
+    }
 
     let offset = getExpressionOffset(text, text.length - 1);
     if (offset >= 0) {
@@ -58,8 +59,9 @@ function isStopChar(c) {
 function findMatchingQuote(expr, offset) {
     let quoteChar = expr.charAt(offset);
     for (let i = offset - 1; i >= 0; --i) {
-        if (expr.charAt(i) == quoteChar && expr.charAt(i - 1) != '\\')
+        if (expr.charAt(i) == quoteChar && expr.charAt(i - 1) != '\\') {
             return i;
+        }
     }
     return -1;
 }
@@ -67,8 +69,9 @@ function findMatchingQuote(expr, offset) {
 // Given the ending position of a regex, find where it starts
 function findMatchingSlash(expr, offset) {
     for (let i = offset - 1; i >= 0; --i) {
-        if (expr.charAt(i) == '/' && expr.charAt(i - 1) != '\\')
+        if (expr.charAt(i) == '/' && expr.charAt(i - 1) != '\\') {
             return i;
+        }
     }
     return -1;
 }
@@ -79,30 +82,31 @@ function findMatchingSlash(expr, offset) {
 // findMatchingBrace("[(])", 3) returns 1.
 function findMatchingBrace(expr, offset) {
     let closeBrace = expr.charAt(offset);
-    let openBrace = { ')': '(', ']': '[' }[closeBrace];
+    let openBrace = ({ ')': '(', ']': '[' })[closeBrace];
 
-    return findTheBrace(expr, offset - 1, openBrace, closeBrace);
+    function findTheBrace(expr, offset) {
-}
+        if (offset < 0) {
+            return -1;
+        }
 
-function findTheBrace(expr, offset, ...braces) {
+        if (expr.charAt(offset) == openBrace) {
-    let [openBrace, closeBrace] = braces;
+            return offset;
+        }
+        if (expr.charAt(offset).match(/['"]/)) {
+            return findTheBrace(expr, findMatchingQuote(expr, offset) - 1);
+        }
+        if (expr.charAt(offset) == '/') {
+            return findTheBrace(expr, findMatchingSlash(expr, offset) - 1);
+        }
+        if (expr.charAt(offset) == closeBrace) {
+            return findTheBrace(expr, findTheBrace(expr, offset - 1) - 1);
+        }
 
-    if (offset < 0)
+        return findTheBrace(expr, offset - 1);
-        return -1;
 
-    if (expr.charAt(offset) == openBrace)
+    }
-        return offset;
 
-    if (expr.charAt(offset).match(/['"]/))
+    return findTheBrace(expr, offset - 1);
-        return findTheBrace(expr, findMatchingQuote(expr, offset) - 1, ...braces);
-
-    if (expr.charAt(offset) == '/')
-        return findTheBrace(expr, findMatchingSlash(expr, offset) - 1, ...braces);
-
-    if (expr.charAt(offset) == closeBrace)
-        return findTheBrace(expr, findTheBrace(expr, offset - 1, ...braces) - 1, ...braces);
-
-    return findTheBrace(expr, offset - 1, ...braces);
 }
 
 // Walk expr backwards from offset looking for the beginning of an
@@ -114,11 +118,13 @@ function getExpressionOffset(expr, offset) {
     while (offset >= 0) {
         let currChar = expr.charAt(offset);
 
-        if (isStopChar(currChar))
+        if (isStopChar(currChar)) {
             return offset + 1;
+        }
 
-        if (currChar.match(/[)\]]/))
+        if (currChar.match(/[)\]]/)) {
             offset = findMatchingBrace(expr, offset);
+        }
 
         --offset;
     }
@@ -135,10 +141,10 @@ function isValidPropertyName(w) {
 // To get all properties (enumerable and not), we need to walk
 // the prototype chain ourselves
 function getAllProps(obj) {
-    if (obj === null || obj === undefined)
+    if (obj === null || obj === undefined) {
         return [];
-
+    }
-    return Object.getOwnPropertyNames(obj).concat(getAllProps(Object.getPrototypeOf(obj)));
+    return Object.getOwnPropertyNames(obj).concat( getAllProps(Object.getPrototypeOf(obj)) );
 }
 
 // Given a string _expr_, returns all methods
@@ -162,11 +168,11 @@ function getPropertyNamesFromExpression(expr, commandHeader = '') {
     if (typeof obj === 'object') {
         let allProps = getAllProps(obj);
         // Get only things we are allowed to complete following a '.'
-        allProps = allProps.filter(isValidPropertyName);
+        allProps = allProps.filter( isValidPropertyName );
 
         // Make sure propsUnique contains one key for every
         // property so we end up with a unique list of properties
-        allProps.map(p => (propsUnique[p] = null));
+        allProps.map(p => propsUnique[p] = null);
     }
     return Object.keys(propsUnique).sort();
 }
@@ -183,26 +189,24 @@ function getCommonPrefix(words) {
     return word;
 }
 
-// Remove any blocks that are quoted or are in a regex
-function removeLiterals(str) {
-    if (str.length == 0)
-        return '';
-
-    let currChar = str.charAt(str.length - 1);
-    if (currChar == '"' || currChar == '\'') {
-        return removeLiterals(
-            str.slice(0, findMatchingQuote(str, str.length - 1)));
-    } else if (currChar == '/') {
-        return removeLiterals(
-            str.slice(0, findMatchingSlash(str, str.length - 1)));
-    }
-
-    return removeLiterals(str.slice(0, str.length - 1)) + currChar;
-}
-
 // Returns true if there is reason to think that eval(str)
 // will modify the global scope
 function isUnsafeExpression(str) {
+    // Remove any blocks that are quoted or are in a regex
+    function removeLiterals(str) {
+        if (str.length == 0) {
+            return '';
+        }
+
+        let currChar = str.charAt(str.length - 1);
+        if (currChar == '"' || currChar == '\'') {
+            return removeLiterals(str.slice(0, findMatchingQuote(str, str.length - 1)));
+        } else if (currChar == '/') {
+            return removeLiterals(str.slice(0, findMatchingSlash(str, str.length - 1)));
+        }
+
+        return removeLiterals(str.slice(0, str.length - 1)) + currChar;
+    }
 
     // Check for any sort of assignment
     // The strategy used is dumb: remove any quotes
@@ -210,10 +214,10 @@ function isUnsafeExpression(str) {
     // If there is, it might be an unsafe assignment.
 
     let prunedStr = removeLiterals(str);
-    prunedStr = prunedStr.replace(/[=!]==/g, '');    // replace === and !== with nothing
+    prunedStr = prunedStr.replace(/[=!]==/g, '');    //replace === and !== with nothing
-    prunedStr = prunedStr.replace(/[=<>!]=/g, '');    // replace ==, <=, >=, != with nothing
+    prunedStr = prunedStr.replace(/[=<>!]=/g, '');    //replace ==, <=, >=, != with nothing
 
-    if (prunedStr.match(/[=]/)) {
+    if (prunedStr.match(/=/)) {
         return true;
     } else if (prunedStr.match(/;/)) {
         // If we contain a semicolon not inside of a quote/regex, assume we're unsafe as well

js/misc/loginManager.js

@@ -74,9 +74,8 @@ function registerSessionWithGDM() {
 let _loginManager = null;
 
 /**
- * getLoginManager:
+ * LoginManager:
  * An abstraction over systemd/logind and ConsoleKit.
- * @returns {object} - the LoginManager singleton
  *
  */
 function getLoginManager() {
@@ -104,21 +103,21 @@ var LoginManagerSystemd = class {
 
     getCurrentSessionProxy(callback) {
         if (this._currentSession) {
-            callback(this._currentSession);
+            callback (this._currentSession);
             return;
         }
 
         let sessionId = GLib.getenv('XDG_SESSION_ID');
         if (!sessionId) {
             log('Unset XDG_SESSION_ID, getCurrentSessionProxy() called outside a user session. Asking logind directly.');
-            let [session, objectPath] = this._userProxy.Display;
+            let [session, objectPath_] = this._userProxy.Display;
             if (session) {
                 log(`Will monitor session ${session}`);
                 sessionId = session;
             } else {
                 log('Failed to find "Display" session; are we the greeter?');
 
-                for ([session, objectPath] of this._userProxy.Sessions) {
+                for (let [session, objectPath] of this._userProxy.Sessions) {
                     let sessionProxy = new SystemdLoginSession(Gio.DBus.system,
                                                                'org.freedesktop.login1',
                                                                objectPath);
@@ -186,7 +185,7 @@ var LoginManagerSystemd = class {
                 try {
                     let [outVariant_, fdList] = proxy.call_with_unix_fd_list_finish(result);
                     fd = fdList.steal_fds()[0];
-                    callback(new Gio.UnixInputStream({ fd }));
+                    callback(new Gio.UnixInputStream({ fd: fd }));
                 } catch (e) {
                     logError(e, "Error getting systemd inhibitor");
                     callback(null);

js/misc/modemManager.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported ModemBase, ModemGsm, ModemCdma, BroadbandModem  */
 
-const { Gio, GObject, NM, NMA } = imports.gi;
+const { Gio, NMA } = imports.gi;
+const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
@@ -84,9 +84,9 @@ function _findProviderForSid(sid) {
 }
 
 
-// ----------------------------------------------------- //
+//------------------------------------------------------------------------------
-// Support for the old ModemManager interface (MM < 0.7) //
+// Support for the old ModemManager interface (MM < 0.7)
-// ----------------------------------------------------- //
+//------------------------------------------------------------------------------
 
 
 // The following are not the complete interfaces, just the methods we need
@@ -98,46 +98,21 @@ const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInter
 const ModemCdmaInterface = loadInterfaceXML('org.freedesktop.ModemManager.Modem.Cdma');
 const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
 
-var ModemBase = GObject.registerClass({
+var ModemGsm = class {
-    GTypeFlags: GObject.TypeFlags.ABSTRACT,
+    constructor(path) {
-    Properties: {
-        'operator-name': GObject.ParamSpec.string(
-            'operator-name', 'operator-name', 'operator-name',
-            GObject.ParamFlags.READABLE,
-            null),
-        'signal-quality': GObject.ParamSpec.int(
-            'signal-quality', 'signal-quality', 'signal-quality',
-            GObject.ParamFlags.READABLE,
-            0, 100, 0),
-    },
-}, class ModemBase extends GObject.Object {
-    _setOperatorName(operatorName) {
-        if (this.operator_name == operatorName)
-            return;
-        this.operator_name = operatorName;
-        this.notify('operator-name');
-    }
-
-    _setSignalQuality(signalQuality) {
-        if (this.signal_quality == signalQuality)
-            return;
-        this.signal_quality = signalQuality;
-        this.notify('signal-quality');
-    }
-});
-
-var ModemGsm = GObject.registerClass(
-class ModemGsm extends ModemBase {
-    _init(path) {
-        super._init();
         this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
 
+        this.signal_quality = 0;
+        this.operator_name = null;
+
         // Code is duplicated because the function have different signatures
         this._proxy.connectSignal('SignalQuality', (proxy, sender, [quality]) => {
-            this._setSignalQuality(quality);
+            this.signal_quality = quality;
+            this.emit('notify::signal-quality');
         });
         this._proxy.connectSignal('RegistrationInfo', (proxy, sender, [_status, code, name]) => {
-            this._setOperatorName(_findProviderForMccMnc(name, code));
+            this.operator_name = _findProviderForMccMnc(name, code);
+            this.emit('notify::operator-name');
         });
         this._proxy.GetRegistrationInfoRemote(([result], err) => {
             if (err) {
@@ -146,28 +121,32 @@ class ModemGsm extends ModemBase {
             }
 
             let [status_, code, name] = result;
-            this._setOperatorName(_findProviderForMccMnc(name, code));
+            this.operator_name = _findProviderForMccMnc(name, code);
+            this.emit('notify::operator-name');
         });
         this._proxy.GetSignalQualityRemote((result, err) => {
             if (err) {
                 // it will return an error if the device is not connected
-                this._setSignalQuality(0);
+                this.signal_quality = 0;
             } else {
                 let [quality] = result;
-                this._setSignalQuality(quality);
+                this.signal_quality = quality;
             }
+            this.emit('notify::signal-quality');
         });
     }
-});
+};
+Signals.addSignalMethods(ModemGsm.prototype);
 
-var ModemCdma = GObject.registerClass(
+var ModemCdma = class {
-class ModemCdma extends ModemBase {
+    constructor(path) {
-    _init(path) {
-        super._init();
         this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
 
+        this.signal_quality = 0;
+        this.operator_name = null;
         this._proxy.connectSignal('SignalQuality', (proxy, sender, params) => {
-            this._setSignalQuality(params[0]);
+            this.signal_quality = params[0];
+            this.emit('notify::signal-quality');
 
             // receiving this signal means the device got activated
             // and we can finally call GetServingSystem
@@ -177,11 +156,12 @@ class ModemCdma extends ModemBase {
         this._proxy.GetSignalQualityRemote((result, err) => {
             if (err) {
                 // it will return an error if the device is not connected
-                this._setSignalQuality(0);
+                this.signal_quality = 0;
             } else {
                 let [quality] = result;
-                this._setSignalQuality(quality);
+                this.signal_quality = quality;
             }
+            this.emit('notify::signal-quality');
         });
     }
 
@@ -189,19 +169,22 @@ class ModemCdma extends ModemBase {
         this._proxy.GetServingSystemRemote(([result], err) => {
             if (err) {
                 // it will return an error if the device is not connected
-                this._setOperatorName(null);
+                this.operator_name = null;
             } else {
                 let [bandClass_, band_, sid] = result;
-                this._setOperatorName(_findProviderForSid(sid));
+
+                this.operator_name = _findProviderForSid(sid);
             }
+            this.emit('notify::operator-name');
         });
     }
-});
+};
+Signals.addSignalMethods(ModemCdma.prototype);
 
 
-// ------------------------------------------------------- //
+//------------------------------------------------------------------------------
-// Support for the new ModemManager1 interface (MM >= 0.7) //
+// Support for the new ModemManager1 interface (MM >= 0.7)
-// ------------------------------------------------------- //
+//------------------------------------------------------------------------------
 
 const BroadbandModemInterface = loadInterfaceXML('org.freedesktop.ModemManager1.Modem');
 const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface);
@@ -212,20 +195,12 @@ const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gp
 const BroadbandModemCdmaInterface = loadInterfaceXML('org.freedesktop.ModemManager1.Modem.ModemCdma');
 const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface);
 
-var BroadbandModem = GObject.registerClass({
+var BroadbandModem = class {
-    Properties: {
+    constructor(path, capabilities) {
-        'capabilities': GObject.ParamSpec.flags(
+        this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
-            'capabilities', 'capabilities', 'capabilities',
-            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-            NM.DeviceModemCapabilities.$gtype,
-            NM.DeviceModemCapabilities.NONE),
-    },
-}, class BroadbandModem extends ModemBase {
-    _init(path, capabilities) {
-        super._init({ capabilities });
-        this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
         this._proxy_3gpp = new BroadbandModem3gppProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
         this._proxy_cdma = new BroadbandModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
+        this._capabilities = capabilities;
 
         this._proxy.connect('g-properties-changed', (proxy, properties) => {
             if ('SignalQuality' in properties.deep_unpack())
@@ -249,8 +224,9 @@ var BroadbandModem = GObject.registerClass({
     }
 
     _reloadSignalQuality() {
-        let [quality, recent_] = this.SignalQuality;
+        let [quality, recent_] = this._proxy.SignalQuality;
-        this._setSignalQuality(quality);
+        this.signal_quality = quality;
+        this.emit('notify::signal-quality');
     }
 
     _reloadOperatorName() {
@@ -264,7 +240,8 @@ var BroadbandModem = GObject.registerClass({
             newName += this.operator_name_cdma;
         }
 
-        this._setOperatorName(newName);
+        this.operator_name = newName;
+        this.emit('notify::operator-name');
     }
 
     _reload3gppOperatorName() {
@@ -279,4 +256,5 @@ var BroadbandModem = GObject.registerClass({
         this.operator_name_cdma = _findProviderForSid(sid);
         this._reloadOperatorName();
     }
-});
+};
+Signals.addSignalMethods(BroadbandModem.prototype);

js/misc/objectManager.js

@@ -192,8 +192,9 @@ var ObjectManager = class {
     _onNameAppeared() {
         this._managerProxy.GetManagedObjectsRemote((result, error) => {
             if (!result) {
-                if (error)
+                if (error) {
                     logError(error, `could not get remote objects for service ${this._serviceName} path ${this._managerPath}`);
+                }
 
                 this._tryToCompleteLoad();
                 return;

js/misc/params.js

@@ -17,10 +17,9 @@
 // @params and @defaults
 function parse(params = {}, defaults, allowExtras) {
     if (!allowExtras) {
-        for (let prop in params) {
+        for (let prop in params)
             if (!(prop in defaults))
                 throw new Error(`Unrecognized parameter "${prop}"`);
-        }
     }
 
     let defaultsCopy = Object.assign({}, defaults);

js/misc/smartcardManager.js

@@ -72,10 +72,11 @@ var SmartcardManager = class {
             if ('IsInserted' in properties.deep_unpack()) {
                 this._updateToken(token);
 
-                if (token.IsInserted)
+                if (token.IsInserted) {
                     this.emit('smartcard-inserted', token);
-                else
+                } else {
                     this.emit('smartcard-removed', token);
+                }
             }
         });