shell-app: Add discrete GPU support for NVidia drivers

Add the necessary environment variables that would make offloading to
the NVidia "secondary" drivers work as expected.

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

.eslintrc.json

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

.gitlab-ci.yml

@@ -1,6 +1,5 @@
 stages:
  - review
- - source_check
  - build
  - test
 
@@ -15,8 +14,10 @@ variables:
         - merge_requests
 
 check_commit_log:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v1
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: review
+    variables:
+        GIT_DEPTH: "100"
     script:
         - ./.gitlab-ci/check-commit-log.sh
     only:
@@ -24,28 +25,36 @@ check_commit_log:
 
 js_check:
     image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
-    stage: source_check
+    stage: review
     script:
         - find js -name '*.js' -exec js60 -c -s '{}' ';' 2>&1 | tee $JS_LOG
         - (! grep -q . $JS_LOG)
     <<: *only_default
-    only:
-        changes:
-            - js/**/*
     artifacts:
         paths:
             - ${JS_LOG}
         when: on_failure
 
+eslint:
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+    stage: review
+    script:
+        - ./.gitlab-ci/run-eslint.sh
+    <<: *only_default
+    artifacts:
+        paths:
+            - reports
+        when: always
+
 build:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
+    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
+        - meson . build -Dbuiltype=debugoptimized -Dman=false --werror
         - ninja -C build
         - ninja -C build install
     <<: *only_default
@@ -56,8 +65,10 @@ build:
             - build
 
 test:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: test
+    variables:
+        XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
     before_script:
         - ninja -C mutter/build install
     script:
@@ -70,7 +81,7 @@ test:
         when: on_failure
 
 test-pot:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: test
     before_script:
         - ninja -C mutter/build install

.gitlab-ci/Dockerfile

@@ -1,19 +0,0 @@
-FROM registry.gitlab.gnome.org/gnome/mutter/master:v1
-
-RUN dnf -y update && dnf -y upgrade && \
-    dnf install -y 'dnf-command(copr)' && \
-    dnf copr enable -y fmuellner/gnome-shell-ci && \
-    dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \
-
-    # bt only exports HAVE_BLUETOOTH to js, rest are outdated build-requires
-    dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel \
-                  upower-devel python3-devel && \
-
-    # We'll build mutter ourselves
-    dnf remove -y --noautoremove mutter mutter-devel && \
-
-    # Needed for tests
-    dnf install -y '*/xvfb-run' gdm-lib accountsservice-libs && \
-
-    dnf clean all && \
-    rm -rf /var/cache/dnf

.gitlab-ci/Dockerfile.extension-ci

@@ -1,7 +1,7 @@
 FROM registry.fedoraproject.org/fedora:latest
 
 RUN dnf -y update && dnf -y upgrade && \
-    dnf install -y 'dnf-command(copr)' && \
+    dnf install -y 'dnf-command(copr)' git && \
 
     # For syntax checks with `find . -name '*.js' -exec js60 -c -s '{}' ';'`
     dnf install -y findutils mozjs60-devel && \

.gitlab-ci/checkout-mutter.sh

@@ -17,15 +17,19 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
   merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
 
   echo Looking for $merge_request_branch on remote ...
-  if git fetch $merge_request_remote $merge_request_branch >/dev/null 2>&1; then
+  if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
     mutter_target=FETCH_HEAD
+  else
+    mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+    echo Using $mutter_target instead
   fi
 fi
 
 if [ -z "$mutter_target" ]; then
-  mutter_target=$(git branch -r -l $shell_branch)
+  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
 
-git checkout $mutter_target
+git checkout -q $mutter_target

.gitlab-ci/run-eslint.sh

@@ -0,0 +1,114 @@
+#!/usr/bin/env bash
+
+OUTPUT_REGULAR=reports/lint-regular-report.txt
+OUTPUT_LEGACY=reports/lint-legacy-report.txt
+OUTPUT_FINAL=reports/lint-common-report.txt
+
+OUTPUT_MR=reports/lint-mr-report.txt
+
+LINE_CHANGES=changed-lines.txt
+
+is_empty() {
+  (! grep -q . $1)
+}
+
+run_eslint() {
+  ARGS_LEGACY='--config lint/eslintrc-legacy.json'
+
+  local extra_args=ARGS_$1
+  local output_var=OUTPUT_$1
+  local output=${!output_var}
+
+  # 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() {
+  # Turn raw context-less git-diff into a list of
+  # filename:lineno pairs of new (+) lines
+  git diff -U0 "$@" -- js |
+  awk '
+    BEGIN { file=""; }
+    /^+++ b/ { file=substr($0,7); }
+    /^@@ / {
+        len = split($3,a,",")
+        start=a[1]
+        count=(len > 1) ? a[2] : 1
+
+        for (line=start; line<start+count; line++)
+            printf "%s/%s:%d:\n",ENVIRON["PWD"],file,line;
+    }'
+}
+
+copy_matched_lines() {
+  local source=$1
+  local matches=$2
+  local target=$3
+
+  echo -n > $target
+  for l in $(<$matches); do
+    grep $l $source >> $target
+  done
+}
+
+create_common() {
+  # comm requires sorted input;
+  # we also strip the error message to make the following a "common" error:
+  # regular:
+  #  file.js:42:23 Indentation of 55, expected 42
+  # legacy:
+  #  file.js:42:23 Indentation of 55, extected 24
+  prepare() {
+    sed 's: .*::' $1 | sort
+  }
+
+  comm -12 <(prepare $OUTPUT_REGULAR) <(prepare $OUTPUT_LEGACY) >$OUTPUT_FINAL.tmp
+
+  # Now add back the stripped error messages
+  copy_matched_lines $OUTPUT_REGULAR $OUTPUT_FINAL.tmp $OUTPUT_FINAL
+  rm $OUTPUT_FINAL.tmp
+}
+
+# Disable MR handling for now. We aren't ready to enforce
+# non-legacy style just yet ...
+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
+
+  list_commit_range_additions $commit_range > $LINE_CHANGES
+
+  # Don't bother with running lint when no JS changed
+  if is_empty $LINE_CHANGES; then
+    exit 0
+  fi
+fi
+
+echo Generating lint report using regular configuration
+run_eslint REGULAR
+echo Generating lint report using legacy configuration
+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
+  exit 0
+fi
+
+copy_matched_lines $OUTPUT_REGULAR $LINE_CHANGES $OUTPUT_MR
+cat $OUTPUT_MR
+is_empty $OUTPUT_MR

HACKING.md

@@ -84,7 +84,6 @@ don't use.
 
     const Main = imports.ui.main;
     const Params = imports.misc.params;
-    const Tweener = imports.ui.tweener;
     const Util = imports.misc.util;
 ```
 The alphabetical ordering should be done independently of the location of the
@@ -187,15 +186,27 @@ and "double quotes" for strings that the user may see. This allows us to
 quickly find untranslated or mistranslated strings by grepping through the
 sources for double quotes without a gettext call around them.
 
-## `actor` and `_delegate`
+## `actor` (deprecated) 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, we usually have a wrapper class
+you could inherit from GTypes natively in JS, in some cases we have a wrapper
-that has a property called `actor`. We call this wrapper class the "delegate".
+class that has a property called `actor` (now deprecated). We call this
+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() {
@@ -216,6 +227,7 @@ 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
 
@@ -277,34 +289,49 @@ If your usage of an object is like a hash table (and thus conceptually the keys
 can have special chars in them), don't use quotes, but use brackets: `{ bar: 42
 }`, `foo['bar']`.
 
-## Getters, setters, and Tweener
+## Animations
+
+Most objects that are animated are actors, and most properties used in animations
+are animatable, which means they can use implicit animations:
 
-Getters and setters should be used when you are dealing with an API that is
-designed around setting properties, like Tweener. If you want to animate an
-arbitrary property, create a getter and setter, and use Tweener to animate the
-property.
 ```javascript
-    var ANIMATION_TIME = 2000;
+    moveActor(actor, x, y) {
-
+        actor.ease({
-    var MyClass = class {
+            x,
-        constructor() {
+            y,
-            this.actor = new St.BoxLayout();
+            duration: 500, // ms
-            this._position = 0;
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
-        }
+        });
-
+    }
-        get position() {
+```
-            return this._position;
+
-        }
+The above is a convenience wrapper around the actual Clutter API, and should generally
-
+be preferred over the more verbose:
-        set position(value) {
+
-            this._position = value;
+```javascript
-            this.actor.set_position(value, value);
+    moveActor(actor, x, y) {
-        }
+        actor.save_easing_state();
-    };
+
-
+        actor.set_easing_duration(500);
-    let myThing = new MyClass();
+        actor.set_easing_mode(Clutter.AnimationMode.EASE_OUT_QUAD);
-    Tweener.addTween(myThing,
+        actor.set({
-                     { position: 100,
+            x,
-                       time: ANIMATION_TIME,
+            y
-                       transition: 'easeOutQuad' });
+        });
+
+        actor.restore_easing_state();
+    }
+```
+
+There is a similar convenience API around Clutter.PropertyTransition to animate
+actor (or actor meta) properties that cannot use implicit animations:
+
+```javascript
+    desaturateActor(actor, desaturate) {
+        let factor = desaturate ? 1.0 : 0.0;
+        actor.ease_property('@effects.desaturate.factor', factor, {
+            duration: 500, // ms
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
+    }
 ```

NEWS

@@ -1,3 +1,258 @@
+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]
+* Fix pointer a11y timeout animation [Jonas D.; #1533]
+* Add new extensions CLI tool [Florian; #1234]
+* Only track top-level windows [Carlos; #556]
+* Misc. bug fixes and cleanups [Jonas D., Jonas Å., Piotr, Florian;
+  !678, !682, !686]
+
+Contributors:
+  Jonas Ådahl, Jonas Dreßler, Carlos Garnacho, Florian Müllner
+
+Translators:
+  Asier Sarasua Garmendia [eu], Sveinn í Felli [is], Anders Jonsson [sv],
+  Jordi Mas [ca], Kukuh Syafaat [id], Florentina Mușat [ro], Jiri Grönroos [fi],
+  Aurimas Černius [lt], Daniel Mustieles [es], Piotr Drąg [pl],
+  Danial Behzadi [fa]
+
+3.33.90
+=======
+* Implement DND app picker folder management [Georges; !643, !645, !664, !671]
+* Make Clocks/Weather integration work with sandboxed apps [Florian; #1158]
+* Support startup via systemd user instance [Benjamin; !507]
+* Replace Tweener with Clutter animations [Florian; !663, !22, !666, !668, !669]
+* Minimize travel distance in overview animation [Sergey; !267]
+* Rescan icon theme when installed apps changed [Georges; !661]
+* Consistently animate new window actions [Jonas; !662, !673]
+* Misc. bug fixes and cleanups [Florian, Daniel, Ray, Bastien, Jonas, Niels,
+  Marco, Georges; !635, !636, !637, #1462, !628, !640, !641, !627, !644, !647,
+  !385, #1474, !651, #1144, !646, !653, !652, !655, #1482, !656, $654, !665,
+  !667, !670, #1357, !672, !657, #1507, !674, !677]
+
+Contributors:
+  Benjamin Berg, Sergey Bugaev, Jonas Dreßler, Niels De Graef, Florian Müllner,
+  Georges Basile Stavracas Neto, Bastien Nocera, Ray Strode,
+  Marco Trevisan (Treviño), verdre, Daniel van Vugt
+
+Translators:
+  Asier Sarasua Garmendia [eu], Rafael Fontenelle [pt_BR],
+  Kristjan SCHMIDT [eo], Jor Teron [mjw], Daniel Mustieles [es],
+  Kukuh Syafaat [id], Jordi Mas [ca], Fabio Tomat [fur], Daniel Șerbănescu [ro],
+  Anders Jonsson [sv]
+
+3.33.4
+======
+* Fix unintentional interference between gestures [Jonas; !598]
+* Fix unintentional loop while polkit dialog is active [Ray; !602]
+* Fix alt-tab icon size on HiDPI [Jonas; !587]
+* Style fixes and improvements [Frederik, Jakub; !610, #1446, #1449]
+* Fix style updates for non-background CSS properties [Florian; #1212]
+* Fix cursor visibility in screen recordings [Illya; #1208]
+* Add option for disabling the hot corner [Florian; #688320]
+* Use more fine-grained levels in battery indicator [Florian; !561, #1442]
+* Fix the calculation of the maximum number of app search results [Jonas; !110]
+* Handle horizontal workspace layout with gestures/animations [Florian; !575]
+* Improve handling of session mode extensions [Florian, Didier; #789852]
+* Misc. bug fixes and cleanups [Jonas, Florian, Sonny, Carlos, Mario, Benjamin,
+  Marco, Ting-Wei; !599, !600, !591, !606, !152, !607, !604, !495, !608, !611,
+  !614, !612, !615, !618, #369, !620, #774, !621, !616, #1065, !609, !626,
+  !491, !631, !632, !633, #1457]
+
+Contributors:
+  Benjamin Berg, Jonas Dreßler, Frederik Feichtmeier, Carlos Garnacho,
+  Illya Klymov, Ting-Wei Lan, Florian Müllner, Sonny Piers, Mario Sanchez Prada,
+  Didier Roche, Jakub Steiner, Ray Strode, Jor Teron, Marco Trevisan (Treviño)
+
+Translators:
+  Jordi Mas [ca], Jor Teron [mjw]
+
+3.33.3
+======
+* Prepare for optional X11 [Carlos; !378]
+* Fix opening window menu [Marco; !557]
+* Reload search providers when installed applications change [Cosimo; !562]
+* Implement locate-pointer accessibility feature [Olivier; #981]
+* Allow to disable window menus via session mode [Cosimo; !569]
+* Implement mouse accessibility [Olivier; !474]
+* Call GDM's RegisterSession() after startup [Iain; !570]
+* Fix extended keys popups being hidden by on-screen keyboard [Marco; !583]
+* Fix top bar being hidden by lock screen [Jonas; !571]
+* Update theme to better match GTK's Adwaita [Frederik; #841]
+* Set up GJS profiler when GJS_TRACE_FD is set [Christian; !573]
+* Misc. bug fixes and cleanups [Jonas, Cosimo, Robert, Florian, Marco, Simon,
+  Laurent, Niels, Will; !551, !555, !464, #1333, !565, !572, !568, !558, #1205,
+  #1336, !579, !576, #1392, !582, !586, #1406, #1351]
+
+Contributors:
+  Laurent Bigonville, Cosimo Cecchi, Piotr Drąg, Jonas Dreßler,
+  Frederik Feichtmeier, Olivier Fourdan, Carlos Garnacho, Niels De Graef,
+  Christian Hergert, Iain Lane, Robert Mader, Florian Müllner, Simon Schampijer,
+  Jakub Steiner, Will Thompson, Marco Trevisan (Treviño)
+
+Translators:
+  Kukuh Syafaat [id], Balázs Meskó [hu], Daniel Mustieles [es],
+  Fabio Tomat [fur], Nathan Follens [nl], Goran Vidović [hr], Jordi Mas [ca]
+
+3.33.2
+======
+* Fix keeping actors visible in scrollviews [Marco; #1061]
+* Move some chrome above popup windows [Jonas D.; !358]
+* Include 'sandboxed-app-id' in winodw introspection info [Florian; #1289]
+* Port to libecal-2.0 [Milan; !501]
+* Support TCRYPT in mount password dialog [segfault; !126]
+* Misc. bug fixes and cleanups [Florian, Marco, Veerasamy; !517, #745, !499,
+  !510, !515, !546, !549]
+
+Contributors:
+  Cosimo Cecchi, Milan Crha, Jonas Dreßler, Florian Müllner, segfault,
+  Veerasamy Sevagen, Marco Trevisan (Treviño)
+
+Translators:
+  Daniel Mustieles [es]
+
+3.33.1
+======
+* Refine the app menu [Florian; #968]
+* Refine window preview style [Feichtmeier; !461]
+* Only emit ::style-changed on actual changes [Carlos; #1153]
+* Disable emoji on-screen keyboard support on X11 [Florian; #1172]
+* Fix tablet button mapping overlay [Carlos; #1220]
+* Don't crash for world clock locations with no timezone [Florian; #1062]
+* Don't leak old on-screen keyboard layout groups [Carlos; mutter#556]
+* Fix ellipsization in dialog subtitles/bodies [Marco; !531]
+* Fix glitch of fullscreen window in workspace switch animation [Jonas D.; !322]
+* Fix distortion of some image contents [Florian; !525]
+* Allow dragging unfocused tiled/maximized windows from top bar [Dylan; #679290]
+* Handle network interface name changes [Fabrice; !534]
+* Avoid unnecessary style changes when computing :first/:last-child
+  [Florian; !529]
+* Misc. bug fixes and cleanups [Florian, Marco, Robert, Georges, Carlos, Simon,
+  Jonas D.; !487, !441, !502, !503, !504, !506, #822, !551, !512, !509, !511,
+  #1054, !524, #1065, !331, !540]
+
+Contributors:
+  Fabrice Bellet, Jonas Dreßler, Feichtmeier, Carlos Garnacho, Robert Mader,
+  Dylan McCall, Simon McVittie, Florian Müllner, Georges Basile Stavracas Neto,
+  Marco Trevisan (Treviño)
+
+Translators:
+  Daniel Mustieles [es], Kukuh Syafaat [id], Fabio Tomat [fur],
+  Carmen Bianca BAKKER [eo], Dingzhong Chen [zh_CN], Tim Sabsch [de]
+
+3.32.1
+======
+* Fix avatar scaling on login screen [Florian; #1024]
+* Fix distortion of desktop zoom [Florian; #646]
+* Fix mouse cursor visibility when using desktop zoom [Florian, Marco; #1020]
+* Fix screen dimming after wake-up on lock screen [Xiaoguang; #900]
+* Fix Alt+Esc switcher [Florian; #1064]
+* Respect struts for popover placement [Andrea; #1102]
+* Fix app icons updates after theme changes [Florian; #1117]
+* Fix desktop zoom after resolution changes [Marco; #1120]
+* Implement stick-to-finger workspace switch overview gestures [Florian; #516]
+* Make World Clocks offsets relative to local time [Florian; #1157]
+* Fix top app icon disappearing from dash [Florian; #1053]
+* Update switch style to match new Adwaita [Jakub; !496]
+* Ensure CSS units are pixel-aligned when scaling is used [Carlos; #91]
+* Misc. bug fixes and cleanups [Florian, Jakub, Robert, Alex, Carlos, Phil,
+  Marco, Benjamin, AsciiWolf, Ray, verdre; !444, #1016, #1018, !449, #1036,
+  !455, #1094, !440, #1023, #624, #1017, !476, !473, !480, #1130, !485, !481,
+  !490, !489, #1151, !435, #1160, !482, #1150, #1166, !384]
+
+Contributors:
+  AsciiWolf, Andrea Azzarone, Benjamin Berg, Carlos Garnacho, Victor Ibragimov,
+  Robert Mader, Alex Monday, Florian Müllner, Jakub Steiner, Ray Strode,
+  Marco Trevisan (Treviño), verdre, Xiaoguang Wang, Phil Wyett
+
+Translators:
+  Victor Ibragimov [tg, af, et, ja], Bruce Cowan [en_GB], Piotr Drąg [tg],
+  Charles Monzat [fr], Khaled Hosny [ar], Goran Vidović [hr],
+  Cheng-Chia Tseng [zh_TW], Carmen Bianca BAKKER [eo], Daniel Mustieles [es],
+  Dušan Kazik [sk]
+
 3.32.0
 ======
 * Fix sizing issues in on-screen-keyboard emoji panel [Carlos; !439]

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

@@ -0,0 +1,15 @@
+<node>
+
+  <!--
+      org.gnome.Shell.ClocksIntegration:
+      @short_description: Clocks integration interface
+
+      The interface used for exporting location settings to GNOME Shell's
+      world clocks integration.
+  -->
+  <interface name="org.gnome.Shell.ClocksIntegration">
+
+  <property name="Locations" type="av" access="read"/>
+
+  </interface>
+</node>

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

@@ -173,6 +173,30 @@
       <arg type="s" direction="in" name="uuid"/>
     </method>
 
+    <!--
+        EnableExtension:
+        @uuid: The UUID of the extension
+        @success: Whether the operation was successful
+
+        Enable an extension.
+    -->
+    <method name="EnableExtension"> \
+      <arg type="s" direction="in" name="uuid"/> \
+      <arg type="b" direction="out" name="success"/> \
+    </method> \
+
+    <!--
+        DisableExtension:
+        @uuid: The UUID of the extension
+        @success: Whether the operation was successful
+
+        Disable an extension.
+    -->
+    <method name="DisableExtension"> \
+      <arg type="s" direction="in" name="uuid"/> \
+      <arg type="b" direction="out" name="success"/> \
+    </method> \
+
     <!--
         LaunchExtensionPrefs:
         @uuid: The UUID of the extension
@@ -189,6 +213,15 @@
     -->
     <method name="CheckForUpdates"/>
 
+    <signal name="ExtensionStateChanged">
+      <arg type="s" name="uuid"/>
+      <arg type="a{sv}" name="state"/>
+    </signal>
+
+    <!--
+        ExtensionStatusChanged:
+        Deprecated for ExtensionStateChanged
+    -->
     <signal name="ExtensionStatusChanged">
       <arg type="s" name="uuid"/>
       <arg type="i" name="state"/>

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

@@ -0,0 +1,16 @@
+<node>
+
+  <!--
+      org.gnome.Shell.WeatherIntegration:
+      @short_description: Weather integration interface
+
+      The interface used for exporting location settings to GNOME Shell's
+      weather integration.
+  -->
+  <interface name="org.gnome.Shell.WeatherIntegration">
+
+  <property name="AutomaticLocation" type="b" access="read"/>
+  <property name="Locations" type="av" access="read"/>
+
+  </interface>
+</node>

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

@@ -9,7 +9,7 @@
     <method name="ShowOSD">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>
-    <method name="ShowMonitorLabels2">
+    <method name="ShowMonitorLabels">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>
     <method name="HideMonitorLabels"/>

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

@@ -40,6 +40,7 @@
     <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Wacom.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.AudioDeviceSelection.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.CalendarServer.xml</file>
+    <file preprocess="xml-stripblanks">org.gnome.Shell.ClocksIntegration.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.Extensions.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.Introspect.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.HotplugSniffer.xml</file>
@@ -48,6 +49,7 @@
     <file preprocess="xml-stripblanks">org.gnome.Shell.Screencast.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.Screenshot.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.Wacom.PadOsd.xml</file>
+    <file preprocess="xml-stripblanks">org.gnome.Shell.WeatherIntegration.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.xml</file>
     <file preprocess="xml-stripblanks">org.Gtk.MountOperationHandler.xml</file>
     <file preprocess="xml-stripblanks">org.gtk.Notifications.xml</file>

data/gnome-shell-disable-extensions.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Disable GNOME Shell extensions after failure
+DefaultDependencies=no
+
+# Only disable extensions for a short period of time after login.
+# This means we err on the side of failing the first login after a broken
+# extension was installed.
+Requisite=gnome-session-stable.timer
+
+[Service]
+Type=simple
+# Disable extensions
+ExecStart=gsettings set org.gnome.shell disable-user-extensions true
+Restart=no

data/gnome-shell-theme.gresource.xml

@@ -20,12 +20,16 @@
     <file>no-notifications.svg</file>
     <file>noise-texture.png</file>
     <file>pad-osd.css</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>
+    <file alias="icons/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
     <file>process-working.svg</file>
-    <file>toggle-off-us.svg</file>
+    <file>toggle-off.svg</file>
-    <file>toggle-off-intl.svg</file>
+    <file>toggle-off-dark.svg</file>
     <file>toggle-off-hc.svg</file>
-    <file>toggle-on-us.svg</file>
+    <file>toggle-on.svg</file>
-    <file>toggle-on-intl.svg</file>
+    <file>toggle-on-dark.svg</file>
     <file>toggle-on-hc.svg</file>
   </gresource>
 </gresources>

data/gnome-shell-wayland.service.in

@@ -0,0 +1,27 @@
+[Unit]
+Description=GNOME Shell on Wayland
+# On wayland, force a session shutdown
+OnFailure=gnome-shell-disable-extensions.service gnome-session-shutdown.target
+OnFailureJobMode=replace-irreversibly
+CollectMode=inactive-or-failed
+RefuseManualStart=on
+RefuseManualStop=on
+
+After=gnome-session-manager.target
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+# The units already conflict because they use the same BusName
+#Conflicts=gnome-shell-x11.service
+
+[Service]
+Type=notify
+ExecStart=@bindir@/gnome-shell
+# Exit code 1 means we are probably *not* dealing with an extension failure
+SuccessExitStatus=1
+# On wayland we cannot restart
+Restart=no
+# Kill any stubborn child processes after this long
+TimeoutStopSec=5

data/gnome-shell-wayland.target

@@ -1,5 +1,10 @@
 [Unit]
-Description=GNOME Shell (wayland sync point)
+Description=GNOME Shell on Wayland
-After=gnome-shell.service
+DefaultDependencies=no
-BindsTo=gnome-shell.service
+
-Conflicts=gnome-shell-x11.target
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+Requires=gnome-shell-wayland.service
+After=gnome-shell-wayland.service

data/gnome-shell-x11.service.in

@@ -0,0 +1,33 @@
+[Unit]
+Description=GNOME Shell on X11
+# On X11, try to show the GNOME Session Failed screen
+OnFailure=gnome-shell-disable-extensions.service gnome-session-failed.target
+OnFailureJobMode=replace
+CollectMode=inactive-or-failed
+RefuseManualStart=on
+RefuseManualStop=on
+
+After=gnome-session-manager.target
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+# The units already conflict because they use the same BusName
+#Conflicts=gnome-shell-wayland.service
+
+# Limit startup frequency more than the default
+StartLimitIntervalSec=15s
+StartLimitBurst=3
+
+[Service]
+Type=notify
+ExecStart=@bindir@/gnome-shell
+# Exit code 1 means we are probably *not* dealing with an extension failure
+SuccessExitStatus=1
+# On X11 we want to restart on-success (Alt+F2 + r) and on-failure.
+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

@@ -1,5 +1,10 @@
 [Unit]
-Description=GNOME Shell (x11 sync point)
+Description=GNOME Shell on X11
-After=gnome-shell.service
+DefaultDependencies=no
-BindsTo=gnome-shell.service
+
-Conflicts=gnome-shell-wayland.target
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+Requires=gnome-shell-x11.service
+After=gnome-shell-x11.service

data/gnome-shell.service.in

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

data/meson.build

@@ -14,6 +14,8 @@ desktopconf = configuration_data()
 # 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
   i18n.merge_file('desktop',
     input: configure_file(
@@ -22,7 +24,7 @@ foreach desktop_file : desktop_files
       configuration: desktopconf
     ),
     output: desktop_file,
-    po_dir: '../po',
+    po_dir: po_dir,
     install: true,
     install_dir: desktopdir,
     type: 'desktop'
@@ -98,15 +100,23 @@ if have_systemd
   unitconf = configuration_data()
   unitconf.set('bindir', bindir)
 
-  unit = configure_file(
+  configure_file(
-    input: 'gnome-shell.service.in',
+    input: 'gnome-shell-x11.service.in',
-    output: 'gnome-shell.service',
+    output: 'gnome-shell-x11.service',
     configuration: unitconf,
     install_dir: systemduserunitdir
   )
 
-  units = files('gnome-shell-wayland.target',
+  configure_file(
-                'gnome-shell-x11.target')
+    input: 'gnome-shell-wayland.service.in',
+    output: 'gnome-shell-wayland.service',
+    configuration: unitconf,
+    install_dir: systemduserunitdir
+  )
+
+  units = files('gnome-shell-x11.target',
+                'gnome-shell-wayland.target',
+                'gnome-shell-disable-extensions.service')
 
   install_data(units, install_dir: systemduserunitdir)
 endif

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

@@ -14,3 +14,4 @@ X-GNOME-Autostart-Phase=DisplayServer
 X-GNOME-Provides=panel;windowmanager;
 X-GNOME-Autostart-Notify=true
 X-GNOME-AutoRestart=false
+X-GNOME-HiddenUnderSystemd=@systemd_hidden@

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

@@ -21,6 +21,17 @@
         EnableExtension and DisableExtension D-Bus methods on org.gnome.Shell.
       </description>
     </key>
+    <key name="disabled-extensions" type="as">
+      <default>[]</default>
+      <summary>UUIDs of extensions to force disabling</summary>
+      <description>
+        GNOME Shell extensions have a UUID property; this key lists extensions
+        which should be disabled, even if loaded as part of the current mode.
+        You can also manipulate this list with the EnableExtension and
+        DisableExtension D-Bus methods on org.gnome.Shell.
+        This key takes precedence over the “enabled-extensions” setting.
+      </description>
+    </key>
     <key name="disable-user-extensions" type="b">
       <default>false</default>
       <summary>Disable user extensions</summary>
@@ -39,7 +50,7 @@
       </description>
     </key>
     <key name="favorite-apps" type="as">
-      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
+      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'org.gnome.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
@@ -99,7 +110,6 @@
       </description>
     </key>
     <child name="keybindings" schema="org.gnome.shell.keybindings"/>
-    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
   </schema>
 
   <schema id="org.gnome.shell.keybindings" path="/org/gnome/shell/keybindings/"
@@ -140,11 +150,6 @@
         Keybinding to focus the active notification.
       </description>
     </key>
-    <key name="pause-resume-tweens" type="as">
-      <default>[]</default>
-      <summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</summary>
-      <description></description>
-    </key>
     <key name="switch-to-application-1" type="as">
       <default>["&lt;Super&gt;1"]</default>
       <summary>Switch to application 1</summary>
@@ -183,17 +188,6 @@
     </key>
   </schema>
 
-  <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="keyboard-type" type="s">
-      <default>'touch'</default>
-      <summary>Which keyboard to use</summary>
-      <description>
-        The type of keyboard to use.
-      </description>
-    </key>
-  </schema>
-
   <schema id="org.gnome.shell.app-switcher"
           path="/org/gnome/shell/app-switcher/"
           gettext-domain="@GETTEXT_PACKAGE@">
@@ -234,6 +228,36 @@
     </key>
   </schema>
 
+  <schema id="org.gnome.shell.world-clocks" path="/org/gnome/shell/world-clocks/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="locations" type="av">
+      <summary>Locations</summary>
+      <description>
+        The locations to show in world clocks
+      </description>
+      <default>[]</default>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.shell.weather" path="/org/gnome/shell/weather/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="automatic-location" type="b">
+      <summary>Automatic location</summary>
+      <description>
+        Whether to fetch the current location or not
+      </description>
+      <default>false</default>
+    </key>
+
+    <key name="locations" type="av">
+      <summary>Location</summary>
+      <description>
+        The location for which to show a forecast
+      </description>
+      <default>[]</default>
+    </key>
+  </schema>
+
   <!-- unused, change 00_org.gnome.shell.gschema.override instead -->
   <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
 	  gettext-domain="@GETTEXT_PACKAGE@">

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

@@ -1,3 +1,5 @@
+$variant: 'light';
+
 @import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";

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

@@ -3,11 +3,11 @@
 
 
 $base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
-$bg_color: if($variant == 'light', #f6f5f4, desaturate(#3d3846, 10%));
+$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
 $fg_color: if($variant == 'light', #2e3436, #eeeeec);
 
 $selected_fg_color: #ffffff;
-$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));
+$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, 10%));
 $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
@@ -21,11 +21,15 @@ $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
 $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
 
 $osd_fg_color: #eeeeec;
-$osd_bg_color: #2e3436;
+$osd_text_color: white;
+$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: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.9);
+$osd_outer_borders_color: transparentize(white, 0.84);
 
 $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/_drawing.scss

@@ -37,16 +37,13 @@
 // possible $t values:
 // normal, focus, insensitive
 //
-  $_inner_shadows: inset 0 2px 4px transparentize(black, 0.6);
 
   @if $t==normal {
     background-color: $base_color;
     border-color: $borders_color;
-    @include _shadows($_inner_shadows);
 
   }
   @if $t==focus {
-    @include _shadows($_inner_shadows);
     border-color: if($fc==$selected_bg_color,
                      $selected_borders_color,
                      darken($fc,35%));
@@ -111,7 +108,7 @@
   }
 }
 
-@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge) {
 //
 // Button drawing function
 //
@@ -130,46 +127,39 @@
   $_hilight_color: _button_hilight_color($c);
   $_button_edge: if($edge == none, none, _widget_edge($edge));
   $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
-
+  $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
 
   @if $t==normal {
   //
   // normal button
   //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
-                            $osd_bg_color);
 
-    color: $osd_fg_color;
+    color: $tc;
-    background-color: $_bg;
+    background-color: $c;
-    border-color: $osd_borders_color;
+    border-color: $borders_color;
-    box-shadow: inset 0 1px lighten($osd_bg_color,10%);
+    box-shadow: $_button_shadow;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
   }
   @if $t==focus {
   //
   // focused button
-  //
+  //  
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+    color: $tc;
-                          lighten($osd_bg_color,3%));
-
-    color: $osd_fg_color;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    box-shadow: inset 0px 0px 0px 1px $selected_bg_color;
+    box-shadow: inset 0px 0px 0px 2px $selected_bg_color;
+    //border-color: $selected_bg_color;
   }
 
   @else if $t==hover {
   //
   // active osd button
   //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+    color: $tc;
-                            lighten($osd_bg_color,3%));
+    border-color: $borders_color;
-
+    background-color: $c;
-    color: white;
+    box-shadow: $_button_shadow;
-    border-color: $osd_borders_color;
-    background-color: $_bg;
-    box-shadow: inset 0 1px lighten($osd_bg_color,20%);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
 
@@ -178,27 +168,18 @@
   //
   // active osd button
   //
-    $_bg: if($c!=$bg_color, $c, $osd_borders_color);
+    color: $tc;
-
+    border-color: $borders_color;
-    color: white;
+    background-color: $c;
-    border-color: $osd_borders_color;
-    background-color: $selected_bg_color;
-    // This should be none, but it's creating some issues with borders, so to
-    // workaround it for now, use inset wich goes through a different code path.
-    // see https://bugzilla.gnome.org/show_bug.cgi?id=752934
-    box-shadow: inset 0 0 black;
     text-shadow: none;
     icon-shadow: none;
+    box-shadow: none;
   }
   @else if $t==insensitive {
-  //
-  // insensitive osd button
-  //
-    $_bg: transparentize(mix($insensitive_fg_color,$osd_bg_color,20%),0.3);
 
     color: $insensitive_fg_color;
-    border-color: $osd_borders_color;
+    border-color: $insensitive_borders_color;
-    background-color: $_bg;
+    background-color: $insensitive_bg_color;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;

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

@@ -26,6 +26,7 @@ $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.9);
 
 $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/pointer-double-click-symbolic.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2">
+  <g
+     id="layer1"
+     style="display:inline">
+    <g
+       id="id1"
+       transform="translate(-19,-0.75)">
+      <path
+         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 19.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.38151 2.829427,-2.763021 4.24414,-4.144531 0.5882,1.18866 1.158389,2.386561 1.758464,3.569127 1.108631,1.640259 4.157538,0.465128 3.89799,-1.495859 0.01057,-0.470226 -0.405577,-0.908445 -0.434651,-1.313638 0.259401,-0.25321 0.518802,-0.50642 0.778203,-0.75963 0.5882,1.18866 1.158389,2.386561 1.758464,3.569127 1.108631,1.640259 4.157538,0.465128 3.89799,-1.495859 -0.192325,-0.904303 -0.717854,-1.698026 -1.068629,-2.548967 -0.238908,-0.512658 -0.477817,-1.025315 -0.716725,-1.537973 1.755859,0 3.511719,0 5.267578,0 C 34.777352,9.738932 30.31641,5.0970051 25.855469,0.45507812 c 0,2.08138018 0,4.16276048 0,6.24414068 -2,-2.0813802 -4,-4.1627605 -6,-6.24414068 z m 1.5,3.72656248 c 2,2.0813801 4,4.1627603 6,6.2441404 0,-2.0813801 0,-4.1627603 0,-6.2441404 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.366537,0 -2.733073,0 -4.09961,0 0.883468,1.903435 1.781983,3.800273 2.656081,5.707817 0.0065,0.622781 -1.227555,0.980575 -1.325116,0.207118 -0.80433,-1.640251 -1.608661,-3.280501 -2.412991,-4.920752 -1.020182,0.995443 -2.040365,1.990885 -3.060547,2.986328 0.263642,0.608048 0.596803,1.192457 0.814693,1.816134 -0.182662,0.601037 -1.26833,0.8373 -1.365856,0.06795 -0.796094,-1.623456 -1.592189,-3.246912 -2.388284,-4.870368 -1.059245,1.033854 -2.118489,2.067708 -3.177734,3.101562 -4e-6,-4.265002 -7e-6,-8.5300036 -1.1e-5,-12.7950054 z"
+         id="path5565" />
+    </g>
+    <g
+       id="id2"
+       transform="translate(-25,-0.75)" />
+  </g>
+</svg>

data/theme/pointer-drag-symbolic.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2">
+  <g
+     id="g835">
+    <path
+       style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="M 10.705078 1.671875 C 9.8685536 1.7465699 8.886927 1.5353073 8.2578125 2.2480469 C 8.0785627 2.7511513 7.8667422 2.9777446 7.3125 2.8652344 C 6.5186841 2.8141575 5.6105879 2.9190179 5.125 3.6386719 C 4.5700923 4.4696324 4.8113194 5.4949043 4.7578125 6.4316406 L 4.7578125 7.9335938 C 4.2480917 7.6156216 3.6258927 7.8015358 3.0585938 7.7519531 C 2.6157606 7.7312277 2.1774807 7.7771069 1.7402344 7.84375 C 1.7971654 10.529678 1.813967 13.217089 1.8613281 15.902344 C 1.9550191 17.204635 3.0933719 18.307155 4.40625 18.326172 C 5.0391993 18.341272 5.8885801 18.332951 6.6308594 18.337891 C 9.8526764 18.325821 13.076973 18.38774 16.296875 18.28125 C 17.459088 18.161027 18.510143 17.092798 18.367188 15.884766 L 18.367188 6.4042969 C 17.660379 5.4636119 16.551912 4.623434 15.308594 4.8339844 C 15.009045 4.3804158 14.822476 3.3608651 14.082031 3.0351562 C 13.727176 2.744118 13.242443 2.9253873 12.822266 2.8730469 C 12.524824 2.8003648 11.966366 3.0655864 11.953125 2.6210938 C 11.795774 2.0995736 11.23789 1.7125276 10.705078 1.671875 z M 10.599609 3.1757812 C 10.764131 3.4472414 10.782382 3.9294982 10.818359 4.3007812 C 10.824915 4.3076775 10.838155 4.3066925 10.845703 4.3125 C 10.836598 4.3123268 10.827465 4.3126732 10.818359 4.3125 L 11.3125 10.212891 L 11.976562 4.3710938 L 13.322266 4.375 C 13.858345 4.7645492 13.735252 5.5154752 13.876953 6.0976562 C 13.865826 6.1651282 13.88335 6.1937019 13.892578 6.234375 C 13.891928 6.2343667 13.891276 6.2343833 13.890625 6.234375 L 13.902344 6.3203125 L 14.384766 10.185547 L 15.048828 6.265625 C 15.622863 6.228498 16.206517 6.3041365 16.607422 6.7675781 C 17.017062 6.9844433 16.823063 7.4565491 16.867188 7.8261719 L 16.867188 16.167969 C 16.530129 17.131654 15.267211 16.71624 14.492188 16.828125 C 11.121671 16.841205 7.7500508 16.861953 4.3808594 16.814453 C 3.4051926 16.786173 3.2389196 15.744474 3.3398438 14.972656 C 3.3282027 13.065594 3.2950998 11.158732 3.2617188 9.2519531 C 3.5880829 9.2584131 3.9376766 9.2391948 4.25 9.2617188 C 4.7438842 10.17694 4.7346154 11.262903 4.7578125 12.277344 C 5.2504494 12.270544 5.8011939 12.317174 6.2578125 12.277344 C 6.2669593 9.7577406 6.2393741 7.2373172 6.2714844 4.71875 C 6.3763823 4.198849 7.0022289 4.409587 7.3828125 4.3652344 L 8.0585938 4.3652344 L 8.546875 10.212891 L 9.2167969 4.3359375 L 9.2128906 4.3359375 C 9.2438386 3.9531035 9.0622615 3.4401006 9.4609375 3.2167969 L 10.599609 3.1757812 z "
+       id="path5630" />
+  </g>
+</svg>

data/theme/pointer-primary-click-symbolic.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2"
+   version="1.1">
+  <g
+     id="layer1"
+     style="display:inline">
+    <g
+       id="id1"
+       transform="translate(-22.25,-0.75)">
+      <path
+         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 25.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.380859 2.829427,-2.761719 4.24414,-4.142578 0.612408,1.215372 1.173049,2.460221 1.819709,3.656095 1.141947,1.476279 3.975266,0.389006 3.846009,-1.473608 -0.09413,-0.822519 -0.594755,-1.521423 -0.899969,-2.277599 -0.298869,-0.640171 -0.597739,-1.280342 -0.896608,-1.920513 1.75651,0 3.513021,0 5.269531,0 C 34.777344,9.738932 30.316406,5.0970051 25.855469,0.45507812 Z m 1.5,3.72656248 c 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.367188,0 -2.734375,0 -4.101563,0 0.885072,1.903196 1.781799,3.80152 2.659622,5.707744 0.0349,0.566084 -1.149057,0.988823 -1.282093,0.297971 -0.818567,-1.671162 -1.637133,-3.342323 -2.455699,-5.013485 -1.059896,1.034505 -2.119791,2.06901 -3.179687,3.103515 1.5e-5,-4.264988 3e-5,-8.5299756 4.5e-5,-12.7949634 z"
+         id="path5565" />
+    </g>
+  </g>
+</svg>

data/theme/pointer-secondary-click-symbolic.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2">
+  <g
+     id="layer1"
+     style="display:inline;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
+    <g
+       transform="matrix(-1,0,0,1,42,-0.75)"
+       id="g5847"
+       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
+      <path
+         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 25.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.380859 2.829427,-2.761719 4.24414,-4.142578 0.612408,1.215372 1.173049,2.460221 1.819709,3.656095 1.141947,1.476279 3.975266,0.389006 3.846009,-1.473608 -0.09413,-0.822519 -0.594755,-1.521423 -0.899969,-2.277599 -0.298869,-0.640171 -0.597739,-1.280342 -0.896608,-1.920513 1.75651,0 3.513021,0 5.269531,0 C 34.777344,9.738932 30.316406,5.0970051 25.855469,0.45507812 Z m 1.5,3.72656248 c 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.367188,0 -2.734375,0 -4.101563,0 0.885072,1.903196 1.781799,3.80152 2.659622,5.707744 0.0349,0.566084 -1.149057,0.988823 -1.282093,0.297971 -0.818567,-1.671162 -1.637133,-3.342323 -2.455699,-5.013485 -1.059896,1.034505 -2.119791,2.06901 -3.179687,3.103515 1.5e-5,-4.264988 3e-5,-8.5299756 4.5e-5,-12.7949634 z"
+         id="path5851" />
+    </g>
+  </g>
+</svg>

data/theme/toggle-off-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22"><defs><linearGradient id="a"><stop offset="0" stop-color="#39393a"/><stop offset="1" stop-color="#302f30"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53" y1="294.429" x2="53" y2="309.804" gradientUnits="userSpaceOnUse" gradientTransform="translate(-42.76)"/></defs><g transform="translate(0 -291.18)" stroke-width="1.085"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#323233" stroke="#272728"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none" fill="url(#b)" stroke="#151515"/></g></svg>

data/theme/toggle-off-intl.svg

@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="toggle-off-us.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802-8"
-       id="linearGradient12311-3-1-0-5-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802-8"
-       inkscape:collect="always">
-      <stop
-         id="stop37804-1"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806-8"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="492.52756"
-       x2="610.13782"
-       y1="501.43866"
-       x1="610.13782"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13602"
-       xlink:href="#linearGradient37802-8"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-5.0602834"
-     inkscape:cy="16.473273"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1375"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
-      </g>
-      <g
-         transform="translate(-49.946213,-1.890275)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.15627193;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         id="path13479"
-         sodipodi:cx="16.4375"
-         sodipodi:cy="10.8125"
-         sodipodi:rx="4.3125"
-         sodipodi:ry="4.3125"
-         d="m 20.75,10.8125 a 4.3125,4.3125 0 1 1 -8.625,0 4.3125,4.3125 0 1 1 8.625,0 z"
-         transform="matrix(1.4212691,0,0,1.1514287,577.38488,1761.1138)" />
-    </g>
-  </g>
-</svg>

data/theme/toggle-off-us.svg

@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="toggle-on-intl.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802"
-       id="linearGradient12311-3-1-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802"
-       inkscape:collect="always">
-      <stop
-         id="stop37804"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4-3"
-       id="linearGradient77680"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0322581,717.71949,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4-3">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5-7" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0-9" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802-8"
-       id="linearGradient12311-3-1-0-5-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802-8"
-       inkscape:collect="always">
-      <stop
-         id="stop37804-1"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806-8"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="492.52756"
-       x2="610.13782"
-       y1="501.43866"
-       x1="610.13782"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13602"
-       xlink:href="#linearGradient37802-8"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="16.760995"
-     inkscape:cy="21.955673"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1375"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
-      </g>
-      <g
-         transform="translate(-49.946213,-1.890275)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <text
-         xml:space="preserve"
-         style="font-size:13.79166794px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-         x="520.29974"
-         y="1997.0011"
-         id="text75614"
-         sodipodi:linespacing="125%"
-         transform="scale(1.1236771,0.88993537)"><tspan
-           sodipodi:role="line"
-           id="tspan75616"
-           x="520.29974"
-           y="1997.0011">OFF</tspan></text>
-    </g>
-  </g>
-</svg>

data/theme/toggle-off.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="46" height="22"><g transform="translate(0 -291.18)"><rect style="marker:none;font-variant-east_asian:normal" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#e1dedb" stroke="#cdc7c2" stroke-linecap="round" stroke-linejoin="round"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none;font-variant-east_asian:normal" fill="#f8f7f7" stroke="#aa9f98" stroke-linecap="round" stroke-linejoin="round"/><g transform="matrix(.97148 0 0 1 1658.914 -2552.91)" stroke-width="1.015" stroke-linecap="round" stroke-linejoin="round"><rect ry="13.17" rx="13.556" y="1234.681" x="-1242.732" height="26" width="49.409" style="marker:none" fill="#e1dedb" stroke="#cdc7c2"/><rect style="marker:none" width="26.763" height="26" x="-1242.732" y="1234.769" rx="13.511" ry="13.126" fill="#f8f7f7" stroke="#aa9f98"/></g><g transform="matrix(.97148 0 0 1 1658.914 -2512.91)" stroke-width="1.015" stroke="#2b73cc"><rect style="marker:none" width="49.409" height="26" x="-1242.732" y="1234.681" rx="13.556" ry="13.17" fill="#3081e3"/><rect ry="13.126" rx="13.511" y="1234.769" x="-1220.086" height="26" width="26.763" style="marker:none" fill="#f8f7f7" stroke-linecap="round" stroke-linejoin="round"/></g></g></svg>

data/theme/toggle-on-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22"><defs><linearGradient id="a"><stop offset="0" stop-color="#39393a"/><stop offset="1" stop-color="#302f30"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53" y1="294.429" x2="53" y2="309.804" gradientUnits="userSpaceOnUse" gradientTransform="translate(-19)"/></defs><g transform="translate(0 -291.18)" stroke="#030e1b" stroke-width="1.085"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#15539e"/><rect ry="10.455" rx="10.455" y="291.715" x="24.304" height="20.911" width="21.143" style="marker:none" fill="url(#b)"/></g></svg>

data/theme/toggle-on-intl.svg

@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toggle-on-intl.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461"
-       id="linearGradient77551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
-       x1="1164.7644"
-       y1="962.93695"
-       x2="1164.7644"
-       y2="970.51404" />
-    <linearGradient
-       id="linearGradient77461"
-       inkscape:collect="always">
-      <stop
-         id="stop77463"
-         offset="0"
-         style="stop-color:#182f4c;stop-opacity:1" />
-      <stop
-         id="stop77465"
-         offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="37.410841"
-     inkscape:cy="16.009314"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient77551);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-      <g
-         transform="translate(2.0625,-2)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <rect
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         id="rect13678"
-         width="3.0646207"
-         height="12.414008"
-         x="554.77728"
-         y="1767.3566" />
-    </g>
-  </g>
-</svg>

data/theme/toggle-on-us.svg

@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toggle-on-us.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient77461-1"
-       inkscape:collect="always">
-      <stop
-         id="stop77463-1"
-         offset="0"
-         style="stop-color:#182f4c;stop-opacity:1" />
-      <stop
-         id="stop77465-4"
-         offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient77551-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8527367,0,0,0.80554422,-969.41608,-778.00299)"
-       x1="1164.7644"
-       y1="962.93695"
-       x2="1164.7644"
-       y2="970.51404" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient11198"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3066667,0,0,1,-1066.3709,794.25325)"
-       x1="1322.5831"
-       y1="-312.51855"
-       x2="1322.5831"
-       y2="-306.53461" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-26.798898"
-     inkscape:cy="5.3753009"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient11198);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
-      </g>
-      <g
-         transform="translate(2.0625,-2)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <text
-         transform="scale(1.1000946,0.90901274)"
-         sodipodi:linespacing="125%"
-         id="text38018"
-         y="1955.5205"
-         x="495.94223"
-         style="font-size:13.29953671px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-         xml:space="preserve"><tspan
-           y="1955.5205"
-           x="495.94223"
-           id="tspan38020"
-           sodipodi:role="line">ON</tspan></text>
-    </g>
-  </g>
-</svg>

data/theme/toggle-on.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="46" height="22"><g transform="translate(0 -291.18)" stroke="#2b73cc"><rect style="marker:none;font-variant-east_asian:normal" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#3081e3"/><rect ry="10.455" rx="10.455" y="291.715" x="24.304" height="20.911" width="21.143" style="marker:none;font-variant-east_asian:normal" fill="#f8f7f7" stroke-linecap="round" stroke-linejoin="round"/></g></svg>

docs/reference/shell/meson.build

@@ -28,7 +28,7 @@ foreach iface : ifaces
     output: 'doc-gen-' + iface[1],
     command: [
       'gdbus-codegen',
-      '--interface-prefix=@0@.'.format(iface),
+      '--interface-prefix=@0@.'.format(iface[0]),
       '--generate-docbook', 'doc-gen',
       '--output-directory', '@OUTDIR@',
       '@INPUT@'

gnome-shell.doap

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

js/extensionPrefs/main.js

@@ -1,3 +1,7 @@
+/* exported main */
+imports.gi.versions.Gdk = '3.0';
+imports.gi.versions.Gtk = '3.0';
+
 const Gettext = imports.gettext;
 const { Gdk, GLib, Gio, GObject, Gtk, Pango } = imports.gi;
 const Format = imports.format;
@@ -8,6 +12,8 @@ const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
+const { ExtensionState } = ExtensionUtils;
+
 const GnomeShellIface = loadInterfaceXML('org.gnome.Shell.Extensions');
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
 
@@ -17,74 +23,54 @@ function stripPrefix(string, prefix) {
     return string;
 }
 
-var Application = class {
+var Application = GObject.registerClass({
-    constructor() {
+    GTypeName: 'ExtensionPrefs_Application'
+}, class Application extends Gtk.Application {
+    _init() {
         GLib.set_prgname('gnome-shell-extension-prefs');
-        this.application = new Gtk.Application({
+        super._init({
             application_id: 'org.gnome.shell.ExtensionPrefs',
             flags: Gio.ApplicationFlags.HANDLES_COMMAND_LINE
         });
 
-        this.application.connect('activate', this._onActivate.bind(this));
-        this.application.connect('command-line', this._onCommandLine.bind(this));
-        this.application.connect('startup', this._onStartup.bind(this));
-
-        this._extensionPrefsModules = {};
-
         this._startupUuid = null;
         this._loaded = false;
         this._skipMainWindow = false;
+        this._shellProxy = null;
     }
 
-    _extensionAvailable(uuid) {
+    get shellProxy() {
-        let extension = ExtensionUtils.extensions[uuid];
+        return this._shellProxy;
+    }
 
-        if (!extension)
+    _showPrefs(uuid) {
+        let row = this._extensionSelector.get_children().find(c => {
+            return c.uuid === uuid && c.hasPrefs;
+        });
+
+        if (!row)
             return false;
 
-        if (!extension.dir.get_child('prefs.js').query_exists(null))
-            return false;
-
-        return true;
-    }
-
-    _getExtensionPrefsModule(extension) {
-        let uuid = extension.metadata.uuid;
-
-        if (this._extensionPrefsModules.hasOwnProperty(uuid))
-            return this._extensionPrefsModules[uuid];
-
-        ExtensionUtils.installImporter(extension);
-
-        let prefsModule = extension.imports.prefs;
-        prefsModule.init(extension.metadata);
-
-        this._extensionPrefsModules[uuid] = prefsModule;
-        return prefsModule;
-    }
-
-    _selectExtension(uuid) {
-        if (!this._extensionAvailable(uuid))
-            return;
-
-        let extension = ExtensionUtils.extensions[uuid];
         let widget;
 
         try {
-            let prefsModule = this._getExtensionPrefsModule(extension);
+            widget = row.prefsModule.buildPrefsWidget();
-            widget = prefsModule.buildPrefsWidget();
         } catch (e) {
-            widget = this._buildErrorUI(extension, e);
+            widget = this._buildErrorUI(row, e);
         }
 
-        let dialog = new Gtk.Window({ modal: !this._skipMainWindow,
+        let dialog = new Gtk.Window({
-                                      type_hint: Gdk.WindowTypeHint.DIALOG });
+            modal: !this._skipMainWindow,
-        dialog.set_titlebar(new Gtk.HeaderBar({ show_close_button: true,
+            type_hint: Gdk.WindowTypeHint.DIALOG
-                                                title: extension.metadata.name,
+        });
-                                                visible: true }));
+        dialog.set_titlebar(new Gtk.HeaderBar({
+            show_close_button: true,
+            title: row.name,
+            visible: true
+        }));
 
         if (this._skipMainWindow) {
-            this.application.add_window(dialog);
+            this.add_window(dialog);
             if (this._window)
                 this._window.destroy();
             this._window = dialog;
@@ -96,9 +82,11 @@ var Application = class {
         dialog.set_default_size(600, 400);
         dialog.add(widget);
         dialog.show();
+
+        return true;
     }
 
-    _buildErrorUI(extension, exc) {
+    _buildErrorUI(row, exc) {
         let scroll = new Gtk.ScrolledWindow({
             hscrollbar_policy: Gtk.PolicyType.NEVER,
             propagate_natural_height: true
@@ -168,13 +156,20 @@ var Application = class {
 
         copyButton.connect('clicked', w => {
             let clipboard = Gtk.Clipboard.get_default(w.get_display());
-            let backticks = '```';
+            // markdown for pasting in gitlab issues
-            clipboard.set_text(
+            let lines = [
-                // markdown for pasting in gitlab issues
+                `The settings of extension ${row.uuid} had an error:`,
-                `The settings of extension ${extension.uuid} had an error:\n${
+                '```',
-                backticks}\n${exc}\n${backticks}\n\nStack trace:\n${
+                `${exc}`,
-                backticks}\n${exc.stack}${backticks}\n`, -1
+                '```',
-            );
+                '',
+                'Stack trace:',
+                '```',
+                exc.stack.replace(/\n$/, ''), // stack without trailing newline
+                '```',
+                ''
+            ];
+            clipboard.set_text(lines.join('\n'), -1);
         });
 
         let spacing = new Gtk.SeparatorToolItem({ draw: false });
@@ -185,13 +180,13 @@ var Application = class {
             label: _("Homepage"),
             tooltip_text: _("Visit extension homepage"),
             no_show_all: true,
-            visible: extension.metadata.url != null
+            visible: row.url != null
         });
         toolbar.add(urlButton);
 
         urlButton.connect('clicked', w => {
             let context = w.get_display().get_app_launch_context();
-            Gio.AppInfo.launch_default_for_uri(extension.metadata.url, context);
+            Gio.AppInfo.launch_default_for_uri(row.url, context);
         });
 
         let expandedBox = new Gtk.Box({
@@ -206,8 +201,8 @@ var Application = class {
         return scroll;
     }
 
-    _buildUI(app) {
+    _buildUI() {
-        this._window = new Gtk.ApplicationWindow({ application: app,
+        this._window = new Gtk.ApplicationWindow({ application: this,
                                                    window_position: Gtk.WindowPosition.CENTER });
 
         this._window.set_default_size(800, 500);
@@ -241,18 +236,14 @@ var Application = class {
         this._mainStack.add_named(new EmptyPlaceholder(), 'placeholder');
 
         this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
-        this._shellProxy.connectSignal('ExtensionStatusChanged', (proxy, senderName, [uuid, state, error]) => {
+        this._shellProxy.connectSignal('ExtensionStateChanged',
-            if (ExtensionUtils.extensions[uuid] !== undefined)
+            this._onExtensionStateChanged.bind(this));
-                this._scanExtensions();
-        });
 
         this._window.show_all();
     }
 
     _sortList(row1, row2) {
-        let name1 = ExtensionUtils.extensions[row1.uuid].metadata.name;
+        return row1.name.localeCompare(row2.name);
-        let name2 = ExtensionUtils.extensions[row2.uuid].metadata.name;
-        return name1.localeCompare(name2);
     }
 
     _updateHeader(row, before) {
@@ -263,19 +254,56 @@ var Application = class {
         row.set_header(sep);
     }
 
-    _scanExtensions() {
+    _findExtensionRow(uuid) {
-        let finder = new ExtensionUtils.ExtensionFinder();
+        return this._extensionSelector.get_children().find(c => c.uuid === uuid);
-        finder.connect('extension-found', this._extensionFound.bind(this));
-        finder.scanExtensions();
-        this._extensionsLoaded();
     }
 
-    _extensionFound(finder, extension) {
+    _onExtensionStateChanged(proxy, senderName, [uuid, newState]) {
-        let row = new ExtensionRow(extension.uuid);
+        let row = this._findExtensionRow(uuid);
+        if (row) {
+            let { state } = ExtensionUtils.deserializeExtension(newState);
+            if (state == ExtensionState.UNINSTALLED)
+                row.destroy();
+            return; // we only deal with new and deleted extensions here
+        }
+
+        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() {
+        this._shellProxy.ListExtensionsRemote(([extensionsMap], e) => {
+            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 {
+                    throw e;
+                }
+                return;
+            }
+
+            for (let uuid in extensionsMap) {
+                let extension = ExtensionUtils.deserializeExtension(extensionsMap[uuid]);
+                this._addExtensionRow(extension);
+            }
+            this._extensionsLoaded();
+        });
+    }
+
+    _addExtensionRow(extension) {
+        let row = new ExtensionRow(extension);
 
-        row.prefsButton.visible = this._extensionAvailable(row.uuid);
         row.prefsButton.connect('clicked', () => {
-            this._selectExtension(row.uuid);
+            this._showPrefs(row.uuid);
         });
 
         row.show_all();
@@ -288,24 +316,26 @@ var Application = class {
         else
             this._mainStack.visible_child_name = 'placeholder';
 
-        if (this._startupUuid && this._extensionAvailable(this._startupUuid))
+        if (this._startupUuid)
-            this._selectExtension(this._startupUuid);
+            this._showPrefs(this._startupUuid);
         this._startupUuid = null;
         this._skipMainWindow = false;
         this._loaded = true;
     }
 
-    _onActivate() {
+    vfunc_activate() {
         this._window.present();
     }
 
-    _onStartup(app) {
+    vfunc_startup() {
-        this._buildUI(app);
+        super.vfunc_startup();
+
+        this._buildUI();
         this._scanExtensions();
     }
 
-    _onCommandLine(app, commandLine) {
+    vfunc_command_line(commandLine) {
-        app.activate();
+        this.activate();
         let args = commandLine.get_arguments();
 
         if (args.length) {
@@ -316,16 +346,14 @@ var Application = class {
             // Strip off "extension:///" prefix which fakes a URI, if it exists
             uuid = stripPrefix(uuid, "extension:///");
 
-            if (this._extensionAvailable(uuid))
+            if (!this._loaded)
-                this._selectExtension(uuid);
-            else if (!this._loaded)
                 this._startupUuid = uuid;
-            else
+            else if (!this._showPrefs(uuid))
                 this._skipMainWindow = false;
         }
         return 0;
     }
-};
+});
 
 var Expander = GObject.registerClass({
     Properties: {
@@ -492,6 +520,35 @@ class EmptyPlaceholder extends Gtk.Box {
     }
 });
 
+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) {
@@ -504,30 +561,59 @@ class DescriptionLabel extends Gtk.Label {
 
 var ExtensionRow = GObject.registerClass(
 class ExtensionRow extends Gtk.ListBoxRow {
-    _init(uuid) {
+    _init(extension) {
         super._init();
 
-        this.uuid = uuid;
+        this._app = Gio.Application.get_default();
+        this._extension = extension;
+        this._prefsModule = null;
 
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
+        this.connect('destroy', this._onDestroy.bind(this));
-        this._settings.connect('changed::enabled-extensions', () => {
-            this._switch.state = this._isEnabled();
-        });
-        this._settings.connect('changed::disable-extension-version-validation',
-            () => {
-                this._switch.sensitive = this._canEnable();
-            });
-        this._settings.connect('changed::disable-user-extensions',
-            () => {
-                this._switch.sensitive = this._canEnable();
-            });
 
         this._buildUI();
+
+        this._extensionStateChangedId = this._app.shellProxy.connectSignal(
+            'ExtensionStateChanged', (p, sender, [uuid, newState]) => {
+                if (this.uuid !== uuid)
+                    return;
+
+                this._extension = ExtensionUtils.deserializeExtension(newState);
+                let state = (this._extension.state == ExtensionState.ENABLED);
+
+                GObject.signal_handler_block(this._switch, this._notifyActiveId);
+                this._switch.state = state;
+                GObject.signal_handler_unblock(this._switch, this._notifyActiveId);
+
+                this._switch.sensitive = this._canToggle();
+            });
+    }
+
+    get uuid() {
+        return this._extension.uuid;
+    }
+
+    get name() {
+        return this._extension.metadata.name;
+    }
+
+    get hasPrefs() {
+        return this._extension.hasPrefs;
+    }
+
+    get url() {
+        return this._extension.metadata.url;
+    }
+
+    _onDestroy() {
+        if (!this._app.shellProxy)
+            return;
+
+        if (this._extensionStateChangedId)
+            this._app.shellProxy.disconnectSignal(this._extensionStateChangedId);
+        this._extensionStateChangedId = 0;
     }
 
     _buildUI() {
-        let extension = ExtensionUtils.extensions[this.uuid];
-
         let hbox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL,
                                  hexpand: true, margin_end: 24, spacing: 24,
                                  margin: 12 });
@@ -537,19 +623,20 @@ class ExtensionRow extends Gtk.ListBoxRow {
                                  spacing: 6, hexpand: true });
         hbox.add(vbox);
 
-        let name = GLib.markup_escape_text(extension.metadata.name, -1);
+        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 = extension.metadata.description.split('\n')[0];
+        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,
@@ -559,51 +646,37 @@ class ExtensionRow extends Gtk.ListBoxRow {
 
         this.prefsButton = button;
 
-        this._switch = new Gtk.Switch({ valign: Gtk.Align.CENTER,
+        this._switch = new Gtk.Switch({
-                                        sensitive: this._canEnable(),
+            valign: Gtk.Align.CENTER,
-                                        state: this._isEnabled() });
+            sensitive: this._canToggle(),
-        this._switch.connect('notify::active', () => {
+            state: this._extension.state === ExtensionState.ENABLED
+        });
+        this._notifyActiveId = this._switch.connect('notify::active', () => {
             if (this._switch.active)
-                this._enable();
+                this._app.shellProxy.EnableExtensionRemote(this.uuid);
             else
-                this._disable();
+                this._app.shellProxy.DisableExtensionRemote(this.uuid);
         });
         this._switch.connect('state-set', () => true);
         hbox.add(this._switch);
     }
 
-    _canEnable() {
+    _canToggle() {
-        let extension = ExtensionUtils.extensions[this.uuid];
+        return this._extension.canChange;
-        let checkVersion = !this._settings.get_boolean('disable-extension-version-validation');
-
-        return !this._settings.get_boolean('disable-user-extensions') &&
-               !(checkVersion && ExtensionUtils.isOutOfDate(extension));
     }
 
-    _isEnabled() {
+    get prefsModule() {
-        let extensions = this._settings.get_strv('enabled-extensions');
+        if (!this._prefsModule) {
-        return extensions.indexOf(this.uuid) != -1;
+            ExtensionUtils.installImporter(this._extension);
-    }
 
-    _enable() {
+            // give extension prefs access to their own extension object
-        let extensions = this._settings.get_strv('enabled-extensions');
+            ExtensionUtils.getCurrentExtension = () => this._extension;
-        if (extensions.indexOf(this.uuid) != -1)
-            return;
 
-        extensions.push(this.uuid);
+            this._prefsModule = this._extension.imports.prefs;
-        this._settings.set_strv('enabled-extensions', extensions);
+            this._prefsModule.init(this._extension.metadata);
-    }
+        }
 
-    _disable() {
+        return this._prefsModule;
-        let extensions = this._settings.get_strv('enabled-extensions');
-        let pos = extensions.indexOf(this.uuid);
-        if (pos == -1)
-            return;
-        do {
-            extensions.splice(pos, 1);
-            pos = extensions.indexOf(this.uuid);
-        } while (pos != -1);
-        this._settings.set_strv('enabled-extensions', extensions);
     }
 });
 
@@ -611,12 +684,12 @@ function initEnvironment() {
     // Monkey-patch in a "global" object that fakes some Shell utilities
     // that ExtensionUtils depends on.
     window.global = {
-        log() {
+        log(...args) {
-            print([].join.call(arguments, ', '));
+            print(args.join(', '));
         },
 
         logError(s) {
-            log('ERROR: ' + s);
+            log(`ERROR: ${s}`);
         },
 
         userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])
@@ -631,6 +704,5 @@ function main(argv) {
     Gettext.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
     Gettext.textdomain(Config.GETTEXT_PACKAGE);
 
-    let app = new Application();
+    new Application().run(argv);
-    app.application.run(argv);
 }

js/gdm/authPrompt.js

@@ -1,21 +1,25 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported AuthPrompt */
 
-const { Clutter, Pango, Shell, St } = imports.gi;
+const { Clutter, GObject, 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 Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;
 
 var DEFAULT_BUTTON_WELL_ICON_SIZE = 16;
-var DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0;
+var DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1000;
-var DEFAULT_BUTTON_WELL_ANIMATION_TIME = 0.3;
+var DEFAULT_BUTTON_WELL_ANIMATION_TIME = 300;
 
-var MESSAGE_FADE_OUT_ANIMATION_TIME = 0.5;
+var MESSAGE_FADE_OUT_ANIMATION_TIME = 500;
+
+const WIGGLE_OFFSET = 6;
+const WIGGLE_DURATION = 65;
+const N_WIGGLES = 3;
 
 var AuthPromptMode = {
     UNLOCK_ONLY: 0,
@@ -34,8 +38,21 @@ var BeginRequestType = {
     DONT_PROVIDE_USERNAME: 1
 };
 
-var AuthPrompt = class {
+var AuthPrompt = GObject.registerClass({
-    constructor(gdmClient, mode) {
+    Signals: {
+        '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;
@@ -59,47 +76,42 @@ var AuthPrompt = class {
         this.smartcardDetected = this._userVerifier.smartcardDetected;
 
         this.connect('next', () => {
-                this.updateSensitivity(false);
+            this.updateSensitivity(false);
-                this.startSpinning();
+            this.startSpinning();
-                if (this._queryingService) {
+            if (this._queryingService) {
-                    this._userVerifier.answerQuery(this._queryingService, this._entry.text);
+                this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-                } else {
+            } else {
-                    this._preemptiveAnswer = this._entry.text;
+                this._preemptiveAnswer = this._entry.text;
-                }
+            }
-            });
+        });
 
-        this.actor = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
+        this.connect('destroy', this._onDestroy.bind(this));
-                                        vertical: true });
-        this.actor.connect('destroy', this._onDestroy.bind(this));
-        this.actor.connect('key-press-event', (actor, event) => {
-                if (event.get_key_symbol() == Clutter.KEY_Escape)
-                    this.cancel();
-                return Clutter.EVENT_PROPAGATE;
-            });
 
-        this._userWell = new St.Bin({ x_fill: true,
+        this._userWell = new St.Bin({ x_fill: true, x_align: St.Align.START });
-                                      x_align: St.Align.START });
+        this.add(this._userWell, {
-        this.actor.add(this._userWell,
+            x_align: St.Align.START,
-                       { x_align: St.Align.START,
+            x_fill: true,
-                         x_fill: true,
+            y_fill: true,
-                         y_fill: true,
+            expand: true
-                         expand: true });
+        });
         this._label = new St.Label({ style_class: 'login-dialog-prompt-label' });
 
-        this.actor.add(this._label,
+        this.add(this._label, {
-                       { expand: true,
+            expand: true,
-                         x_fill: false,
+            x_fill: false,
-                         y_fill: true,
+            y_fill: true,
-                         x_align: St.Align.START });
+            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.actor.add(this._entry,
+        this.add(this._entry, {
-                       { expand: true,
+            expand: true,
-                         x_fill: true,
+            x_fill: true,
-                         y_fill: false,
+            y_fill: false,
-                         x_align: St.Align.START });
+            x_align: St.Align.START
+        });
 
         this._entry.grab_key_focus();
 
@@ -107,14 +119,15 @@ var AuthPrompt = class {
                                        styleClass: 'login-dialog-message' });
         this._message.clutter_text.line_wrap = true;
         this._message.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this.actor.add(this._message, { x_fill: false, x_align: St.Align.START, y_align: St.Align.START });
+        this.add(this._message, { x_fill: false, x_align: St.Align.START, y_align: St.Align.START });
 
         this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
                                              vertical: false });
-        this.actor.add(this._buttonBox,
+        this.add(this._buttonBox, {
-                       { expand:  true,
+            expand: true,
-                         x_align: St.Align.MIDDLE,
+            x_align: St.Align.MIDDLE,
-                         y_align: St.Align.END });
+            y_align: St.Align.END
+        });
 
         this._defaultButtonWell = new St.Widget({ layout_manager: new Clutter.BinLayout() });
         this._defaultButtonWellActor = null;
@@ -122,9 +135,9 @@ var AuthPrompt = class {
         this._initButtons();
 
         this._spinner = new Animation.Spinner(DEFAULT_BUTTON_WELL_ICON_SIZE);
-        this._spinner.actor.opacity = 0;
+        this._spinner.opacity = 0;
-        this._spinner.actor.show();
+        this._spinner.show();
-        this._defaultButtonWell.add_child(this._spinner.actor);
+        this._defaultButtonWell.add_child(this._spinner);
     }
 
     _onDestroy() {
@@ -132,13 +145,19 @@ var AuthPrompt = class {
         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({ style_class: 'modal-dialog-button button',
                                             button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                             reactive: true,
                                             can_focus: true,
                                             label: _("Cancel") });
-        this.cancelButton.connect('clicked', () => { this.cancel(); });
+        this.cancelButton.connect('clicked', () => this.cancel());
         this._buttonBox.add(this.cancelButton,
                             { expand: false,
                               x_fill: false,
@@ -157,7 +176,7 @@ var AuthPrompt = class {
                                           reactive: true,
                                           can_focus: true,
                                           label: _("Next") });
-        this.nextButton.connect('clicked', () => { this.emit('next'); });
+        this.nextButton.connect('clicked', () => this.emit('next'));
         this.nextButton.add_style_pseudo_class('default');
         this._buttonBox.add(this.nextButton,
                             { expand: false,
@@ -242,6 +261,12 @@ var AuthPrompt = class {
         this.updateSensitivity(canRetry);
         this.setActorInDefaultButtonWell(null);
         this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
+
+        Util.wiggle(this._entry, {
+            offset: WIGGLE_OFFSET,
+            duration: WIGGLE_DURATION,
+            wiggleCount: N_WIGGLES,
+        });
     }
 
     _onVerificationComplete() {
@@ -267,16 +292,16 @@ var AuthPrompt = class {
         let oldActor = this._defaultButtonWellActor;
 
         if (oldActor)
-            Tweener.removeTweens(oldActor);
+            oldActor.remove_all_transitions();
 
         let wasSpinner;
-        if (oldActor == this._spinner.actor)
+        if (oldActor == this._spinner)
             wasSpinner = true;
         else
             wasSpinner = false;
 
         let isSpinner;
-        if (actor == this._spinner.actor)
+        if (actor == this._spinner)
             isSpinner = true;
         else
             isSpinner = false;
@@ -290,19 +315,18 @@ var AuthPrompt = class {
                         this._spinner.stop();
                 }
             } else {
-                Tweener.addTween(oldActor,
+                oldActor.ease({
-                                 { opacity: 0,
+                    opacity: 0,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
+                    duration: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
+                    delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear',
+                    mode: Clutter.AnimationMode.LINEAR,
-                                   onCompleteScope: this,
+                    onComplete: () => {
-                                   onComplete() {
+                        if (wasSpinner) {
-                                      if (wasSpinner) {
+                            if (this._spinner)
-                                          if (this._spinner)
+                                this._spinner.stop();
-                                              this._spinner.stop();
+                        }
-                                      }
+                    }
-                                   }
+                });
-                                 });
             }
         }
 
@@ -313,18 +337,19 @@ var AuthPrompt = class {
             if (!animate)
                 actor.opacity = 255;
             else
-                Tweener.addTween(actor,
+                actor.ease({
-                                 { opacity: 255,
+                    opacity: 255,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
+                    duration: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
+                    delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear' });
+                    mode: Clutter.AnimationMode.LINEAR
+                });
         }
 
         this._defaultButtonWellActor = actor;
     }
 
     startSpinning() {
-        this.setActorInDefaultButtonWell(this._spinner.actor, true);
+        this.setActorInDefaultButtonWell(this._spinner, true);
     }
 
     stopSpinning() {
@@ -366,12 +391,12 @@ var AuthPrompt = class {
     _fadeOutMessage() {
         if (this._message.opacity == 0)
             return;
-        Tweener.removeTweens(this._message);
+        this._message.remove_all_transitions();
-        Tweener.addTween(this._message,
+        this._message.ease({
-                         { opacity: 0,
+            opacity: 0,
-                           time: MESSAGE_FADE_OUT_ANIMATION_TIME,
+            duration: MESSAGE_FADE_OUT_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
-                         });
+        });
     }
 
     setMessage(message, type) {
@@ -386,7 +411,7 @@ var AuthPrompt = class {
             this._message.remove_style_class_name('login-dialog-message-hint');
 
         if (message) {
-            Tweener.removeTweens(this._message);
+            this._message.remove_all_transitions();
             this._message.text = message;
             this._message.opacity = 255;
         } else {
@@ -405,9 +430,9 @@ var AuthPrompt = class {
         this._entry.clutter_text.editable = sensitive;
     }
 
-    hide() {
+    vfunc_hide() {
         this.setActorInDefaultButtonWell(null, true);
-        this.actor.hide();
+        super.vfunc_hide();
         this._message.opacity = 0;
 
         this.setUser(null);
@@ -423,7 +448,7 @@ var AuthPrompt = class {
 
         if (user) {
             let userWidget = new UserWidget.UserWidget(user);
-            this._userWell.set_child(userWidget.actor);
+            this._userWell.set_child(userWidget);
         }
     }
 
@@ -508,5 +533,4 @@ var AuthPrompt = class {
         this.reset();
         this.emit('cancelled');
     }
-};
+});
-Signals.addSignalMethods(AuthPrompt.prototype);

js/gdm/batch.js

@@ -20,7 +20,7 @@
  * In order for transformation animations to look good, they need to be
  * incremental and have some order to them (e.g., fade out hidden items,
  * then shrink to close the void left over). Chaining animations in this way can
- * be error-prone and wordy using just Tweener callbacks.
+ * be error-prone and wordy using just ease() callbacks.
  *
  * The classes in this file help with this:
  *
@@ -44,6 +44,7 @@
  * replaced by something else.
  */
 
+const { GObject } = imports.gi;
 const Signals = imports.signals;
 
 var Task = class {
@@ -124,7 +125,7 @@ var Batch = class extends Task {
     }
 
     process() {
-        throw new Error('Not implemented');
+        throw new GObject.NotImplementedError(`process in ${this.constructor.name}`);
     }
 
     runTask() {
@@ -176,36 +177,35 @@ Signals.addSignalMethods(Batch.prototype);
 
 var ConcurrentBatch = class extends Batch {
     process() {
-       let hold = this.runTask();
+        let hold = this.runTask();
 
-       if (hold) {
+        if (hold) {
-           this.hold.acquireUntilAfter(hold);
+            this.hold.acquireUntilAfter(hold);
-       }
+        }
 
-       // Regardless of the state of the just run task,
+        // Regardless of the state of the just run task,
-       // fire off the next one, so all the tasks can run
+        // fire off the next one, so all the tasks can run
-       // concurrently.
+        // concurrently.
-       this.nextTask();
+        this.nextTask();
     }
 };
 Signals.addSignalMethods(ConcurrentBatch.prototype);
 
 var ConsecutiveBatch = class extends Batch {
     process() {
-       let hold = this.runTask();
+        let hold = this.runTask();
 
-       if (hold && hold.isAcquired()) {
+        if (hold && hold.isAcquired()) {
-           // This task is inhibiting the batch. Wait on it
+            // This task is inhibiting the batch. Wait on it
-           // before processing the next one.
+            // before processing the next one.
-           let signalId = hold.connect('release', () => {
+            let signalId = hold.connect('release', () => {
-               hold.disconnect(signalId);
+                hold.disconnect(signalId);
-               this.nextTask();
+                this.nextTask();
-           });
+            });
-           return;
+        } else {
-       } else {
+            // This task finished, process the next one
-           // This task finished, process the next one
+            this.nextTask();
-           this.nextTask();
+        }
-       }
     }
 };
 Signals.addSignalMethods(ConsecutiveBatch.prototype);

js/gdm/fingerprint.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported FprintManager */
 
 const Gio = imports.gi.Gio;
 
@@ -23,8 +24,8 @@ function FprintManager() {
 
     try {
         self.init(null);
-    } catch(e) {
+    } catch (e) {
-        log('Failed to connect to Fprint service: ' + e.message);
+        log(`Failed to connect to Fprint service: ${e.message}`);
         return null;
     }
 

js/gdm/loginDialog.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported LoginDialog */
 /*
  * Copyright 2011 Red Hat, Inc
  *
@@ -18,7 +19,6 @@
 
 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;
@@ -30,81 +30,88 @@ const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const Realmd = imports.gdm.realmd;
-const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;
 
-const _FADE_ANIMATION_TIME = 0.25;
+const _FADE_ANIMATION_TIME = 250;
-const _SCROLL_ANIMATION_TIME = 0.5;
+const _SCROLL_ANIMATION_TIME = 500;
 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
 const _LOGO_ICON_HEIGHT = 48;
 const _MAX_BOTTOM_MENU_ITEMS = 5;
 
-var UserListItem = class {
+var UserListItem = GObject.registerClass({
-    constructor(user) {
+    GTypeName: 'LoginDialog_UserListItem',
+    Signals: { 'activate': {} }
+}, class UserListItem extends St.Button {
+    _init(user) {
+        let layout = new St.BoxLayout({ vertical: true });
+        super._init({
+            style_class: 'login-dialog-user-list-item',
+            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+            can_focus: true,
+            child: layout,
+            reactive: true,
+            x_align: St.Align.START,
+            x_fill: true
+        });
+
         this.user = user;
         this._userChangedId = this.user.connect('changed',
-                                                 this._onUserChanged.bind(this));
+                                                this._onUserChanged.bind(this));
 
-        let layout = new St.BoxLayout({ vertical: true });
+        this.connect('destroy', this._onDestroy.bind(this));
-        this.actor = new St.Button({ style_class: 'login-dialog-user-list-item',
+        this.connect('notify::hover', () => {
-                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+            this._setSelected(this.hover);
-                                     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.actor);
+        layout.add(this._userWidget);
 
-        this._userWidget.actor.bind_property('label-actor', this.actor, 'label-actor',
+        this._userWidget.bind_property('label-actor', this, '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.actor.add_style_pseudo_class('logged-in');
+            this.add_style_pseudo_class('logged-in');
         else
-            this.actor.remove_style_pseudo_class('logged-in');
+            this.remove_style_pseudo_class('logged-in');
     }
 
     _onDestroy() {
         this.user.disconnect(this._userChangedId);
     }
 
-    _onClicked() {
+    vfunc_clicked() {
         this.emit('activate');
     }
 
     _setSelected(selected) {
         if (selected) {
-            this.actor.add_style_pseudo_class('selected');
+            this.add_style_pseudo_class('selected');
-            this.actor.grab_key_focus();
+            this.grab_key_focus();
         } else {
-            this.actor.remove_style_pseudo_class('selected');
+            this.remove_style_pseudo_class('selected');
         }
     }
 
@@ -145,23 +152,30 @@ var UserListItem = class {
         this._timedLoginIndicator.visible = false;
         this._timedLoginIndicator.scale_x = 0.;
     }
-};
+});
-Signals.addSignalMethods(UserListItem.prototype);
 
-var UserList = class {
+var UserList = GObject.registerClass({
-    constructor() {
+    GTypeName: 'LoginDialog_UserList',
-        this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view'});
+    Signals: {
-        this.actor.set_policy(St.PolicyType.NEVER,
+        'activate': { param_types: [UserListItem.$gtype] },
-                              St.PolicyType.AUTOMATIC);
+        'item-added': { param_types: [UserListItem.$gtype] },
+    }
+}, class UserList extends St.ScrollView {
+    _init() {
+        super._init({ style_class: 'login-dialog-user-list-view' });
+        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.actor.add_actor(this._box);
+        this.add_actor(this._box);
         this._items = {};
+    }
 
-        this.actor.connect('key-focus-in', this._moveFocusToItems.bind(this));
+    vfunc_key_focus_in() {
+        this._moveFocusToItems();
     }
 
     _moveFocusToItems() {
@@ -170,10 +184,10 @@ var UserList = class {
         if (!hasItems)
             return;
 
-        if (global.stage.get_key_focus() != this.actor)
+        if (global.stage.get_key_focus() != this)
             return;
 
-        let focusSet = this.actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
+        let focusSet = this.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
         if (!focusSet) {
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
                 this._moveFocusToItems();
@@ -187,8 +201,6 @@ var UserList = class {
     }
 
     updateStyle(isExpanded) {
-        let tasks = [];
-
         if (isExpanded)
             this._box.add_style_pseudo_class('expanded');
         else
@@ -196,27 +208,26 @@ var UserList = class {
 
         for (let userName in this._items) {
             let item = this._items[userName];
-            item.actor.sync_hover();
+            item.sync_hover();
         }
     }
 
     scrollToItem(item) {
-        let box = item.actor.get_allocation_box();
+        let box = item.get_allocation_box();
 
-        let adjustment = this.actor.get_vscroll_bar().get_adjustment();
+        let adjustment = this.get_vscroll_bar().get_adjustment();
 
         let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
-        Tweener.removeTweens(adjustment);
+        adjustment.ease(value, {
-        Tweener.addTween (adjustment,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                          { value: value,
+            duration: _SCROLL_ANIMATION_TIME
-                            time: _SCROLL_ANIMATION_TIME,
+        });
-                            transition: 'easeOutQuad' });
     }
 
     jumpToItem(item) {
-        let box = item.actor.get_allocation_box();
+        let box = item.get_allocation_box();
 
-        let adjustment = this.actor.get_vscroll_bar().get_adjustment();
+        let adjustment = this.get_vscroll_bar().get_adjustment();
 
         let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
 
@@ -244,7 +255,7 @@ var UserList = class {
             return;
 
         if (user.locked)
-           return;
+            return;
 
         let userName = user.get_user_name();
 
@@ -254,14 +265,14 @@ var UserList = class {
         this.removeUser(user);
 
         let item = new UserListItem(user);
-        this._box.add(item.actor, { x_fill: true });
+        this._box.add(item, { x_fill: true });
 
         this._items[userName] = item;
 
         item.connect('activate', this._onItemActivated.bind(this));
 
         // Try to keep the focused item front-and-center
-        item.actor.connect('key-focus-in', () => { this.scrollToItem(item); });
+        item.connect('key-focus-in', () => this.scrollToItem(item));
 
         this._moveFocusToItems();
 
@@ -282,33 +293,38 @@ var UserList = class {
         if (!item)
             return;
 
-        item.actor.destroy();
+        item.destroy();
         delete this._items[userName];
     }
 
     numItems() {
         return Object.keys(this._items).length;
     }
-};
+});
-Signals.addSignalMethods(UserList.prototype);
 
-var SessionMenuButton = class {
+var SessionMenuButton = GObject.registerClass({
-    constructor() {
+    GTypeName: 'LoginDialog_SessionMenuButton',
+    Signals: { 'session-activated': { param_types: [GObject.TYPE_STRING] } }
+}, class SessionMenuButton extends St.Bin {
+    _init() {
         let gearIcon = new St.Icon({ icon_name: 'emblem-system-symbolic' });
-        this._button = new St.Button({ style_class: 'login-dialog-session-list-button',
+        let button = new St.Button({
-                                       reactive: true,
+            style_class: 'login-dialog-session-list-button',
-                                       track_hover: true,
+            reactive: true,
-                                       can_focus: true,
+            track_hover: true,
-                                       accessible_name: _("Choose Session"),
+            can_focus: true,
-                                       accessible_role: Atk.Role.MENU,
+            accessible_name: _("Choose Session"),
-                                       child: gearIcon });
+            accessible_role: Atk.Role.MENU,
+            child: gearIcon
+        });
 
-        this.actor = new St.Bin({ child: this._button });
+        super._init({ child: button });
+        this._button = button;
 
         let side = St.Side.TOP;
         let align = 0;
         if (Gdm.get_session_ids().length > _MAX_BOTTOM_MENU_ITEMS) {
-            if (this.actor.text_direction == Clutter.TextDirection.RTL)
+            if (this.text_direction == Clutter.TextDirection.RTL)
                 side = St.Side.RIGHT;
             else
                 side = St.Side.LEFT;
@@ -319,17 +335,17 @@ var SessionMenuButton = class {
         this._menu.actor.hide();
 
         this._menu.connect('open-state-changed', (menu, isOpen) => {
-             if (isOpen)
+            if (isOpen)
-                 this._button.add_style_pseudo_class('active');
+                this._button.add_style_pseudo_class('active');
-             else
+            else
-                 this._button.remove_style_pseudo_class('active');
+                this._button.remove_style_pseudo_class('active');
         });
 
-        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button },
+        this._manager = new PopupMenu.PopupMenuManager(this._button,
                                                        { actionMode: Shell.ActionMode.NONE });
         this._manager.addMenu(this._menu);
 
-        this._button.connect('clicked', () => { this._menu.toggle(); });
+        this._button.connect('clicked', () => this._menu.toggle());
 
         this._items = {};
         this._activeSessionId = null;
@@ -353,11 +369,11 @@ var SessionMenuButton = class {
     }
 
     setActiveSession(sessionId) {
-         if (sessionId == this._activeSessionId)
+        if (sessionId == this._activeSessionId)
-             return;
+            return;
 
-         this._activeSessionId = sessionId;
+        this._activeSessionId = sessionId;
-         this._updateOrnament();
+        this._updateOrnament();
     }
 
     close() {
@@ -374,7 +390,7 @@ var SessionMenuButton = class {
         }
 
         for (let i = 0; i < ids.length; i++) {
-            let [sessionName, sessionDescription] = Gdm.get_session_name_and_description(ids[i]);
+            let [sessionName, sessionDescription_] = Gdm.get_session_name_and_description(ids[i]);
 
             let id = ids[i];
             let item = new PopupMenu.PopupMenuItem(sessionName);
@@ -387,15 +403,13 @@ var SessionMenuButton = class {
             });
         }
     }
-};
+});
-Signals.addSignalMethods(SessionMenuButton.prototype);
 
 var LoginDialog = GObject.registerClass({
     Signals: { 'failed': {} },
 }, class LoginDialog extends St.Widget {
     _init(parentActor) {
-        super._init({ style_class: 'login-dialog',
+        super._init({ style_class: 'login-dialog', visible: false });
-                      visible: false });
 
         this.get_accessible().set_role(Atk.Role.WINDOW);
 
@@ -403,18 +417,18 @@ var LoginDialog = GObject.registerClass({
         this.connect('destroy', this._onDestroy.bind(this));
         parentActor.add_child(this);
 
-        this._userManager = AccountsService.UserManager.get_default()
+        this._userManager = AccountsService.UserManager.get_default();
         this._gdmClient = new Gdm.Client();
 
         this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA });
 
-        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
+        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_KEY}`,
                                this._updateBanner.bind(this));
-        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,
+        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_TEXT_KEY}`,
                                this._updateBanner.bind(this));
-        this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,
+        this._settings.connect(`changed::${GdmUtil.DISABLE_USER_LIST_KEY}`,
                                this._updateDisableUserList.bind(this));
-        this._settings.connect('changed::' + GdmUtil.LOGO_KEY,
+        this._settings.connect(`changed::${GdmUtil.LOGO_KEY}`,
                                this._updateLogo.bind(this));
 
         this._textureCache = St.TextureCache.get_default();
@@ -429,7 +443,7 @@ var LoginDialog = GObject.registerClass({
         this.add_child(this._userSelectionBox);
 
         this._userList = new UserList();
-        this._userSelectionBox.add(this._userList.actor,
+        this._userSelectionBox.add(this._userList,
                                    { expand: true,
                                      x_fill: true,
                                      y_fill: true });
@@ -438,7 +452,7 @@ var LoginDialog = GObject.registerClass({
         this._authPrompt.connect('prompted', this._onPrompted.bind(this));
         this._authPrompt.connect('reset', this._onReset.bind(this));
         this._authPrompt.hide();
-        this.add_child(this._authPrompt.actor);
+        this.add_child(this._authPrompt);
 
         // translators: this message is shown below the user list on the
         // login screen. It can be activated to reveal an entry for
@@ -497,9 +511,9 @@ var LoginDialog = GObject.registerClass({
             (list, sessionId) => {
                 this._greeter.call_select_session_sync (sessionId, null);
             });
-        this._sessionMenuButton.actor.opacity = 0;
+        this._sessionMenuButton.opacity = 0;
-        this._sessionMenuButton.actor.show();
+        this._sessionMenuButton.show();
-        this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton.actor);
+        this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton);
 
         this._disableUserList = undefined;
         this._userListLoaded = false;
@@ -520,7 +534,7 @@ var LoginDialog = GObject.registerClass({
     _getBannerAllocation(dialogBox) {
         let actorBox = new Clutter.ActorBox();
 
-        let [minWidth, minHeight, natWidth, natHeight] = this._bannerView.get_preferred_size();
+        let [, , natWidth, natHeight] = this._bannerView.get_preferred_size();
         let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
 
         actorBox.x1 = Math.floor(centerX - natWidth / 2);
@@ -534,7 +548,7 @@ var LoginDialog = GObject.registerClass({
     _getLogoBinAllocation(dialogBox) {
         let actorBox = new Clutter.ActorBox();
 
-        let [minWidth, minHeight, natWidth, natHeight] = this._logoBin.get_preferred_size();
+        let [, , natWidth, natHeight] = this._logoBin.get_preferred_size();
         let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
 
         actorBox.x1 = Math.floor(centerX - natWidth / 2);
@@ -548,7 +562,7 @@ var LoginDialog = GObject.registerClass({
     _getCenterActorAllocation(dialogBox, actor) {
         let actorBox = new Clutter.ActorBox();
 
-        let [minWidth, minHeight, natWidth, natHeight] = actor.get_preferred_size();
+        let [, , natWidth, natHeight] = actor.get_preferred_size();
         let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
         let centerY = dialogBox.y1 + (dialogBox.y2 - dialogBox.y1) / 2;
 
@@ -575,19 +589,15 @@ var LoginDialog = GObject.registerClass({
         // First find out what space the children require
         let bannerAllocation = null;
         let bannerHeight = 0;
-        let bannerWidth = 0;
         if (this._bannerView.visible) {
             bannerAllocation = this._getBannerAllocation(dialogBox, this._bannerView);
             bannerHeight = bannerAllocation.y2 - bannerAllocation.y1;
-            bannerWidth = bannerAllocation.x2 - bannerAllocation.x1;
         }
 
         let authPromptAllocation = null;
-        let authPromptHeight = 0;
         let authPromptWidth = 0;
-        if (this._authPrompt.actor.visible) {
+        if (this._authPrompt.visible) {
-            authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);
+            authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt);
-            authPromptHeight = authPromptAllocation.y2 - authPromptAllocation.y1;
             authPromptWidth = authPromptAllocation.x2 - authPromptAllocation.x1;
         }
 
@@ -619,64 +629,64 @@ var LoginDialog = GObject.registerClass({
             let leftOverYSpace = bannerSpace - bannerHeight;
 
             if (leftOverYSpace > 0) {
-                 // First figure out how much left over space is up top
+                // First figure out how much left over space is up top
-                 let leftOverTopSpace = leftOverYSpace / 2;
+                let leftOverTopSpace = leftOverYSpace / 2;
 
-                 // Then, shift the banner into the middle of that extra space
+                // Then, shift the banner into the middle of that extra space
-                 let yShift = Math.floor(leftOverTopSpace / 2);
+                let yShift = Math.floor(leftOverTopSpace / 2);
 
-                 bannerAllocation.y1 += yShift;
+                bannerAllocation.y1 += yShift;
-                 bannerAllocation.y2 += yShift;
+                bannerAllocation.y2 += yShift;
             } else {
-                 // Then figure out how much space there would be if we switched to a
+                // Then figure out how much space there would be if we switched to a
-                 // wide layout with banner on one side and authprompt on the other.
+                // wide layout with banner on one side and authprompt on the other.
-                 let leftOverXSpace = dialogWidth - authPromptWidth;
+                let leftOverXSpace = dialogWidth - authPromptWidth;
 
-                 // In a wide view, half of the available space goes to the banner,
+                // In a wide view, half of the available space goes to the banner,
-                 // and the other half goes to the margins.
+                // and the other half goes to the margins.
-                 let wideBannerWidth = leftOverXSpace / 2;
+                let wideBannerWidth = leftOverXSpace / 2;
-                 let wideSpacing  = leftOverXSpace - wideBannerWidth;
+                let wideSpacing  = leftOverXSpace - wideBannerWidth;
 
-                 // If we do go with a wide layout, we need there to be at least enough
+                // If we do go with a wide layout, we need there to be at least enough
-                 // space for the banner and the auth prompt to be the same width,
+                // space for the banner and the auth prompt to be the same width,
-                 // so it doesn't look unbalanced.
+                // so it doesn't look unbalanced.
-                 if (authPromptWidth > 0 && wideBannerWidth > authPromptWidth) {
+                if (authPromptWidth > 0 && wideBannerWidth > authPromptWidth) {
-                     let centerX = dialogBox.x1 + dialogWidth / 2;
+                    let centerX = dialogBox.x1 + dialogWidth / 2;
-                     let centerY = dialogBox.y1 + dialogHeight / 2;
+                    let centerY = dialogBox.y1 + dialogHeight / 2;
 
-                     // A small portion of the spacing goes down the center of the
+                    // A small portion of the spacing goes down the center of the
-                     // screen to help delimit the two columns of the wide view
+                    // screen to help delimit the two columns of the wide view
-                     let centerGap = wideSpacing / 8;
+                    let centerGap = wideSpacing / 8;
 
-                     // place the banner along the left edge of the center margin
+                    // place the banner along the left edge of the center margin
-                     bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);
+                    bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);
-                     bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);
+                    bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);
 
-                     // figure out how tall it would like to be and try to accomodate
+                    // figure out how tall it would like to be and try to accommodate
-                     // but don't let it get too close to the logo
+                    // but don't let it get too close to the logo
-                     let [wideMinHeight, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);
+                    let [, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);
 
-                     let maxWideHeight = dialogHeight - 3 * logoHeight;
+                    let maxWideHeight = dialogHeight - 3 * logoHeight;
-                     wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);
+                    wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);
-                     bannerAllocation.y1 = Math.floor(centerY - wideBannerHeight / 2);
+                    bannerAllocation.y1 = Math.floor(centerY - wideBannerHeight / 2);
-                     bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;
+                    bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;
 
-                     // place the auth prompt along the right edge of the center margin
+                    // place the auth prompt along the right edge of the center margin
-                     authPromptAllocation.x1 = Math.floor(centerX + centerGap / 2);
+                    authPromptAllocation.x1 = Math.floor(centerX + centerGap / 2);
-                     authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;
+                    authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;
-                 } else {
+                } else {
-                     // If we aren't going to do a wide view, then we need to limit
+                    // If we aren't going to do a wide view, then we need to limit
-                     // the height of the banner so it will present scrollbars
+                    // the height of the banner so it will present scrollbars
 
-                     // First figure out how much space there is without the banner
+                    // First figure out how much space there is without the banner
-                     leftOverYSpace += bannerHeight;
+                    leftOverYSpace += bannerHeight;
 
-                     // Then figure out how much of that space is up top
+                    // Then figure out how much of that space is up top
-                     let availableTopSpace = Math.floor(leftOverYSpace / 2);
+                    let availableTopSpace = Math.floor(leftOverYSpace / 2);
 
-                     // Then give all of that space to the banner
+                    // Then give all of that space to the banner
-                     bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;
+                    bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;
-                 }
+                }
             }
         } else if (userSelectionAllocation) {
             // Grow the user list to fill the space
@@ -697,7 +707,7 @@ var LoginDialog = GObject.registerClass({
         }
 
         if (authPromptAllocation)
-            this._authPrompt.actor.allocate(authPromptAllocation, flags);
+            this._authPrompt.allocate(authPromptAllocation, flags);
 
         if (userSelectionAllocation)
             this._userSelectionBox.allocate(userSelectionAllocation, flags);
@@ -764,14 +774,15 @@ var LoginDialog = GObject.registerClass({
 
     _fadeInBannerView() {
         this._bannerView.show();
-        Tweener.addTween(this._bannerView,
+        this._bannerView.ease({
-                         { opacity: 255,
+            opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
+            duration: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad' });
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
     }
 
     _hideBannerView() {
-        Tweener.removeTweens(this._bannerView);
+        this._bannerView.remove_all_transitions();
         this._bannerView.opacity = 0;
         this._bannerView.hide();
     }
@@ -800,7 +811,7 @@ var LoginDialog = GObject.registerClass({
     _onPrompted() {
         if (this._shouldShowSessionMenuButton()) {
             this._sessionMenuButton.updateSensitivity(true);
-            this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton.actor);
+            this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton);
         } else {
             this._sessionMenuButton.updateSensitivity(false);
         }
@@ -851,23 +862,24 @@ var LoginDialog = GObject.registerClass({
     _shouldShowSessionMenuButton() {
         if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFYING &&
             this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_FAILED)
-          return false;
+            return false;
 
         if (this._user && this._user.is_loaded && this._user.is_logged_in())
-          return false;
+            return false;
 
         return true;
     }
 
     _showPrompt() {
-        if (this._authPrompt.actor.visible)
+        if (this._authPrompt.visible)
             return;
-        this._authPrompt.actor.opacity = 0;
+        this._authPrompt.opacity = 0;
-        this._authPrompt.actor.show();
+        this._authPrompt.show();
-        Tweener.addTween(this._authPrompt.actor,
+        this._authPrompt.ease({
-                         { opacity: 255,
+            opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
+            duration: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad' });
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
         this._fadeInBannerView();
     }
 
@@ -911,28 +923,31 @@ var LoginDialog = GObject.registerClass({
         this._showPrompt();
     }
 
+    _bindOpacity() {
+        this._bindings = Main.layoutManager.uiGroup.get_children()
+            .filter(c => c != Main.layoutManager.screenShieldGroup)
+            .map(c => this.bind_property('opacity', c, 'opacity', 0));
+    }
+
+    _unbindOpacity() {
+        this._bindings.forEach(b => b.unbind());
+    }
+
     _loginScreenSessionActivated() {
         if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
             return;
 
-        Tweener.addTween(this,
+        this._bindOpacity();
-                         { opacity: 255,
+        this.ease({
-                           time: _FADE_ANIMATION_TIME,
+            opacity: 255,
-                           transition: 'easeOutQuad',
+            duration: _FADE_ANIMATION_TIME,
-                           onUpdate() {
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                               let children = Main.layoutManager.uiGroup.get_children();
+            onComplete: () => {
-
+                if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-                               for (let i = 0; i < children.length; i++) {
+                    this._authPrompt.reset();
-                                   if (children[i] != Main.layoutManager.screenShieldGroup)
+                this._unbindOpacity();
-                                       children[i].opacity = this.opacity;
+            }
-                               }
+        });
-                           },
-                           onUpdateScope: this,
-                           onComplete() {
-                               if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-                                   this._authPrompt.reset();
-                           },
-                           onCompleteScope: this });
     }
 
     _gotGreeterSessionProxy(proxy) {
@@ -945,34 +960,27 @@ var LoginDialog = GObject.registerClass({
     }
 
     _startSession(serviceName) {
-        Tweener.addTween(this,
+        this._bindOpacity();
-                         { opacity: 0,
+        this.ease({
-                           time: _FADE_ANIMATION_TIME,
+            opacity: 0,
-                           transition: 'easeOutQuad',
+            duration: _FADE_ANIMATION_TIME,
-                           onUpdate() {
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                               let children = Main.layoutManager.uiGroup.get_children();
+            onComplete: () => {
-
+                this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
-                               for (let i = 0; i < children.length; i++) {
+                this._unbindOpacity();
-                                   if (children[i] != Main.layoutManager.screenShieldGroup)
+            }
-                                       children[i].opacity = this.opacity;
+        });
-                               }
-                           },
-                           onUpdateScope: this,
-                           onComplete() {
-                               this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
-                           },
-                           onCompleteScope: this });
     }
 
     _onSessionOpened(client, serviceName) {
-        this._authPrompt.finish(() => { this._startSession(serviceName); });
+        this._authPrompt.finish(() => this._startSession(serviceName));
     }
 
     _waitForItemForUser(userName) {
         let item = this._userList.getItemFromUserName(userName);
 
         if (item)
-          return null;
+            return null;
 
         let hold = new Batch.Hold();
         let signalId = this._userList.connect('item-added',
@@ -983,7 +991,7 @@ var LoginDialog = GObject.registerClass({
                     hold.release();
             });
 
-        hold.connect('release', () => { this._userList.disconnect(signalId); });
+        hold.connect('release', () => this._userList.disconnect(signalId));
 
         return hold;
     }
@@ -1047,18 +1055,19 @@ var LoginDialog = GObject.registerClass({
                              return this._blockTimedLoginUntilIdle();
                          } else {
                              animationTime = delay;
+                             return null;
                          }
                      },
 
                      () => {
                          // If idle timeout is done, make sure the timed login indicator is shown
                          if (delay > _TIMED_LOGIN_IDLE_THRESHOLD &&
-                             this._authPrompt.actor.visible)
+                             this._authPrompt.visible)
                              this._authPrompt.cancel();
 
                          if (delay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) {
                              this._userList.scrollToItem(loginItem);
-                             loginItem.actor.grab_key_focus();
+                             loginItem.grab_key_focus();
                          }
                      },
 
@@ -1082,12 +1091,12 @@ var LoginDialog = GObject.registerClass({
 
         // Restart timed login on user interaction
         global.stage.connect('captured-event', (actor, event) => {
-           if (event.type() == Clutter.EventType.KEY_PRESS ||
+            if (event.type() == Clutter.EventType.KEY_PRESS ||
                event.type() == Clutter.EventType.BUTTON_PRESS) {
-               this._startTimedLogin(userName, seconds);
+                this._startTimedLogin(userName, seconds);
-           }
+            }
 
-           return Clutter.EVENT_PROPAGATE;
+            return Clutter.EVENT_PROPAGATE;
         });
     }
 
@@ -1119,7 +1128,7 @@ var LoginDialog = GObject.registerClass({
         this._sessionMenuButton.close();
         this._setUserListExpanded(true);
         this._notListedButton.show();
-        this._userList.actor.grab_key_focus();
+        this._userList.grab_key_focus();
     }
 
     _beginVerificationForItem(item) {
@@ -1227,16 +1236,17 @@ var LoginDialog = GObject.registerClass({
                                         _("Login Window"),
                                         'dialog-password-symbolic',
                                         { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
-        this._userList.actor.grab_key_focus();
+        this._userList.grab_key_focus();
         this.show();
         this.opacity = 0;
 
         Main.pushModal(this, { actionMode: Shell.ActionMode.LOGIN_SCREEN });
 
-        Tweener.addTween(this,
+        this.ease({
-                         { opacity: 255,
+            opacity: 255,
-                           time: 1,
+            duration: 1000,
-                           transition: 'easeInQuad' });
+            mode: Clutter.AnimationMode.EASE_IN_QUAD
+        });
 
         return true;
     }
@@ -1250,7 +1260,7 @@ var LoginDialog = GObject.registerClass({
         this._authPrompt.cancel();
     }
 
-    addCharacter(unichar) {
+    addCharacter(_unichar) {
         // Don't allow type ahead at the login screen
     }
 

js/gdm/oVirt.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getOVirtCredentialsManager */
 
 const Gio = imports.gi.Gio;
 const Signals = imports.signals;

js/gdm/realmd.js

@@ -15,12 +15,13 @@ const RealmIface = loadInterfaceXML("org.freedesktop.realmd.Realm");
 const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);
 
 var Manager = class {
-    constructor(parentActor) {
+    constructor() {
         this._aggregateProvider = Provider(Gio.DBus.system,
                                            'org.freedesktop.realmd',
                                            '/org/freedesktop/realmd',
-                                           this._reloadRealms.bind(this))
+                                           this._reloadRealms.bind(this));
         this._realms = {};
+        this._loginFormat = null;
 
         this._signalId = this._aggregateProvider.connect('g-properties-changed',
             (proxy, properties) => {
@@ -36,10 +37,10 @@ var Manager = class {
             return;
 
         for (let i = 0; i < realmPaths.length; i++) {
-            let realm = Realm(Gio.DBus.system,
+            Realm(Gio.DBus.system,
-                              'org.freedesktop.realmd',
+                  'org.freedesktop.realmd',
-                              realmPaths[i],
+                  realmPaths[i],
-                              this._onRealmLoaded.bind(this));
+                  this._onRealmLoaded.bind(this));
         }
     }
 
@@ -86,7 +87,7 @@ var Manager = class {
     }
 
     get loginFormat() {
-        if (this._loginFormat !== undefined)
+        if (this._loginFormat)
             return this._loginFormat;
 
         this._updateLoginFormat();
@@ -98,10 +99,10 @@ var Manager = class {
         Service(Gio.DBus.system,
                 'org.freedesktop.realmd',
                 '/org/freedesktop/realmd',
-                service => { service.ReleaseRemote(); });
+                service => service.ReleaseRemote());
         this._aggregateProvider.disconnect(this._signalId);
         this._realms = { };
         this._updateLoginFormat();
     }
 };
-Signals.addSignalMethods(Manager.prototype)
+Signals.addSignalMethods(Manager.prototype);

js/gdm/util.js

@@ -1,4 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported BANNER_MESSAGE_KEY, BANNER_MESSAGE_TEXT_KEY, LOGO_KEY,
+            DISABLE_USER_LIST_KEY, fadeInActor, fadeOutActor, cloneAndFadeOutActor */
 
 const { Clutter, Gio, GLib } = imports.gi;
 const Signals = imports.signals;
@@ -9,14 +11,13 @@ const OVirt = imports.gdm.oVirt;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const SmartcardManager = imports.misc.smartcardManager;
-const Tweener = imports.ui.tweener;
 
 var PASSWORD_SERVICE_NAME = 'gdm-password';
 var FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
 var SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
 var OVIRT_SERVICE_NAME = 'gdm-ovirtcred';
-var FADE_ANIMATION_TIME = 0.16;
+var FADE_ANIMATION_TIME = 160;
-var CLONE_FADE_ANIMATION_TIME = 0.25;
+var CLONE_FADE_ANIMATION_TIME = 250;
 
 var LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
 var PASSWORD_AUTHENTICATION_KEY = 'enable-password-authentication';
@@ -30,7 +31,7 @@ var LOGO_KEY = 'logo';
 var DISABLE_USER_LIST_KEY = 'disable-user-list';
 
 // Give user 48ms to read each character of a PAM message
-var USER_READ_TIME = 48
+var USER_READ_TIME = 48;
 
 var MessageType = {
     NONE: 0,
@@ -45,20 +46,20 @@ function fadeInActor(actor) {
 
     let hold = new Batch.Hold();
     actor.show();
-    let [minHeight, naturalHeight] = actor.get_preferred_height(-1);
+    let [, naturalHeight] = actor.get_preferred_height(-1);
 
     actor.opacity = 0;
     actor.set_height(0);
-    Tweener.addTween(actor,
+    actor.ease({
-                     { opacity: 255,
+        opacity: 255,
-                       height: naturalHeight,
+        height: naturalHeight,
-                       time: FADE_ANIMATION_TIME,
+        duration: FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                       onComplete() {
+        onComplete: () => {
-                           this.set_height(-1);
+            this.set_height(-1);
-                           hold.release();
+            hold.release();
-                       },
+        }
-                     });
+    });
 
     return hold;
 }
@@ -71,17 +72,17 @@ function fadeOutActor(actor) {
     }
 
     let hold = new Batch.Hold();
-    Tweener.addTween(actor,
+    actor.ease({
-                     { opacity: 0,
+        opacity: 0,
-                       height: 0,
+        height: 0,
-                       time: FADE_ANIMATION_TIME,
+        duration: FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                       onComplete() {
+        onComplete: () => {
-                           this.hide();
+            this.hide();
-                           this.set_height(-1);
+            this.set_height(-1);
-                           hold.release();
+            hold.release();
-                       },
+        }
-                     });
+    });
     return hold;
 }
 
@@ -101,15 +102,15 @@ function cloneAndFadeOutActor(actor) {
     clone.set_position(x, y);
 
     let hold = new Batch.Hold();
-    Tweener.addTween(clone,
+    clone.ease({
-                     { opacity: 0,
+        opacity: 0,
-                       time: CLONE_FADE_ANIMATION_TIME,
+        duration: CLONE_FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                       onComplete() {
+        onComplete: () => {
-                           clone.destroy();
+            clone.destroy();
-                           hold.release();
+            hold.release();
-                       }
+        }
-                     });
+    });
     return hold;
 }
 
@@ -303,7 +304,7 @@ var ShellUserVerifier = class {
             });
     }
 
-    _oVirtUserAuthenticated(token) {
+    _oVirtUserAuthenticated(_token) {
         this._preemptingService = OVIRT_SERVICE_NAME;
         this.emit('ovirt-user-authenticated');
     }
@@ -342,7 +343,7 @@ var ShellUserVerifier = class {
         try {
             this._clearUserVerifier();
             this._userVerifier = client.open_reauthentication_channel_finish(result);
-        } catch(e) {
+        } catch (e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                 return;
             if (e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
@@ -369,7 +370,7 @@ var ShellUserVerifier = class {
         try {
             this._clearUserVerifier();
             this._userVerifier = client.get_user_verifier_finish(result);
-        } catch(e) {
+        } catch (e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                 return;
             this._reportInitError('Failed to obtain user verifier', e);
@@ -423,36 +424,31 @@ var ShellUserVerifier = class {
     _startService(serviceName) {
         this._hold.acquire();
         if (this._userName) {
-           this._userVerifier.call_begin_verification_for_user(serviceName,
+            this._userVerifier.call_begin_verification_for_user(serviceName, this._userName, this._cancellable, (obj, result) => {
-                                                               this._userName,
+                try {
-                                                               this._cancellable,
+                    obj.call_begin_verification_for_user_finish(result);
-                                                               (obj, result) => {
+                } catch (e) {
-               try {
+                    if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                   obj.call_begin_verification_for_user_finish(result);
+                        return;
-               } catch(e) {
+                    this._reportInitError('Failed to start verification for user', e);
-                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                    return;
-                       return;
+                }
-                   this._reportInitError('Failed to start verification for user', e);
-                   return;
-               }
 
-               this._hold.release();
+                this._hold.release();
-           });
+            });
         } else {
-           this._userVerifier.call_begin_verification(serviceName,
+            this._userVerifier.call_begin_verification(serviceName, this._cancellable, (obj, result) => {
-                                                      this._cancellable,
+                try {
-                                                      (obj, result) => {
+                    obj.call_begin_verification_finish(result);
-               try {
+                } catch (e) {
-                   obj.call_begin_verification_finish(result);
+                    if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-               } catch(e) {
+                        return;
-                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                    this._reportInitError('Failed to start verification', e);
-                       return;
+                    return;
-                   this._reportInitError('Failed to start verification', e);
+                }
-                   return;
-               }
 
-               this._hold.release();
+                this._hold.release();
-           });
+            });
         }
     }
 

js/js-resources.gresource.xml

@@ -64,6 +64,7 @@
     <file>ui/keyboard.js</file>
     <file>ui/layout.js</file>
     <file>ui/lightbox.js</file>
+    <file>ui/locatePointer.js</file>
     <file>ui/lookingGlass.js</file>
     <file>ui/magnifier.js</file>
     <file>ui/magnifierDBus.js</file>
@@ -81,9 +82,11 @@
     <file>ui/pageIndicators.js</file>
     <file>ui/panel.js</file>
     <file>ui/panelMenu.js</file>
+    <file>ui/pointerA11yTimeout.js</file>
     <file>ui/pointerWatcher.js</file>
     <file>ui/popupMenu.js</file>
     <file>ui/remoteSearch.js</file>
+    <file>ui/ripples.js</file>
     <file>ui/runDialog.js</file>
     <file>ui/screenShield.js</file>
     <file>ui/screencast.js</file>
@@ -120,6 +123,7 @@
 
     <file>ui/status/accessibility.js</file>
     <file>ui/status/brightness.js</file>
+    <file>ui/status/dwellClick.js</file>
     <file>ui/status/location.js</file>
     <file>ui/status/keyboard.js</file>
     <file>ui/status/nightLight.js</file>

js/misc/extensionUtils.js

@@ -1,23 +1,37 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported ExtensionState, ExtensionType, getCurrentExtension,
+   getSettings, initTranslations, isOutOfDate, installImporter,
+   serializeExtension, deserializeExtension */
 
 // Common utils for the extension system and the extension
 // preferences tool
 
-const Gettext = imports.gettext;
+const { Gio, GLib } = imports.gi;
-const Signals = imports.signals;
 
-const Gio = imports.gi.Gio;
+const Gettext = imports.gettext;
+const Lang = imports.lang;
 
 const Config = imports.misc.config;
-const FileUtils = imports.misc.fileUtils;
 
 var ExtensionType = {
     SYSTEM: 1,
     PER_USER: 2
 };
 
-// Maps uuid -> metadata object
+var ExtensionState = {
-var extensions = {};
+    ENABLED: 1,
+    DISABLED: 2,
+    ERROR: 3,
+    OUT_OF_DATE: 4,
+    DOWNLOADING: 5,
+    INITIALIZED: 6,
+
+    // Used as an error state for operations on unknown extensions,
+    // should never be in a real extensionMeta object.
+    UNINSTALLED: 99
+};
+
+const SERIALIZED_PROPERTIES = ['type', 'state', 'path', 'error', 'hasPrefs', 'canChange'];
 
 /**
  * getCurrentExtension:
@@ -31,7 +45,7 @@ function getCurrentExtension() {
     // Search for an occurrence of an extension stack frame
     // Start at 1 because 0 is the stack frame of this function
     for (let i = 1; i < stack.length; i++) {
-        if (stack[i].indexOf('/gnome-shell/extensions/') > -1) {
+        if (stack[i].includes('/gnome-shell/extensions/')) {
             extensionStackLine = stack[i];
             break;
         }
@@ -49,13 +63,17 @@ function getCurrentExtension() {
     if (!match)
         return null;
 
+    // local import, as the module is used from outside the gnome-shell process
+    // as well (not this function though)
+    let extensionManager = imports.ui.main.extensionManager;
+
     let path = match[1];
     let file = Gio.File.new_for_path(path);
 
     // Walk up the directory tree, looking for an extension with
     // the same UUID as a directory name.
     while (file != null) {
-        let extension = extensions[file.get_basename()];
+        let extension = extensionManager.lookup(file.get_basename());
         if (extension !== undefined)
             return extension;
         file = file.get_parent();
@@ -147,8 +165,8 @@ function versionCheck(required, current) {
         let requiredArray = required[i].split('.');
         if (requiredArray[0] == major &&
             requiredArray[1] == minor &&
-            (requiredArray[2] == point ||
+            ((requiredArray[2] === undefined && parseInt(minor) % 2 == 0) ||
-             (requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
+             requiredArray[2] == point))
             return true;
     }
     return false;
@@ -161,54 +179,50 @@ function isOutOfDate(extension) {
     return false;
 }
 
-function createExtensionObject(uuid, dir, type) {
+function serializeExtension(extension) {
-    let info;
+    let obj = {};
+    Lang.copyProperties(extension.metadata, obj);
 
-    let metadataFile = dir.get_child('metadata.json');
+    SERIALIZED_PROPERTIES.forEach(prop => {
-    if (!metadataFile.query_exists(null)) {
+        obj[prop] = extension[prop];
-        throw new Error('Missing metadata.json');
+    });
-    }
 
-    let metadataContents, success, tag;
+    let res = {};
-    try {
+    for (let key in obj) {
-        [success, metadataContents, tag] = metadataFile.load_contents(null);
+        let val = obj[key];
-        if (metadataContents instanceof Uint8Array)
+        let type;
-            metadataContents = imports.byteArray.toString(metadataContents);
+        switch (typeof val) {
-    } catch (e) {
+        case 'string':
-        throw new Error('Failed to load metadata.json: ' + e);
+            type = 's';
-    }
+            break;
-    let meta;
+        case 'number':
-    try {
+            type = 'd';
-        meta = JSON.parse(metadataContents);
+            break;
-    } catch (e) {
+        case 'boolean':
-        throw new Error('Failed to parse metadata.json: ' + e);
+            type = 'b';
-    }
+            break;
-
+        default:
-    let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
+            continue;
-    for (let i = 0; i < requiredProperties.length; i++) {
-        let prop = requiredProperties[i];
-        if (!meta[prop]) {
-            throw new Error('missing "' + prop + '" property in metadata.json');
         }
+        res[key] = GLib.Variant.new(type, val);
     }
 
-    if (uuid != meta.uuid) {
+    return res;
-        throw new Error('uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
+}
+
+function deserializeExtension(variant) {
+    let res = { metadata: {} };
+    for (let prop in variant) {
+        let val = variant[prop].unpack();
+        if (SERIALIZED_PROPERTIES.includes(prop))
+            res[prop] = val;
+        else
+            res.metadata[prop] = val;
     }
-
+    // add the 2 additional properties to create a valid extension object, as createExtensionObject()
-    let extension = {};
+    res.uuid = res.metadata.uuid;
-
+    res.dir = Gio.File.new_for_path(res.path);
-    extension.metadata = meta;
+    return res;
-    extension.uuid = meta.uuid;
-    extension.type = type;
-    extension.dir = dir;
-    extension.path = dir.get_path();
-    extension.error = '';
-    extension.hasPrefs = dir.get_child('prefs.js').query_exists(null);
-
-    extensions[uuid] = extension;
-
-    return extension;
 }
 
 function installImporter(extension) {
@@ -219,36 +233,3 @@ function installImporter(extension) {
     extension.imports = imports[extension.uuid];
     imports.searchPath = oldSearchPath;
 }
-
-var ExtensionFinder = class {
-    _loadExtension(extensionDir, info, perUserDir) {
-        let fileType = info.get_file_type();
-        if (fileType != Gio.FileType.DIRECTORY)
-            return;
-        let uuid = info.get_name();
-        let existing = extensions[uuid];
-        if (existing) {
-            log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
-            return;
-        }
-
-        let extension;
-        let type = extensionDir.has_prefix(perUserDir) ? ExtensionType.PER_USER
-                                                       : ExtensionType.SYSTEM;
-        try {
-            extension = createExtensionObject(uuid, extensionDir, type);
-        } catch(e) {
-            logError(e, 'Could not load extension %s'.format(uuid));
-            return;
-        }
-        this.emit('extension-found', extension);
-    }
-
-    scanExtensions() {
-        let perUserDir = Gio.File.new_for_path(global.userdatadir);
-        FileUtils.collectFromDatadirs('extensions', true, (dir, info) => {
-            this._loadExtension(dir, info, perUserDir);
-        });
-    }
-};
-Signals.addSignalMethods(ExtensionFinder.prototype);

js/misc/fileUtils.js

@@ -1,4 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported collectFromDatadirs, deleteGFile, recursivelyDeleteDir,
+            recursivelyMoveDir, loadInterfaceXML */
 
 const { Gio, GLib } = imports.gi;
 const Config = imports.misc.config;
@@ -36,7 +38,7 @@ function recursivelyDeleteDir(dir, deleteParent) {
     let children = dir.enumerate_children('standard::name,standard::type',
                                           Gio.FileQueryInfoFlags.NONE, null);
 
-    let info, child;
+    let info;
     while ((info = children.next_file(null)) != null) {
         let type = info.get_file_type();
         let child = dir.get_child(info.get_name());
@@ -57,7 +59,7 @@ function recursivelyMoveDir(srcDir, destDir) {
     if (!destDir.query_exists(null))
         destDir.make_directory_with_parents(null);
 
-    let info, child;
+    let info;
     while ((info = children.next_file(null)) != null) {
         let type = info.get_file_type();
         let srcChild = srcDir.get_child(info.get_name());
@@ -84,13 +86,13 @@ function loadInterfaceXML(iface) {
     let f = Gio.File.new_for_uri(uri);
 
     try {
-        let [ok, bytes] = f.load_contents(null);
+        let [ok_, bytes] = f.load_contents(null);
         if (bytes instanceof Uint8Array)
-            xml = imports.byteArray.toString(bytes)
+            xml = imports.byteArray.toString(bytes);
         else
             xml = bytes.toString();
     } catch (e) {
-        log('Failed to load D-Bus interface ' + iface);
+        log(`Failed to load D-Bus interface ${iface}`);
     }
 
     return xml;

js/misc/gnomeSession.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported PresenceStatus, Presence, Inhibitor, SessionManager */
 
 const Gio = imports.gi.Gio;
 

js/misc/history.js

@@ -18,7 +18,7 @@ var HistoryManager = class {
         this._historyIndex = 0;
         if (this._key) {
             this._history = global.settings.get_strv(this._key);
-            global.settings.connect('changed::' + this._key,
+            global.settings.connect(`changed::${this._key}`,
                                     this._historyChanged.bind(this));
 
         } else {
@@ -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));
         }
     }
@@ -66,7 +66,7 @@ var HistoryManager = class {
             this._indexChanged();
         }
 
-        return this._historyIndex ? this._history[this._historyIndex -1] : null;
+        return this._historyIndex ? this._history[this._historyIndex - 1] : null;
     }
 
     addItem(input) {

js/misc/ibusManager.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getIBusManager */
 
 const { Gio, GLib, IBus } = imports.gi;
-const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
 const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
@@ -18,9 +18,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() {
@@ -42,7 +42,7 @@ var IBusManager = class {
         this._candidatePopup = new IBusCandidatePopup.CandidatePopup();
 
         this._panelService = null;
-        this._engines = {};
+        this._engines = new Map();
         this._ready = false;
         this._registerPropertiesId = 0;
         this._currentEngineName = null;
@@ -58,54 +58,79 @@ var IBusManager = class {
         this._spawn();
     }
 
-    _spawn() {
+    _spawn(extraArgs = []) {
         try {
-            Gio.Subprocess.new(['ibus-daemon', '--xim', '--panel', 'disable'],
+            let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs];
-                               Gio.SubprocessFlags.NONE);
+            Gio.Subprocess.new(cmdLine, Gio.SubprocessFlags.NONE);
-        } catch(e) {
+        } catch (e) {
-            log('Failed to launch ibus-daemon: ' + e.message);
+            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();
 
         this._panelService = null;
         this._candidatePopup.setPanelService(null);
-        this._engines = {};
+        this._engines.clear();
         this._ready = false;
         this._registerPropertiesId = 0;
         this._currentEngineName = null;
 
         this.emit('ready', false);
-
-        this._spawn();
     }
 
     _onConnected() {
-        this._ibus.list_engines_async(-1, null, this._initEngines.bind(this));
+        this._cancellable = new Gio.Cancellable();
+        this._ibus.list_engines_async(-1, this._cancellable,
+            this._initEngines.bind(this));
         this._ibus.request_name_async(IBus.SERVICE_PANEL,
-                                      IBus.BusNameFlag.REPLACE_EXISTING,
+            IBus.BusNameFlag.REPLACE_EXISTING, -1, this._cancellable,
-                                      -1, null,
+            this._initPanelService.bind(this));
-                                      this._initPanelService.bind(this));
     }
 
     _initEngines(ibus, result) {
-        let enginesList = this._ibus.list_engines_async_finish(result);
+        try {
-        if (enginesList) {
+            let enginesList = this._ibus.list_engines_async_finish(result);
             for (let i = 0; i < enginesList.length; ++i) {
                 let name = enginesList[i].get_name();
-                this._engines[name] = enginesList[i];
+                this._engines.set(name, enginesList[i]);
             }
             this._updateReadiness();
-        } else {
+        } catch (e) {
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                return;
+
+            logError(e);
             this._clear();
         }
     }
 
     _initPanelService(ibus, result) {
-        let success = this._ibus.request_name_async_finish(result);
+        let success = false;
+        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 });
@@ -119,7 +144,7 @@ var IBusManager = class {
                 if (!GLib.str_has_suffix(path, '/InputContext_1'))
                     this.emit ('focus-in');
             });
-            this._panelService.connect('focus-out', () => { this.emit('focus-out'); });
+            this._panelService.connect('focus-out', () => this.emit('focus-out'));
 
             try {
                 // IBus versions older than 1.5.10 have a bug which
@@ -132,13 +157,13 @@ var IBusManager = class {
             } catch (e) {
             }
             // If an engine is already active we need to get its properties
-            this._ibus.get_global_engine_async(-1, null, (i, result) => {
+            this._ibus.get_global_engine_async(-1, this._cancellable, (_bus, result) => {
                 let engine;
                 try {
                     engine = this._ibus.get_global_engine_async_finish(result);
                     if (!engine)
                         return;
-                } catch(e) {
+                } catch (e) {
                     return;
                 }
                 this._engineChanged(this._ibus, engine.get_name());
@@ -150,8 +175,7 @@ var IBusManager = class {
     }
 
     _updateReadiness() {
-        this._ready = (Object.keys(this._engines).length > 0 &&
+        this._ready = this._engines.size > 0 && this._panelService != null;
-                       this._panelService != null);
         this.emit('ready', this._ready);
     }
 
@@ -189,10 +213,10 @@ var IBusManager = class {
     }
 
     getEngineDesc(id) {
-        if (!this._ready || !this._engines.hasOwnProperty(id))
+        if (!this._ready || !this._engines.has(id))
             return null;
 
-        return this._engines[id];
+        return this._engines.get(id);
     }
 
     setEngine(id, callback) {
@@ -205,8 +229,18 @@ var IBusManager = class {
             return;
         }
 
-        this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
+        this._ibus.set_global_engine_async(id,
-                                           null, callback || null);
+            this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
+            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) {
@@ -214,21 +248,23 @@ var IBusManager = class {
             return;
 
         if (this._preloadEnginesId != 0) {
-            Mainloop.source_remove(this._preloadEnginesId);
+            GLib.source_remove(this._preloadEnginesId);
             this._preloadEnginesId = 0;
         }
 
         this._preloadEnginesId =
-            Mainloop.timeout_add_seconds(this._PRELOAD_ENGINES_DELAY_TIME,
+            GLib.timeout_add_seconds(
-                                         () => {
+                GLib.PRIORITY_DEFAULT,
-                                             this._ibus.preload_engines_async(
+                this._PRELOAD_ENGINES_DELAY_TIME,
-                                                 ids,
+                () => {
-                                                 -1,
+                    this._ibus.preload_engines_async(
-                                                 null,
+                        ids,
-                                                 null);
+                        -1,
-                                             this._preloadEnginesId = 0;
+                        this._cancellable,
-                                             return GLib.SOURCE_REMOVE;
+                        null);
-                                         });
+                    this._preloadEnginesId = 0;
+                    return GLib.SOURCE_REMOVE;
+                });
     }
 };
 Signals.addSignalMethods(IBusManager.prototype);

js/misc/inputMethod.js

@@ -1,5 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const { Clutter, GLib, GObject, IBus } = imports.gi;
+/* exported InputMethod */
+const { Clutter, GLib, Gio, GObject, IBus } = imports.gi;
 
 const Keyboard = imports.ui.status.keyboard;
 
@@ -35,15 +36,7 @@ class InputMethod extends Clutter.InputMethod {
     }
 
     _updateCapabilities() {
-        let caps = 0;
+        let caps = IBus.Capabilite.PREEDIT_TEXT | IBus.Capabilite.FOCUS | IBus.Capabilite.SURROUNDING_TEXT;
-
-        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);
@@ -54,12 +47,22 @@ class InputMethod extends Clutter.InputMethod {
     }
 
     _onConnected() {
-        this._ibus.create_input_context_async ('gnome-shell', -1, null,
+        this._cancellable = new Gio.Cancellable();
-                                               this._setContext.bind(this));
+        this._ibus.create_input_context_async ('gnome-shell', -1,
+            this._cancellable, this._setContext.bind(this));
     }
 
     _setContext(bus, res) {
-        this._context = this._ibus.create_input_context_async_finish(res);
+        try {
+            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));
@@ -71,10 +74,15 @@ class InputMethod extends Clutter.InputMethod {
     }
 
     _clear() {
+        if (this._cancellable) {
+            this._cancellable.cancel();
+            this._cancellable = null;
+        }
+
         this._context = null;
         this._hints = 0;
         this._purpose = 0;
-        this._preeditStr = ''
+        this._preeditStr = '';
         this._preeditPos = 0;
         this._preeditVisible = false;
     }
@@ -84,15 +92,15 @@ class InputMethod extends Clutter.InputMethod {
             this.emit('request-surrounding');
     }
 
-    _onCommitText(context, text) {
+    _onCommitText(_context, text) {
         this.commit(text.get_text());
     }
 
-    _onDeleteSurroundingText(context) {
+    _onDeleteSurroundingText() {
         this.delete_surrounding();
     }
 
-    _onUpdatePreeditText(context, text, pos, visible) {
+    _onUpdatePreeditText(_context, text, pos, visible) {
         if (text == null)
             return;
 
@@ -108,17 +116,17 @@ class InputMethod extends Clutter.InputMethod {
         this._preeditVisible = visible;
     }
 
-    _onShowPreeditText(context) {
+    _onShowPreeditText() {
         this._preeditVisible = true;
         this.set_preedit_text(this._preeditStr, this._preeditPos);
     }
 
-    _onHidePreeditText(context) {
+    _onHidePreeditText() {
         this.set_preedit_text(null, this._preeditPos);
         this._preeditVisible = false;
     }
 
-    _onForwardKeyEvent(context, keyval, keycode, state) {
+    _onForwardKeyEvent(_context, keyval, keycode, state) {
         let press = (state & IBus.ModifierType.RELEASE_MASK) == 0;
         state &= ~(IBus.ModifierType.RELEASE_MASK);
 
@@ -136,7 +144,6 @@ class InputMethod extends Clutter.InputMethod {
         this._currentFocus = focus;
         if (this._context) {
             this._context.focus_in();
-            this._updateCapabilities();
             this._emitRequestSurrounding();
         }
 
@@ -148,10 +155,8 @@ 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
@@ -254,17 +259,19 @@ class InputMethod extends Clutter.InputMethod {
         if (event.type() == Clutter.EventType.KEY_RELEASE)
             state |= IBus.ModifierType.RELEASE_MASK;
 
-        this._context.process_key_event_async(event.get_key_symbol(),
+        this._context.process_key_event_async(
-                                              event.get_key_code() - 8, // Convert XKB keycodes to evcodes
+            event.get_key_symbol(),
-                                              state, -1, null,
+            event.get_key_code() - 8, // Convert XKB keycodes to evcodes
-                                              (context, res) => {
+            state, -1, this._cancellable,
-                                                  try {
+            (context, res) => {
-                                                      let retval = context.process_key_event_async_finish(res);
+                try {
-                                                      this.notify_key_event(event, retval);
+                    let retval = context.process_key_event_async_finish(res);
-                                                  } catch (e) {
+                    this.notify_key_event(event, retval);
-                                                      log('Error processing key on IM: ' + e.message);
+                } catch (e) {
-                                                  }
+                    if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                                              });
+                        log(`Error processing key on IM: ${e.message}`);
+                }
+            });
         return true;
     }
 });

js/misc/introspect.js

@@ -1,3 +1,4 @@
+/* exported IntrospectService */
 const { Gio, GLib, Meta, Shell } = imports.gi;
 
 const INTROSPECT_SCHEMA = 'org.gnome.shell';
@@ -42,17 +43,20 @@ var IntrospectService = class {
     }
 
     _isStandaloneApp(app) {
-        let windows = app.get_windows();
-
         return app.get_windows().some(w => w.transient_for == null);
     }
 
     _isIntrospectEnabled() {
-       return this._settings.get_boolean(INTROSPECT_KEY);
+        return this._settings.get_boolean(INTROSPECT_KEY);
     }
 
     _isSenderWhitelisted(sender) {
-       return APP_WHITELIST.includes(sender);
+        return APP_WHITELIST.includes(sender);
+    }
+
+    _getSandboxedAppId(app) {
+        let ids = app.get_windows().map(w => w.get_sandboxed_app_id());
+        return ids.find(id => id != null);
     }
 
     _syncRunningApplications() {
@@ -76,6 +80,10 @@ var IntrospectService = class {
                 newActiveApplication = app.get_id();
             }
 
+            let sandboxedAppId = this._getSandboxedAppId(app);
+            if (sandboxedAppId)
+                appInfo['sandboxed-app-id'] = new GLib.Variant('s', sandboxedAppId);
+
             newRunningApplications[app.get_id()] = appInfo;
         }
 
@@ -119,7 +127,8 @@ 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');
@@ -137,6 +146,7 @@ var IntrospectService = class {
                 let frameRect = window.get_frame_rect();
                 let title = window.get_title();
                 let wmClass = window.get_wm_class();
+                let sandboxedAppId = window.get_sandboxed_app_id();
 
                 windowsList[windowId] = {
                     'app-id': GLib.Variant.new('s', app.get_id()),
@@ -153,6 +163,10 @@ var IntrospectService = class {
 
                 if (wmClass != null)
                     windowsList[windowId]['wm-class'] = GLib.Variant.new('s', wmClass);
+
+                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

@@ -1,4 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported getCompletions, getCommonPrefix, getDeclaredConstants */
 
 // Returns a list of potential completions for text. Completions either
 // follow a dot (e.g. foo.ba -> bar) or they are picked from globalCompletionList (e.g. fo -> foo)
@@ -8,7 +9,7 @@
 // This function is likely the one you want to call from external modules
 function getCompletions(text, commandHeader, globalCompletionList) {
     let methods = [];
-    let expr, base;
+    let expr_, base;
     let attrHead = '';
     if (globalCompletionList == null) {
         globalCompletionList = [];
@@ -21,7 +22,7 @@ function getCompletions(text, commandHeader, globalCompletionList) {
         // Look for expressions like "Main.panel.foo" and match Main.panel and foo
         let matches = text.match(/(.*)\.(.*)/);
         if (matches) {
-            [expr, base, attrHead] = matches;
+            [expr_, base, attrHead] = matches;
 
             methods = getPropertyNamesFromExpression(base, commandHeader).filter(
                 attr => attr.slice(0, attrHead.length) == attrHead
@@ -32,7 +33,7 @@ function getCompletions(text, commandHeader, globalCompletionList) {
         // not proceeded by a dot and match them against global constants
         matches = text.match(/^(\w*)$/);
         if (text == '' || matches) {
-            [expr, attrHead] = matches;
+            [expr_, attrHead] = matches;
             methods = globalCompletionList.filter(
                 attr => attr.slice(0, attrHead.length) == attrHead
             );
@@ -51,14 +52,14 @@ function getCompletions(text, commandHeader, globalCompletionList) {
 // if we encounter anything that isn't a letter, '.', ')', or ']',
 // we should stop parsing.
 function isStopChar(c) {
-    return !c.match(/[\w\.\)\]]/);
+    return !c.match(/[\w.)\]]/);
 }
 
 // Given the ending position of a quoted string, find where it starts
 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;
         }
     }
@@ -68,7 +69,7 @@ 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;
         }
     }
@@ -81,7 +82,7 @@ function findMatchingSlash(expr, offset) {
 // findMatchingBrace("[(])", 3) returns 1.
 function findMatchingBrace(expr, offset) {
     let closeBrace = expr.charAt(offset);
-    let openBrace = ({')': '(', ']': '['})[closeBrace];
+    let openBrace = ({ ')': '(', ']': '[' })[closeBrace];
 
     function findTheBrace(expr, offset) {
         if (offset < 0) {
@@ -117,11 +118,11 @@ 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);
         }
 
@@ -151,15 +152,11 @@ function getAllProps(obj) {
 // e.g., expr="({ foo: null, bar: null, 4: null })" will
 // return ["foo", "bar", ...] but the list will not include "4",
 // since methods accessed with '.' notation must star with a letter or _.
-function getPropertyNamesFromExpression(expr, commandHeader) {
+function getPropertyNamesFromExpression(expr, commandHeader = '') {
-    if (commandHeader == null) {
-        commandHeader = '';
-    }
-
     let obj = {};
     if (!isUnsafeExpression(expr)) {
         try {
-                obj = eval(commandHeader + expr);
+            obj = eval(commandHeader + expr);
         } catch (e) {
             return [];
         }
@@ -168,14 +165,14 @@ function getPropertyNamesFromExpression(expr, commandHeader) {
     }
 
     let propsUnique = {};
-    if (typeof obj === 'object'){
+    if (typeof obj === 'object') {
         let allProps = getAllProps(obj);
         // Get only things we are allowed to complete following a '.'
         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();
 }
@@ -220,7 +217,7 @@ function isUnsafeExpression(str) {
     prunedStr = prunedStr.replace(/[=!]==/g, '');    //replace === and !== 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
@@ -234,10 +231,10 @@ function isUnsafeExpression(str) {
 function getDeclaredConstants(str) {
     let ret = [];
     str.split(';').forEach(s => {
-        let base, keyword;
+        let base_, keyword;
         let match = s.match(/const\s+(\w+)\s*=/);
         if (match) {
-            [base, keyword] = match;
+            [base_, keyword] = match;
             ret.push(keyword);
         }
     });

js/misc/keyboardManager.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getKeyboardManager, holdKeyboard, releaseKeyboard */
 
 const { GLib, GnomeDesktop, Meta } = imports.gi;
 
@@ -60,7 +61,7 @@ var KeyboardManager = class {
             this._currentKeymap.options == options)
             return;
 
-        this._currentKeymap = {layouts, variants, options};
+        this._currentKeymap = { layouts, variants, options };
         Meta.get_backend().set_keymap(layouts, variants, options);
     }
 
@@ -125,7 +126,7 @@ var KeyboardManager = class {
 
     _getLocaleLayout() {
         let locale = GLib.get_language_names()[0];
-        if (locale.indexOf('_') == -1)
+        if (!locale.includes('_'))
             locale = DEFAULT_LOCALE;
 
         let [found, , id] = GnomeDesktop.get_input_source_from_locale(locale);

js/misc/loginManager.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported canLock, getLoginManager, registerSessionWithGDM */
 
 const { GLib, Gio } = imports.gi;
 const Signals = imports.signals;
@@ -43,11 +44,33 @@ function canLock() {
 
         let version = result.deep_unpack()[0].deep_unpack();
         return haveSystemd() && versionCompare('3.5.91', version);
-    } catch(e) {
+    } catch (e) {
         return false;
     }
 }
 
+
+function registerSessionWithGDM() {
+    log("Registering session with GDM");
+    Gio.DBus.system.call('org.gnome.DisplayManager',
+                         '/org/gnome/DisplayManager/Manager',
+                         'org.gnome.DisplayManager.Manager',
+                         'RegisterSession',
+                         GLib.Variant.new('(a{sv})', [{}]), null,
+                         Gio.DBusCallFlags.NONE, -1, null,
+        (source, result) => {
+            try {
+                source.call_finish(result);
+            } catch (e) {
+                if (!e.matches(Gio.DBusError, Gio.DBusError.UNKNOWN_METHOD))
+                    log(`Error registering session with GDM: ${e.message}`);
+                else
+                    log("Not calling RegisterSession(): method not exported, GDM too old?");
+            }
+        }
+    );
+}
+
 let _loginManager = null;
 
 /**
@@ -87,7 +110,7 @@ var LoginManagerSystemd = class {
         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;
@@ -160,10 +183,10 @@ var LoginManagerSystemd = class {
             (proxy, result) => {
                 let fd = -1;
                 try {
-                    let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
+                    let [outVariant_, fdList] = proxy.call_with_unix_fd_list_finish(result);
                     fd = fdList.steal_fds()[0];
                     callback(new Gio.UnixInputStream({ fd: fd }));
-                } catch(e) {
+                } catch (e) {
                     logError(e, "Error getting systemd inhibitor");
                     callback(null);
                 }
@@ -177,7 +200,7 @@ var LoginManagerSystemd = class {
 Signals.addSignalMethods(LoginManagerSystemd.prototype);
 
 var LoginManagerDummy = class {
-    getCurrentSessionProxy(callback) {
+    getCurrentSessionProxy(_callback) {
         // we could return a DummySession object that fakes whatever callers
         // expect (at the time of writing: connect() and connectSignal()
         // methods), but just never calling the callback should be safer

js/misc/modemManager.js

@@ -26,33 +26,33 @@ function _getMobileProvidersDatabase() {
 }
 
 // _findProviderForMccMnc:
-// @operator_name: operator name
+// @operatorName: operator name
-// @operator_code: operator code
+// @operatorCode: operator code
 //
 // Given an operator name string (which may not be a real operator name) and an
 // operator code string, tries to find a proper operator name to display.
 //
-function _findProviderForMccMnc(operator_name, operator_code) {
+function _findProviderForMccMnc(operatorName, operatorCode) {
-    if (operator_name) {
+    if (operatorName) {
-        if (operator_name.length != 0 &&
+        if (operatorName.length != 0 &&
-            (operator_name.length > 6 || operator_name.length < 5)) {
+            (operatorName.length > 6 || operatorName.length < 5)) {
             // this looks like a valid name, i.e. not an MCCMNC (that some
             // devices return when not yet connected
-            return operator_name;
+            return operatorName;
         }
 
-        if (isNaN(parseInt(operator_name))) {
+        if (isNaN(parseInt(operatorName))) {
             // name is definitely not a MCCMNC, so it may be a name
             // after all; return that
-            return operator_name;
+            return operatorName;
         }
     }
 
     let needle;
-    if ((!operator_name || operator_name.length == 0) && operator_code)
+    if ((!operatorName || operatorName.length == 0) && operatorCode)
-        needle = operator_code;
+        needle = operatorCode;
-    else if (operator_name && (operator_name.length == 6 || operator_name.length == 5))
+    else if (operatorName && (operatorName.length == 6 || operatorName.length == 5))
-        needle = operator_name;
+        needle = operatorName;
     else // nothing to search
         return null;
 
@@ -71,7 +71,7 @@ function _findProviderForMccMnc(operator_name, operator_code) {
 // Tries to find the operator name corresponding to the given SID
 //
 function _findProviderForSid(sid) {
-    if (sid == 0)
+    if (!sid)
         return null;
 
     let mpd = _getMobileProvidersDatabase();
@@ -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
@@ -110,7 +110,7 @@ var ModemGsm = class {
             this.signal_quality = quality;
             this.emit('notify::signal-quality');
         });
-        this._proxy.connectSignal('RegistrationInfo', (proxy, sender, [status, code, name]) => {
+        this._proxy.connectSignal('RegistrationInfo', (proxy, sender, [_status, code, name]) => {
             this.operator_name = _findProviderForMccMnc(name, code);
             this.emit('notify::operator-name');
         });
@@ -120,7 +120,7 @@ var ModemGsm = class {
                 return;
             }
 
-            let [status, code, name] = result;
+            let [status_, code, name] = result;
             this.operator_name = _findProviderForMccMnc(name, code);
             this.emit('notify::operator-name');
         });
@@ -171,9 +171,9 @@ var ModemCdma = class {
                 // it will return an error if the device is not connected
                 this.operator_name = null;
             } else {
-                let [bandClass, band, sid] = result;
+                let [bandClass_, band_, sid] = result;
 
-                this.operator_name = _findProviderForSid(sid)
+                this.operator_name = _findProviderForSid(sid);
             }
             this.emit('notify::operator-name');
         });
@@ -182,9 +182,9 @@ var ModemCdma = class {
 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);
@@ -224,23 +224,23 @@ var BroadbandModem = class {
     }
 
     _reloadSignalQuality() {
-        let [quality, recent] = this._proxy.SignalQuality;
+        let [quality, recent_] = this._proxy.SignalQuality;
         this.signal_quality = quality;
         this.emit('notify::signal-quality');
     }
 
     _reloadOperatorName() {
-        let new_name = "";
+        let newName = "";
         if (this.operator_name_3gpp && this.operator_name_3gpp.length > 0)
-            new_name += this.operator_name_3gpp;
+            newName += this.operator_name_3gpp;
 
         if (this.operator_name_cdma && this.operator_name_cdma.length > 0) {
-            if (new_name != "")
+            if (newName != "")
-                new_name += ", ";
+                newName += ", ";
-            new_name += this.operator_name_cdma;
+            newName += this.operator_name_cdma;
         }
 
-        this.operator_name = new_name;
+        this.operator_name = newName;
         this.emit('notify::operator-name');
     }
 

js/misc/objectManager.js

@@ -77,54 +77,51 @@ var ObjectManager = class {
         let info = this._interfaceInfos[interfaceName];
 
         if (!info) {
-           if (onFinished)
+            if (onFinished)
-               onFinished();
+                onFinished();
-           return;
+            return;
         }
 
         let proxy = new Gio.DBusProxy({ g_connection: this._connection,
-                                       g_name: this._serviceName,
+                                        g_name: this._serviceName,
-                                       g_object_path: objectPath,
+                                        g_object_path: objectPath,
-                                       g_interface_name: interfaceName,
+                                        g_interface_name: interfaceName,
-                                       g_interface_info: info,
+                                        g_interface_info: info,
-                                       g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });
+                                        g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });
 
-        proxy.init_async(GLib.PRIORITY_DEFAULT,
+        proxy.init_async(GLib.PRIORITY_DEFAULT, this._cancellable, (initable, result) => {
-                         this._cancellable,
+            try {
-                         (initable, result) => {
+                initable.init_finish(result);
-               let error = null;
+            } catch (e) {
-               try {
+                logError(e, `could not initialize proxy for interface ${interfaceName}`);
-                   initable.init_finish(result);
-               } catch(e) {
-                   logError(e, 'could not initialize proxy for interface ' + interfaceName);
 
-                   if (onFinished)
+                if (onFinished)
-                       onFinished();
+                    onFinished();
-                   return;
+                return;
-               }
+            }
 
-               let isNewObject;
+            let isNewObject;
-               if (!this._objects[objectPath]) {
+            if (!this._objects[objectPath]) {
-                   this._objects[objectPath] = {};
+                this._objects[objectPath] = {};
-                   isNewObject = true;
+                isNewObject = true;
-               } else {
+            } else {
-                   isNewObject = false;
+                isNewObject = false;
-               }
+            }
 
-               this._objects[objectPath][interfaceName] = proxy;
+            this._objects[objectPath][interfaceName] = proxy;
 
-               if (!this._interfaces[interfaceName])
+            if (!this._interfaces[interfaceName])
-                   this._interfaces[interfaceName] = [];
+                this._interfaces[interfaceName] = [];
 
-               this._interfaces[interfaceName].push(proxy);
+            this._interfaces[interfaceName].push(proxy);
 
-               if (isNewObject)
+            if (isNewObject)
-                   this.emit('object-added', objectPath);
+                this.emit('object-added', objectPath);
 
-               this.emit('interface-added', interfaceName, proxy);
+            this.emit('interface-added', interfaceName, proxy);
 
-               if (onFinished)
+            if (onFinished)
-                   onFinished();
+                onFinished();
         });
     }
 
@@ -155,11 +152,10 @@ var ObjectManager = class {
     }
 
     _onManagerProxyLoaded(initable, result) {
-        let error = null;
         try {
             initable.init_finish(result);
-        } catch(e) {
+        } catch (e) {
-            logError(e, 'could not initialize object manager for object ' + this._serviceName);
+            logError(e, `could not initialize object manager for object ${this._serviceName}`);
 
             this._tryToCompleteLoad();
             return;
@@ -197,7 +193,7 @@ var ObjectManager = class {
         this._managerProxy.GetManagedObjectsRemote((result, error) => {
             if (!result) {
                 if (error) {
-                   logError(error, 'could not get remote objects for service ' + this._serviceName + ' path ' + this._managerPath);
+                    logError(error, `could not get remote objects for service ${this._serviceName} path ${this._managerPath}`);
                 }
 
                 this._tryToCompleteLoad();

js/misc/params.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported parse */
 
 // parse:
 // @params: caller-provided parameter object, or %null
@@ -14,22 +15,13 @@
 //
 // Return value: a new object, containing the merged parameters from
 // @params and @defaults
-function parse(params, defaults, allowExtras) {
+function parse(params = {}, defaults, allowExtras) {
-    let ret = {}, prop;
+    if (!allowExtras) {
-
+        for (let prop in params)
-    if (!params)
+            if (!(prop in defaults))
-        params = {};
+                throw new Error(`Unrecognized parameter "${prop}"`);
-
-    for (prop in params) {
-        if (!(prop in defaults) && !allowExtras)
-            throw new Error('Unrecognized parameter "' + prop + '"');
-        ret[prop] = params[prop];
     }
 
-    for (prop in defaults) {
+    let defaultsCopy = Object.assign({}, defaults);
-        if (!(prop in params))
+    return Object.assign(defaultsCopy, params);
-            ret[prop] = defaults[prop];
+}
-    }
-
-    return ret;
-}

js/misc/permissionStore.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported PermissionStore */
 
 const Gio = imports.gi.Gio;
 
@@ -12,4 +13,4 @@ function PermissionStore(initCallback, cancellable) {
                                     'org.freedesktop.impl.portal.PermissionStore',
                                     '/org/freedesktop/impl/portal/PermissionStore',
                                     initCallback, cancellable);
-};
+}

js/misc/smartcardManager.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getSmartcardManager */
 
 const Gio = imports.gi.Gio;
 const Signals = imports.signals;
@@ -29,7 +30,7 @@ var SmartcardManager = class {
         this._objectManager = new ObjectManager.ObjectManager({ connection: Gio.DBus.session,
                                                                 name: "org.gnome.SettingsDaemon.Smartcard",
                                                                 objectPath: '/org/gnome/SettingsDaemon/Smartcard',
-                                                                knownInterfaces: [ SmartcardTokenIface ],
+                                                                knownInterfaces: [SmartcardTokenIface],
                                                                 onLoaded: this._onLoaded.bind(this) });
         this._insertedTokens = {};
         this._loginToken = null;

js/misc/systemActions.js

@@ -1,3 +1,4 @@
+/* exported getDefault */
 const { AccountsService, Clutter, Gdm, Gio, GLib, GObject, Meta } = imports.gi;
 
 const GnomeSession = imports.misc.gnomeSession;
@@ -83,48 +84,54 @@ const SystemActions = GObject.registerClass({
         this._canHaveSuspend = true;
 
         this._actions = new Map();
-        this._actions.set(POWER_OFF_ACTION_ID,
+        this._actions.set(POWER_OFF_ACTION_ID, {
-                          { // Translators: The name of the power-off action in search
+            // Translators: The name of the power-off action in search
-                            name: C_("search-result", "Power Off"),
+            name: C_("search-result", "Power Off"),
-                            iconName: 'system-shutdown-symbolic',
+            iconName: 'system-shutdown-symbolic',
-                            // Translators: A list of keywords that match the power-off action, separated by semicolons
+            // Translators: A list of keywords that match the power-off action, separated by semicolons
-                            keywords: _("power off;shutdown;reboot;restart").split(';'),
+            keywords: _("power off;shutdown;reboot;restart").split(/[; ]/),
-                            available: false });
+            available: false
-        this._actions.set(LOCK_SCREEN_ACTION_ID,
+        });
-                          { // Translators: The name of the lock screen action in search
+        this._actions.set(LOCK_SCREEN_ACTION_ID, {
-                            name: C_("search-result", "Lock Screen"),
+            // Translators: The name of the lock screen action in search
-                            iconName: 'system-lock-screen-symbolic',
+            name: C_("search-result", "Lock Screen"),
-                            // Translators: A list of keywords that match the lock screen action, separated by semicolons
+            iconName: 'system-lock-screen-symbolic',
-                            keywords: _("lock screen").split(';'),
+            // Translators: A list of keywords that match the lock screen action, separated by semicolons
-                            available: false });
+            keywords: _("lock screen").split(/[; ]/),
-        this._actions.set(LOGOUT_ACTION_ID,
+            available: false
-                          { // Translators: The name of the logout action in search
+        });
-                            name: C_("search-result", "Log Out"),
+        this._actions.set(LOGOUT_ACTION_ID, {
-                            iconName: 'application-exit-symbolic',
+            // Translators: The name of the logout action in search
-                            // Translators: A list of keywords that match the logout action, separated by semicolons
+            name: C_("search-result", "Log Out"),
-                            keywords: _("logout;sign off").split(';'),
+            iconName: 'application-exit-symbolic',
-                            available: false });
+            // Translators: A list of keywords that match the logout action, separated by semicolons
-        this._actions.set(SUSPEND_ACTION_ID,
+            keywords: _("logout;log out;sign off").split(/[; ]/),
-                          { // Translators: The name of the suspend action in search
+            available: false
-                            name: C_("search-result", "Suspend"),
+        });
-                            iconName: 'media-playback-pause-symbolic',
+        this._actions.set(SUSPEND_ACTION_ID, {
-                            // Translators: A list of keywords that match the suspend action, separated by semicolons
+            // Translators: The name of the suspend action in search
-                            keywords: _("suspend;sleep").split(';'),
+            name: C_("search-result", "Suspend"),
-                            available: false });
+            iconName: 'media-playback-pause-symbolic',
-        this._actions.set(SWITCH_USER_ACTION_ID,
+            // Translators: A list of keywords that match the suspend action, separated by semicolons
-                          { // Translators: The name of the switch user action in search
+            keywords: _("suspend;sleep").split(/[; ]/),
-                            name: C_("search-result", "Switch User"),
+            available: false
-                            iconName: 'system-switch-user-symbolic',
+        });
-                            // Translators: A list of keywords that match the switch user action, separated by semicolons
+        this._actions.set(SWITCH_USER_ACTION_ID, {
-                            keywords: _("switch user").split(';'),
+            // Translators: The name of the switch user action in search
-                            available: false });
+            name: C_("search-result", "Switch User"),
-        this._actions.set(LOCK_ORIENTATION_ACTION_ID,
+            iconName: 'system-switch-user-symbolic',
-                          { // Translators: The name of the lock orientation action in search
+            // Translators: A list of keywords that match the switch user action, separated by semicolons
-                            name: C_("search-result", "Lock Orientation"),
+            keywords: _("switch user").split(/[; ]/),
-                            iconName: '',
+            available: false
-                            // Translators: A list of keywords that match the lock orientation action, separated by semicolons
+        });
-                            keywords: _("lock orientation;screen;rotation").split(';'),
+        this._actions.set(LOCK_ORIENTATION_ACTION_ID, {
-                            available: false });
+            // Translators: The name of the lock orientation action in search
+            name: C_("search-result", "Lock Orientation"),
+            iconName: '',
+            // Translators: A list of keywords that match the lock orientation action, separated by semicolons
+            keywords: _("lock orientation;screen;rotation").split(/[; ]/),
+            available: false
+        });
 
         this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
         this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
@@ -137,92 +144,96 @@ const SystemActions = GObject.registerClass({
         this._userManager = AccountsService.UserManager.get_default();
 
         this._userManager.connect('notify::is-loaded',
-                                  () => { this._updateMultiUser(); });
+                                  () => this._updateMultiUser());
         this._userManager.connect('notify::has-multiple-users',
-                                  () => { this._updateMultiUser(); });
+                                  () => this._updateMultiUser());
         this._userManager.connect('user-added',
-                                  () => { this._updateMultiUser(); });
+                                  () => this._updateMultiUser());
         this._userManager.connect('user-removed',
-                                  () => { this._updateMultiUser(); });
+                                  () => this._updateMultiUser());
 
-        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
+        this._lockdownSettings.connect(`changed::${DISABLE_USER_SWITCH_KEY}`,
-                                       () => { this._updateSwitchUser(); });
+                                       () => this._updateSwitchUser());
-        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
+        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
-                                       () => { this._updateLogout(); });
+                                       () => this._updateLogout());
-        global.settings.connect('changed::' + ALWAYS_SHOW_LOG_OUT_KEY,
+        global.settings.connect(`changed::${ALWAYS_SHOW_LOG_OUT_KEY}`,
-                                () => { this._updateLogout(); });
+                                () => this._updateLogout());
 
-        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
+        this._lockdownSettings.connect(`changed::${DISABLE_LOCK_SCREEN_KEY}`,
-                                       () => { this._updateLockScreen(); });
+                                       () => this._updateLockScreen());
 
-        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
+        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
-                                       () => { this._updateHaveShutdown(); });
+                                       () => this._updateHaveShutdown());
 
         this.forceUpdate();
 
         this._orientationSettings.connect('changed::orientation-lock',
-                                          () => { this._updateOrientationLock();
+                                          () => {
-                                                  this._updateOrientationLockIcon(); });
+                                              this._updateOrientationLock();
+                                              this._updateOrientationLockIcon();
+                                          });
         Main.layoutManager.connect('monitors-changed',
-                                   () => { this._updateOrientationLock(); });
+                                   () => this._updateOrientationLock());
-        Gio.DBus.system.watch_name(SENSOR_BUS_NAME,
+        this._sensorProxy = new SensorProxy(Gio.DBus.system,
-                                   Gio.BusNameWatcherFlags.NONE,
+            SENSOR_BUS_NAME,
-                                   () => { this._sensorProxyAppeared(); },
+            SENSOR_OBJECT_PATH,
-                                   () => {
+            (proxy, error)  => {
-                                       this._sensorProxy = null;
+                if (error)
-                                       this._updateOrientationLock();
+                    log(error.message);
-                                   });
+            },
+            null,
+            Gio.DBusProxyFlags.DO_NOT_AUTO_START);
+        this._sensorProxy.connect('g-properties-changed', () => {
+            this._updateOrientationLock();
+        });
+        this._sensorProxy.connect('notify::g-name-owner', () => {
+            this._updateOrientationLock();
+        });
         this._updateOrientationLock();
         this._updateOrientationLockIcon();
 
-        Main.sessionMode.connect('updated', () => { this._sessionUpdated(); });
+        Main.sessionMode.connect('updated', () => this._sessionUpdated());
         this._sessionUpdated();
     }
 
+    // eslint-disable-next-line camelcase
     get can_power_off() {
         return this._actions.get(POWER_OFF_ACTION_ID).available;
     }
 
+    // eslint-disable-next-line camelcase
     get can_suspend() {
         return this._actions.get(SUSPEND_ACTION_ID).available;
     }
 
+    // eslint-disable-next-line camelcase
     get can_lock_screen() {
         return this._actions.get(LOCK_SCREEN_ACTION_ID).available;
     }
 
+    // eslint-disable-next-line camelcase
     get can_switch_user() {
         return this._actions.get(SWITCH_USER_ACTION_ID).available;
     }
 
+    // eslint-disable-next-line camelcase
     get can_logout() {
         return this._actions.get(LOGOUT_ACTION_ID).available;
     }
 
+    // eslint-disable-next-line camelcase
     get can_lock_orientation() {
         return this._actions.get(LOCK_ORIENTATION_ACTION_ID).available;
     }
 
+    // eslint-disable-next-line camelcase
     get orientation_lock_icon() {
         return this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName;
     }
 
-    _sensorProxyAppeared() {
-        this._sensorProxy = new SensorProxy(Gio.DBus.system, SENSOR_BUS_NAME, SENSOR_OBJECT_PATH,
-            (proxy, error)  => {
-                if (error) {
-                    log(error.message);
-                    return;
-                }
-                this._sensorProxy.connect('g-properties-changed',
-                                          () => { this._updateOrientationLock(); });
-                this._updateOrientationLock();
-            });
-    }
-
     _updateOrientationLock() {
         let available = false;
-        if (this._sensorProxy)
+        if (this._sensorProxy.g_name_owner)
             available = this._sensorProxy.HasAccelerometer &&
                         this._monitorManager.get_is_builtin_display_on();
 
@@ -233,8 +244,9 @@ const SystemActions = GObject.registerClass({
 
     _updateOrientationLockIcon() {
         let locked = this._orientationSettings.get_boolean('orientation-lock');
-        let iconName = locked ? 'rotation-locked-symbolic'
+        let iconName = locked
-                              : 'rotation-allowed-symbolic';
+            ? 'rotation-locked-symbolic'
+            : 'rotation-allowed-symbolic';
         this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName = iconName;
 
         this.notify('orientation-lock-icon');
@@ -257,12 +269,12 @@ const SystemActions = GObject.registerClass({
 
     getMatchingActions(terms) {
         // terms is a list of strings
-        terms = terms.map((term) => { return term.toLowerCase(); });
+        terms = terms.map(term => term.toLowerCase());
 
         let results = [];
 
-        for (let [key, {available, keywords}] of this._actions)
+        for (let [key, { available, keywords }] of this._actions)
-            if (available && terms.every(t => keywords.some(k => (k.indexOf(t) >= 0))))
+            if (available && terms.every(t => keywords.some(k => k.startsWith(t))))
                 results.push(key);
 
         return results;
@@ -278,24 +290,24 @@ const SystemActions = GObject.registerClass({
 
     activateAction(id) {
         switch (id) {
-            case POWER_OFF_ACTION_ID:
+        case POWER_OFF_ACTION_ID:
-                this.activatePowerOff();
+            this.activatePowerOff();
-                break;
+            break;
-            case LOCK_SCREEN_ACTION_ID:
+        case LOCK_SCREEN_ACTION_ID:
-                this.activateLockScreen();
+            this.activateLockScreen();
-                break;
+            break;
-            case LOGOUT_ACTION_ID:
+        case LOGOUT_ACTION_ID:
-                this.activateLogout();
+            this.activateLogout();
-                break;
+            break;
-            case SUSPEND_ACTION_ID:
+        case SUSPEND_ACTION_ID:
-                this.activateSuspend();
+            this.activateSuspend();
-                break;
+            break;
-            case SWITCH_USER_ACTION_ID:
+        case SWITCH_USER_ACTION_ID:
-                this.activateSwitchUser();
+            this.activateSwitchUser();
-                break;
+            break;
-            case LOCK_ORIENTATION_ACTION_ID:
+        case LOCK_ORIENTATION_ACTION_ID:
-                this.activateLockOrientation();
+            this.activateLockOrientation();
-                break;
+            break;
         }
     }
 

js/misc/util.js

@@ -1,23 +1,23 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported findUrls, spawn, spawnCommandLine, spawnApp, trySpawnCommandLine,
+            formatTime, formatTimeSpan, createTimeLabel, insertSorted,
+            makeCloseButton, ensureActorVisibleInScrollView, wiggle */
 
 const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
-const Mainloop = imports.mainloop;
-const Signals = imports.signals;
 
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
 const Params = imports.misc.params;
 
-var SCROLL_TIME = 0.1;
+var SCROLL_TIME = 100;
 
 // http://daringfireball.net/2010/07/improved_regex_for_matching_urls
 const _balancedParens = '\\([^\\s()<>]+\\)';
 const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
-const _notTrailingJunk = '[^\\s`!()\\[\\]{};:\'\\".,<>?\u00AB\u00BB\u201C\u201D\u2018\u2019]';
+const _notTrailingJunk = '[^\\s`!()\\[\\]{};:\'\\".,<>?\u00AB\u00BB\u200E\u200F\u201C\u201D\u2018\u2019\u202A\u202C]';
 
 const _urlRegexp = new RegExp(
-    '(^|' + _leadingJunk + ')' +
+    `(^|${_leadingJunk})` +
     '(' +
         '(?:' +
             '(?:http|https|ftp)://' +             // scheme://
@@ -29,12 +29,12 @@ const _urlRegexp = new RegExp(
         '(?:' +                                   // one or more:
             '[^\\s()<>]+' +                       // run of non-space non-()
             '|' +                                 // or
-            _balancedParens +                     // balanced parens
+            `${_balancedParens}` +                // balanced parens
         ')+' +
         '(?:' +                                   // end with:
-            _balancedParens +                     // balanced parens
+            `${_balancedParens}` +                // balanced parens
             '|' +                                 // or
-            _notTrailingJunk +                    // last non-junk char
+            `${_notTrailingJunk}` +               // last non-junk char
         ')' +
     ')', 'gi');
 
@@ -69,16 +69,16 @@ function spawn(argv) {
 }
 
 // spawnCommandLine:
-// @command_line: a command line
+// @commandLine: a command line
 //
-// Runs @command_line in the background, handling any errors that
+// Runs @commandLine in the background, handling any errors that
 // occur when trying to parse or start the program.
-function spawnCommandLine(command_line) {
+function spawnCommandLine(commandLine) {
     try {
-        let [success, argv] = GLib.shell_parse_argv(command_line);
+        let [success_, argv] = GLib.shell_parse_argv(commandLine);
         trySpawn(argv);
     } catch (err) {
-        _handleSpawnError(command_line, err);
+        _handleSpawnError(commandLine, err);
     }
 }
 
@@ -93,7 +93,7 @@ function spawnApp(argv) {
 
         let context = global.create_app_launch_context(0, -1);
         app.launch([], context);
-    } catch(err) {
+    } catch (err) {
         _handleSpawnError(argv[0], err);
     }
 }
@@ -103,13 +103,12 @@ function spawnApp(argv) {
 //
 // Runs @argv in the background. If launching @argv fails,
 // this will throw an error.
-function trySpawn(argv)
+function trySpawn(argv) {
-{
+    var success_, pid;
-    var success, pid;
     try {
-        [success, pid] = GLib.spawn_async(null, argv, null,
+        [success_, pid] = GLib.spawn_async(null, argv, null,
-                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+                                           GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                          null);
+                                           null);
     } catch (err) {
         /* Rewrite the error in case of ENOENT */
         if (err.matches(GLib.SpawnError, GLib.SpawnError.NOENT)) {
@@ -135,19 +134,19 @@ function trySpawn(argv)
 }
 
 // trySpawnCommandLine:
-// @command_line: a command line
+// @commandLine: a command line
 //
-// Runs @command_line in the background. If launching @command_line
+// Runs @commandLine in the background. If launching @commandLine
 // fails, this will throw an error.
-function trySpawnCommandLine(command_line) {
+function trySpawnCommandLine(commandLine) {
-    let success, argv;
+    let success_, argv;
 
     try {
-        [success, argv] = GLib.shell_parse_argv(command_line);
+        [success_, argv] = GLib.shell_parse_argv(commandLine);
     } catch (err) {
         // Replace "Error invoking GLib.shell_parse_argv: " with
         // something nicer
-        err.message = err.message.replace(/[^:]*: /, _("Could not parse command:") + "\n");
+        err.message = err.message.replace(/[^:]*: /, `${_("Could not parse command:")}\n`);
         throw err;
     }
 
@@ -222,7 +221,7 @@ function formatTime(time, params) {
             /* Translators: Time in 24h format */
             format = N_("%H\u2236%M");
         // Show the word "Yesterday" and time if date is on yesterday
-        else if (daysAgo <2)
+        else if (daysAgo < 2)
             /* Translators: this is the word "Yesterday" followed by a
              time string in 24h format. i.e. "Yesterday, 14:30" */
             // xgettext:no-c-format
@@ -251,7 +250,7 @@ function formatTime(time, params) {
             /* Translators: Time in 12h format */
             format = N_("%l\u2236%M %p");
         // Show the word "Yesterday" and time if date is on yesterday
-        else if (daysAgo <2)
+        else if (daysAgo < 2)
             /* Translators: this is the word "Yesterday" followed by a
              time string in 12h format. i.e. "Yesterday, 2:30 pm" */
             // xgettext:no-c-format
@@ -289,7 +288,7 @@ function createTimeLabel(date, params) {
     let id = _desktopSettings.connect('changed::clock-format', () => {
         label.text = formatTime(date, params);
     });
-    label.connect('destroy', () => { _desktopSettings.disconnect(id); });
+    label.connect('destroy', () => _desktopSettings.disconnect(id));
     return label;
 }
 
@@ -314,7 +313,8 @@ function lowerBound(array, val, cmp) {
     if (array.length == 0)
         return 0;
 
-    min = 0; max = array.length;
+    min = 0;
+    max = array.length;
     while (min < (max - 1)) {
         mid = Math.floor((min + max) / 2);
         v = cmp(array[mid], val);
@@ -346,7 +346,7 @@ function insertSorted(array, val, cmp) {
 var CloseButton = GObject.registerClass(
 class CloseButton extends St.Button {
     _init(boxpointer) {
-        super._init({ style_class: 'notification-close'});
+        super._init({ style_class: 'notification-close' });
 
         // This is a bit tricky. St.Bin has its own x-align/y-align properties
         // that compete with Clutter's properties. This should be fixed for
@@ -366,7 +366,7 @@ class CloseButton extends St.Button {
     }
 
     _computeBoxPointerOffset() {
-        if (!this._boxPointer || !this._boxPointer.actor.get_stage())
+        if (!this._boxPointer || !this._boxPointer.get_stage())
             return 0;
 
         let side = this._boxPointer.arrowSide;
@@ -380,7 +380,7 @@ class CloseButton extends St.Button {
         let themeNode = this.get_theme_node();
 
         let offY = this._computeBoxPointerOffset();
-        this.translation_x = themeNode.get_length('-shell-close-overlap-x')
+        this.translation_x = themeNode.get_length('-shell-close-overlap-x');
         this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY;
     }
 
@@ -396,7 +396,7 @@ function makeCloseButton(boxpointer) {
 
 function ensureActorVisibleInScrollView(scrollView, actor) {
     let adjustment = scrollView.vscroll.adjustment;
-    let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
+    let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();
 
     let offset = 0;
     let vfade = scrollView.get_effect("fade");
@@ -424,97 +424,42 @@ function ensureActorVisibleInScrollView(scrollView, actor) {
     else
         return;
 
-    Tweener.addTween(adjustment,
+    adjustment.ease(value, {
-                     { value: value,
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                       time: SCROLL_TIME,
+        duration: SCROLL_TIME
-                       transition: 'easeOutQuad' });
+    });
 }
 
-var AppSettingsMonitor = class {
+function wiggle(actor, params) {
-    constructor(appId, schemaId) {
+    params = Params.parse(params, {
-        this._appId = appId;
+        offset: 0,
-        this._schemaId = schemaId;
+        duration: 0,
+        wiggleCount: 0,
+    });
+    actor.translation_x = 0;
 
-        this._app = null;
+    // Accelerate before wiggling
-        this._settings = null;
+    actor.ease({
-        this._handlers = [];
+        translation_x: -params.offset,
-
+        duration: params.duration,
-        this._schemaSource = Gio.SettingsSchemaSource.get_default();
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-
+        onComplete: () => {
-        this._appSystem = Shell.AppSystem.get_default();
+            // Wiggle
-        this._appSystem.connect('installed-changed',
+            actor.ease({
-                                this._onInstalledChanged.bind(this));
+                translation_x: params.offset,
-        this._onInstalledChanged();
+                duration: params.duration,
-    }
+                mode: Clutter.AnimationMode.LINEAR,
-
+                repeatCount: params.wiggleCount,
-    get available() {
+                autoReverse: true,
-        return this._app != null && this._settings != null;
+                onComplete: () => {
-    }
+                    // Decelerate and return to the original position
-
+                    actor.ease({
-    activateApp() {
+                        translation_x: 0,
-        if (this._app)
+                        duration: params.duration,
-            this._app.activate();
+                        mode: Clutter.AnimationMode.EASE_IN_QUAD,
-    }
+                    });
-
+                }
-    watchSetting(key, callback) {
-        let handler = { id: 0, key: key, callback: callback };
-        this._handlers.push(handler);
-
-        this._connectHandler(handler);
-    }
-
-    _connectHandler(handler) {
-        if (!this._settings || handler.id > 0)
-            return;
-
-        handler.id = this._settings.connect('changed::' + handler.key,
-                                            handler.callback);
-        handler.callback(this._settings, handler.key);
-    }
-
-    _disconnectHandler(handler) {
-        if (this._settings && handler.id > 0)
-            this._settings.disconnect(handler.id);
-        handler.id = 0;
-    }
-
-    _onInstalledChanged() {
-        let hadApp = (this._app != null);
-        this._app = this._appSystem.lookup_app(this._appId);
-        let haveApp = (this._app != null);
-
-        if (hadApp == haveApp)
-            return;
-
-        if (haveApp)
-            this._checkSettings();
-        else
-            this._setSettings(null);
-    }
-
-    _setSettings(settings) {
-        this._handlers.forEach((handler) => { this._disconnectHandler(handler); });
-
-        let hadSettings = (this._settings != null);
-        this._settings = settings;
-        let haveSettings = (this._settings != null);
-
-        this._handlers.forEach((handler) => { this._connectHandler(handler); });
-
-        if (hadSettings != haveSettings)
-            this.emit('available-changed');
-    }
-
-    _checkSettings() {
-        let schema = this._schemaSource.lookup(this._schemaId, true);
-        if (schema) {
-            this._setSettings(new Gio.Settings({ settings_schema: schema }));
-        } else if (this._app) {
-            Mainloop.timeout_add_seconds(1, () => {
-                this._checkSettings();
-                return GLib.SOURCE_REMOVE;
             });
         }
-    }
+    });
-};
+}
-Signals.addSignalMethods(AppSettingsMonitor.prototype);

js/misc/weather.js

@@ -1,10 +1,19 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Geoclue, Gio, GLib, GWeather } = imports.gi;
+const { Geoclue, Gio, GLib, GWeather, Shell } = imports.gi;
 const Signals = imports.signals;
 
 const PermissionStore = imports.misc.permissionStore;
-const Util = imports.misc.util;
+
+const { loadInterfaceXML } = imports.misc.fileUtils;
+
+const WeatherIntegrationIface = loadInterfaceXML('org.gnome.Shell.WeatherIntegration');
+
+const WEATHER_BUS_NAME = 'org.gnome.Weather';
+const WEATHER_OBJECT_PATH = '/org/gnome/Weather';
+const WEATHER_INTEGRATION_IFACE = 'org.gnome.Shell.WeatherIntegration';
+
+const WEATHER_APP_ID = 'org.gnome.Weather.desktop';
 
 // Minimum time between updates to show loading indication
 var UPDATE_THRESHOLD = 10 * GLib.TIME_SPAN_MINUTE;
@@ -26,7 +35,7 @@ var WeatherClient = class {
         this._weatherAuthorized = false;
         this._permStore = new PermissionStore.PermissionStore((proxy, error) => {
             if (error) {
-                log('Failed to connect to permissionStore: ' + error.message);
+                log(`Failed to connect to permissionStore: ${error.message}`);
                 return;
             }
 
@@ -40,7 +49,7 @@ var WeatherClient = class {
 
             this._permStore.LookupRemote('gnome', 'geolocation', (res, error) => {
                 if (error)
-                    log('Error looking up permission: ' + error.message);
+                    log(`Error looking up permission: ${error.message}`);
 
                 let [perms, data] = error ? [{}, null] : res;
                 let  params = ['gnome', 'geolocation', false, data, perms];
@@ -66,17 +75,38 @@ var WeatherClient = class {
             this.emit('changed');
         });
 
-        this._weatherAppMon = new Util.AppSettingsMonitor('org.gnome.Weather.desktop',
+        this._weatherApp = null;
-                                                          'org.gnome.Weather');
+        this._weatherProxy = null;
-        this._weatherAppMon.connect('available-changed', () => { this.emit('changed'); });
+
-        this._weatherAppMon.watchSetting('automatic-location',
+        let nodeInfo = Gio.DBusNodeInfo.new_for_xml(WeatherIntegrationIface);
-                                         this._onAutomaticLocationChanged.bind(this));
+        Gio.DBusProxy.new(
-        this._weatherAppMon.watchSetting('locations',
+            Gio.DBus.session,
-                                         this._onLocationsChanged.bind(this));
+            Gio.DBusProxyFlags.DO_NOT_AUTO_START | Gio.DBusProxyFlags.GET_INVALIDATED_PROPERTIES,
+            nodeInfo.lookup_interface(WEATHER_INTEGRATION_IFACE),
+            WEATHER_BUS_NAME,
+            WEATHER_OBJECT_PATH,
+            WEATHER_INTEGRATION_IFACE,
+            null,
+            this._onWeatherProxyReady.bind(this));
+
+        this._settings = new Gio.Settings({
+            schema_id: 'org.gnome.shell.weather'
+        });
+        this._settings.connect('changed::automatic-location',
+            this._onAutomaticLocationChanged.bind(this));
+        this._onAutomaticLocationChanged();
+        this._settings.connect('changed::locations',
+            this._onLocationsChanged.bind(this));
+        this._onLocationsChanged();
+
+        this._appSystem = Shell.AppSystem.get_default();
+        this._appSystem.connect('installed-changed',
+            this._onInstalledChanged.bind(this));
+        this._onInstalledChanged();
     }
 
     get available() {
-        return this._weatherAppMon.available;
+        return this._weatherApp != null;
     }
 
     get loading() {
@@ -92,7 +122,8 @@ var WeatherClient = class {
     }
 
     activateApp() {
-        this._weatherAppMon.activateApp();
+        if (this._weatherApp)
+            this._weatherApp.activate();
     }
 
     update() {
@@ -114,6 +145,38 @@ var WeatherClient = class {
                this._weatherAuthorized;
     }
 
+    _onWeatherProxyReady(o, res) {
+        try {
+            this._weatherProxy = Gio.DBusProxy.new_finish(res);
+        } catch (e) {
+            log(`Failed to create GNOME Weather proxy: ${e}`);
+            return;
+        }
+
+        this._weatherProxy.connect('g-properties-changed',
+            this._onWeatherPropertiesChanged.bind(this));
+        this._onWeatherPropertiesChanged();
+    }
+
+    _onWeatherPropertiesChanged() {
+        if (this._weatherProxy.g_name_owner == null)
+            return;
+
+        this._settings.set_boolean('automatic-location',
+            this._weatherProxy.AutomaticLocation);
+        this._settings.set_value('locations',
+            new GLib.Variant('av', this._weatherProxy.Locations));
+    }
+
+    _onInstalledChanged() {
+        let hadApp = (this._weatherApp != null);
+        this._weatherApp = this._appSystem.lookup_app(WEATHER_APP_ID);
+        let haveApp = (this._weatherApp != null);
+
+        if (hadApp !== haveApp)
+            this.emit('changed');
+    }
+
     _loadInfo() {
         let id = this._weatherInfo.connect('updated', () => {
             this._weatherInfo.disconnect(id);
@@ -178,8 +241,8 @@ var WeatherClient = class {
             (o, res) => {
                 try {
                     this._gclueService = Geoclue.Simple.new_finish(res);
-                } catch(e) {
+                } catch (e) {
-                    log('Failed to connect to Geoclue2 service: ' + e.message);
+                    log(`Failed to connect to Geoclue2 service: ${e.message}`);
                     this._setLocation(this._mostRecentLocation);
                     return;
                 }
@@ -198,8 +261,8 @@ var WeatherClient = class {
         this._setLocation(location);
     }
 
-    _onAutomaticLocationChanged(settings, key) {
+    _onAutomaticLocationChanged() {
-        let useAutoLocation = settings.get_boolean(key);
+        let useAutoLocation = this._settings.get_boolean('automatic-location');
         if (this._autoLocationRequested == useAutoLocation)
             return;
 
@@ -217,8 +280,9 @@ var WeatherClient = class {
             this._setLocation(this._mostRecentLocation);
     }
 
-    _onLocationsChanged(settings, key) {
+    _onLocationsChanged() {
-        let serialized = settings.get_value(key).deep_unpack().shift();
+        let locations = this._settings.get_value('locations').deep_unpack();
+        let serialized = locations.shift();
         let mostRecentLocation = null;
 
         if (serialized)
@@ -234,7 +298,7 @@ var WeatherClient = class {
     }
 
     _onPermStoreChanged(proxy, sender, params) {
-        let [table, id, deleted, data, perms] = params;
+        let [table, id, deleted_, data_, perms] = params;
 
         if (table != 'gnome' || id != 'geolocation')
             return;

js/perf/core.js

@@ -1,4 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported run, script_overviewShowStart, script_overviewShowDone,
+            script_applicationsShowStart, script_applicationsShowDone,
+            script_afterShowHide, malloc_usedSize, glx_swapComplete,
+            clutter_stagePaintDone */
+/* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^malloc", "^glx", "^clutter"] }] */
 
 const System = imports.system;
 
@@ -19,7 +24,7 @@ var METRICS = {
       units: "frames / s" },
     overviewLatencySubsequent:
     { description: "Time to first frame after triggering overview, second time",
-      units: "us"},
+      units: "us" },
     overviewFpsSubsequent:
     { description: "Frames rate when going to the overview, second time",
       units: "frames / s" },
@@ -52,7 +57,7 @@ var METRICS = {
       units: "us" },
     applicationsShowTimeSubsequent:
     { description: "Time to switch to applications view, second time",
-      units: "us"}
+      units: "us" }
 };
 
 let WINDOW_CONFIGS = [
@@ -121,10 +126,12 @@ function *run() {
 
     for (let i = 0; i < 2; i++) {
         Scripting.scriptEvent('applicationsShowStart');
-        Main.overview._dash.showAppsButton.checked = true;
+        // eslint-disable-next-line require-atomic-updates
+        Main.overview.dash.showAppsButton.checked = true;
         yield Scripting.waitLeisure();
         Scripting.scriptEvent('applicationsShowDone');
-        Main.overview._dash.showAppsButton.checked = false;
+        // eslint-disable-next-line require-atomic-updates
+        Main.overview.dash.showAppsButton.checked = false;
         yield Scripting.waitLeisure();
     }
 }
@@ -136,7 +143,6 @@ let overviewFrames;
 let overviewLatency;
 let mallocUsedSize = 0;
 let overviewShowCount = 0;
-let firstOverviewUsedSize;
 let haveSwapComplete = false;
 let applicationsShowStart;
 let applicationsShowCount = 0;
@@ -148,7 +154,7 @@ function script_overviewShowStart(time) {
     overviewFrames = 0;
 }
 
-function script_overviewShowDone(time) {
+function script_overviewShowDone(_time) {
     // We've set up the state at the end of the zoom out, but we
     // need to wait for one more frame to paint before we count
     // ourselves as done.
@@ -167,7 +173,7 @@ function script_applicationsShowDone(time) {
         METRICS.applicationsShowTimeSubsequent.value = time - applicationsShowStart;
 }
 
-function script_afterShowHide(time) {
+function script_afterShowHide(_time) {
     if (overviewShowCount == 1) {
         METRICS.usedAfterOverview.value = mallocUsedSize;
     } else {

js/perf/hwtest.js

@@ -1,3 +1,12 @@
+/* exported run, script_desktopShown, script_overviewShowStart,
+            script_overviewShowDone, script_applicationsShowStart,
+            script_applicationsShowDone, script_mainViewDrawStart,
+            script_mainViewDrawDone, script_overviewDrawStart,
+            script_overviewDrawDone, script_redrawTestStart,
+            script_redrawTestDone, script_collectTimings,
+            script_geditLaunch, script_geditFirstFrame,
+            clutter_stagePaintStart, clutter_paintCompletedTimestamp */
+/* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^clutter"] }] */
 const { Clutter, Gio, Shell } = imports.gi;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
@@ -30,7 +39,7 @@ var METRICS = {
     geditStartTime:
     { description: "Time from gedit launch to window drawn",
       units: "us" },
-}
+};
 
 function waitAndDraw(milliseconds) {
     let cb;
@@ -38,7 +47,7 @@ function waitAndDraw(milliseconds) {
     let timeline = new Clutter.Timeline({ duration: milliseconds });
     timeline.start();
 
-    timeline.connect('new-frame', (timeline, frame) => {
+    timeline.connect('new-frame', (_timeline, _frame) => {
         global.stage.queue_redraw();
     });
 
@@ -48,7 +57,7 @@ function waitAndDraw(milliseconds) {
             cb();
     });
 
-    return callback => { cb = callback; };
+    return callback => (cb = callback);
 }
 
 function waitSignal(object, signal) {
@@ -60,7 +69,7 @@ function waitSignal(object, signal) {
             cb();
     });
 
-    return callback => { cb = callback; };
+    return callback => (cb = callback);
 }
 
 function extractBootTimestamp() {
@@ -73,8 +82,8 @@ function extractBootTimestamp() {
     let result = null;
 
     let datastream = Gio.DataInputStream.new(sp.get_stdout_pipe());
-    while (true) {
+    while (true) { // eslint-disable-line no-constant-condition
-        let [line, length] = datastream.read_line_utf8(null);
+        let [line, length_] = datastream.read_line_utf8(null);
         if (line === null)
             break;
 
@@ -117,7 +126,8 @@ function *run() {
     yield Scripting.sleep(1000);
 
     Scripting.scriptEvent('applicationsShowStart');
-    Main.overview._dash.showAppsButton.checked = true;
+    // eslint-disable-next-line require-atomic-updates
+    Main.overview.dash.showAppsButton.checked = true;
 
     yield Scripting.waitLeisure();
     Scripting.scriptEvent('applicationsShowDone');
@@ -127,9 +137,9 @@ function *run() {
     Main.overview.hide();
     yield Scripting.waitLeisure();
 
-    ////////////////////////////////////////
+    // --------------------- //
-    // Tests of redraw speed
+    // Tests of redraw speed //
-    ////////////////////////////////////////
+    // --------------------- //
 
     global.frame_timestamps = true;
     global.frame_finish_timestamp = true;
@@ -157,7 +167,7 @@ function *run() {
     Main.overview.hide();
 
     yield Scripting.createTestWindow({ maximized: true,
-                                       redraws: true});
+                                       redraws: true });
     yield Scripting.waitTestWindows();
 
     yield Scripting.sleep(1000);
@@ -176,8 +186,6 @@ function *run() {
 
     yield Scripting.sleep(1000);
 
-    ////////////////////////////////////////
-
     let appSys = Shell.AppSystem.get_default();
     let app = appSys.lookup_app('org.gnome.gedit.desktop');
 
@@ -234,31 +242,31 @@ function script_applicationsShowDone(time) {
     METRICS.applicationsShowTime.value = time - applicationsShowStart;
 }
 
-function script_mainViewDrawStart(time) {
+function script_mainViewDrawStart(_time) {
     redrawTiming = 'mainView';
 }
 
-function script_mainViewDrawDone(time) {
+function script_mainViewDrawDone(_time) {
     redrawTiming = null;
 }
 
-function script_overviewDrawStart(time) {
+function script_overviewDrawStart(_time) {
     redrawTiming = 'overview';
 }
 
-function script_overviewDrawDone(time) {
+function script_overviewDrawDone(_time) {
     redrawTiming = null;
 }
 
-function script_redrawTestStart(time) {
+function script_redrawTestStart(_time) {
     redrawTiming = 'application';
 }
 
-function script_redrawTestDone(time) {
+function script_redrawTestDone(_time) {
     redrawTiming = null;
 }
 
-function script_collectTimings(time) {
+function script_collectTimings(_time) {
     for (let timing in redrawTimes) {
         let times = redrawTimes[timing];
         times.sort((a, b) => a - b);
@@ -269,11 +277,11 @@ function script_collectTimings(time) {
         if (len == 0)
             median = -1;
         else if (len % 2 == 1)
-            median = times[(len - 1)/ 2];
+            median = times[(len - 1) / 2];
         else
             median = Math.round((times[len / 2 - 1] + times[len / 2]) / 2);
 
-        METRICS[timing + 'RedrawTime'].value = median;
+        METRICS[`${timing}RedrawTime`].value = median;
     }
 }
 

js/portalHelper/main.js

@@ -1,3 +1,4 @@
+/* exported main */
 const Format = imports.format;
 const Gettext = imports.gettext;
 const { Gio, GLib, GObject, Gtk, Pango, Soup, WebKit2: WebKit } = imports.gi;
@@ -19,7 +20,6 @@ const PortalHelperSecurityLevel = {
     INSECURE: 2
 };
 
-const INACTIVITY_TIMEOUT = 30000; //ms
 const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
 const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST;
 const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
@@ -59,7 +59,7 @@ class PortalHeaderBar extends Gtk.HeaderBar {
                                              single_line_mode: true,
                                              ellipsize: Pango.EllipsizeMode.END,
                                              valign: Gtk.Align.BASELINE,
-                                             selectable: true});
+                                             selectable: true });
         this.subtitleLabel.get_style_context().add_class('subtitle');
         hbox.add(this.subtitleLabel);
 
@@ -152,7 +152,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
         this._webView.load_uri(this._originalUrl);
     }
 
-    vfunc_delete_event(event) {
+    vfunc_delete_event(_event) {
         if (this._recheckAtExit)
             this._doneCallback(PortalHelperResult.RECHECK);
         else
@@ -178,7 +178,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
         this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.INSECURE);
     }
 
-    _onLoadFailedWithTlsErrors(view, failingURI, certificate, errors) {
+    _onLoadFailedWithTlsErrors(view, failingURI, certificate, _errors) {
         this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.INSECURE);
         let uri = new Soup.URI(failingURI);
         this._webContext.allow_tls_certificate_for_host(certificate, uri.get_host());
@@ -265,7 +265,7 @@ class WebPortalHelper extends Gtk.Application {
         this._queue = [];
 
         let action = new Gio.SimpleAction({ name: 'quit' });
-        action.connect('activate', () => { this.active_window.destroyWindow(); });
+        action.connect('activate', () => this.active_window.destroyWindow());
         this.add_action(action);
     }
 

js/ui/accessDialog.js

@@ -1,4 +1,5 @@
-const { Clutter, Gio, GLib, Shell } = imports.gi;
+/* exported AccessDialogDBus */
+const { Clutter, Gio, GLib, GObject, Shell } = imports.gi;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
@@ -15,9 +16,10 @@ var DialogResponse = {
     CLOSED: 2
 };
 
-var AccessDialog = class extends ModalDialog.ModalDialog {
+var AccessDialog = GObject.registerClass(
-    constructor(invocation, handle, title, subtitle, body, options) {
+class AccessDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'access-dialog' });
+    _init(invocation, handle, title, subtitle, body, options) {
+        super._init({ styleClass: 'access-dialog' });
 
         this._invocation = invocation;
         this._handle = handle;
@@ -54,8 +56,8 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
 
             let check = new CheckBox.CheckBox();
             check.getLabelActor().text = name;
-            check.actor.checked = selected == "true";
+            check.checked = selected == "true";
-            content.insertBeforeBody(check.actor);
+            content.insertBeforeBody(check);
 
             this._choices.set(id, check);
         }
@@ -68,7 +70,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
         this.addButton({ label: grantLabel,
                          action: () => {
                              this._sendResponse(DialogResponse.OK);
-                         }});
+                         } });
     }
 
     open() {
@@ -78,7 +80,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
         this._requestExported = this._request.export(connection, this._handle);
     }
 
-    CloseAsync(invocation, params) {
+    CloseAsync(invocation, _params) {
         if (this._invocation.get_sender() != invocation.get_sender()) {
             invocation.return_error_literal(Gio.DBusError,
                                             Gio.DBusError.ACCESS_DENIED,
@@ -97,7 +99,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
         let results = {};
         if (response == DialogResponse.OK) {
             for (let [id, check] of this._choices) {
-                let checked = check.actor.checked ? 'true' : 'false';
+                let checked = check.checked ? 'true' : 'false';
                 results[id] = new GLib.Variant('s', checked);
             }
         }
@@ -109,7 +111,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
         });
         this.close();
     }
-};
+});
 
 var AccessDialogDBus = class {
     constructor() {
@@ -131,10 +133,10 @@ var AccessDialogDBus = class {
             return;
         }
 
-        let [handle, appId, parentWindow, title, subtitle, body, options] = params;
+        let [handle, appId, parentWindow_, title, subtitle, body, options] = params;
         // We probably want to use parentWindow and global.display.focus_window
         // for this check in the future
-        if (appId && appId + '.desktop' != this._windowTracker.focus_app.id) {
+        if (appId && `${appId}.desktop` != this._windowTracker.focus_app.id) {
             invocation.return_error_literal(Gio.DBusError,
                                             Gio.DBusError.ACCESS_DENIED,
                                             'Only the focused app is allowed to show a system access dialog');
@@ -145,7 +147,7 @@ var AccessDialogDBus = class {
                                       subtitle, body, options);
         dialog.open();
 
-        dialog.connect('closed', () => { this._accessDialog = null; });
+        dialog.connect('closed', () => (this._accessDialog = null));
 
         this._accessDialog = dialog;
     }

js/ui/altTab.js

@@ -1,17 +1,17 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported AppSwitcherPopup, GroupCyclerPopup, WindowSwitcherPopup,
+            WindowCyclerPopup */
 
 const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
-const Mainloop = imports.mainloop;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;
-const Tweener = imports.ui.tweener;
 
 var APP_ICON_HOVER_TIMEOUT = 200; // milliseconds
 
 var THUMBNAIL_DEFAULT_SIZE = 256;
 var THUMBNAIL_POPUP_TIME = 500; // milliseconds
-var THUMBNAIL_FADE_TIME = 0.1; // seconds
+var THUMBNAIL_FADE_TIME = 100; // milliseconds
 
 var WINDOW_PREVIEW_SIZE = 128;
 var APP_ICON_SIZE = 96;
@@ -36,7 +36,7 @@ function _createWindowClone(window, size) {
                                // usual hack for the usual bug in ClutterBinLayout...
                                x_expand: true,
                                y_expand: true });
-};
+}
 
 function getWindows(workspace) {
     // We ignore skip-taskbar windows in switchers, but if they are attached
@@ -87,9 +87,9 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             let hPadding = leftPadding + rightPadding;
 
             let icon = this._items[this._selectedIndex];
-            let [posX, posY] = icon.get_transformed_position();
+            let [posX] = icon.get_transformed_position();
             let thumbnailCenter = posX + icon.width / 2;
-            let [childMinWidth, childNaturalWidth] = this._thumbnails.get_preferred_width(-1);
+            let [, childNaturalWidth] = this._thumbnails.get_preferred_width(-1);
             childBox.x1 = Math.max(primary.x + leftPadding, Math.floor(thumbnailCenter - childNaturalWidth / 2));
             if (childBox.x1 + childNaturalWidth > primary.x + primary.width - hPadding) {
                 let offset = childBox.x1 + childNaturalWidth - primary.width + hPadding;
@@ -103,7 +103,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
                 childBox.x2 = primary.x + primary.width - rightPadding;
             childBox.y1 = this._switcherList.allocation.y2 + spacing;
             this._thumbnails.addClones(primary.y + primary.height - bottomPadding - childBox.y1);
-            let [childMinHeight, childNaturalHeight] = this._thumbnails.get_preferred_height(-1);
+            let [, childNaturalHeight] = this._thumbnails.get_preferred_height(-1);
             childBox.y2 = childBox.y1 + childNaturalHeight;
             this._thumbnails.allocate(childBox, flags);
         }
@@ -291,7 +291,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         if (this._thumbnails)
             this._destroyThumbnails();
         if (this._thumbnailTimeoutId != 0)
-            Mainloop.source_remove(this._thumbnailTimeoutId);
+            GLib.source_remove(this._thumbnailTimeoutId);
     }
 
     /**
@@ -326,7 +326,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         }
 
         if (this._thumbnailTimeoutId != 0) {
-            Mainloop.source_remove(this._thumbnailTimeoutId);
+            GLib.source_remove(this._thumbnailTimeoutId);
             this._thumbnailTimeoutId = 0;
         }
 
@@ -343,7 +343,8 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             this._thumbnails.highlight(window, forceAppFocus);
         } else if (this._items[this._selectedIndex].cachedWindows.length > 1 &&
                    !forceAppFocus) {
-            this._thumbnailTimeoutId = Mainloop.timeout_add (
+            this._thumbnailTimeoutId = GLib.timeout_add(
+                GLib.PRIORITY_DEFAULT,
                 THUMBNAIL_POPUP_TIME,
                 this._timeoutPopupThumbnails.bind(this));
             GLib.Source.set_name_by_id(this._thumbnailTimeoutId, '[gnome-shell] this._timeoutPopupThumbnails');
@@ -360,15 +361,15 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
 
     _destroyThumbnails() {
         let thumbnailsActor = this._thumbnails;
-        Tweener.addTween(thumbnailsActor,
+        this._thumbnails.ease({
-                         { opacity: 0,
+            opacity: 0,
-                           time: THUMBNAIL_FADE_TIME,
+            duration: THUMBNAIL_FADE_TIME,
-                           transition: 'easeOutQuad',
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                           onComplete: () => {
+            onComplete: () => {
-                               thumbnailsActor.destroy();
+                thumbnailsActor.destroy();
-                               this.thumbnailsVisible = false;
+                this.thumbnailsVisible = false;
-                           }
+            }
-                         });
+        });
         this._thumbnails = null;
         if (this._switcherList._items[this._selectedIndex])
             this._switcherList._items[this._selectedIndex].remove_accessible_state (Atk.StateType.EXPANDED);
@@ -391,38 +392,39 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         this._thumbnails.get_allocation_box();
 
         this._thumbnails.opacity = 0;
-        Tweener.addTween(this._thumbnails,
+        this._thumbnails.ease({
-                         { opacity: 255,
+            opacity: 255,
-                           time: THUMBNAIL_FADE_TIME,
+            duration: THUMBNAIL_FADE_TIME,
-                           transition: 'easeOutQuad',
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                           onComplete: () => { this.thumbnailsVisible = true; }
+            onComplete: () => {
-                         });
+                this.thumbnailsVisible = true;
+            }
+        });
 
         this._switcherList._items[this._selectedIndex].add_accessible_state (Atk.StateType.EXPANDED);
     }
 });
 
-class CyclerHighlight {
+var CyclerHighlight = GObject.registerClass(
-    constructor() {
+class CyclerHighlight extends St.Widget {
+    _init() {
+        super._init({ layout_manager: new Clutter.BinLayout() });
         this._window = null;
 
-        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-
         this._clone = new Clutter.Clone();
-        this.actor.add_actor(this._clone);
+        this.add_actor(this._clone);
 
         this._highlight = new St.Widget({ style_class: 'cycler-highlight' });
-        this.actor.add_actor(this._highlight);
+        this.add_actor(this._highlight);
 
         let coordinate = Clutter.BindCoordinate.ALL;
         let constraint = new Clutter.BindConstraint({ coordinate: coordinate });
         this._clone.bind_property('source', constraint, 'source', 0);
 
-        this.actor.add_constraint(constraint);
+        this.add_constraint(constraint);
 
-        this.actor.connect('notify::allocation',
+        this.connect('notify::allocation', this._onAllocationChanged.bind(this));
-                           this._onAllocationChanged.bind(this));
+        this.connect('destroy', this._onDestroy.bind(this));
-        this.actor.connect('destroy', this._onDestroy.bind(this));
     }
 
     set window(w) {
@@ -434,8 +436,8 @@ class CyclerHighlight {
         if (this._clone.source)
             this._clone.source.sync_visibility();
 
-        let windowActor = this._window ? this._window.get_compositor_private()
+        let windowActor = this._window
-                                       : null;
+            ? this._window.get_compositor_private() : null;
 
         if (windowActor)
             windowActor.hide();
@@ -448,7 +450,7 @@ class CyclerHighlight {
             this._highlight.set_size(0, 0);
             this._highlight.hide();
         } else {
-            let [x, y] = this.actor.allocation.get_origin();
+            let [x, y] = this.allocation.get_origin();
             let rect = this._window.get_frame_rect();
             this._highlight.set_size(rect.width, rect.height);
             this._highlight.set_position(rect.x - x, rect.y - y);
@@ -459,7 +461,7 @@ class CyclerHighlight {
     _onDestroy() {
         this.window = null;
     }
-};
+});
 
 // We don't show an actual popup, so just provide what SwitcherPopup
 // expects instead of inheriting from SwitcherList
@@ -469,17 +471,15 @@ var CyclerList = GObject.registerClass({
                'item-removed': { param_types: [GObject.TYPE_INT] },
                'item-highlighted': { param_types: [GObject.TYPE_INT] } },
 }, class CyclerList extends St.Widget {
-    highlight(index, justOutline) {
+    highlight(index, _justOutline) {
         this.emit('item-highlighted', index);
     }
 });
 
-var CyclerPopup = GObject.registerClass(
+var CyclerPopup = GObject.registerClass({
-class CyclerPopup extends SwitcherPopup.SwitcherPopup {
+    GTypeFlags: GObject.TypeFlags.ABSTRACT
+}, class CyclerPopup extends SwitcherPopup.SwitcherPopup {
     _init() {
-        if (new.target === CyclerPopup)
-            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
-
         super._init();
 
         this._items = this._getWindows();
@@ -488,7 +488,7 @@ class CyclerPopup extends SwitcherPopup.SwitcherPopup {
             return;
 
         this._highlight = new CyclerHighlight();
-        global.window_group.add_actor(this._highlight.actor);
+        global.window_group.add_actor(this._highlight);
 
         this._switcherList = new CyclerList();
         this._switcherList.connect('item-highlighted', (list, index) => {
@@ -496,9 +496,9 @@ class CyclerPopup extends SwitcherPopup.SwitcherPopup {
         });
     }
 
-    _highlightItem(index, justOutline) {
+    _highlightItem(index, _justOutline) {
         this._highlight.window = this._items[index];
-        global.window_group.set_child_above_sibling(this._highlight.actor, null);
+        global.window_group.set_child_above_sibling(this._highlight, null);
     }
 
     _finish() {
@@ -528,7 +528,7 @@ class CyclerPopup extends SwitcherPopup.SwitcherPopup {
     }
 
     _onDestroy() {
-        this._highlight.actor.destroy();
+        this._highlight.destroy();
 
         super._onDestroy();
     }
@@ -647,8 +647,9 @@ class WindowCyclerPopup extends CyclerPopup {
     }
 });
 
-var AppIcon = GObject.registerClass(
+var AppIcon = GObject.registerClass({
-class AppIcon extends St.BoxLayout {
+    GTypeName: 'AltTab_AppIcon'
+}, class AppIcon extends St.BoxLayout {
     _init(app) {
         super._init({ style_class: 'alt-tab-app',
                       vertical: true });
@@ -662,17 +663,10 @@ class AppIcon extends St.BoxLayout {
         this.add(this.label, { x_fill: false });
     }
 
+    // eslint-disable-next-line camelcase
     set_size(size) {
         this.icon = this.app.create_icon_texture(size);
         this._iconBin.child = this.icon;
-        this._iconBin.set_size(size, size);
-    }
-
-    vfunc_get_preferred_width(forHeight) {
-        let [minWidth, ] = super.vfunc_get_preferred_width(forHeight);
-
-        minWidth = Math.max(minWidth, forHeight);
-        return [minWidth, minWidth];
     }
 });
 
@@ -717,7 +711,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
 
     _onDestroy() {
         if (this._mouseTimeOutId != 0)
-            Mainloop.source_remove(this._mouseTimeOutId);
+            GLib.source_remove(this._mouseTimeOutId);
 
         this.icons.forEach(icon => {
             icon.app.disconnect(icon._stateChangedId);
@@ -726,15 +720,16 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
 
     _setIconSize() {
         let j = 0;
-        while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
+        while (this._items.length > 1 && this._items[j].style_class != 'item-box') {
-                j++;
+            j++;
         }
         let themeNode = this._items[j].get_theme_node();
+        this._list.ensure_style();
 
         let iconPadding = themeNode.get_horizontal_padding();
         let iconBorder = themeNode.get_border_width(St.Side.LEFT) + themeNode.get_border_width(St.Side.RIGHT);
-        let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
+        let [, labelNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
-        let iconSpacing = iconNaturalHeight + iconPadding + iconBorder;
+        let iconSpacing = labelNaturalHeight + iconPadding + iconBorder;
         let totalSpacing = this._list.spacing * (this._items.length - 1);
 
         // We just assume the whole screen here due to weirdness happing with the passed width
@@ -747,7 +742,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
         let iconSize = baseIconSizes[0];
 
         if (this._items.length > 1) {
-            for(let i =  0; i < baseIconSizes.length; i++) {
+            for (let i =  0; i < baseIconSizes.length; i++) {
                 iconSize = baseIconSizes[i];
                 let height = iconSizes[i] + iconSpacing;
                 let w = height * this._items.length + totalSpacing;
@@ -758,7 +753,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
 
         this._iconSize = iconSize;
 
-        for(let i = 0; i < this.icons.length; i++) {
+        for (let i = 0; i < this.icons.length; i++) {
             if (this.icons[i].icon != null)
                 break;
             this.icons[i].set_size(iconSize);
@@ -795,21 +790,24 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
     // activation when the thumbnail list is open
     _onItemEnter(index) {
         if (this._mouseTimeOutId != 0)
-            Mainloop.source_remove(this._mouseTimeOutId);
+            GLib.source_remove(this._mouseTimeOutId);
         if (this._altTabPopup.thumbnailsVisible) {
-            this._mouseTimeOutId = Mainloop.timeout_add(APP_ICON_HOVER_TIMEOUT,
+            this._mouseTimeOutId = GLib.timeout_add(
-                                                        () => {
+                GLib.PRIORITY_DEFAULT,
-                                                            this._enterItem(index);
+                APP_ICON_HOVER_TIMEOUT,
-                                                            this._mouseTimeOutId = 0;
+                () => {
-                                                            return GLib.SOURCE_REMOVE;
+                    this._enterItem(index);
-                                                        });
+                    this._mouseTimeOutId = 0;
+                    return GLib.SOURCE_REMOVE;
+                });
             GLib.Source.set_name_by_id(this._mouseTimeOutId, '[gnome-shell] this._enterItem');
-        } else
+        } else {
-           this._itemEntered(index);
+            this._itemEntered(index);
+        }
     }
 
     _enterItem(index) {
-        let [x, y, mask] = global.get_pointer();
+        let [x, y] = global.get_pointer();
         let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
         if (this._items[index].contains(pickedActor))
             this._itemEntered(index);
@@ -850,9 +848,8 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                 this._removeIcon(app);
         });
 
-        let n = this._arrows.length;
         let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
-        arrow.connect('repaint', () => { SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM); });
+        arrow.connect('repaint', () => SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM));
         this.add_actor(arrow);
         this._arrows.push(arrow);
 
@@ -879,9 +876,9 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
     _init(windows) {
         super._init(false);
 
-        this._labels = new Array();
+        this._labels = [];
-        this._thumbnailBins = new Array();
+        this._thumbnailBins = [];
-        this._clones = new Array();
+        this._clones = [];
         this._windows = windows;
 
         for (let i = 0; i < windows.length; i++) {
@@ -917,7 +914,7 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
             return;
         let totalPadding = this._items[0].get_theme_node().get_horizontal_padding() + this._items[0].get_theme_node().get_vertical_padding();
         totalPadding += this.get_theme_node().get_horizontal_padding() + this.get_theme_node().get_vertical_padding();
-        let [labelMinHeight, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
+        let [, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
         let spacing = this._items[0].child.get_theme_node().get_length('spacing');
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         let thumbnailSize = THUMBNAIL_DEFAULT_SIZE * scaleFactor;
@@ -942,7 +939,7 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
         }
 
         // Make sure we only do this once
-        this._thumbnailBins = new Array();
+        this._thumbnailBins = [];
     }
 
     _removeThumbnail(source, clone) {
@@ -993,32 +990,32 @@ class WindowIcon extends St.BoxLayout {
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
 
         switch (mode) {
-            case AppIconMode.THUMBNAIL_ONLY:
+        case AppIconMode.THUMBNAIL_ONLY:
-                size = WINDOW_PREVIEW_SIZE;
+            size = WINDOW_PREVIEW_SIZE;
-                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+            this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
-                break;
+            break;
 
-            case AppIconMode.BOTH:
+        case AppIconMode.BOTH:
-                size = WINDOW_PREVIEW_SIZE;
+            size = WINDOW_PREVIEW_SIZE;
-                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+            this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
 
-                if (this.app)
+            if (this.app)
-                    this._icon.add_actor(this._createAppIcon(this.app,
+                this._icon.add_actor(this._createAppIcon(this.app,
-                                                             APP_ICON_SIZE_SMALL));
+                                                         APP_ICON_SIZE_SMALL));
-                break;
+            break;
 
-            case AppIconMode.APP_ICON_ONLY:
+        case AppIconMode.APP_ICON_ONLY:
-                size = APP_ICON_SIZE;
+            size = APP_ICON_SIZE;
-                this._icon.add_actor(this._createAppIcon(this.app, size));
+            this._icon.add_actor(this._createAppIcon(this.app, size));
         }
 
         this._icon.set_size(size * scaleFactor, size * scaleFactor);
     }
 
     _createAppIcon(app, size) {
-        let appIcon = app ? app.create_icon_texture(size)
+        let appIcon = app
-                          : new St.Icon({ icon_name: 'icon-missing',
+            ? app.create_icon_texture(size)
-                                          icon_size: size });
+            : new St.Icon({ icon_name: 'icon-missing', icon_size: size });
         appIcon.x_expand = appIcon.y_expand = true;
         appIcon.x_align = appIcon.y_align = Clutter.ActorAlign.END;
 
@@ -1045,8 +1042,8 @@ class WindowList extends SwitcherPopup.SwitcherList {
             this.addItem(icon, icon.label);
             this.icons.push(icon);
 
-            icon._unmanagedSignalId = icon.window.connect('unmanaged', (window) => {
+            icon._unmanagedSignalId = icon.window.connect('unmanaged', window => {
-                this._removeWindow(window)
+                this._removeWindow(window);
             });
         }
 
@@ -1082,7 +1079,7 @@ class WindowList extends SwitcherPopup.SwitcherList {
         childBox.y1 = childBox.y2 - this._label.height;
         this._label.allocate(childBox, flags);
 
-        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM)
+        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM);
         childBox.x1 = box.x1;
         childBox.x2 = box.x2;
         childBox.y1 = box.y1;

js/ui/animation.js

@@ -1,21 +1,18 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Animation, AnimatedIcon, Spinner */
 
-const { GLib, Gio, St } = imports.gi;
+const { Clutter, GLib, GObject, Gio, St } = imports.gi;
-const Mainloop = imports.mainloop;
-
-const Tweener = imports.ui.tweener;
 
 var ANIMATED_ICON_UPDATE_TIMEOUT = 16;
-var SPINNER_ANIMATION_TIME = 0.3;
+var SPINNER_ANIMATION_TIME = 300;
-var SPINNER_ANIMATION_DELAY = 1.0;
+var SPINNER_ANIMATION_DELAY = 1000;
 
-var Animation = class {
+var Animation = GObject.registerClass(
-    constructor(file, width, height, speed) {
+class Animation extends St.Bin {
-        this.actor = new St.Bin();
+    _init(file, width, height, speed) {
-        this.actor.set_size(width, height);
+        super._init({ width: width, height: height });
-        this.actor.connect('destroy', this._onDestroy.bind(this));
+        this.connect('destroy', this._onDestroy.bind(this));
-        this.actor.connect('notify::size', this._syncAnimationSize.bind(this));
+        this.connect('resource-scale-changed',
-        this.actor.connect('resource-scale-changed',
             this._loadFile.bind(this, file, width, height));
 
         let themeContext = St.ThemeContext.get_for_stage(global.stage);
@@ -46,7 +43,7 @@ var Animation = class {
 
     stop() {
         if (this._timeoutId > 0) {
-            Mainloop.source_remove(this._timeoutId);
+            GLib.source_remove(this._timeoutId);
             this._timeoutId = 0;
         }
 
@@ -54,20 +51,30 @@ var Animation = class {
     }
 
     _loadFile(file, width, height) {
-        let [validResourceScale, resourceScale] = this.actor.get_resource_scale();
+        let [validResourceScale, resourceScale] = this.get_resource_scale();
+        let wasPlaying = this._isPlaying;
+
+        if (this._isPlaying)
+            this.stop();
 
         this._isLoaded = false;
-        this.actor.destroy_all_children();
+        this.destroy_all_children();
 
-        if (!validResourceScale)
+        if (!validResourceScale) {
+            if (wasPlaying)
+                this.play();
             return;
+        }
 
-        let texture_cache = St.TextureCache.get_default();
+        let textureCache = St.TextureCache.get_default();
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = texture_cache.load_sliced_image(file, width, height,
+        this._animations = textureCache.load_sliced_image(file, width, height,
-                                                           scaleFactor, resourceScale,
+                                                          scaleFactor, resourceScale,
-                                                           this._animationsLoaded.bind(this));
+                                                          this._animationsLoaded.bind(this));
-        this.actor.set_child(this._animations);
+        this.set_child(this._animations);
+
+        if (wasPlaying)
+            this.play();
     }
 
     _showFrame(frame) {
@@ -91,7 +98,7 @@ var Animation = class {
         if (!this._isLoaded)
             return;
 
-        let [width, height] = this.actor.get_size();
+        let [width, height] = this.get_size();
 
         for (let i = 0; i < this._animations.get_n_children(); ++i)
             this._animations.get_child_at_index(i).set_size(width, height);
@@ -114,20 +121,22 @@ var Animation = class {
             themeContext.disconnect(this._scaleChangedId);
         this._scaleChangedId = 0;
     }
-};
+});
 
-var AnimatedIcon = class extends Animation {
+var AnimatedIcon = GObject.registerClass(
-    constructor(file, size) {
+class AnimatedIcon extends Animation {
-        super(file, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+    _init(file, size) {
+        super._init(file, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
     }
-};
+});
 
-var Spinner = class extends AnimatedIcon {
+var Spinner = GObject.registerClass(
-    constructor(size, animate=false) {
+class Spinner extends AnimatedIcon {
+    _init(size, animate = false) {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
-        super(file, size);
+        super._init(file, size);
 
-        this.actor.opacity = 0;
+        this.opacity = 0;
         this._animate = animate;
     }
 
@@ -137,37 +146,35 @@ var Spinner = class extends AnimatedIcon {
     }
 
     play() {
-        Tweener.removeTweens(this.actor);
+        this.remove_all_transitions();
 
         if (this._animate) {
             super.play();
-            Tweener.addTween(this.actor, {
+            this.ease({
                 opacity: 255,
                 delay: SPINNER_ANIMATION_DELAY,
-                time: SPINNER_ANIMATION_TIME,
+                duration: SPINNER_ANIMATION_TIME,
-                transition: 'linear'
+                mode: Clutter.AnimationMode.LINEAR
             });
         } else {
-            this.actor.opacity = 255;
+            this.opacity = 255;
             super.play();
         }
     }
 
     stop() {
-        Tweener.removeTweens(this.actor);
+        this.remove_all_transitions();
 
         if (this._animate) {
-            Tweener.addTween(this.actor, {
+            this.ease({
                 opacity: 0,
-                time: SPINNER_ANIMATION_TIME,
+                duration: SPINNER_ANIMATION_TIME,
-                transition: 'linear',
+                mode: Clutter.AnimationMode.LINEAR,
-                onComplete: () => {
+                onComplete: () => super.stop()
-                    this.stop(false);
-                }
             });
         } else {
-            this.actor.opacity = 0;
+            this.opacity = 0;
             super.stop();
         }
     }
-};
+});

js/ui/appFavorites.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getAppFavorites */
 
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
@@ -54,6 +55,7 @@ const RENAMED_DESKTOP_IDS = {
     'org.gnome.taquin.desktop': 'org.gnome.Taquin.desktop',
     'org.gnome.Weather.Application.desktop': 'org.gnome.Weather.desktop',
     'polari.desktop': 'org.gnome.Polari.desktop',
+    'shotwell.desktop': 'org.gnome.Shotwell.desktop',
     'tali.desktop': 'org.gnome.Tali.desktop',
     'totem.desktop': 'org.gnome.Totem.desktop',
     'evince.desktop': 'org.gnome.Evince.desktop',
@@ -63,7 +65,7 @@ class AppFavorites {
     constructor() {
         this.FAVORITE_APPS_KEY = 'favorite-apps';
         this._favorites = {};
-        global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, this._onFavsChanged.bind(this));
+        global.settings.connect(`changed::${this.FAVORITE_APPS_KEY}`, this._onFavsChanged.bind(this));
         this.reload();
     }
 
@@ -146,12 +148,11 @@ class AppFavorites {
 
         let app = Shell.AppSystem.get_default().lookup_app(appId);
 
-        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()),
+        let msg = _("%s has been added to your favorites.").format(app.get_name());
-                                 { forFeedback: true,
+        Main.overview.setMessage(msg, {
-                                   undoCallback: () => {
+            forFeedback: true,
-                                       this._removeFavorite(appId);
+            undoCallback: () => this._removeFavorite(appId),
-                                   }
+        });
-                                 });
     }
 
     addFavorite(appId) {
@@ -180,14 +181,13 @@ class AppFavorites {
         if (!this._removeFavorite(appId))
             return;
 
-        Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
+        let msg = _("%s has been removed from your favorites.").format(app.get_name());
-                                 { forFeedback: true,
+        Main.overview.setMessage(msg, {
-                                   undoCallback: () => {
+            forFeedback: true,
-                                       this._addFavorite(appId, pos);
+            undoCallback: () => this._addFavorite(appId, pos),
-                                   }
+        });
-                                 });
     }
-};
+}
 Signals.addSignalMethods(AppFavorites.prototype);
 
 var appFavoritesInstance = null;

js/ui/audioDeviceSelection.js

@@ -1,4 +1,5 @@
-const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
+/* exported AudioDeviceSelectionDBus */
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
@@ -13,10 +14,11 @@ var AudioDevice = {
 
 const AudioDeviceSelectionIface = loadInterfaceXML('org.gnome.Shell.AudioDeviceSelection');
 
-var AudioDeviceSelectionDialog =
+var AudioDeviceSelectionDialog = GObject.registerClass({
-class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
+    Signals: { 'device-selected': { param_types: [GObject.TYPE_UINT] } }
-    constructor(devices) {
+}, class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'audio-device-selection-dialog' });
+    _init(devices) {
+        super._init({ styleClass: 'audio-device-selection-dialog' });
 
         this._deviceItems = {};
 
@@ -33,11 +35,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
             throw new Error('Too few devices for a selection');
     }
 
-    destroy() {
+    _buildLayout() {
-        super.destroy();
-    }
-
-    _buildLayout(devices) {
         let title = new St.Label({ style_class: 'audio-selection-title',
                                    text: _("Select Audio Device"),
                                    x_align: Clutter.ActorAlign.CENTER });
@@ -57,28 +55,28 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
     }
 
     _getDeviceLabel(device) {
-        switch(device) {
+        switch (device) {
-            case AudioDevice.HEADPHONES:
+        case AudioDevice.HEADPHONES:
-                return _("Headphones");
+            return _("Headphones");
-            case AudioDevice.HEADSET:
+        case AudioDevice.HEADSET:
-                return _("Headset");
+            return _("Headset");
-            case AudioDevice.MICROPHONE:
+        case AudioDevice.MICROPHONE:
-                return _("Microphone");
+            return _("Microphone");
-            default:
+        default:
-                return null;
+            return null;
         }
     }
 
     _getDeviceIcon(device) {
-        switch(device) {
+        switch (device) {
-            case AudioDevice.HEADPHONES:
+        case AudioDevice.HEADPHONES:
-                return 'audio-headphones-symbolic';
+            return 'audio-headphones-symbolic';
-            case AudioDevice.HEADSET:
+        case AudioDevice.HEADSET:
-                return 'audio-headset-symbolic';
+            return 'audio-headset-symbolic';
-            case AudioDevice.MICROPHONE:
+        case AudioDevice.MICROPHONE:
-                return 'audio-input-microphone-symbolic';
+            return 'audio-input-microphone-symbolic';
-            default:
+        default:
-                return null;
+            return null;
         }
     }
 
@@ -88,6 +86,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
         box.connect('notify::height', () => {
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
                 box.width = box.height;
+                return GLib.SOURCE_REMOVE;
             });
         });
 
@@ -113,11 +112,11 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
     }
 
     _openSettings() {
-        let desktopFile = 'gnome-sound-panel.desktop'
+        let desktopFile = 'gnome-sound-panel.desktop';
         let app = Shell.AppSystem.get_default().lookup_app(desktopFile);
 
         if (!app) {
-            log('Settings panel for desktop file ' + desktopFile + ' could not be loaded!');
+            log(`Settings panel for desktop file ${desktopFile} could not be loaded!`);
             return;
         }
 
@@ -125,7 +124,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
         Main.overview.hide();
         app.activate();
     }
-};
+});
 
 var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
     constructor() {
@@ -162,12 +161,12 @@ var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
 
         let [deviceNames] = params;
         let devices = 0;
-        deviceNames.forEach(n => { devices |= AudioDevice[n.toUpperCase()]; });
+        deviceNames.forEach(n => (devices |= AudioDevice[n.toUpperCase()]));
 
         let dialog;
         try {
             dialog = new AudioDeviceSelectionDialog(devices);
-        } catch(e) {
+        } catch (e) {
             invocation.return_value(null);
             return;
         }

js/ui/background.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported SystemBackground */
 
 // READ THIS FIRST
 // Background handling is a maze of objects, both objects in this file, and
@@ -93,13 +94,12 @@
 //     MetaBackgroundImage         MetaBackgroundImage
 //     MetaBackgroundImage         MetaBackgroundImage
 
-const { Clutter, GDesktopEnums, Gio, GLib, GnomeDesktop, Meta } = imports.gi;
+const { Clutter, GDesktopEnums, Gio, GLib, GObject, GnomeDesktop, Meta } = imports.gi;
 const Signals = imports.signals;
 
 const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;
 
 var DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
 
@@ -108,10 +108,9 @@ const PRIMARY_COLOR_KEY = 'primary-color';
 const SECONDARY_COLOR_KEY = 'secondary-color';
 const COLOR_SHADING_TYPE_KEY = 'color-shading-type';
 const BACKGROUND_STYLE_KEY = 'picture-options';
-const PICTURE_OPACITY_KEY = 'picture-opacity';
 const PICTURE_URI_KEY = 'picture-uri';
 
-var FADE_ANIMATION_TIME = 1.0;
+var FADE_ANIMATION_TIME = 1000;
 
 // These parameters affect how often we redraw.
 // The first is how different (percent crossfaded) the slide show
@@ -222,16 +221,17 @@ function getBackgroundCache() {
     return _backgroundCache;
 }
 
-var Background = class Background {
+var Background = GObject.registerClass({
-    constructor(params) {
+    Signals: { 'loaded': {}, 'bg-changed': {} }
+}, class Background extends Meta.Background {
+    _init(params) {
         params = Params.parse(params, { monitorIndex: 0,
                                         layoutManager: Main.layoutManager,
                                         settings: null,
                                         file: null,
                                         style: null });
 
-        this.background = new Meta.Background({ meta_display: global.display });
+        super._init({ meta_display: global.display });
-        this.background._delegate = this;
 
         this._settings = params.settings;
         this._file = params.file;
@@ -257,9 +257,8 @@ var Background = class Background {
                 this._refreshAnimation();
             });
 
-        this._settingsChangedSignalId = this._settings.connect('changed', () => {
+        this._settingsChangedSignalId =
-            this.emit('changed');
+            this._settings.connect('changed', this._emitChangedSignal.bind(this));
-        });
 
         this._load();
     }
@@ -288,6 +287,24 @@ var Background = class Background {
         if (this._settingsChangedSignalId != 0)
             this._settings.disconnect(this._settingsChangedSignalId);
         this._settingsChangedSignalId = 0;
+
+        if (this._changedIdleId) {
+            GLib.source_remove(this._changedIdleId);
+            this._changedIdleId = 0;
+        }
+    }
+
+    _emitChangedSignal() {
+        if (this._changedIdleId)
+            return;
+
+        this._changedIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+            this._changedIdleId = 0;
+            this.emit('bg-changed');
+            return GLib.SOURCE_REMOVE;
+        });
+        GLib.Source.set_name_by_id(this._changedIdleId,
+            '[gnome-shell] Background._emitChangedSignal');
     }
 
     updateResolution() {
@@ -313,23 +330,23 @@ var Background = class Background {
             this.emit('loaded');
             return GLib.SOURCE_REMOVE;
         });
-        GLib.Source.set_name_by_id(id, '[gnome-shell] this.emit');
+        GLib.Source.set_name_by_id(id, '[gnome-shell] Background._setLoaded Idle');
     }
 
     _loadPattern() {
-        let colorString, res, color, secondColor;
+        let colorString, res_, color, secondColor;
 
         colorString = this._settings.get_string(PRIMARY_COLOR_KEY);
-        [res, color] = Clutter.Color.from_string(colorString);
+        [res_, color] = Clutter.Color.from_string(colorString);
         colorString = this._settings.get_string(SECONDARY_COLOR_KEY);
-        [res, secondColor] = Clutter.Color.from_string(colorString);
+        [res_, secondColor] = Clutter.Color.from_string(colorString);
 
         let shadingType = this._settings.get_enum(COLOR_SHADING_TYPE_KEY);
 
         if (shadingType == GDesktopEnums.BackgroundShading.SOLID)
-            this.background.set_color(color);
+            this.set_color(color);
         else
-            this.background.set_gradient(shadingType, color, secondColor);
+            this.set_gradient(shadingType, color, secondColor);
     }
 
     _watchFile(file) {
@@ -343,7 +360,7 @@ var Background = class Background {
                                                if (changedFile.equal(file)) {
                                                    let imageCache = Meta.BackgroundImageCache.get_default();
                                                    imageCache.purge(changedFile);
-                                                   this.emit('changed');
+                                                   this._emitChangedSignal();
                                                }
                                            });
         this._fileWatches[key] = signalId;
@@ -365,13 +382,13 @@ var Background = class Background {
         let finish = () => {
             this._setLoaded();
             if (files.length > 1) {
-                this.background.set_blend(files[0], files[1],
+                this.set_blend(files[0], files[1],
-                                          this._animation.transitionProgress,
+                               this._animation.transitionProgress,
-                                          this._style);
+                               this._style);
             } else if (files.length > 0) {
-                this.background.set_file(files[0], this._style);
+                this.set_file(files[0], this._style);
             } else {
-                this.background.set_file(null, this._style);
+                this.set_file(null, this._style);
             }
             this._queueUpdateAnimation();
         };
@@ -416,41 +433,42 @@ var Background = class Background {
             return;
 
         this._updateAnimationTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                      interval,
+                                                          interval,
-                                                      () => {
+                                                          () => {
-                                                          this._updateAnimationTimeoutId = 0;
+                                                              this._updateAnimationTimeoutId = 0;
-                                                          this._updateAnimation();
+                                                              this._updateAnimation();
-                                                          return GLib.SOURCE_REMOVE;
+                                                              return GLib.SOURCE_REMOVE;
-                                                      });
+                                                          });
         GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
     }
 
     _loadAnimation(file) {
-        this._cache.getAnimation({ file: file,
+        this._cache.getAnimation({
-                                   settingsSchema: this._settings.schema_id,
+            file: file,
-                                   onLoaded: animation => {
+            settingsSchema: this._settings.schema_id,
-                                       this._animation = animation;
+            onLoaded: animation => {
+                this._animation = animation;
 
-                                       if (!this._animation || this._cancellable.is_cancelled()) {
+                if (!this._animation || this._cancellable.is_cancelled()) {
-                                           this._setLoaded();
+                    this._setLoaded();
-                                           return;
+                    return;
-                                       }
+                }
 
-                                       this._updateAnimation();
+                this._updateAnimation();
-                                       this._watchFile(file);
+                this._watchFile(file);
-                                   }
+            }
-                                 });
+        });
     }
 
     _loadImage(file) {
-        this.background.set_file(file, this._style);
+        this.set_file(file, this._style);
         this._watchFile(file);
 
         let cache = Meta.BackgroundImageCache.get_default();
         let image = cache.load(file);
-        if (image.is_loaded())
+        if (image.is_loaded()) {
             this._setLoaded();
-        else {
+        } else {
             let id = image.connect('loaded', () => {
                 this._setLoaded();
                 image.disconnect(id);
@@ -477,13 +495,14 @@ var Background = class Background {
 
         this._loadFile(this._file);
     }
-};
+});
-Signals.addSignalMethods(Background.prototype);
 
 let _systemBackground;
 
-var SystemBackground = class SystemBackground {
+var SystemBackground = GObject.registerClass({
-    constructor() {
+    Signals: { 'loaded': {} }
+}, class SystemBackground extends Meta.BackgroundActor {
+    _init() {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
 
         if (_systemBackground == null) {
@@ -492,9 +511,11 @@ var SystemBackground = class SystemBackground {
             _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
         }
 
-        this.actor = new Meta.BackgroundActor({ meta_display: global.display,
+        super._init({
-                                                monitor: 0,
+            meta_display: global.display,
-                                                background: _systemBackground });
+            monitor: 0,
+            background: _systemBackground
+        });
 
         let cache = Meta.BackgroundImageCache.get_default();
         let image = cache.load(file);
@@ -513,8 +534,7 @@ var SystemBackground = class SystemBackground {
             });
         }
     }
-};
+});
-Signals.addSignalMethods(SystemBackground.prototype);
 
 var BackgroundSource = class BackgroundSource {
     constructor(layoutManager, settingsSchema) {
@@ -550,7 +570,7 @@ var BackgroundSource = class BackgroundSource {
 
         // We don't watch changes to settings here,
         // instead we rely on Background to watch those
-        // and emit 'changed' at the right time
+        // and emit 'bg-changed' at the right time
 
         if (this._overrideImage != null) {
             file = Gio.File.new_for_path(this._overrideImage);
@@ -579,7 +599,7 @@ var BackgroundSource = class BackgroundSource {
                 style: style
             });
 
-            background._changedId = background.connect('changed', () => {
+            background._changedId = background.connect('bg-changed', () => {
                 background.disconnect(background._changedId);
                 background.destroy();
                 delete this._backgrounds[monitorIndex];
@@ -617,9 +637,9 @@ var Animation = class Animation {
     }
 
     load(callback) {
-        this._show = new GnomeDesktop.BGSlideShow({ filename: this.file.get_path() });
+        this._show = new GnomeDesktop.BGSlideShow({ file: this.file });
 
-        this._show.load_async(null, (object, result) => {
+        this._show.load_async(null, () => {
             this.loaded = true;
             if (callback)
                 callback();
@@ -635,7 +655,7 @@ var Animation = class Animation {
         if (this._show.get_num_slides() < 1)
             return;
 
-        let [progress, duration, isFixed, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
+        let [progress, duration, isFixed_, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
 
         this.transitionDuration = duration;
         this.transitionProgress = progress;
@@ -694,15 +714,12 @@ var BackgroundManager = class BackgroundManager {
         this._newBackgroundActor = null;
         this.emit('changed');
 
-        Tweener.addTween(oldBackgroundActor,
+        oldBackgroundActor.ease({
-                         { opacity: 0,
+            opacity: 0,
-                           time: FADE_ANIMATION_TIME,
+            duration: FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                           onComplete() {
+            onComplete: () => oldBackgroundActor.destroy()
-                               oldBackgroundActor.background.run_dispose();
+        });
-                               oldBackgroundActor.destroy();
-                           }
-                         });
     }
 
     _updateBackgroundActor() {
@@ -719,7 +736,7 @@ var BackgroundManager = class BackgroundManager {
 
         this._newBackgroundActor = newBackgroundActor;
 
-        let background = newBackgroundActor.background._delegate;
+        let background = newBackgroundActor.background;
 
         if (background.isLoaded) {
             this._swapBackgroundActor();
@@ -736,13 +753,14 @@ var BackgroundManager = class BackgroundManager {
 
     _createBackgroundActor() {
         let background = this._backgroundSource.getBackground(this._monitorIndex);
-        let backgroundActor = new Meta.BackgroundActor({ meta_display: global.display,
+        let backgroundActor = new Meta.BackgroundActor({
-                                                         monitor: this._monitorIndex,
+            meta_display: global.display,
-                                                         background: background.background,
+            monitor: this._monitorIndex,
-                                                         vignette: this._vignette,
+            background,
-                                                         vignette_sharpness: 0.5,
+            vignette: this._vignette,
-                                                         brightness: 0.5,
+            vignette_sharpness: 0.5,
-                                                       });
+            brightness: 0.5,
+        });
 
         this._container.add_child(backgroundActor);
 
@@ -752,7 +770,7 @@ var BackgroundManager = class BackgroundManager {
             backgroundActor.lower_bottom();
         }
 
-        let changeSignalId = background.connect('changed', () => {
+        let changeSignalId = background.connect('bg-changed', () => {
             background.disconnect(changeSignalId);
             changeSignalId = null;
             this._updateBackgroundActor();

js/ui/backgroundMenu.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported addBackgroundMenu */
 
 const { Clutter, St } = imports.gi;
 
@@ -25,12 +26,12 @@ var BackgroundMenu = class BackgroundMenu extends PopupMenu.PopupMenu {
 function addBackgroundMenu(actor, layoutManager) {
     actor.reactive = true;
     actor._backgroundMenu = new BackgroundMenu(layoutManager);
-    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
+    actor._backgroundManager = new PopupMenu.PopupMenuManager(actor);
     actor._backgroundManager.addMenu(actor._backgroundMenu);
 
     function openMenu(x, y) {
         Main.layoutManager.setDummyCursorGeometry(x, y, 0, 0);
-        actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
+        actor._backgroundMenu.open(BoxPointer.PopupAnimation.FULL);
     }
 
     let clickAction = new Clutter.ClickAction();

js/ui/barLevel.js

@@ -1,74 +1,106 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported BarLevel */
 
-const { Atk, Clutter, St } = imports.gi;
+const { Atk, Clutter, GObject, St } = imports.gi;
-const Signals = imports.signals;
 
-var BarLevel = class {
+var BarLevel = GObject.registerClass({
-    constructor(value, params) {
+    Properties: {
-        if (isNaN(value))
+        'value': GObject.ParamSpec.double(
-            // Avoid spreading NaNs around
+            'value', 'value', 'value',
-            throw TypeError('The bar level value must be a number');
+            GObject.ParamFlags.READWRITE,
+            0, 2, 0),
+        'maximum-value': GObject.ParamSpec.double(
+            'maximum-value', 'maximum-value', 'maximum-value',
+            GObject.ParamFlags.READWRITE,
+            1, 2, 1),
+        'overdrive-start': GObject.ParamSpec.double(
+            'overdrive-start', 'overdrive-start', 'overdrive-start',
+            GObject.ParamFlags.READWRITE,
+            1, 2, 1)
+    }
+}, class BarLevel extends St.DrawingArea {
+    _init(params) {
         this._maxValue = 1;
-        this._value = Math.max(Math.min(value, this._maxValue), 0);
+        this._value = 0;
         this._overdriveStart = 1;
         this._barLevelWidth = 0;
 
-        if (params == undefined)
+        let defaultParams = {
-            params = {}
+            style_class: 'barlevel',
-
+            accessible_role: Atk.Role.LEVEL_BAR
-        this.actor = new St.DrawingArea({ styleClass: params['styleClass'] || 'barlevel',
+        };
-                                          can_focus: params['canFocus'] || false,
+        super._init(Object.assign(defaultParams, params));
-                                          reactive: params['reactive'] || false,
+        this.connect('allocation-changed', (actor, box) => {
-                                          accessible_role: params['accessibleRole'] || Atk.Role.LEVEL_BAR });
-        this.actor.connect('repaint', this._barLevelRepaint.bind(this));
-        this.actor.connect('allocation-changed', (actor, box) => {
             this._barLevelWidth = box.get_width();
         });
 
-        this._customAccessible = St.GenericAccessible.new_for_actor(this.actor);
+        this._customAccessible = St.GenericAccessible.new_for_actor(this);
-        this.actor.set_accessible(this._customAccessible);
+        this.set_accessible(this._customAccessible);
 
         this._customAccessible.connect('get-current-value', this._getCurrentValue.bind(this));
         this._customAccessible.connect('get-minimum-value', this._getMinimumValue.bind(this));
         this._customAccessible.connect('get-maximum-value', this._getMaximumValue.bind(this));
         this._customAccessible.connect('set-current-value', this._setCurrentValue.bind(this));
 
-        this.connect('value-changed', this._valueChanged.bind(this));
+        this.connect('notify::value', this._valueChanged.bind(this));
     }
 
-    setValue(value) {
+    get value() {
-        if (isNaN(value))
+        return this._value;
-            throw TypeError('The bar level value must be a number');
-
-        this._value = Math.max(Math.min(value, this._maxValue), 0);
-        this.actor.queue_repaint();
     }
 
-    setMaximumValue(value) {
+    set value(value) {
-        if (isNaN(value))
+        value = Math.max(Math.min(value, this._maxValue), 0);
-            throw TypeError('The bar level max value must be a number');
 
-        this._maxValue = Math.max(value, 1);
+        if (this._value == value)
+            return;
+
+        this._value = value;
+        this.notify('value');
+        this.queue_repaint();
+    }
+
+    // eslint-disable-next-line camelcase
+    get maximum_value() {
+        return this._maxValue;
+    }
+
+    // eslint-disable-next-line camelcase
+    set maximum_value(value) {
+        value = Math.max(value, 1);
+
+        if (this._maxValue == value)
+            return;
+
+        this._maxValue = value;
         this._overdriveStart = Math.min(this._overdriveStart, this._maxValue);
-        this.actor.queue_repaint();
+        this.notify('maximum-value');
+        this.queue_repaint();
     }
 
-    setOverdriveStart(value) {
+    // eslint-disable-next-line camelcase
-        if (isNaN(value))
+    get overdrive_start() {
-            throw TypeError('The overdrive limit value must be a number');
+        return this._overdriveStart;
+    }
+
+    // eslint-disable-next-line camelcase
+    set overdrive_start(value) {
+        if (this._overdriveStart == value)
+            return;
+
         if (value > this._maxValue)
             throw new Error(`Tried to set overdrive value to ${value}, ` +
                 `which is a number greater than the maximum allowed value ${this._maxValue}`);
 
         this._overdriveStart = value;
-        this._value = Math.max(Math.min(value, this._maxValue), 0);
+        this.notify('overdrive-start');
-        this.actor.queue_repaint();
+        this.queue_repaint();
     }
 
-    _barLevelRepaint(area) {
+    vfunc_repaint() {
-        let cr = area.get_context();
+        let cr = this.get_context();
-        let themeNode = area.get_theme_node();
+        let themeNode = this.get_theme_node();
-        let [width, height] = area.get_surface_size();
+        let [width, height] = this.get_surface_size();
 
         let barLevelHeight = themeNode.get_length('-barlevel-height');
         let barLevelBorderRadius = Math.min(width, barLevelHeight) / 2;
@@ -105,7 +137,7 @@ var BarLevel = class {
             overdriveSeparatorWidth = themeNode.get_length('-barlevel-overdrive-separator-width');
 
         /* background bar */
-        cr.arc(width - barLevelBorderRadius - barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
+        cr.arc(width - barLevelBorderRadius - barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * (3 / 4), TAU * (1 / 4));
         cr.lineTo(endX, (height + barLevelHeight) / 2);
         cr.lineTo(endX, (height - barLevelHeight) / 2);
         cr.lineTo(width - barLevelBorderRadius - barLevelBorderWidth, (height - barLevelHeight) / 2);
@@ -117,11 +149,12 @@ var BarLevel = class {
 
         /* normal progress bar */
         let x = Math.min(endX, overdriveSeparatorX - overdriveSeparatorWidth / 2);
-        cr.arc(barLevelBorderRadius + barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 1 / 4, TAU * 3 / 4);
+        cr.arc(barLevelBorderRadius + barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * (1 / 4), TAU * (3 / 4));
         cr.lineTo(x, (height - barLevelHeight) / 2);
         cr.lineTo(x, (height + barLevelHeight) / 2);
         cr.lineTo(barLevelBorderRadius + barLevelBorderWidth, (height + barLevelHeight) / 2);
-        Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+        if (this._value > 0)
+            Clutter.cairo_set_source_color(cr, barLevelActiveColor);
         cr.fillPreserve();
         Clutter.cairo_set_source_color(cr, barLevelActiveBorderColor);
         cr.setLineWidth(barLevelBorderWidth);
@@ -143,17 +176,19 @@ var BarLevel = class {
         }
 
         /* end progress bar arc */
-        if (this._value <= this._overdriveStart)
+        if (this._value > 0) {
-            Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+            if (this._value <= this._overdriveStart)
-        else
+                Clutter.cairo_set_source_color(cr, barLevelActiveColor);
-            Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
+            else
-        cr.arc(endX, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
+                Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
-        cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
+            cr.arc(endX, height / 2, barLevelBorderRadius, TAU * (3 / 4), TAU * (1 / 4));
-        cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
+            cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
-        cr.lineTo(endX, (height - barLevelHeight) / 2);
+            cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
-        cr.fillPreserve();
+            cr.lineTo(endX, (height - barLevelHeight) / 2);
-        cr.setLineWidth(barLevelBorderWidth);
+            cr.fillPreserve();
-        cr.stroke();
+            cr.setLineWidth(barLevelBorderWidth);
+            cr.stroke();
+        }
 
         /* draw overdrive separator */
         if (overdriveActive) {
@@ -172,32 +207,27 @@ var BarLevel = class {
         cr.$dispose();
     }
 
-    _getCurrentValue(actor) {
+    _getCurrentValue() {
         return this._value;
     }
 
-    _getOverdriveStart(actor) {
+    _getOverdriveStart() {
         return this._overdriveStart;
     }
 
-    _getMinimumValue(actor) {
+    _getMinimumValue() {
         return 0;
     }
 
-    _getMaximumValue(actor) {
+    _getMaximumValue() {
         return this._maxValue;
     }
 
-    _setCurrentValue(actor, value) {
+    _setCurrentValue(_actor, value) {
         this._value = value;
     }
 
-    _valueChanged(barLevel, value, property) {
+    _valueChanged() {
         this._customAccessible.notify("accessible-value");
     }
-
+});
-    get value() {
-        return this._value;
-    }
-};
-Signals.addSignalMethods(BarLevel.prototype);

js/ui/boxpointer.js

@@ -1,9 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported BoxPointer */
 
-const { Clutter, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, GObject, Shell, St } = imports.gi;
 
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
 
 var PopupAnimation = {
     NONE:  0,
@@ -12,7 +12,7 @@ var PopupAnimation = {
     FULL:  ~0,
 };
 
-var POPUP_ANIMATION_TIME = 0.15;
+var POPUP_ANIMATION_TIME = 150;
 
 /**
  * BoxPointer:
@@ -33,8 +33,6 @@ var BoxPointer = GObject.registerClass({
     _init(arrowSide, binProperties) {
         super._init();
 
-        this.actor = this;
-
         this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._arrowSide = arrowSide;
@@ -48,57 +46,29 @@ var BoxPointer = GObject.registerClass({
         this.add_actor(this._border);
         this.bin.raise(this._border);
         this._sourceAlignment = 0.5;
-        this._capturedEventId = 0;
+        this._muteInput = true;
-        this._muteInput();
+
+        this.connect('destroy', this._onDestroy.bind(this));
+    }
+
+    vfunc_captured_event() {
+        if (this._muteInput)
+            return Clutter.EVENT_STOP;
+
+        return Clutter.EVENT_PROPAGATE;
+    }
+
+    _onDestroy() {
+        if (this._sourceActorDestroyId) {
+            this._sourceActor.disconnect(this._sourceActorDestroyId);
+            delete this._sourceActorDestroyId;
+        }
     }
 
     get arrowSide() {
         return this._arrowSide;
     }
 
-    _muteInput() {
-        if (this._capturedEventId == 0)
-            this._capturedEventId = this.connect('captured-event',
-                                                 () => Clutter.EVENT_STOP);
-    }
-
-    _unmuteInput() {
-        if (this._capturedEventId != 0) {
-            this.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-    }
-
-    // BoxPointer.show() and BoxPointer.hide() are here for only compatibility
-    // purposes, and will be removed in 3.32.
-    show(animate, onComplete) {
-        if (animate !== undefined) {
-            try {
-                throw new Error('BoxPointer.show() has been moved to BoxPointer.open(), this code will break in the future.');
-            } catch(e) {
-                logError(e);
-                this.open(animate, onComplete);
-                return;
-            }
-        }
-
-        this.visible = true;
-    }
-
-    hide(animate, onComplete) {
-        if (animate !== undefined) {
-            try {
-                throw new Error('BoxPointer.hide() has been moved to BoxPointer.close(), this code will break in the future.');
-            } catch(e) {
-                logError(e);
-                this.close(animate, onComplete);
-                return;
-            }
-        }
-
-        this.visible = false;
-    }
-
     open(animate, onComplete) {
         let themeNode = this.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
@@ -113,31 +83,33 @@ var BoxPointer = GObject.registerClass({
 
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
-                case St.Side.TOP:
+            case St.Side.TOP:
-                    this.translation_y = -rise;
+                this.translation_y = -rise;
-                    break;
+                break;
-                case St.Side.BOTTOM:
+            case St.Side.BOTTOM:
-                    this.translation_y = rise;
+                this.translation_y = rise;
-                    break;
+                break;
-                case St.Side.LEFT:
+            case St.Side.LEFT:
-                    this.translation_x = -rise;
+                this.translation_x = -rise;
-                    break;
+                break;
-                case St.Side.RIGHT:
+            case St.Side.RIGHT:
-                    this.translation_x = rise;
+                this.translation_x = rise;
-                    break;
+                break;
             }
         }
 
-        Tweener.addTween(this, { opacity: 255,
+        this.ease({
-                                 translation_x: 0,
+            opacity: 255,
-                                 translation_y: 0,
+            translation_x: 0,
-                                 transition: 'linear',
+            translation_y: 0,
-                                 onComplete: () => {
+            duration: animationTime,
-                                     this._unmuteInput();
+            mode: Clutter.AnimationMode.LINEAR,
-                                     if (onComplete)
+            onComplete: () => {
-                                         onComplete();
+                this._muteInput = false;
-                                 },
+                if (onComplete)
-                                 time: animationTime });
+                    onComplete();
+            }
+        });
     }
 
     close(animate, onComplete) {
@@ -153,38 +125,39 @@ var BoxPointer = GObject.registerClass({
 
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
-                case St.Side.TOP:
+            case St.Side.TOP:
-                    translationY = rise;
+                translationY = rise;
-                    break;
+                break;
-                case St.Side.BOTTOM:
+            case St.Side.BOTTOM:
-                    translationY = -rise;
+                translationY = -rise;
-                    break;
+                break;
-                case St.Side.LEFT:
+            case St.Side.LEFT:
-                    translationX = rise;
+                translationX = rise;
-                    break;
+                break;
-                case St.Side.RIGHT:
+            case St.Side.RIGHT:
-                    translationX = -rise;
+                translationX = -rise;
-                    break;
+                break;
             }
         }
 
-        this._muteInput();
+        this._muteInput = true;
 
-        Tweener.removeTweens(this);
+        this.remove_all_transitions();
-        Tweener.addTween(this, { opacity: fade ? 0 : 255,
+        this.ease({
-                                 translation_x: translationX,
+            opacity: fade ? 0 : 255,
-                                 translation_y: translationY,
+            translation_x: translationX,
-                                 transition: 'linear',
+            translation_y: translationY,
-                                 time: animationTime,
+            duration: animationTime,
-                                 onComplete: () => {
+            mode: Clutter.AnimationMode.LINEAR,
-                                     this.hide();
+            onComplete: () => {
-                                     this.opacity = 0;
+                this.hide();
-                                     this.translation_x = 0;
+                this.opacity = 0;
-                                     this.translation_y = 0;
+                this.translation_x = 0;
-                                     if (onComplete)
+                this.translation_y = 0;
-                                         onComplete();
+                if (onComplete)
-                                 }
+                    onComplete();
-                               });
+            }
+        });
     }
 
     _adjustAllocationForArrow(isWidth, minSize, natSize) {
@@ -192,8 +165,8 @@ var BoxPointer = GObject.registerClass({
         let borderWidth = themeNode.get_length('-arrow-border-width');
         minSize += borderWidth * 2;
         natSize += borderWidth * 2;
-        if ((!isWidth && (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM))
+        if ((!isWidth && (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM)) ||
-            || (isWidth && (this._arrowSide == St.Side.LEFT || this._arrowSide == St.Side.RIGHT))) {
+            (isWidth && (this._arrowSide == St.Side.LEFT || this._arrowSide == St.Side.RIGHT))) {
             let rise = themeNode.get_length('-arrow-rise');
             minSize += rise;
             natSize += rise;
@@ -227,13 +200,10 @@ var BoxPointer = GObject.registerClass({
         this.set_allocation(box, flags);
 
         let themeNode = this.get_theme_node();
-        box = themeNode.get_content_box(box);
-
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let rise = themeNode.get_length('-arrow-rise');
         let childBox = new Clutter.ActorBox();
-        let availWidth = box.x2 - box.x1;
+        let [availWidth, availHeight] = themeNode.get_content_box(box).get_size();
-        let availHeight = box.y2 - box.y1;
 
         childBox.x1 = 0;
         childBox.y1 = 0;
@@ -246,24 +216,25 @@ var BoxPointer = GObject.registerClass({
         childBox.x2 = availWidth - borderWidth;
         childBox.y2 = availHeight - borderWidth;
         switch (this._arrowSide) {
-            case St.Side.TOP:
+        case St.Side.TOP:
-                childBox.y1 += rise;
+            childBox.y1 += rise;
-                break;
+            break;
-            case St.Side.BOTTOM:
+        case St.Side.BOTTOM:
-                childBox.y2 -= rise;
+            childBox.y2 -= rise;
-                break;
+            break;
-            case St.Side.LEFT:
+        case St.Side.LEFT:
-                childBox.x1 += rise;
+            childBox.x1 += rise;
-                break;
+            break;
-            case St.Side.RIGHT:
+        case St.Side.RIGHT:
-                childBox.x2 -= rise;
+            childBox.x2 -= rise;
-                break;
+            break;
         }
         this.bin.allocate(childBox, flags);
 
         if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition();
+            this._reposition(box);
-            this._updateFlip();
+            this._updateFlip(box);
+            this.set_allocation(box, flags);
         }
     }
 
@@ -289,7 +260,7 @@ var BoxPointer = GObject.registerClass({
         let borderRadius = themeNode.get_length('-arrow-border-radius');
 
         let halfBorder = borderWidth / 2;
-        let halfBase = Math.floor(base/2);
+        let halfBase = Math.floor(base / 2);
 
         let backgroundColor = themeNode.get_color('-arrow-background-color');
 
@@ -370,7 +341,7 @@ var BoxPointer = GObject.registerClass({
         if (!skipTopRight) {
             cr.lineTo(x2 - borderRadius, y1);
             cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
-                   3*Math.PI/2, Math.PI*2);
+                   3 * Math.PI / 2, Math.PI * 2);
         }
 
         if (this._arrowSide == St.Side.RIGHT && rise) {
@@ -391,7 +362,7 @@ var BoxPointer = GObject.registerClass({
         if (!skipBottomRight) {
             cr.lineTo(x2, y2 - borderRadius);
             cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
-                   0, Math.PI/2);
+                   0, Math.PI / 2);
         }
 
         if (this._arrowSide == St.Side.BOTTOM && rise) {
@@ -412,7 +383,7 @@ var BoxPointer = GObject.registerClass({
         if (!skipBottomLeft) {
             cr.lineTo(x1 + borderRadius, y2);
             cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
-                   Math.PI/2, Math.PI);
+                   Math.PI / 2, Math.PI);
         }
 
         if (this._arrowSide == St.Side.LEFT && rise) {
@@ -421,7 +392,7 @@ var BoxPointer = GObject.registerClass({
                 cr.lineTo(x1 - rise, y1);
                 cr.lineTo(x1 + borderRadius, y1);
             } else if (skipBottomLeft) {
-                cr.lineTo(x1 - rise, y2)
+                cr.lineTo(x1 - rise, y2);
                 cr.lineTo(x1 - rise, y2 - halfBase);
             } else {
                 cr.lineTo(x1, this._arrowOrigin + halfBase);
@@ -433,7 +404,7 @@ var BoxPointer = GObject.registerClass({
         if (!skipTopLeft) {
             cr.lineTo(x1, y1 + borderRadius);
             cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
-                   Math.PI, 3*Math.PI/2);
+                   Math.PI, 3 * Math.PI / 2);
         }
 
         Clutter.cairo_set_source_color(cr, backgroundColor);
@@ -450,15 +421,25 @@ var BoxPointer = GObject.registerClass({
     }
 
     setPosition(sourceActor, alignment) {
-        // We need to show it now to force an allocation,
+        if (!this._sourceActor || sourceActor != this._sourceActor) {
-        // so that we can query the correct size.
+            if (this._sourceActorDestroyId) {
-        this.show();
+                this._sourceActor.disconnect(this._sourceActorDestroyId);
+                delete this._sourceActorDestroyId;
+            }
+
+            this._sourceActor = sourceActor;
+
+            if (this._sourceActor) {
+                this._sourceActorDestroyId = this._sourceActor.connect('destroy', () => {
+                    this._sourceActor = null;
+                    delete this._sourceActorDestroyId;
+                });
+            }
+        }
 
-        this._sourceActor = sourceActor;
         this._arrowAlignment = alignment;
 
-        this._reposition();
+        this.queue_relayout();
-        this._updateFlip();
     }
 
     setSourceAlignment(alignment) {
@@ -470,7 +451,7 @@ var BoxPointer = GObject.registerClass({
         this.setPosition(this._sourceActor, this._arrowAlignment);
     }
 
-    _reposition() {
+    _reposition(allocationBox) {
         let sourceActor = this._sourceActor;
         let alignment = this._arrowAlignment;
         let monitorIndex = Main.layoutManager.findIndexForActor(sourceActor);
@@ -484,7 +465,7 @@ var BoxPointer = GObject.registerClass({
         let sourceAllocation = this._sourceAllocation;
         let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
         let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
-        let [minWidth, minHeight, natWidth, natHeight] = this.get_preferred_size();
+        let [, , natWidth, natHeight] = this.get_preferred_size();
 
         // We also want to keep it onscreen, and separated from the
         // edge by the same distance as the main part of the box is
@@ -528,7 +509,7 @@ var BoxPointer = GObject.registerClass({
         //     of the box to maintain the arrow's accuracy.
 
         let arrowOrigin;
-        let halfBase = Math.floor(arrowBase/2);
+        let halfBase = Math.floor(arrowBase / 2);
         let halfBorder = borderWidth / 2;
         let halfMargin = margin / 2;
         let [x1, y1] = [halfBorder, halfBorder];
@@ -584,8 +565,7 @@ var BoxPointer = GObject.registerClass({
         }
 
         // Actually set the position
-        this.x = Math.floor(x);
+        allocationBox.set_origin(Math.floor(x), Math.floor(y));
-        this.y = Math.floor(y);
     }
 
     // @origin: Coordinate specifying middle of the arrow, along
@@ -610,7 +590,7 @@ var BoxPointer = GObject.registerClass({
 
     _calculateArrowSide(arrowSide) {
         let sourceAllocation = this._sourceAllocation;
-        let [minWidth, minHeight, boxWidth, boxHeight] = this.get_preferred_size();
+        let [, , boxWidth, boxHeight] = this.get_preferred_size();
         let workarea = this._workArea;
 
         switch (arrowSide) {
@@ -639,15 +619,11 @@ var BoxPointer = GObject.registerClass({
         return arrowSide;
     }
 
-    _updateFlip() {
+    _updateFlip(allocationBox) {
         let arrowSide = this._calculateArrowSide(this._userArrowSide);
         if (this._arrowSide != arrowSide) {
             this._arrowSide = arrowSide;
-            this._reposition();
+            this._reposition(allocationBox);
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
-                this.queue_relayout();
-                return false;
-            });
 
             this.emit('arrow-side-changed');
         }

js/ui/calendar.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Calendar, CalendarMessageList */
 
-const { Clutter, Gio, GLib, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;
@@ -17,7 +18,7 @@ var ELLIPSIS_CHAR = '\u2026';
 
 var MESSAGE_ICON_SIZE = -1; // pick up from CSS
 
-var NC_ = (context, str) => context + '\u0004' + str;
+var NC_ = (context, str) => `${context}\u0004${str}`;
 
 function sameYear(dateA, dateB) {
     return (dateA.getYear() == dateB.getYear());
@@ -38,7 +39,7 @@ function isToday(date) {
 function _isWorkDay(date) {
     /* Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
     let days = C_('calendar-no-work', "06");
-    return days.indexOf(date.getDay().toString()) == -1;
+    return !days.includes(date.getDay().toString());
 }
 
 function _getBeginningOfDay(date) {
@@ -109,15 +110,15 @@ var EmptyEventSource = class EmptyEventSource {
     destroy() {
     }
 
-    requestRange(begin, end) {
+    requestRange(_begin, _end) {
     }
 
-    getEvents(begin, end) {
+    getEvents(_begin, _end) {
         let result = [];
         return result;
     }
 
-    hasEvents(day) {
+    hasEvents(_day) {
         return false;
     }
 };
@@ -143,8 +144,7 @@ function _datesEqual(a, b) {
     return true;
 }
 
-function _dateIntervalsOverlap(a0, a1, b0, b1)
+function _dateIntervalsOverlap(a0, a1, b0, b1) {
-{
     if (a1 <= b0)
         return false;
     else if (b1 <= a0)
@@ -168,7 +168,7 @@ var DBusEventSource = class DBusEventSource {
             try {
                 this._dbusProxy.init_finish(result);
                 loaded = true;
-            } catch(e) {
+            } catch (e) {
                 if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
                     // Ignore timeouts and install signals as normal, because with high
                     // probability the service will appear later on, and we will get a
@@ -178,7 +178,7 @@ var DBusEventSource = class DBusEventSource {
                     // about the HasCalendars property and would cause an exception trying
                     // to read it)
                 } else {
-                    log('Error loading calendars: ' + e.message);
+                    log(`Error loading calendars: ${e.message}`);
                     return;
                 }
             }
@@ -221,13 +221,13 @@ var DBusEventSource = class DBusEventSource {
         this._lastRequestEnd = null;
     }
 
-    _onNameAppeared(owner) {
+    _onNameAppeared() {
         this._initialized = true;
         this._resetCache();
         this._loadEvents(true);
     }
 
-    _onNameVanished(oldOwner) {
+    _onNameVanished() {
         this._resetCache();
         this.emit('changed');
     }
@@ -236,22 +236,20 @@ var DBusEventSource = class DBusEventSource {
         this._loadEvents(false);
     }
 
-    _onEventsReceived(results, error) {
+    _onEventsReceived(results, _error) {
         let newEvents = [];
-        let appointments = results ? results[0] : null;
+        let appointments = results[0] || [];
-        if (appointments != null) {
+        for (let n = 0; n < appointments.length; n++) {
-            for (let n = 0; n < appointments.length; n++) {
+            let a = appointments[n];
-                let a = appointments[n];
+            let date = new Date(a[4] * 1000);
-                let date = new Date(a[4] * 1000);
+            let end = new Date(a[5] * 1000);
-                let end = new Date(a[5] * 1000);
+            let id = a[0];
-                let id = a[0];
+            let summary = a[1];
-                let summary = a[1];
+            let allDay = a[3];
-                let allDay = a[3];
+            let event = new CalendarEvent(id, date, end, summary, allDay);
-                let event = new CalendarEvent(id, date, end, summary, allDay);
+            newEvents.push(event);
-                newEvents.push(event);
-            }
-            newEvents.sort((ev1, ev2) => ev1.date.getTime() - ev2.date.getTime());
         }
+        newEvents.sort((ev1, ev2) => ev1.date.getTime() - ev2.date.getTime());
 
         this._events = newEvents;
         this.isLoading = false;
@@ -263,7 +261,7 @@ var DBusEventSource = class DBusEventSource {
         if (!this._initialized)
             return;
 
-        if (this._curRequestBegin && this._curRequestEnd){
+        if (this._curRequestBegin && this._curRequestEnd) {
             this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
                                             this._curRequestEnd.getTime() / 1000,
                                             forceReload,
@@ -285,7 +283,7 @@ var DBusEventSource = class DBusEventSource {
 
     getEvents(begin, end) {
         let result = [];
-        for(let n = 0; n < this._events.length; n++) {
+        for (let n = 0; n < this._events.length; n++) {
             let event = this._events[n];
 
             if (_dateIntervalsOverlap (event.date, event.end, begin, end)) {
@@ -315,12 +313,14 @@ var DBusEventSource = class DBusEventSource {
 };
 Signals.addSignalMethods(DBusEventSource.prototype);
 
-var Calendar = class Calendar {
+var Calendar = GObject.registerClass({
-    constructor() {
+    Signals: { 'selected-date-changed': { param_types: [GLib.DateTime.$gtype] } }
+}, class Calendar extends St.Widget {
+    _init() {
         this._weekStart = Shell.util_get_week_start();
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.calendar' });
 
-        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, this._onSettingsChange.bind(this));
+        this._settings.connect(`changed::${SHOW_WEEKDATE_KEY}`, this._onSettingsChange.bind(this));
         this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
 
         /**
@@ -346,12 +346,11 @@ var Calendar = class Calendar {
 
         this._shouldDateGrabFocus = false;
 
-        this.actor = new St.Widget({ style_class: 'calendar',
+        super._init({
-                                     layout_manager: new Clutter.TableLayout(),
+            style_class: 'calendar',
-                                     reactive: true });
+            layout_manager: new Clutter.TableLayout(),
-
+            reactive: true
-        this.actor.connect('scroll-event',
+        });
-                           this._onScroll.bind(this));
 
         this._buildHeader ();
     }
@@ -375,7 +374,10 @@ var Calendar = class Calendar {
 
         this._selectedDate = date;
         this._update();
-        this.emit('selected-date-changed', new Date(this._selectedDate));
+
+        let datetime = GLib.DateTime.new_from_unix_local(
+            this._selectedDate.getTime() / 1000);
+        this.emit('selected-date-changed', datetime);
     }
 
     updateTimeZone() {
@@ -386,9 +388,9 @@ var Calendar = class Calendar {
     }
 
     _buildHeader() {
-        let layout = this.actor.layout_manager;
+        let layout = this.layout_manager;
         let offsetCols = this._useWeekdate ? 1 : 0;
-        this.actor.destroy_all_children();
+        this.destroy_all_children();
 
         // Top line of the calendar '<| September 2009 |>'
         this._topBox = new St.BoxLayout();
@@ -402,8 +404,8 @@ var Calendar = class Calendar {
         this._topBox.add(this._backButton);
         this._backButton.connect('clicked', this._onPrevMonthButtonClicked.bind(this));
 
-        this._monthLabel = new St.Label({style_class: 'calendar-month-label',
+        this._monthLabel = new St.Label({ style_class: 'calendar-month-label',
-                                         can_focus: true });
+                                          can_focus: true });
         this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
 
         this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward pager-button',
@@ -430,7 +432,7 @@ var Calendar = class Calendar {
                                        can_focus: true });
             label.accessible_name = iter.toLocaleFormat('%A');
             let col;
-            if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
+            if (this.get_text_direction() == Clutter.TextDirection.RTL)
                 col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
             else
                 col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
@@ -439,11 +441,11 @@ var Calendar = class Calendar {
         }
 
         // All the children after this are days, and get removed when we update the calendar
-        this._firstDayIndex = this.actor.get_n_children();
+        this._firstDayIndex = this.get_n_children();
     }
 
-    _onScroll(actor, event) {
+    vfunc_scroll_event(scrollEvent) {
-        switch (event.get_scroll_direction()) {
+        switch (scrollEvent.direction) {
         case Clutter.ScrollDirection.UP:
         case Clutter.ScrollDirection.LEFT:
             this._onPrevMonthButtonClicked();
@@ -466,8 +468,7 @@ var Calendar = class Calendar {
                 let day = 32 - new Date(newDate.getFullYear() - 1, 11, 32).getDate();
                 newDate = new Date(newDate.getFullYear() - 1, 11, day);
             }
-        }
+        } else {
-        else {
             newDate.setMonth(oldMonth - 1);
             if (newDate.getMonth() != oldMonth - 1) {
                 let day = 32 - new Date(newDate.getFullYear(), oldMonth - 1, 32).getDate();
@@ -490,8 +491,7 @@ var Calendar = class Calendar {
                 let day = 32 - new Date(newDate.getFullYear() + 1, 0, 32).getDate();
                 newDate = new Date(newDate.getFullYear() + 1, 0, day);
             }
-        }
+        } else {
-        else {
             newDate.setMonth(oldMonth + 1);
             if (newDate.getMonth() != oldMonth + 1) {
                 let day = 32 - new Date(newDate.getFullYear(), oldMonth + 1, 32).getDate();
@@ -515,7 +515,7 @@ var Calendar = class Calendar {
         let now = new Date();
 
         // Remove everything but the topBox and the weekday labels
-        let children = this.actor.get_children();
+        let children = this.get_children();
         for (let i = this._firstDayIndex; i < children.length; i++)
             children[i].destroy();
 
@@ -546,20 +546,18 @@ var Calendar = class Calendar {
         this._calendarBegin = new Date(beginDate);
         this._markedAsToday = now;
 
-        let year = beginDate.getYear();
-
         let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
         let startsOnWeekStart = daysToWeekStart == 0;
         let weekPadding = startsOnWeekStart ? 7 : 0;
 
         beginDate.setTime(beginDate.getTime() - (weekPadding + daysToWeekStart) * MSECS_IN_DAY);
 
-        let layout = this.actor.layout_manager;
+        let layout = this.layout_manager;
         let iter = new Date(beginDate);
         let row = 2;
         // nRows here means 6 weeks + one header + one navbar
         let nRows = 8;
-        while (row < 8) {
+        while (row < nRows) {
             // xgettext:no-javascript-format
             let button = new St.Button({ label: iter.toLocaleFormat(C_("date day number format", "%d")),
                                          can_focus: true });
@@ -585,12 +583,13 @@ var Calendar = class Calendar {
 
             // Hack used in lieu of border-collapse - see gnome-shell.css
             if (row == 2)
-                styleClass = 'calendar-day-top ' + styleClass;
+                styleClass = `calendar-day-top ${styleClass}`;
 
-            let leftMost = rtl ? iter.getDay() == (this._weekStart + 6) % 7
+            let leftMost = rtl
-                               : iter.getDay() == this._weekStart;
+                ? iter.getDay() == (this._weekStart + 6) % 7
+                : iter.getDay() == this._weekStart;
             if (leftMost)
-                styleClass = 'calendar-day-left ' + styleClass;
+                styleClass = `calendar-day-left ${styleClass}`;
 
             if (sameDay(now, iter))
                 styleClass += ' calendar-today';
@@ -648,17 +647,17 @@ var Calendar = class Calendar {
                 button.add_style_pseudo_class('selected');
                 if (this._shouldDateGrabFocus)
                     button.grab_key_focus();
-            }
+            } else {
-            else
                 button.remove_style_pseudo_class('selected');
+            }
         });
     }
-};
+});
-Signals.addSignalMethods(Calendar.prototype);
 
-var EventMessage = class EventMessage extends MessageList.Message {
+var EventMessage = GObject.registerClass(
-    constructor(event, date) {
+class EventMessage extends MessageList.Message {
-        super('', event.summary);
+    _init(event, date) {
+        super._init('', event.summary);
 
         this._event = event;
         this._date = date;
@@ -667,11 +666,12 @@ var EventMessage = class EventMessage extends MessageList.Message {
 
         this._icon = new St.Icon({ icon_name: 'x-office-calendar-symbolic' });
         this.setIcon(this._icon);
+    }
 
-        this.actor.connect('style-changed', () => {
+    vfunc_style_changed() {
-            let iconVisible = this.actor.get_parent().has_style_pseudo_class('first-child');
+        let iconVisible = this.get_parent().has_style_pseudo_class('first-child');
-            this._icon.opacity = (iconVisible ? 255 : 0);
+        this._icon.opacity = (iconVisible ? 255 : 0);
-        });
+        super.vfunc_style_changed();
     }
 
     _formatEventTime() {
@@ -686,32 +686,33 @@ var EventMessage = class EventMessage extends MessageList.Message {
              */
             title = C_("event list time", "All Day");
         } else {
-            let date = this._event.date >= periodBegin ? this._event.date
+            let date = this._event.date >= periodBegin
-                                                       : this._event.end;
+                ? this._event.date
+                : this._event.end;
             title = Util.formatTime(date, { timeOnly: true });
         }
 
         let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
         if (this._event.date < periodBegin && !this._event.allDay) {
             if (rtl)
-                title = title + ELLIPSIS_CHAR;
+                title = `${title}${ELLIPSIS_CHAR}`;
             else
-                title = ELLIPSIS_CHAR + title;
+                title = `${ELLIPSIS_CHAR}${title}`;
         }
         if (this._event.end > periodEnd && !this._event.allDay) {
             if (rtl)
-                title = ELLIPSIS_CHAR + title;
+                title = `${ELLIPSIS_CHAR}${title}`;
             else
-                title = title + ELLIPSIS_CHAR;
+                title = `${title}${ELLIPSIS_CHAR}`;
         }
         return title;
     }
-};
+});
 
-var NotificationMessage =
+var NotificationMessage = GObject.registerClass(
 class NotificationMessage extends MessageList.Message {
-    constructor(notification) {
+    _init(notification) {
-        super(notification.title, notification.bannerBodyText);
+        super._init(notification.title, notification.bannerBodyText);
         this.setUseBodyMarkup(notification.bannerBodyMarkup);
 
         this.notification = notification;
@@ -741,14 +742,14 @@ class NotificationMessage extends MessageList.Message {
             return this.notification.source.createIcon(MESSAGE_ICON_SIZE);
     }
 
-    _onUpdated(n, clear) {
+    _onUpdated(n, _clear) {
         this.setIcon(this._getIcon());
         this.setTitle(n.title);
         this.setBody(n.bannerBodyText);
         this.setUseBodyMarkup(n.bannerBodyMarkup);
     }
 
-    _onClicked() {
+    vfunc_clicked() {
         this.notification.activate();
     }
 
@@ -770,11 +771,12 @@ class NotificationMessage extends MessageList.Message {
     canClose() {
         return true;
     }
-};
+});
 
-var EventsSection = class EventsSection extends MessageList.MessageListSection {
+var EventsSection = GObject.registerClass(
-    constructor() {
+class EventsSection extends MessageList.MessageListSection {
-        super();
+    _init() {
+        super._init();
 
         this._desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
         this._desktopSettings.connect('changed', this._reloadEvents.bind(this));
@@ -786,7 +788,7 @@ var EventsSection = class EventsSection extends MessageList.MessageListSection {
                                       label: '',
                                       x_align: St.Align.START,
                                       can_focus: true });
-        this.actor.insert_child_below(this._title, null);
+        this.insert_child_below(this._title, null);
 
         this._title.connect('clicked', this._onTitleClicked.bind(this));
         this._title.connect('key-focus-in', this._onKeyFocusIn.bind(this));
@@ -905,12 +907,29 @@ var EventsSection = class EventsSection extends MessageList.MessageListSection {
 
         super._sync();
     }
-};
+});
 
-var NotificationSection =
+var TimeLabel = GObject.registerClass(
+class NotificationTimeLabel extends St.Label {
+    _init(datetime) {
+        super._init({
+            style_class: 'event-time',
+            x_align: Clutter.ActorAlign.START,
+            y_align: Clutter.ActorAlign.END
+        });
+        this._datetime = datetime;
+    }
+
+    vfunc_map() {
+        this.text = Util.formatTimeSpan(this._datetime);
+        super.vfunc_map();
+    }
+});
+
+var NotificationSection = GObject.registerClass(
 class NotificationSection extends MessageList.MessageListSection {
-    constructor() {
+    _init() {
-        super();
+        super._init();
 
         this._sources = new Map();
         this._nUrgent = 0;
@@ -919,8 +938,6 @@ class NotificationSection extends MessageList.MessageListSection {
         Main.messageTray.getSources().forEach(source => {
             this._sourceAdded(Main.messageTray, source);
         });
-
-        this.actor.connect('notify::mapped', this._onMapped.bind(this));
     }
 
     get allowed() {
@@ -928,17 +945,6 @@ class NotificationSection extends MessageList.MessageListSection {
                !Main.sessionMode.isGreeter;
     }
 
-    _createTimeLabel(datetime) {
-        let label = new St.Label({ style_class: 'event-time',
-                                   x_align: Clutter.ActorAlign.START,
-                                   y_align: Clutter.ActorAlign.END });
-        label.connect('notify::mapped', () => {
-            if (label.mapped)
-                label.text = Util.formatTimeSpan(datetime);
-        });
-        return label;
-    }
-
     _sourceAdded(tray, source) {
         let obj = {
             destroyId: 0,
@@ -956,13 +962,13 @@ class NotificationSection extends MessageList.MessageListSection {
 
     _onNotificationAdded(source, notification) {
         let message = new NotificationMessage(notification);
-        message.setSecondaryActor(this._createTimeLabel(notification.datetime));
+        message.setSecondaryActor(new TimeLabel(notification.datetime));
 
         let isUrgent = notification.urgency == MessageTray.Urgency.CRITICAL;
 
         let updatedId = notification.connect('updated', () => {
-            message.setSecondaryActor(this._createTimeLabel(notification.datetime));
+            message.setSecondaryActor(new TimeLabel(notification.datetime));
-            this.moveMessage(message, isUrgent ? 0 : this._nUrgent, this.actor.mapped);
+            this.moveMessage(message, isUrgent ? 0 : this._nUrgent, this.mapped);
         });
         let destroyId = notification.connect('destroy', () => {
             notification.disconnect(destroyId);
@@ -982,7 +988,7 @@ class NotificationSection extends MessageList.MessageListSection {
         }
 
         let index = isUrgent ? 0 : this._nUrgent;
-        this.addMessageAtIndex(message, index, this.actor.mapped);
+        this.addMessageAtIndex(message, index, this.mapped);
     }
 
     _onSourceDestroy(source, obj) {
@@ -992,25 +998,23 @@ class NotificationSection extends MessageList.MessageListSection {
         this._sources.delete(source);
     }
 
-    _onMapped() {
+    vfunc_map() {
-        if (!this.actor.mapped)
+        this._messages.forEach(message => {
-            return;
-
-        for (let message of this._messages.keys())
             if (message.notification.urgency != MessageTray.Urgency.CRITICAL)
                 message.notification.acknowledged = true;
+        });
+        super.vfunc_map();
     }
 
     _shouldShow() {
         return !this.empty && isToday(this._date);
     }
-};
+});
-
-var Placeholder = class Placeholder {
-    constructor() {
-        this.actor = new St.BoxLayout({ style_class: 'message-list-placeholder',
-                                        vertical: true });
 
+var Placeholder = GObject.registerClass(
+class Placeholder extends St.BoxLayout {
+    _init() {
+        super._init({ style_class: 'message-list-placeholder', vertical: true });
         this._date = new Date();
 
         let todayFile = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/no-notifications.svg');
@@ -1019,10 +1023,10 @@ var Placeholder = class Placeholder {
         this._otherIcon = new Gio.FileIcon({ file: otherFile });
 
         this._icon = new St.Icon();
-        this.actor.add_actor(this._icon);
+        this.add_actor(this._icon);
 
         this._label = new St.Label();
-        this.actor.add_actor(this._label);
+        this.add_actor(this._label);
 
         this._sync();
     }
@@ -1049,20 +1053,24 @@ var Placeholder = class Placeholder {
             this._label.text = _("No Events");
         }
     }
-};
+});
 
-var CalendarMessageList = class CalendarMessageList {
+var CalendarMessageList = GObject.registerClass(
-    constructor() {
+class CalendarMessageList extends St.Widget {
-        this.actor = new St.Widget({ style_class: 'message-list',
+    _init() {
-                                     layout_manager: new Clutter.BinLayout(),
+        super._init({
-                                     x_expand: true, y_expand: true });
+            style_class: 'message-list',
+            layout_manager: new Clutter.BinLayout(),
+            x_expand: true,
+            y_expand: true
+        });
 
         this._placeholder = new Placeholder();
-        this.actor.add_actor(this._placeholder.actor);
+        this.add_actor(this._placeholder);
 
         let box = new St.BoxLayout({ vertical: true,
                                      x_expand: true, y_expand: true });
-        this.actor.add_actor(box);
+        this.add_actor(box);
 
         this._scrollView = new St.ScrollView({ style_class: 'vfade',
                                                overlay_scrollbars: true,
@@ -1076,17 +1084,21 @@ var CalendarMessageList = class CalendarMessageList {
                                             can_focus: true });
         this._clearButton.set_x_align(Clutter.ActorAlign.END);
         this._clearButton.connect('clicked', () => {
-            let sections = [...this._sections.keys()];
+            this._sectionList.get_children().forEach(s => s.clear());
-            sections.forEach((s) => { s.clear(); });
         });
         box.add_actor(this._clearButton);
 
+        this._placeholder.bind_property('visible',
+            this._clearButton, 'visible',
+            GObject.BindingFlags.INVERT_BOOLEAN);
+
         this._sectionList = new St.BoxLayout({ style_class: 'message-list-sections',
                                                vertical: true,
                                                y_expand: true,
                                                y_align: Clutter.ActorAlign.START });
+        this._sectionList.connect('actor-added', this._sync.bind(this));
+        this._sectionList.connect('actor-removed', this._sync.bind(this));
         this._scrollView.add_actor(this._sectionList);
-        this._sections = new Map();
 
         this._mediaSection = new Mpris.MediaSection();
         this._addSection(this._mediaSection);
@@ -1101,59 +1113,35 @@ var CalendarMessageList = class CalendarMessageList {
     }
 
     _addSection(section) {
-        let obj = {
+        let connectionsIds = [];
-            destroyId: 0,
-            visibleId:  0,
-            emptyChangedId: 0,
-            canClearChangedId: 0,
-            keyFocusId: 0
-        };
-        obj.destroyId = section.actor.connect('destroy', () => {
-            this._removeSection(section);
-        });
-        obj.visibleId = section.actor.connect('notify::visible',
-                                              this._sync.bind(this));
-        obj.emptyChangedId = section.connect('empty-changed',
-                                             this._sync.bind(this));
-        obj.canClearChangedId = section.connect('can-clear-changed',
-                                                this._sync.bind(this));
-        obj.keyFocusId = section.connect('key-focus-in',
-                                         this._onKeyFocusIn.bind(this));
 
-        this._sections.set(section, obj);
+        for (let prop of ['visible', 'empty', 'can-clear']) {
-        this._sectionList.add_actor(section.actor);
+            connectionsIds.push(
-        this._sync();
+                section.connect(`notify::${prop}`, this._sync.bind(this)));
-    }
+        }
+        connectionsIds.push(section.connect('message-focused', (_s, messageActor) => {
+            Util.ensureActorVisibleInScrollView(this._scrollView, messageActor);
+        }));
 
-    _removeSection(section) {
+        connectionsIds.push(section.connect('destroy', (section) => {
-        let obj = this._sections.get(section);
+            connectionsIds.forEach(id => section.disconnect(id));
-        section.actor.disconnect(obj.destroyId);
+            this._sectionList.remove_actor(section);
-        section.actor.disconnect(obj.visibleId);
+        }));
-        section.disconnect(obj.emptyChangedId);
-        section.disconnect(obj.canClearChangedId);
-        section.disconnect(obj.keyFocusId);
 
-        this._sections.delete(section);
+        this._sectionList.add_actor(section);
-        this._sectionList.remove_actor(section.actor);
-        this._sync();
-    }
-
-    _onKeyFocusIn(section, actor) {
-        Util.ensureActorVisibleInScrollView(this._scrollView, actor);
     }
 
     _sync() {
-        let sections = [...this._sections.keys()];
+        let sections = this._sectionList.get_children();
         let visible = sections.some(s => s.allowed);
-        this.actor.visible = visible;
+        this.visible = visible;
         if (!visible)
             return;
 
-        let empty = sections.every(s => s.empty || !s.actor.visible);
+        let empty = sections.every(s => s.empty || !s.visible);
-        this._placeholder.actor.visible = empty;
+        this._placeholder.visible = empty;
-        this._clearButton.visible = !empty;
 
-        let canClear = sections.some(s => s.canClear && s.actor.visible);
+        let canClear = sections.some(s => s.canClear && s.visible);
         this._clearButton.reactive = canClear;
     }
 
@@ -1162,8 +1150,7 @@ var CalendarMessageList = class CalendarMessageList {
     }
 
     setDate(date) {
-        for (let section of this._sections.keys())
+        this._sectionList.get_children().forEach(s => s.setDate(date));
-            section.setDate(date);
         this._placeholder.setDate(date);
     }
-};
+});

js/ui/checkBox.js

@@ -1,15 +1,19 @@
-const { Clutter, Pango, St } = imports.gi;
+/* exported CheckBox */
+const { Clutter, GObject, Pango, St } = imports.gi;
 
-var CheckBox = class CheckBox {
+var CheckBox = GObject.registerClass(
-    constructor(label) {
+class CheckBox extends St.Button {
+    _init(label) {
         let container = new St.BoxLayout();
-        this.actor = new St.Button({ style_class: 'check-box',
+        super._init({
-                                     child: container,
+            style_class: 'check-box',
-                                     button_mask: St.ButtonMask.ONE,
+            child: container,
-                                     toggle_mode: true,
+            button_mask: St.ButtonMask.ONE,
-                                     can_focus: true,
+            toggle_mode: true,
-                                     x_fill: true,
+            can_focus: true,
-                                     y_fill: true });
+            x_fill: true,
+            y_fill: true
+        });
 
         this._box = new St.Bin();
         this._box.set_y_align(Clutter.ActorAlign.START);
@@ -31,4 +35,4 @@ var CheckBox = class CheckBox {
     getLabelActor() {
         return this._label;
     }
-};
+});

js/ui/closeDialog.js

@@ -1,17 +1,17 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported CloseDialog */
 
 const { Clutter, Gio, GLib, GObject, Meta, Shell } = imports.gi;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
 
-var FROZEN_WINDOW_BRIGHTNESS = -0.3
+var FROZEN_WINDOW_BRIGHTNESS = -0.3;
-var DIALOG_TRANSITION_TIME = 0.15
+var DIALOG_TRANSITION_TIME = 150;
 var ALIVE_TIMEOUT = 5000;
 
 var CloseDialog = GObject.registerClass({
-    Implements: [ Meta.CloseDialog ],
+    Implements: [Meta.CloseDialog],
     Properties: {
         'window': GObject.ParamSpec.override('window', Meta.CloseDialog)
     },
@@ -56,12 +56,12 @@ var CloseDialog = GObject.registerClass({
         this._dialog.height = windowActor.height;
 
         this._dialog.addContent(this._createDialogContent());
-        this._dialog.addButton({ label:   _('Force Quit'),
+        this._dialog.addButton({ label: _('Force Quit'),
-                                 action:  this._onClose.bind(this),
+                                 action: this._onClose.bind(this),
                                  default: true });
-        this._dialog.addButton({ label:  _('Wait'),
+        this._dialog.addButton({ label: _('Wait'),
                                  action: this._onWait.bind(this),
-                                 key:    Clutter.Escape });
+                                 key: Clutter.Escape });
 
         global.focus_manager.add_group(this._dialog);
     }
@@ -148,12 +148,12 @@ var CloseDialog = GObject.registerClass({
         this._dialog.scale_y = 0;
         this._dialog.set_pivot_point(0.5, 0.5);
 
-        Tweener.addTween(this._dialog,
+        this._dialog.ease({
-                         { scale_y: 1,
+            scale_y: 1,
-                           transition: 'linear',
+            mode: Clutter.AnimationMode.LINEAR,
-                           time: DIALOG_TRANSITION_TIME,
+            duration: DIALOG_TRANSITION_TIME,
-                           onComplete: this._onFocusChanged.bind(this)
+            onComplete: this._onFocusChanged.bind(this)
-                         });
+        });
     }
 
     vfunc_hide() {
@@ -165,7 +165,7 @@ var CloseDialog = GObject.registerClass({
         GLib.source_remove(this._timeoutId);
         this._timeoutId = 0;
 
-        global.display.disconnect(this._windowFocusChangedId)
+        global.display.disconnect(this._windowFocusChangedId);
         this._windowFocusChangedId = 0;
 
         global.stage.disconnect(this._keyFocusChangedId);
@@ -175,14 +175,12 @@ var CloseDialog = GObject.registerClass({
         this._dialog = null;
         this._removeWindowEffect();
 
-        Tweener.addTween(dialog,
+        dialog.ease({
-                         { scale_y: 0,
+            scale_y: 0,
-                           transition: 'linear',
+            mode: Clutter.AnimationMode.LINEAR,
-                           time: DIALOG_TRANSITION_TIME,
+            duration: DIALOG_TRANSITION_TIME,
-                           onComplete: () => {
+            onComplete: () => dialog.destroy()
-                               dialog.destroy();
+        });
-                           }
-                         });
     }
 
     vfunc_focus() {

js/ui/components/__init__.js

@@ -1,3 +1,4 @@
+/* exported ComponentManager */
 const Main = imports.ui.main;
 
 var ComponentManager = class {
@@ -13,13 +14,13 @@ var ComponentManager = class {
         let newEnabledComponents = Main.sessionMode.components;
 
         newEnabledComponents.filter(
-            name => this._enabledComponents.indexOf(name) == -1
+            name => !this._enabledComponents.includes(name)
         ).forEach(name => {
             this._enableComponent(name);
         });
 
         this._enabledComponents.filter(
-            name => newEnabledComponents.indexOf(name) == -1
+            name => !newEnabledComponents.includes(name)
         ).forEach(name => {
             this._disableComponent(name);
         });
@@ -37,8 +38,8 @@ var ComponentManager = class {
         if (component)
             return component;
 
-	if (Main.sessionMode.isLocked)
+        if (Main.sessionMode.isLocked)
-	    return null;
+            return null;
 
         let constructor = this._importComponent(name);
         component = new constructor();
@@ -48,7 +49,7 @@ var ComponentManager = class {
 
     _enableComponent(name) {
         let component = this._ensureComponent(name);
-	if (component)
+        if (component)
             component.enable();
     }
 

js/ui/components/automountManager.js

@@ -1,10 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */
 
 const { Gio, GLib } = imports.gi;
-const Mainloop = imports.mainloop;
 const Params = imports.misc.params;
 
 const GnomeSession = imports.misc.gnomeSession;
+const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
 var GNOME_SESSION_AUTOMOUNT_INHIBIT = 16;
@@ -37,7 +38,7 @@ var AutomountManager = class {
         this._driveDisconnectedId = this._volumeMonitor.connect('drive-disconnected', this._onDriveDisconnected.bind(this));
         this._driveEjectButtonId = this._volumeMonitor.connect('drive-eject-button', this._onDriveEjectButton.bind(this));
 
-        this._mountAllId = Mainloop.idle_add(this._startupMountAll.bind(this));
+        this._mountAllId = GLib.idle_add(GLib.PRIORITY_DEFAULT, this._startupMountAll.bind(this));
         GLib.Source.set_name_by_id(this._mountAllId, '[gnome-shell] this._startupMountAll');
     }
 
@@ -49,12 +50,12 @@ var AutomountManager = class {
         this._volumeMonitor.disconnect(this._driveEjectButtonId);
 
         if (this._mountAllId > 0) {
-            Mainloop.source_remove(this._mountAllId);
+            GLib.source_remove(this._mountAllId);
             this._mountAllId = 0;
         }
     }
 
-    _InhibitorsChanged(object, senderName, [inhibtor]) {
+    _InhibitorsChanged(_object, _senderName, [_inhibitor]) {
         this._session.IsInhibitedRemote(GNOME_SESSION_AUTOMOUNT_INHIBIT,
             (result, error) => {
                 if (!error) {
@@ -108,25 +109,23 @@ var AutomountManager = class {
         // we force stop/eject in this case, so we don't have to pass a
         // mount operation object
         if (drive.can_stop()) {
-            drive.stop
+            drive.stop(Gio.MountUnmountFlags.FORCE, null, null,
-                (Gio.MountUnmountFlags.FORCE, null, null,
+                (drive, res) => {
-                 (drive, res) => {
+                    try {
-                     try {
+                        drive.stop_finish(res);
-                         drive.stop_finish(res);
+                    } catch (e) {
-                     } catch (e) {
+                        log(`Unable to stop the drive after drive-eject-button ${e.toString()}`);
-                         log("Unable to stop the drive after drive-eject-button " + e.toString());
+                    }
-                     }
+                });
-                 });
         } else if (drive.can_eject()) {
-            drive.eject_with_operation 
+            drive.eject_with_operation(Gio.MountUnmountFlags.FORCE, null, null,
-                (Gio.MountUnmountFlags.FORCE, null, null,
+                (drive, res) => {
-                 (drive, res) => {
+                    try {
-                     try {
+                        drive.eject_with_operation_finish(res);
-                         drive.eject_with_operation_finish(res);
+                    } catch (e) {
-                     } catch (e) {
+                        log(`Unable to eject the drive after drive-eject-button ${e.toString()}`);
-                         log("Unable to eject the drive after drive-eject-button " + e.toString());
+                    }
-                     }
+                });
-                 });
         }
     }
 
@@ -157,7 +156,7 @@ var AutomountManager = class {
             !volume.should_automount() ||
             !volume.can_mount()) {
             // allow the autorun to run anyway; this can happen if the
-            // mount gets added programmatically later, even if 
+            // mount gets added programmatically later, even if
             // should_automount() or can_mount() are false, like for
             // blank optical media.
             this._allowAutorun(volume);
@@ -199,12 +198,20 @@ var AutomountManager = class {
             // error strings are not unique for the cases in the comments below.
             if (e.message.includes('No key available with this passphrase') || // cryptsetup
                 e.message.includes('No key available to unlock device') ||     // udisks (no password)
-                e.message.includes('Error unlocking')) {                       // udisks (wrong password)
+                // libblockdev wrong password opening LUKS device
+                e.message.includes('Failed to activate device: Incorrect passphrase') ||
+                // cryptsetup returns EINVAL in many cases, including wrong TCRYPT password/parameters
+                e.message.includes('Failed to load device\'s parameters: Invalid argument')) {
+
                 this._reaskPassword(volume);
             } else {
-                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                if (e.message.includes('Compiled against a version of libcryptsetup that does not support the VeraCrypt PIM setting')) {
-                    log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
+                    Main.notifyError(_("Unable to unlock volume"),
+                        _("The installed udisks version does not support the PIM setting"));
+                }
 
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                    log(`Unable to mount volume ${volume.get_name()}: ${e.toString()}`);
                 this._closeOperation(volume);
             }
         }
@@ -212,17 +219,17 @@ var AutomountManager = class {
 
     _onVolumeRemoved(monitor, volume) {
         if (volume._allowAutorunExpireId && volume._allowAutorunExpireId > 0) {
-            Mainloop.source_remove(volume._allowAutorunExpireId);
+            GLib.source_remove(volume._allowAutorunExpireId);
             delete volume._allowAutorunExpireId;
         }
-        this._volumeQueue = 
+        this._volumeQueue =
             this._volumeQueue.filter(element => (element != volume));
     }
 
     _reaskPassword(volume) {
         let prevOperation = this._activeOperations.get(volume);
         let existingDialog = prevOperation ? prevOperation.borrowDialog() : null;
-        let operation = 
+        let operation =
             new ShellMountOperation.ShellMountOperation(volume,
                                                         { existingDialog: existingDialog });
         this._mountVolume(volume, operation);
@@ -241,7 +248,7 @@ var AutomountManager = class {
     }
 
     _allowAutorunExpire(volume) {
-        let id = Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, () => {
+        let id = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, AUTORUN_EXPIRE_TIMEOUT_SECS, () => {
             volume.allowAutorun = false;
             delete volume._allowAutorunExpireId;
             return GLib.SOURCE_REMOVE;

js/ui/components/autorunManager.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */
 
-const { Gio, St } = imports.gi;
+const { Gio, GObject, St } = imports.gi;
 
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
@@ -40,7 +41,7 @@ function isMountRootHidden(root) {
     let path = root.get_path();
 
     // skip any mounts in hidden directory hierarchies
-    return (path.indexOf('/.') != -1);
+    return (path.includes('/.'));
 }
 
 function isMountNonLocal(mount) {
@@ -62,18 +63,15 @@ function startAppForMount(app, mount) {
     files.push(root);
 
     try {
-        retval = app.launch(files, 
+        retval = app.launch(files,
                             global.create_app_launch_context(0, -1));
     } catch (e) {
-        log('Unable to launch the application ' + app.get_name()
+        log(`Unable to launch the application ${app.get_name()}: ${e}`);
-            + ': ' + e.toString());
     }
 
     return retval;
 }
 
-/******************************************/
-
 const HotplugSnifferIface = loadInterfaceXML('org.gnome.Shell.HotplugSniffer');
 const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
 function HotplugSniffer() {
@@ -107,8 +105,7 @@ var ContentTypeDiscoverer = class {
         try {
             contentTypes = mount.guess_content_type_finish(res);
         } catch (e) {
-            log('Unable to guess content types on added mount ' + mount.get_name()
+            log(`Unable to guess content types on added mount ${mount.get_name()}: ${e}`);
-                + ': ' + e.toString());
         }
 
         if (contentTypes.length) {
@@ -118,16 +115,13 @@ var ContentTypeDiscoverer = class {
 
             let hotplugSniffer = new HotplugSniffer();
             hotplugSniffer.SniffURIRemote(root.get_uri(),
-                 ([contentTypes]) => {
+                ([contentTypes]) => {
-                     this._emitCallback(mount, contentTypes);
+                    this._emitCallback(mount, contentTypes);
-                 });
+                });
         }
     }
 
-    _emitCallback(mount, contentTypes) {
+    _emitCallback(mount, contentTypes = []) {
-        if (!contentTypes)
-            contentTypes = [];
-
         // we're not interested in win32 software content types here
         contentTypes = contentTypes.filter(
             type => (type != 'x-content/win32-software')
@@ -192,15 +186,15 @@ var AutorunDispatcher = class {
 
     _getAutorunSettingForType(contentType) {
         let runApp = this._settings.get_strv(SETTING_START_APP);
-        if (runApp.indexOf(contentType) != -1)
+        if (runApp.includes(contentType))
             return AutorunSetting.RUN;
 
         let ignore = this._settings.get_strv(SETTING_IGNORE);
-        if (ignore.indexOf(contentType) != -1)
+        if (ignore.includes(contentType))
             return AutorunSetting.IGNORE;
 
         let openFiles = this._settings.get_strv(SETTING_OPEN_FOLDER);
-        if (openFiles.indexOf(contentType) != -1)
+        if (openFiles.includes(contentType))
             return AutorunSetting.FILES;
 
         return AutorunSetting.ASK;
@@ -219,11 +213,11 @@ var AutorunDispatcher = class {
     }
 
     _addSource(mount, apps) {
-        // if we already have a source showing for this 
+        // if we already have a source showing for this
         // mount, return
         if (this._getSourceForMount(mount))
             return;
-     
+
         // add a new source
         this._sources.push(new AutorunSource(this._manager, mount, apps));
     }
@@ -268,7 +262,7 @@ var AutorunDispatcher = class {
 
     removeMount(mount) {
         let source = this._getSourceForMount(mount);
-        
+
         // if we aren't tracking this mount, don't do anything
         if (!source)
             return;
@@ -278,9 +272,10 @@ var AutorunDispatcher = class {
     }
 };
 
-var AutorunSource = class extends MessageTray.Source {
+var AutorunSource = GObject.registerClass(
-    constructor(manager, mount, apps) {
+class AutorunSource extends MessageTray.Source {
-        super(mount.get_name());
+    _init(manager, mount, apps) {
+        super._init(mount.get_name());
 
         this._manager = manager;
         this.mount = mount;
@@ -290,7 +285,7 @@ var AutorunSource = class extends MessageTray.Source {
 
         // add ourselves as a source, and popup the notification
         Main.messageTray.add(this);
-        this.notify(this._notification);
+        this.showNotification(this._notification);
     }
 
     getIcon() {
@@ -300,11 +295,12 @@ var AutorunSource = class extends MessageTray.Source {
     _createPolicy() {
         return new MessageTray.NotificationApplicationPolicy('org.gnome.Nautilus');
     }
-};
+});
 
-var AutorunNotification = class extends MessageTray.Notification {
+var AutorunNotification = GObject.registerClass(
-    constructor(manager, source) {
+class AutorunNotification extends MessageTray.Notification {
-        super(source, source.title);
+    _init(manager, source) {
+        super._init(source, source.title);
 
         this._manager = manager;
         this._mount = source.mount;
@@ -329,10 +325,10 @@ var AutorunNotification = class extends MessageTray.Notification {
                                  style_class: 'hotplug-notification-item-icon' });
         box.add(icon);
 
-        let label = new St.Bin({ y_align: St.Align.MIDDLE,
+        let label = new St.Bin({
-                                 child: new St.Label
+            y_align: St.Align.MIDDLE,
-                                 ({ text: _("Open with %s").format(app.get_name()) })
+            child: new St.Label({ text: _("Open with %s").format(app.get_name()) }),
-                               });
+        });
         box.add(label);
 
         let button = new St.Button({ child: box,
@@ -356,6 +352,6 @@ var AutorunNotification = class extends MessageTray.Notification {
         let app = Gio.app_info_get_default_for_type('inode/directory', false);
         startAppForMount(app, this._mount);
     }
-};
+});
 
 var Component = AutorunManager;

js/ui/components/keyring.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */
 
 const { Clutter, Gcr, Gio, GObject, Pango, Shell, St } = imports.gi;
 
@@ -10,9 +11,10 @@ const CheckBox = imports.ui.checkBox;
 
 var WORK_SPINNER_ICON_SIZE = 16;
 
-var KeyringDialog = class extends ModalDialog.ModalDialog {
+var KeyringDialog = GObject.registerClass(
-    constructor() {
+class KeyringDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'prompt-dialog' });
+    _init() {
+        super._init({ styleClass: 'prompt-dialog' });
 
         this.prompt = new Shell.KeyringPrompt();
         this.prompt.connect('show-password', this._onShowPassword.bind(this));
@@ -23,20 +25,8 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
         this._content = new Dialog.MessageDialogContent({ icon });
         this.contentLayout.add(this._content);
 
-        // FIXME: Why does this break now?
-        /*
         this.prompt.bind_property('message', this._content, 'title', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('description', this._content, 'body', GObject.BindingFlags.SYNC_CREATE);
-        */
-        this.prompt.connect('notify::message', () => {
-            this._content.title = this.prompt.message;
-        });
-        this._content.title = this.prompt.message;
-
-        this.prompt.connect('notify::description', () => {
-            this._content.body = this.prompt.description;
-        });
-        this._content.body = this.prompt.description;
 
         this._workSpinner = null;
         this._controlTable = null;
@@ -87,13 +77,13 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
             this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
 
             if (rtl) {
-                layout.attach(this._workSpinner.actor, 0, row, 1, 1);
+                layout.attach(this._workSpinner, 0, row, 1, 1);
                 layout.attach(this._passwordEntry, 1, row, 1, 1);
                 layout.attach(label, 2, row, 1, 1);
             } else {
                 layout.attach(label, 0, row, 1, 1);
                 layout.attach(this._passwordEntry, 1, row, 1, 1);
-                layout.attach(this._workSpinner.actor, 2, row, 1, 1);
+                layout.attach(this._workSpinner, 2, row, 1, 1);
             }
             row++;
         } else {
@@ -131,8 +121,8 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
         if (this.prompt.choice_visible) {
             let choice = new CheckBox.CheckBox();
             this.prompt.bind_property('choice-label', choice.getLabelActor(), 'text', GObject.BindingFlags.SYNC_CREATE);
-            this.prompt.bind_property('choice-chosen', choice.actor, 'checked', GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
+            this.prompt.bind_property('choice-chosen', choice, 'checked', GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
-            layout.attach(choice.actor, rtl ? 0 : 1, row, 1, 1);
+            layout.attach(choice, rtl ? 0 : 1, row, 1, 1);
             row++;
         }
 
@@ -173,7 +163,7 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
         // NOTE: ModalDialog.open() is safe to call if the dialog is
         // already open - it just returns true without side-effects
         if (this.open())
-          return true;
+            return true;
 
         // The above fail if e.g. unable to get input grab
         //
@@ -183,25 +173,25 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
 
         log('keyringPrompt: Failed to show modal dialog.' +
             ' Dismissing prompt request');
-        this.prompt.cancel()
+        this.prompt.cancel();
         return false;
     }
 
-    _onShowPassword(prompt) {
+    _onShowPassword() {
         this._buildControlTable();
         this._ensureOpen();
         this._updateSensitivity(true);
         this._passwordEntry.grab_key_focus();
     }
 
-    _onShowConfirm(prompt) {
+    _onShowConfirm() {
         this._buildControlTable();
         this._ensureOpen();
         this._updateSensitivity(true);
         this._continueButton.grab_key_focus();
     }
 
-    _onHidePrompt(prompt) {
+    _onHidePrompt() {
         this.close();
     }
 
@@ -224,7 +214,7 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
     _onCancelButton() {
         this.prompt.cancel();
     }
-};
+});
 
 var KeyringDummyDialog = class {
     constructor() {
@@ -242,8 +232,9 @@ var KeyringPrompter = class {
     constructor() {
         this._prompter = new Gcr.SystemPrompter();
         this._prompter.connect('new-prompt', () => {
-            let dialog = this._enabled ? new KeyringDialog()
+            let dialog = this._enabled
-                                       : new KeyringDummyDialog();
+                ? new KeyringDialog()
+                : new KeyringDummyDialog();
             this._currentPrompt = dialog.prompt;
             return this._currentPrompt;
         });

js/ui/components/networkAgent.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */
 
-const { Clutter, Gio, GLib, NM, Pango, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Config = imports.misc.config;
@@ -12,9 +13,10 @@ const ShellEntry = imports.ui.shellEntry;
 
 const VPN_UI_GROUP = 'VPN Plugin UI';
 
-var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
+var NetworkSecretDialog = GObject.registerClass(
-    constructor(agent, requestId, connection, settingName, hints, flags, contentOverride) {
+class NetworkSecretDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'prompt-dialog' });
+    _init(agent, requestId, connection, settingName, hints, flags, contentOverride) {
+        super._init({ styleClass: 'prompt-dialog' });
 
         this._agent = agent;
         this._requestId = requestId;
@@ -79,8 +81,9 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
                         secret.valid = secret.value.length > 0;
                     this._updateOkButton();
                 });
-            } else
+            } else {
                 secret.valid = true;
+            }
 
             if (rtl) {
                 layout.attach(secret.entry, 0, pos, 1, 1);
@@ -104,21 +107,22 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
             descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
 
             contentBox.messageBox.add(descriptionLabel,
-                                      { y_fill:  true,
+                                      { y_fill: true,
                                         y_align: St.Align.START,
                                         expand: true });
         }
 
-        this._okButton = { label:  _("Connect"),
+        this._okButton = {
-                           action: this._onOk.bind(this),
+            label: _("Connect"),
-                           default: true
+            action: this._onOk.bind(this),
-                         };
+            default: true,
+        };
 
-        this.setButtons([{ label: _("Cancel"),
+        this.setButtons([{
-                           action: this.cancel.bind(this),
+            label: _("Cancel"),
-                           key:    Clutter.KEY_Escape,
+            action: this.cancel.bind(this),
-                         },
+            key: Clutter.KEY_Escape,
-                         this._okButton]);
+        }, this._okButton]);
 
         this._updateOkButton();
     }
@@ -160,9 +164,9 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
         if (value.length == 64) {
             // must be composed of hexadecimal digits only
             for (let i = 0; i < 64; i++) {
-                if (!((value[i] >= 'a' && value[i] <= 'f')
+                if (!((value[i] >= 'a' && value[i] <= 'f') ||
-                      || (value[i] >= 'A' && value[i] <= 'F')
+                      (value[i] >= 'A' && value[i] <= 'F') ||
-                      || (value[i] >= '0' && value[i] <= '9')))
+                      (value[i] >= '0' && value[i] <= '9')))
                     return false;
             }
             return true;
@@ -175,28 +179,29 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
         let value = secret.value;
         if (secret.wep_key_type == NM.WepKeyType.KEY) {
             if (value.length == 10 || value.length == 26) {
-		for (let i = 0; i < value.length; i++) {
+                for (let i = 0; i < value.length; i++) {
-                    if (!((value[i] >= 'a' && value[i] <= 'f')
+                    if (!((value[i] >= 'a' && value[i] <= 'f') ||
-                          || (value[i] >= 'A' && value[i] <= 'F')
+                          (value[i] >= 'A' && value[i] <= 'F') ||
-                          || (value[i] >= '0' && value[i] <= '9')))
+                          (value[i] >= '0' && value[i] <= '9')))
-                        return false;
-		}
-	    } else if (value.length == 5 || value.length == 13) {
-		for (let i = 0; i < value.length; i++) {
-                    if (!((value[i] >= 'a' && value[i] <= 'z')
-                          || (value[i] >= 'A' && value[i] <= 'Z')))
                         return false;
                 }
-            } else
+            } else if (value.length == 5 || value.length == 13) {
+                for (let i = 0; i < value.length; i++) {
+                    if (!((value[i] >= 'a' && value[i] <= 'z') ||
+                          (value[i] >= 'A' && value[i] <= 'Z')))
+                        return false;
+                }
+            } else {
                 return false;
-	} else if (secret.wep_key_type == NM.WepKeyType.PASSPHRASE) {
+            }
-	    if (value.length < 0 || value.length > 64)
+        } else if (secret.wep_key_type == NM.WepKeyType.PASSPHRASE) {
-	        return false;
+            if (value.length < 0 || value.length > 64)
-	}
+                return false;
+        }
         return true;
     }
 
-    _getWirelessSecrets(secrets, wirelessSetting) {
+    _getWirelessSecrets(secrets, _wirelessSetting) {
         let wirelessSecuritySetting = this._connection.get_setting_wireless_security();
 
         if (this._settingName == '802-1x') {
@@ -208,12 +213,13 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
         // First the easy ones
         case 'wpa-none':
         case 'wpa-psk':
+        case 'sae':
             secrets.push({ label: _("Password: "), key: 'psk',
                            value: wirelessSecuritySetting.psk || '',
                            validate: this._validateWpaPsk, password: true });
             break;
         case 'none': // static WEP
-            secrets.push({ label: _("Key: "), key: 'wep-key' + wirelessSecuritySetting.wep_tx_keyidx,
+            secrets.push({ label: _("Key: "), key: `wep-key${wirelessSecuritySetting.wep_tx_keyidx}`,
                            value: wirelessSecuritySetting.get_wep_key(wirelessSecuritySetting.wep_tx_keyidx) || '',
                            wep_key_type: wirelessSecuritySetting.wep_key_type,
                            validate: this._validateStaticWep, password: true });
@@ -229,13 +235,12 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
             this._get8021xSecrets(secrets);
             break;
         default:
-            log('Invalid wireless key management: ' + wirelessSecuritySetting.key_mgmt);
+            log(`Invalid wireless key management: ${wirelessSecuritySetting.key_mgmt}`);
         }
     }
 
     _get8021xSecrets(secrets) {
         let ieee8021xSetting = this._connection.get_setting_802_1x();
-        let phase2method;
 
         /* If hints were given we know exactly what we need to ask */
         if (this._settingName == "802-1x" && this._hints.length) {
@@ -272,7 +277,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
                            value: ieee8021xSetting.private_key_password || '', password: true });
             break;
         default:
-            log('Invalid EAP/IEEE802.1x method: ' + ieee8021xSetting.get_eap_method(0));
+            log(`Invalid EAP/IEEE802.1x method: ${ieee8021xSetting.get_eap_method(0)}`);
         }
     }
 
@@ -303,7 +308,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
         let ssid;
 
         let content = { };
-        content.secrets = [ ];
+        content.secrets = [];
 
         switch (connectionType) {
         case '802-11-wireless':
@@ -326,7 +331,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
             this._getPPPoESecrets(content.secrets);
             break;
         case 'gsm':
-            if (this._hints.indexOf('pin') != -1) {
+            if (this._hints.includes('pin')) {
                 let gsmSetting = this._connection.get_setting_gsm();
                 content.title = _("PIN code required");
                 content.message = _("PIN code is needed for the mobile broadband device");
@@ -342,12 +347,12 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
             this._getMobileSecrets(content.secrets, connectionType);
             break;
         default:
-            log('Invalid connection type: ' + connectionType);
+            log(`Invalid connection type: ${connectionType}`);
-        };
+        }
 
         return content;
     }
-};
+});
 
 var VPNRequestHandler = class {
     constructor(agent, requestId, authHelper, serviceType, connection, hints, flags) {
@@ -358,16 +363,15 @@ var VPNRequestHandler = class {
         this._pluginOutBuffer = [];
         this._title = null;
         this._description = null;
-        this._content = [ ];
+        this._content = [];
         this._shellDialog = null;
 
         let connectionSetting = connection.get_setting_connection();
 
-        let argv = [ authHelper.fileName,
+        let argv = [authHelper.fileName,
-                     '-u', connectionSetting.uuid,
+                    '-u', connectionSetting.uuid,
-                     '-n', connectionSetting.id,
+                    '-n', connectionSetting.id,
-                     '-s', serviceType
+                    '-s', serviceType];
-                   ];
         if (authHelper.externalUIMode)
             argv.push('--external-ui-mode');
         if (flags & NM.SecretAgentGetSecretsFlags.ALLOW_INTERACTION)
@@ -384,7 +388,7 @@ var VPNRequestHandler = class {
         this._newStylePlugin = authHelper.externalUIMode;
 
         try {
-            let [success, pid, stdin, stdout, stderr] =
+            let [success_, pid, stdin, stdout, stderr] =
                 GLib.spawn_async_with_pipes(null, /* pwd */
                                             argv,
                                             null, /* envp */
@@ -406,7 +410,7 @@ var VPNRequestHandler = class {
                                                     this._vpnChildFinished.bind(this));
 
             this._writeConnection();
-        } catch(e) {
+        } catch (e) {
             logError(e, 'error while spawning VPN auth helper');
 
             this._agent.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
@@ -423,7 +427,7 @@ var VPNRequestHandler = class {
         } else {
             try {
                 this._stdin.write('QUIT\n\n', null);
-            } catch(e) { /* ignore broken pipe errors */ }
+            } catch (e) { /* ignore broken pipe errors */ }
         }
 
         this.destroy();
@@ -443,7 +447,7 @@ var VPNRequestHandler = class {
         this._destroyed = true;
     }
 
-    _vpnChildFinished(pid, status, requestObj) {
+    _vpnChildFinished(pid, status, _requestObj) {
         this._childWatch = 0;
         if (this._newStylePlugin) {
             // For new style plugin, all work is done in the async reading functions
@@ -458,8 +462,9 @@ var VPNRequestHandler = class {
                 this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
             else
                 this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
-        } else
+        } else {
             this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+        }
 
         this.destroy();
     }
@@ -472,7 +477,7 @@ var VPNRequestHandler = class {
             if (line == '' && this._previousLine == '') {
                 try {
                     this._stdin.write('QUIT\n\n', null);
-                } catch(e) { /* ignore broken pipe errors */ }
+                } catch (e) { /* ignore broken pipe errors */ }
             } else {
                 this._agent.set_password(this._requestId, this._previousLine, line);
                 this._previousLine = undefined;
@@ -484,7 +489,7 @@ var VPNRequestHandler = class {
 
     _readStdoutOldStyle() {
         this._dataStdout.read_line_async(GLib.PRIORITY_DEFAULT, null, (stream, result) => {
-            let [line, len] = this._dataStdout.read_line_finish_utf8(result);
+            let [line, len_] = this._dataStdout.read_line_finish_utf8(result);
 
             if (line == null) {
                 // end of file
@@ -539,7 +544,7 @@ var VPNRequestHandler = class {
                                 message: keyfile.get_string(VPN_UI_GROUP, 'Description'),
                                 secrets: [] };
 
-            let [groups, len] = keyfile.get_groups();
+            let [groups, len_] = keyfile.get_groups();
             for (let i = 0; i < groups.length; i++) {
                 if (groups[i] == VPN_UI_GROUP)
                     continue;
@@ -548,11 +553,12 @@ var VPNRequestHandler = class {
                 let shouldAsk = keyfile.get_boolean(groups[i], 'ShouldAsk');
 
                 if (shouldAsk) {
-                    contentOverride.secrets.push({ label: keyfile.get_string(groups[i], 'Label'),
+                    contentOverride.secrets.push({
-                                                   key: groups[i],
+                        label: keyfile.get_string(groups[i], 'Label'),
-                                                   value: value,
+                        key: groups[i],
-                                                   password: keyfile.get_boolean(groups[i], 'IsSecret')
+                        value: value,
-                                                 });
+                        password: keyfile.get_boolean(groups[i], 'IsSecret'),
+                    });
                 } else {
                     if (!value.length) // Ignore empty secrets
                         continue;
@@ -560,7 +566,7 @@ var VPNRequestHandler = class {
                     this._agent.set_password(this._requestId, groups[i], value);
                 }
             }
-        } catch(e) {
+        } catch (e) {
             // No output is a valid case it means "both secrets are stored"
             if (data.length > 0) {
                 logError(e, 'error while reading VPN plugin output keyfile');
@@ -586,15 +592,15 @@ var VPNRequestHandler = class {
 
         try {
             vpnSetting.foreach_data_item((key, value) => {
-                this._stdin.write('DATA_KEY=' + key + '\n', null);
+                this._stdin.write(`DATA_KEY=${key}\n`, null);
-                this._stdin.write('DATA_VAL=' + (value || '') + '\n\n', null);
+                this._stdin.write(`DATA_VAL=${value || ''}\n\n`, null);
             });
             vpnSetting.foreach_secret((key, value) => {
-                this._stdin.write('SECRET_KEY=' + key + '\n', null);
+                this._stdin.write(`SECRET_KEY=${key}\n`, null);
-                this._stdin.write('SECRET_VAL=' + (value || '') + '\n\n', null);
+                this._stdin.write(`SECRET_VAL=${value || ''}\n\n`, null);
             });
             this._stdin.write('DONE\n\n', null);
-        } catch(e) {
+        } catch (e) {
             logError(e, 'internal error while writing connection to helper');
 
             this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
@@ -606,10 +612,11 @@ Signals.addSignalMethods(VPNRequestHandler.prototype);
 
 var NetworkAgent = class {
     constructor() {
-        this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
+        this._native = new Shell.NetworkAgent({
-                                                capabilities: NM.SecretAgentCapabilities.VPN_HINTS,
+            identifier: 'org.gnome.Shell.NetworkAgent',
-                                                auto_register: false
+            capabilities: NM.SecretAgentCapabilities.VPN_HINTS,
-                                              });
+            auto_register: false,
+        });
 
         this._dialogs = { };
         this._vpnRequests = { };
@@ -618,9 +625,9 @@ var NetworkAgent = class {
         this._pluginDir = Gio.file_new_for_path(Config.VPNDIR);
         try {
             let monitor = this._pluginDir.monitor(Gio.FileMonitorFlags.NONE, null);
-            monitor.connect('changed', () => { this._vpnCacheBuilt = false; });
+            monitor.connect('changed', () => (this._vpnCacheBuilt = false));
-        } catch(e) {
+        } catch (e) {
-            log('Failed to create monitor for VPN plugin dir: ' + e.message);
+            log(`Failed to create monitor for VPN plugin dir: ${e.message}`);
         }
 
         this._native.connect('new-request', this._newRequest.bind(this));
@@ -631,7 +638,7 @@ var NetworkAgent = class {
             try {
                 this._native.init_finish(res);
                 this._initialized = true;
-            } catch(e) {
+            } catch (e) {
                 this._native = null;
                 logError(e, 'error initializing the NetworkManager Agent');
             }
@@ -679,12 +686,13 @@ var NetworkAgent = class {
         let connectionSetting = connection.get_setting_connection();
         let connectionType = connectionSetting.get_connection_type();
         switch (connectionType) {
-        case '802-11-wireless':
+        case '802-11-wireless': {
             let wirelessSetting = connection.get_setting_wireless();
             let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
             title = _("Authentication required by wireless network");
             body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
             break;
+        }
         case '802-3-ethernet':
             title = _("Wired 802.1X authentication");
             body = _("A password is required to connect to “%s”.".format(connection.get_id()));
@@ -694,8 +702,7 @@ var NetworkAgent = class {
             body = _("A password is required to connect to “%s”.".format(connection.get_id()));
             break;
         case 'gsm':
-            if (hints.indexOf('pin') != -1) {
+            if (hints.includes('pin')) {
-                let gsmSetting = connection.get_setting_gsm();
                 title = _("PIN code required");
                 body = _("PIN code is needed for the mobile broadband device");
                 break;
@@ -707,7 +714,7 @@ var NetworkAgent = class {
             body = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
             break;
         default:
-            log('Invalid connection type: ' + connectionType);
+            log(`Invalid connection type: ${connectionType}`);
             this._native.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
             return;
         }
@@ -727,7 +734,7 @@ var NetworkAgent = class {
         });
 
         Main.messageTray.add(source);
-        source.notify(notification);
+        source.showNotification(notification);
     }
 
     _newRequest(agent, requestId, connection, settingName, hints, flags) {

js/ui/components/polkitAgent.js

@@ -1,8 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */
 
 const { AccountsService, Clutter, Gio, GLib,
-        Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
+        GObject, Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
-const Signals = imports.signals;
 
 const Animation = imports.ui.animation;
 const Dialog = imports.ui.dialog;
@@ -15,9 +15,11 @@ var DIALOG_ICON_SIZE = 48;
 
 var WORK_SPINNER_ICON_SIZE = 16;
 
-var AuthenticationDialog = class extends ModalDialog.ModalDialog {
+var AuthenticationDialog = GObject.registerClass({
-    constructor(actionId, body, cookie, userNames) {
+    Signals: { 'done': { param_types: [GObject.TYPE_BOOLEAN] } }
-        super({ styleClass: 'prompt-dialog' });
+}, class AuthenticationDialog extends ModalDialog.ModalDialog {
+    _init(actionId, body, cookie, userNames) {
+        super._init({ styleClass: 'prompt-dialog' });
 
         this.actionId = actionId;
         this.message = body;
@@ -25,7 +27,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._wasDismissed = false;
 
         this._sessionUpdatedId = Main.sessionMode.connect('updated', () => {
-            this._group.visible = !Main.sessionMode.isLocked;
+            this.visible = !Main.sessionMode.isLocked;
         });
 
         this.connect('closed', this._onDialogClosed.bind(this));
@@ -37,19 +39,19 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this.contentLayout.add_actor(content);
 
         if (userNames.length > 1) {
-            log('polkitAuthenticationAgent: Received ' + userNames.length +
+            log(`polkitAuthenticationAgent: Received ${userNames.length} ` +
-                ' identities that can be used for authentication. Only ' +
+                'identities that can be used for authentication. Only ' +
                 'considering one.');
         }
 
         let userName = GLib.get_user_name();
-        if (userNames.indexOf(userName) < 0)
+        if (!userNames.includes(userName))
             userName = 'root';
-        if (userNames.indexOf(userName) < 0)
+        if (!userNames.includes(userName))
             userName = userNames[0];
 
         this._user = AccountsService.UserManager.get_default().get_user(userName);
-        let userRealName = this._user.get_real_name()
+        let userRealName = this._user.get_real_name();
         this._userLoadedId = this._user.connect('notify::is_loaded',
                                                 this._onUserChanged.bind(this));
         this._userChangedId = this._user.connect('changed',
@@ -74,17 +76,17 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
             this._userAvatar = new UserWidget.Avatar(this._user,
                                                      { iconSize: DIALOG_ICON_SIZE,
                                                        styleClass: 'polkit-dialog-user-icon' });
-            this._userAvatar.actor.hide();
+            this._userAvatar.hide();
-            userBox.add(this._userAvatar.actor,
+            userBox.add(this._userAvatar,
-                        { x_fill:  true,
+                        { x_fill: true,
-                          y_fill:  false,
+                          y_fill: false,
                           x_align: St.Align.END,
                           y_align: St.Align.START });
             let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-label',
                                             text: userRealName }));
             userBox.add(userLabel,
-                        { x_fill:  true,
+                        { x_fill: true,
-                          y_fill:  false,
+                          y_fill: false,
                           x_align: St.Align.END,
                           y_align: St.Align.MIDDLE });
         }
@@ -97,14 +99,14 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE });
         this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                              text: "",
-                                             can_focus: true});
+                                             can_focus: true });
         ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
         this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
         this._passwordBox.add(this._passwordEntry,
                               { expand: true });
 
         this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
-        this._passwordBox.add(this._workSpinner.actor);
+        this._passwordBox.add(this._workSpinner);
 
         this.setInitialKeyFocus(this._passwordEntry);
         this._passwordBox.hide();
@@ -126,7 +128,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
          * gnome-shell.css sets the color to be transparent
          */
         this._nullMessageLabel = new St.Label({ style_class: 'prompt-dialog-null-label',
-                                                text: 'abc'});
+                                                text: 'abc' });
         this._nullMessageLabel.add_style_class_name('hidden');
         this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         this._nullMessageLabel.clutter_text.line_wrap = true;
@@ -136,7 +138,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._cancelButton = this.addButton({ label: _("Cancel"),
                                               action: this.cancel.bind(this),
                                               key: Clutter.Escape });
-        this._okButton = this.addButton({ label:  _("Authenticate"),
+        this._okButton = this.addButton({ label: _("Authenticate"),
                                           action: this._onAuthenticateButtonPressed.bind(this),
                                           default: true });
 
@@ -179,9 +181,9 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
             //
             // We could add retrying if this turns out to be a problem
 
-            log('polkitAuthenticationAgent: Failed to show modal dialog.' +
+            log('polkitAuthenticationAgent: Failed to show modal dialog. ' +
-                ' Dismissing authentication request for action-id ' + this.actionId +
+                `Dismissing authentication request for action-id ${this.actionId} ` +
-                ' cookie ' + this._cookie);
+                `cookie ${this._cookie}`);
             this._emitDone(true);
         }
     }
@@ -249,14 +251,14 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         }
     }
 
-    _onSessionRequest(session, request, echo_on) {
+    _onSessionRequest(session, request, echoOn) {
         // Cheap localization trick
         if (request == 'Password:' || request == 'Password: ')
             this._passwordLabel.set_text(_("Password:"));
         else
             this._passwordLabel.set_text(request);
 
-        if (echo_on)
+        if (echoOn)
             this._passwordEntry.clutter_text.set_password_char('');
         else
             this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
@@ -303,7 +305,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
     _onUserChanged() {
         if (this._user.is_loaded && this._userAvatar) {
             this._userAvatar.update();
-            this._userAvatar.actor.show();
+            this._userAvatar.show();
         }
     }
 
@@ -326,8 +328,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
 
         this._destroySession();
     }
-};
+});
-Signals.addSignalMethods(AuthenticationDialog.prototype);
 
 var AuthenticationAgent = class {
     constructor() {
@@ -342,7 +343,7 @@ var AuthenticationAgent = class {
     enable() {
         try {
             this._native.register();
-        } catch(e) {
+        } catch (e) {
             log('Failed to register AuthenticationAgent');
         }
     }
@@ -350,7 +351,7 @@ var AuthenticationAgent = class {
     disable() {
         try {
             this._native.unregister();
-        } catch(e) {
+        } catch (e) {
             log('Failed to unregister AuthenticationAgent');
         }
     }
@@ -383,11 +384,11 @@ var AuthenticationAgent = class {
         this._currentDialog.performAuthentication();
     }
 
-    _onCancel(nativeAgent) {
+    _onCancel(_nativeAgent) {
         this._completeRequest(false);
     }
 
-    _onDialogDone(dialog, dismissed) {
+    _onDialogDone(_dialog, dismissed) {
         this._completeRequest(dismissed);
     }
 

js/ui/components/telepathyClient.js

@@ -1,14 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */
 
 const { Clutter, Gio, GLib, GObject, St } = imports.gi;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 
 var Tpl = null;
 var Tp = null;
 try {
     ({ TelepathyGLib: Tp, TelepathyLogger: Tpl } = imports.gi);
-} catch(e) {
+} catch (e) {
     log('Telepathy is not available, chat integration will be disabled.');
 }
 
@@ -40,10 +40,8 @@ var NotificationDirection = {
     RECEIVED: 'chat-received'
 };
 
-var N_ = s => s;
-
 function makeMessageFromTpMessage(tpMessage, direction) {
-    let [text, flags] = tpMessage.to_text();
+    let [text, flags_] = tpMessage.to_text();
 
     let timestamp = tpMessage.get_sent_timestamp();
     if (timestamp == 0)
@@ -89,7 +87,7 @@ var TelepathyComponent = class {
         try {
             this._client.register();
         } catch (e) {
-            throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
+            throw new Error(`Could not register Telepathy client. Error: ${e}`);
         }
 
         if (!this._client.account_manager.is_prepared(Tp.AccountManager.get_feature_quark_core()))
@@ -149,20 +147,20 @@ class TelepathyClient extends Tp.BaseClient {
             this._delegatedChannelsCb.bind(this));
     }
 
-    vfunc_observe_channels(account, conn, channels,
+    vfunc_observe_channels(...args) {
-                                     dispatchOp, requests, context) {
+        let [account, conn, channels, dispatchOp_, requests_, context] = args;
         let len = channels.length;
         for (let i = 0; i < len; i++) {
             let channel = channels[i];
-            let [targetHandle, targetHandleType] = channel.get_handle();
+            let [targetHandle_, targetHandleType] = channel.get_handle();
 
             if (channel.get_invalidated())
-              continue;
+                continue;
 
             /* Only observe contact text channels */
             if ((!(channel instanceof Tp.TextChannel)) ||
                targetHandleType != Tp.HandleType.CONTACT)
-               continue;
+                continue;
 
             this._createChatSource(account, conn, channel, channel.get_target_contact());
         }
@@ -182,8 +180,8 @@ class TelepathyClient extends Tp.BaseClient {
         });
     }
 
-    vfunc_handle_channels(account, conn, channels, requests,
+    vfunc_handle_channels(...args) {
-                                    user_action_time, context) {
+        let [account, conn, channels, requests_, userActionTime_, context] = args;
         this._handlingChannels(account, conn, channels, true);
         context.accept();
     }
@@ -200,7 +198,7 @@ class TelepathyClient extends Tp.BaseClient {
             }
 
             if (channel.get_invalidated())
-              continue;
+                continue;
 
             // 'notify' will be true when coming from an actual HandleChannels
             // call, and not when from a successful Claim call. The point is
@@ -217,13 +215,13 @@ class TelepathyClient extends Tp.BaseClient {
                 // We are already handling the channel, display the source
                 let source = this._chatSources[channel.get_object_path()];
                 if (source)
-                    source.notify();
+                    source.showNotification();
             }
         }
     }
 
-    vfunc_add_dispatch_operation(account, conn, channels,
+    vfunc_add_dispatch_operation(...args) {
-                                           dispatchOp, context) {
+        let [account, conn, channels, dispatchOp, context] = args;
         let channel = channels[0];
         let chanType = channel.get_channel_type();
 
@@ -241,7 +239,7 @@ class TelepathyClient extends Tp.BaseClient {
     }
 
     _approveTextChannel(account, conn, channel, dispatchOp, context) {
-        let [targetHandle, targetHandleType] = channel.get_handle();
+        let [targetHandle_, targetHandleType] = channel.get_handle();
 
         if (targetHandleType != Tp.HandleType.CONTACT) {
             context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
@@ -255,22 +253,23 @@ class TelepathyClient extends Tp.BaseClient {
                 dispatchOp.claim_with_finish(result);
                 this._handlingChannels(account, conn, [channel], false);
             } catch (err) {
-                log('Failed to Claim channel: ' + err);
+                log(`Failed to Claim channel: ${err}`);
             }
         });
 
         context.accept();
     }
 
-    _delegatedChannelsCb(client, channels) {
+    _delegatedChannelsCb(_client, _channels) {
         // Nothing to do as we don't make a distinction between observed and
         // handled channels.
     }
 }) : null;
 
-var ChatSource = class extends MessageTray.Source {
+var ChatSource = HAVE_TP ? GObject.registerClass(
-    constructor(account, conn, channel, contact, client) {
+class ChatSource extends MessageTray.Source {
-        super(contact.get_alias());
+    _init(account, conn, channel, contact, client) {
+        super._init(contact.get_alias());
 
         this._account = account;
         this._contact = contact;
@@ -328,7 +327,7 @@ var ChatSource = class extends MessageTray.Source {
 
         // We ack messages when the user expands the new notification
         let id = this._banner.connect('expanded', this._ackMessages.bind(this));
-        this._banner.actor.connect('destroy', () => {
+        this._banner.connect('destroy', () => {
             this._banner.disconnect(id);
             this._banner = null;
         });
@@ -362,28 +361,28 @@ var ChatSource = class extends MessageTray.Source {
         let presenceType = this._contact.get_presence_type();
 
         switch (presenceType) {
-            case Tp.ConnectionPresenceType.AVAILABLE:
+        case Tp.ConnectionPresenceType.AVAILABLE:
-                iconName = 'user-available';
+            iconName = 'user-available';
-                break;
+            break;
-            case Tp.ConnectionPresenceType.BUSY:
+        case Tp.ConnectionPresenceType.BUSY:
-                iconName = 'user-busy';
+            iconName = 'user-busy';
-                break;
+            break;
-            case Tp.ConnectionPresenceType.OFFLINE:
+        case Tp.ConnectionPresenceType.OFFLINE:
-                iconName = 'user-offline';
+            iconName = 'user-offline';
-                break;
+            break;
-            case Tp.ConnectionPresenceType.HIDDEN:
+        case Tp.ConnectionPresenceType.HIDDEN:
-                iconName = 'user-invisible';
+            iconName = 'user-invisible';
-                break;
+            break;
-            case Tp.ConnectionPresenceType.AWAY:
+        case Tp.ConnectionPresenceType.AWAY:
-                iconName = 'user-away';
+            iconName = 'user-away';
-                break;
+            break;
-            case Tp.ConnectionPresenceType.EXTENDED_AWAY:
+        case Tp.ConnectionPresenceType.EXTENDED_AWAY:
-                iconName = 'user-idle';
+            iconName = 'user-idle';
-                break;
+            break;
-            default:
+        default:
-                iconName = 'user-offline';
+            iconName = 'user-offline';
-       }
+        }
-       return new Gio.ThemedIcon({ name: iconName });
+        return new Gio.ThemedIcon({ name: iconName });
     }
 
     _updateAvatarIcon() {
@@ -401,7 +400,7 @@ var ChatSource = class extends MessageTray.Source {
         if (this._client.is_handling_channel(this._channel)) {
             // We are handling the channel, try to pass it to Empathy or Polari
             // (depending on the channel type)
-            // We don't check if either app is availble - mission control will
+            // We don't check if either app is available - mission control will
             // fallback to something else if activation fails
 
             let target;
@@ -429,7 +428,7 @@ var ChatSource = class extends MessageTray.Source {
     }
 
     _displayPendingMessages(logManager, result) {
-        let [success, events] = logManager.get_filtered_events_finish(result);
+        let [success_, events] = logManager.get_filtered_events_finish(result);
 
         let logMessages = events.map(makeMessageFromTplEvent);
         this._ensureNotification();
@@ -478,7 +477,7 @@ var ChatSource = class extends MessageTray.Source {
             this._notification.appendMessage(pendingMessages[i], true);
 
         if (pendingMessages.length > 0)
-            this.notify();
+            this.showNotification();
     }
 
     destroy(reason) {
@@ -547,15 +546,15 @@ var ChatSource = class extends MessageTray.Source {
         // Wait a bit before notifying for the received message, a handler
         // could ack it in the meantime.
         if (this._notifyTimeoutId != 0)
-            Mainloop.source_remove(this._notifyTimeoutId);
+            GLib.source_remove(this._notifyTimeoutId);
-        this._notifyTimeoutId = Mainloop.timeout_add(500,
+        this._notifyTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 500,
             this._notifyTimeout.bind(this));
         GLib.Source.set_name_by_id(this._notifyTimeoutId, '[gnome-shell] this._notifyTimeout');
     }
 
     _notifyTimeout() {
         if (this._pendingMessages.length != 0)
-            this.notify();
+            this.showNotification();
 
         this._notifyTimeoutId = 0;
 
@@ -564,14 +563,14 @@ var ChatSource = class extends MessageTray.Source {
 
     // This is called for both messages we send from
     // our client and other clients as well.
-    _messageSent(channel, message, flags, token) {
+    _messageSent(channel, message, _flags, _token) {
         this._ensureNotification();
         message = makeMessageFromTpMessage(message, NotificationDirection.SENT);
         this._notification.appendMessage(message);
     }
 
-    notify() {
+    showNotification() {
-        super.notify(this._notification);
+        super.showNotification(this._notification);
     }
 
     respond(text) {
@@ -585,7 +584,7 @@ var ChatSource = class extends MessageTray.Source {
 
         let msg = Tp.ClientMessage.new_text(type, text);
         this._channel.send_message_async(msg, 0, (src, result) => {
-            this._channel.send_message_finish(result); 
+            this._channel.send_message_finish(result);
         });
     }
 
@@ -597,12 +596,12 @@ var ChatSource = class extends MessageTray.Source {
         // keep track of it with the ChatStateChanged signal but it is good
         // enough right now.
         if (state != this._chatState) {
-          this._chatState = state;
+            this._chatState = state;
-          this._channel.set_chat_state_async(state, null);
+            this._channel.set_chat_state_async(state, null);
         }
     }
 
-    _presenceChanged(contact, presence, status, message) {
+    _presenceChanged(_contact, _presence, _status, _message) {
         if (this._notification)
             this._notification.update(this._notification.title,
                                       this._notification.bannerBodyText,
@@ -627,12 +626,18 @@ var ChatSource = class extends MessageTray.Source {
         // 'pending-message-removed' for each one.
         this._channel.ack_all_pending_messages_async(null);
     }
-};
+}) : null;
 
-var ChatNotification = class extends MessageTray.Notification {
+var ChatNotification = HAVE_TP ? GObject.registerClass({
-    constructor(source) {
+    Signals: {
-        super(source, source.title, null,
+        'message-removed': { param_types: [Tp.Message.$gtype] },
-              { secondaryGIcon: source.getSecondaryIcon() });
+        'message-added': { param_types: [Tp.Message.$gtype] },
+        'timestamp-changed': { param_types: [Tp.Message.$gtype] },
+    }
+}, class ChatNotification extends MessageTray.Notification {
+    _init(source) {
+        super._init(source, source.title, null,
+            { secondaryGIcon: source.getSecondaryIcon() });
         this.setUrgency(MessageTray.Urgency.HIGH);
         this.setResident(true);
 
@@ -642,7 +647,7 @@ var ChatNotification = class extends MessageTray.Notification {
 
     destroy(reason) {
         if (this._timestampTimeoutId)
-            Mainloop.source_remove(this._timestampTimeoutId);
+            GLib.source_remove(this._timestampTimeoutId);
         this._timestampTimeoutId = 0;
         super.destroy(reason);
     }
@@ -655,7 +660,7 @@ var ChatNotification = class extends MessageTray.Notification {
      *   sender: the name of the sender,
      *   timestamp: the time the message was sent
      *   direction: a #NotificationDirection
-     * 
+     *
      * @noTimestamp: Whether to add a timestamp. If %true, no timestamp
      *   will be added, regardless of the difference since the
      *   last timestamp
@@ -675,8 +680,8 @@ var ChatNotification = class extends MessageTray.Notification {
                         { datetime: GLib.DateTime.new_from_unix_local (message.timestamp),
                           bannerMarkup: true });
 
-        let group = (message.direction == NotificationDirection.RECEIVED ?
+        let group = (message.direction == NotificationDirection.RECEIVED
-                     'received' : 'sent');
+            ? 'received' : 'sent');
 
         this._append({ body: messageBody,
                        group: group,
@@ -698,8 +703,8 @@ var ChatNotification = class extends MessageTray.Notification {
         // SCROLLBACK_RECENT_LENGTH previous messages. Otherwise
         // we'll keep SCROLLBACK_IDLE_LENGTH messages.
 
-        let maxLength = (lastMessageTime < currentTime - SCROLLBACK_RECENT_TIME) ?
+        let maxLength = (lastMessageTime < currentTime - SCROLLBACK_RECENT_TIME)
-            SCROLLBACK_IDLE_LENGTH : SCROLLBACK_RECENT_LENGTH;
+            ? SCROLLBACK_IDLE_LENGTH : SCROLLBACK_RECENT_LENGTH;
 
         let filteredHistory = this.messages.filter(item => item.realMessage);
         if (filteredHistory.length > maxLength) {
@@ -730,7 +735,7 @@ var ChatNotification = class extends MessageTray.Notification {
 
         // Reset the old message timeout
         if (this._timestampTimeoutId)
-            Mainloop.source_remove(this._timestampTimeoutId);
+            GLib.source_remove(this._timestampTimeoutId);
         this._timestampTimeoutId = 0;
 
         let message = { realMessage: props.group != 'meta',
@@ -748,7 +753,8 @@ var ChatNotification = class extends MessageTray.Notification {
             } else {
                 // Schedule a new timestamp in SCROLLBACK_IMMEDIATE_TIME
                 // from the timestamp of the message.
-                this._timestampTimeoutId = Mainloop.timeout_add_seconds(
+                this._timestampTimeoutId = GLib.timeout_add_seconds(
+                    GLib.PRIORITY_DEFAULT,
                     SCROLLBACK_IMMEDIATE_TIME - (currentTime - timestamp),
                     this.appendTimestamp.bind(this));
                 GLib.Source.set_name_by_id(this._timestampTimeoutId, '[gnome-shell] this.appendTimestamp');
@@ -783,7 +789,7 @@ var ChatNotification = class extends MessageTray.Notification {
 
         this._filterMessages();
     }
-};
+}) : null;
 
 var ChatLineBox = GObject.registerClass(
 class ChatLineBox extends St.BoxLayout {
@@ -793,9 +799,10 @@ class ChatLineBox extends St.BoxLayout {
     }
 });
 
-var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
+var ChatNotificationBanner = GObject.registerClass(
-    constructor(notification) {
+class ChatNotificationBanner extends MessageTray.NotificationBanner {
-        super(notification);
+    _init(notification) {
+        super._init(notification);
 
         this._responseEntry = new St.Entry({ style_class: 'chat-response',
                                              x_expand: true,
@@ -880,8 +887,7 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
     }
 
     _addMessage(message) {
-        let highlighter = new MessageList.URLHighlighter(message.body, true, true);
+        let body = new MessageList.URLHighlighter(message.body, true, true);
-        let body = highlighter.actor;
 
         let styles = message.styles;
         for (let i = 0; i < styles.length; i++)
@@ -953,14 +959,15 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
 
         // Remove composing timeout.
         if (this._composingTimeoutId > 0) {
-            Mainloop.source_remove(this._composingTimeoutId);
+            GLib.source_remove(this._composingTimeoutId);
             this._composingTimeoutId = 0;
         }
 
         if (text != '') {
             this.notification.source.setChatState(Tp.ChannelChatState.COMPOSING);
 
-            this._composingTimeoutId = Mainloop.timeout_add_seconds(
+            this._composingTimeoutId = GLib.timeout_add_seconds(
+                GLib.PRIORITY_DEFAULT,
                 COMPOSING_STOP_TIMEOUT,
                 this._composingStopTimeout.bind(this));
             GLib.Source.set_name_by_id(this._composingTimeoutId, '[gnome-shell] this._composingStopTimeout');
@@ -968,6 +975,6 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
             this.notification.source.setChatState(Tp.ChannelChatState.ACTIVE);
         }
     }
-};
+});
 
 var Component = TelepathyComponent;

js/ui/ctrlAltTab.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported CtrlAltTabManager */
 
 const { Clutter, GObject, Meta, Shell, St } = imports.gi;
 
@@ -7,7 +8,6 @@ const SwitcherPopup = imports.ui.switcherPopup;
 const Params = imports.misc.params;
 
 var POPUP_APPICON_SIZE = 96;
-var POPUP_FADE_TIME = 0.1; // seconds
 
 var SortGroup = {
     TOP:    0,
@@ -33,7 +33,7 @@ var CtrlAltTabManager = class CtrlAltTabManager {
         item.iconName = icon;
 
         this._items.push(item);
-        root.connect('destroy', () => { this.removeGroup(root); });
+        root.connect('destroy', () => this.removeGroup(root));
         if (root instanceof St.Widget)
             global.focus_manager.add_group(root);
     }
@@ -64,9 +64,8 @@ var CtrlAltTabManager = class CtrlAltTabManager {
         if (a.sortGroup != b.sortGroup)
             return a.sortGroup - b.sortGroup;
 
-        let ax, bx, y;
+        let [ax] = a.proxy.get_transformed_position();
-        [ax, y] = a.proxy.get_transformed_position();
+        let [bx] = b.proxy.get_transformed_position();
-        [bx, y] = b.proxy.get_transformed_position();
 
         return ax - bx;
     }

js/ui/dash.js

@@ -1,19 +1,18 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Dash */
 
-const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, GLib, GObject,
-const Mainloop = imports.mainloop;
+        Graphene, Meta, Shell, St } = imports.gi;
-const Signals = imports.signals;
 
 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;
 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
 
-var DASH_ANIMATION_TIME = 0.2;
+var DASH_ANIMATION_TIME = 200;
-var DASH_ITEM_LABEL_SHOW_TIME = 0.15;
+var DASH_ITEM_LABEL_SHOW_TIME = 150;
-var DASH_ITEM_LABEL_HIDE_TIME = 0.1;
+var DASH_ITEM_LABEL_HIDE_TIME = 100;
 var DASH_ITEM_HOVER_TIMEOUT = 300;
 
 function getAppFromSource(source) {
@@ -24,27 +23,56 @@ function getAppFromSource(source) {
     }
 }
 
+var DashIcon = GObject.registerClass(
+class DashIcon extends AppDisplay.AppIcon {
+    _init(app) {
+        super._init(app, {
+            setSizeManually: true,
+            showLabel: false
+        });
+    }
+
+    // Disable all DnD methods
+    _onDragBegin() {
+    }
+
+    _onDragEnd() {
+    }
+
+    handleDragOver() {
+        return DND.DragMotionResult.CONTINUE;
+    }
+
+    acceptDrop() {
+        return false;
+    }
+});
+
 // A container like StBin, but taking the child's scale into account
 // when requesting a size
 var DashItemContainer = GObject.registerClass(
 class DashItemContainer extends St.Widget {
     _init() {
         super._init({ style_class: 'dash-item-container',
-                      pivot_point: new Clutter.Point({ x: .5, y: .5 }),
+                      pivot_point: new Graphene.Point({ x: .5, y: .5 }),
+                      scale_x: 0,
+                      scale_y: 0,
+                      opacity: 0,
                       x_expand: true,
                       x_align: Clutter.ActorAlign.CENTER });
 
         this._labelText = "";
-        this.label = new St.Label({ style_class: 'dash-label'});
+        this.label = new St.Label({ style_class: 'dash-label' });
         this.label.hide();
         Main.layoutManager.addChrome(this.label);
         this.label_actor = this.label;
 
         this.child = null;
-        this._childScale = 0;
-        this._childOpacity = 0;
         this.animatingOut = false;
 
+        this.connect('notify::scale-x', () => this.queue_relayout());
+        this.connect('notify::scale-y', () => this.queue_relayout());
+
         this.connect('destroy', () => {
             if (this.child != null)
                 this.child.destroy();
@@ -81,7 +109,7 @@ class DashItemContainer extends St.Widget {
         let itemHeight = this.allocation.y2 - this.allocation.y1;
 
         let labelHeight = this.label.get_height();
-        let yOffset = Math.floor((itemHeight - labelHeight) / 2)
+        let yOffset = Math.floor((itemHeight - labelHeight) / 2);
 
         let y = stageY + yOffset;
 
@@ -95,11 +123,11 @@ class DashItemContainer extends St.Widget {
             x = stageX + this.get_width() + xOffset;
 
         this.label.set_position(x, y);
-        Tweener.addTween(this.label,
+        this.label.ease({
-                         { opacity: 255,
+            opacity: 255,
-                           time: DASH_ITEM_LABEL_SHOW_TIME,
+            duration: DASH_ITEM_LABEL_SHOW_TIME,
-                           transition: 'easeOutQuad',
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
-                         });
+        });
     }
 
     setLabelText(text) {
@@ -108,14 +136,12 @@ class DashItemContainer extends St.Widget {
     }
 
     hideLabel() {
-        Tweener.addTween(this.label,
+        this.label.ease({
-                         { opacity: 0,
+            opacity: 0,
-                           time: DASH_ITEM_LABEL_HIDE_TIME,
+            duration: DASH_ITEM_LABEL_HIDE_TIME,
-                           transition: 'easeOutQuad',
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                           onComplete: () => {
+            onComplete: () => this.label.hide()
-                               this.label.hide();
+        });
-                           }
-                         });
     }
 
     setChild(actor) {
@@ -126,9 +152,6 @@ class DashItemContainer extends St.Widget {
 
         this.child = actor;
         this.add_actor(this.child);
-
-        this.set_scale(this._childScale, this._childScale);
-        this.set_opacity(this._childOpacity);
     }
 
     show(animate) {
@@ -136,12 +159,13 @@ class DashItemContainer extends St.Widget {
             return;
 
         let time = animate ? DASH_ANIMATION_TIME : 0;
-        Tweener.addTween(this,
+        this.ease({
-                         { childScale: 1.0,
+            scale_x: 1,
-                           childOpacity: 255,
+            scale_y: 1,
-                           time: time,
+            opacity: 255,
-                           transition: 'easeOutQuad'
+            duration: time,
-                         });
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
     }
 
     animateOutAndDestroy() {
@@ -153,37 +177,14 @@ class DashItemContainer extends St.Widget {
         }
 
         this.animatingOut = true;
-        Tweener.addTween(this,
+        this.ease({
-                         { childScale: 0.0,
+            scale_x: 0,
-                           childOpacity: 0,
+            scale_y: 0,
-                           time: DASH_ANIMATION_TIME,
+            opacity: 0,
-                           transition: 'easeOutQuad',
+            duration: DASH_ANIMATION_TIME,
-                           onComplete: () => {
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                               this.destroy();
+            onComplete: () => this.destroy()
-                           }
+        });
-                         });
-    }
-
-    set childScale(scale) {
-        this._childScale = scale;
-
-        this.set_scale(scale, scale);
-        this.queue_relayout();
-    }
-
-    get childScale() {
-        return this._childScale;
-    }
-
-    set childOpacity(opacity) {
-        this._childOpacity = opacity;
-
-        this.set_opacity(opacity);
-        this.queue_redraw();
-    }
-
-    get childOpacity() {
-        return this._childOpacity;
     }
 });
 
@@ -198,9 +199,9 @@ class ShowAppsIcon extends DashItemContainer {
                                             toggle_mode: true });
         this._iconActor = null;
         this.icon = new IconGrid.BaseIcon(_("Show Applications"),
-                                           { setSizeManually: true,
+                                          { setSizeManually: true,
-                                             showLabel: false,
+                                            showLabel: false,
-                                             createIcon: this._createIcon.bind(this) });
+                                            createIcon: this._createIcon.bind(this) });
         this.toggleButton.add_actor(this.icon);
         this.toggleButton._delegate = this;
 
@@ -241,14 +242,14 @@ class ShowAppsIcon extends DashItemContainer {
             this.setLabelText(_("Show Applications"));
     }
 
-    handleDragOver(source, actor, x, y, time) {
+    handleDragOver(source, _actor, _x, _y, _time) {
         if (!this._canRemoveApp(getAppFromSource(source)))
             return DND.DragMotionResult.NO_DROP;
 
         return DND.DragMotionResult.MOVE_DROP;
     }
 
-    acceptDrop(source, actor, x, y, time) {
+    acceptDrop(source, _actor, _x, _y, _time) {
         let app = getAppFromSource(source);
         if (!this._canRemoveApp(app))
             return false;
@@ -296,7 +297,7 @@ class DashActor extends St.Widget {
         this.set_allocation(box, flags);
 
         let [appIcons, showAppsButton] = this.get_children();
-        let [showAppsMinHeight, showAppsNatHeight] = showAppsButton.get_preferred_height(availWidth);
+        let [, showAppsNatHeight] = showAppsButton.get_preferred_height(availWidth);
 
         let childBox = new Clutter.ActorBox();
         childBox.x1 = contentBox.x1;
@@ -321,17 +322,19 @@ class DashActor extends St.Widget {
         let themeNode = this.get_theme_node();
         let adjustedForWidth = themeNode.adjust_for_width(forWidth);
         let [, showAppsButton] = this.get_children();
-        let [minHeight, ] = showAppsButton.get_preferred_height(adjustedForWidth);
+        let [minHeight] = showAppsButton.get_preferred_height(adjustedForWidth);
-        [minHeight, ] = themeNode.adjust_preferred_height(minHeight, natHeight);
+        [minHeight] = themeNode.adjust_preferred_height(minHeight, natHeight);
 
         return [minHeight, natHeight];
     }
 });
 
-const baseIconSizes = [ 16, 22, 24, 32, 48, 64 ];
+const baseIconSizes = [16, 22, 24, 32, 48, 64];
 
-var Dash = class Dash {
+var Dash = GObject.registerClass({
-    constructor() {
+    Signals: { 'icon-size-changed': {} }
+}, class Dash extends St.Bin {
+    _init() {
         this._maxHeight = -1;
         this.iconSize = 64;
         this._shownInitially = false;
@@ -351,8 +354,7 @@ var Dash = class Dash {
         this._container.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._showAppsIcon = new ShowAppsIcon();
-        this._showAppsIcon.childScale = 1;
+        this._showAppsIcon.show(false);
-        this._showAppsIcon.childOpacity = 255;
         this._showAppsIcon.icon.setIconSize(this.iconSize);
         this._hookUpLabel(this._showAppsIcon);
 
@@ -360,11 +362,11 @@ var Dash = class Dash {
 
         this._container.add_actor(this._showAppsIcon);
 
-        this.actor = new St.Bin({ child: this._container });
+        super._init({ child: this._container });
-        this.actor.connect('notify::height', () => {
+        this.connect('notify::height', () => {
-            if (this._maxHeight != this.actor.height)
+            if (this._maxHeight != this.height)
                 this._queueRedisplay();
-            this._maxHeight = this.actor.height;
+            this._maxHeight = this.height;
         });
 
         this._workId = Main.initializeDeferredWork(this._box, this._redisplay.bind(this));
@@ -387,7 +389,7 @@ var Dash = class Dash {
 
         // Translators: this is the name of the dock/favorites area on
         // the left of the overview
-        Main.ctrlAltTabManager.addGroup(this.actor, _("Dash"), 'user-bookmarks-symbolic');
+        Main.ctrlAltTabManager.addGroup(this, _("Dash"), 'user-bookmarks-symbolic');
     }
 
     _onDragBegin() {
@@ -474,19 +476,7 @@ var Dash = class Dash {
     }
 
     _createAppItem(app) {
-        let appIcon = new AppDisplay.AppIcon(app,
+        let appIcon = new DashIcon(app);
-                                             { setSizeManually: true,
-                                               showLabel: false });
-        if (appIcon._draggable) {
-            appIcon._draggable.connect('drag-begin',
-                                       () => {
-                                           appIcon.actor.opacity = 50;
-                                       });
-            appIcon._draggable.connect('drag-end',
-                                       () => {
-                                           appIcon.actor.opacity = 255;
-                                       });
-        }
 
         appIcon.connect('menu-state-changed',
                         (appIcon, opened) => {
@@ -494,11 +484,11 @@ var Dash = class Dash {
                         });
 
         let item = new DashItemContainer();
-        item.setChild(appIcon.actor);
+        item.setChild(appIcon);
 
         // Override default AppIcon label_actor, now the
         // accessible_name is set at DashItemContainer.setLabelText
-        appIcon.actor.label_actor = null;
+        appIcon.label_actor = null;
         item.setLabelText(app.get_name());
 
         appIcon.icon.setIconSize(this.iconSize);
@@ -512,7 +502,7 @@ var Dash = class Dash {
         // that the notify::hover handler does everything we need to.
         if (opened) {
             if (this._showLabelTimeoutId > 0) {
-                Mainloop.source_remove(this._showLabelTimeoutId);
+                GLib.source_remove(this._showLabelTimeoutId);
                 this._showLabelTimeoutId = 0;
             }
 
@@ -526,7 +516,7 @@ var Dash = class Dash {
         if (shouldShow) {
             if (this._showLabelTimeoutId == 0) {
                 let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
-                this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
+                this._showLabelTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, timeout,
                     () => {
                         this._labelShowing = true;
                         item.showLabel();
@@ -535,17 +525,17 @@ var Dash = class Dash {
                     });
                 GLib.Source.set_name_by_id(this._showLabelTimeoutId, '[gnome-shell] item.showLabel');
                 if (this._resetHoverTimeoutId > 0) {
-                    Mainloop.source_remove(this._resetHoverTimeoutId);
+                    GLib.source_remove(this._resetHoverTimeoutId);
                     this._resetHoverTimeoutId = 0;
                 }
             }
         } else {
             if (this._showLabelTimeoutId > 0)
-                Mainloop.source_remove(this._showLabelTimeoutId);
+                GLib.source_remove(this._showLabelTimeoutId);
             this._showLabelTimeoutId = 0;
             item.hideLabel();
             if (this._labelShowing) {
-                this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
+                this._resetHoverTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, DASH_ITEM_HOVER_TIMEOUT,
                     () => {
                         this._labelShowing = false;
                         this._resetHoverTimeoutId = 0;
@@ -633,12 +623,12 @@ var Dash = class Dash {
             icon.icon.set_size(icon.icon.width * scale,
                                icon.icon.height * scale);
 
-            Tweener.addTween(icon.icon,
+            icon.icon.ease({
-                             { width: targetWidth,
+                width: targetWidth,
-                               height: targetHeight,
+                height: targetHeight,
-                               time: DASH_ANIMATION_TIME,
+                duration: DASH_ANIMATION_TIME,
-                               transition: 'easeOutQuad',
+                mode: Clutter.AnimationMode.EASE_OUT_QUAD
-                             });
+            });
         }
     }
 
@@ -648,10 +638,10 @@ var Dash = class Dash {
         let running = this._appSystem.get_running();
 
         let children = this._box.get_children().filter(actor => {
-                return actor.child &&
+            return actor.child &&
-                       actor.child._delegate &&
+                   actor.child._delegate &&
-                       actor.child._delegate.app;
+                   actor.child._delegate.app;
-            });
+        });
         // Apps currently in the dash
         let oldApps = children.map(actor => actor.child._delegate.app);
         // Apps supposed to be in the dash
@@ -700,14 +690,14 @@ var Dash = class Dash {
             }
 
             // App removed at oldIndex
-            if (oldApp && newApps.indexOf(oldApp) == -1) {
+            if (oldApp && !newApps.includes(oldApp)) {
                 removedActors.push(children[oldIndex]);
                 oldIndex++;
                 continue;
             }
 
             // App added at newIndex
-            if (newApp && oldApps.indexOf(newApp) == -1) {
+            if (newApp && !oldApps.includes(newApp)) {
                 addedItems.push({ app: newApp,
                                   item: this._createAppItem(newApp),
                                   pos: newIndex });
@@ -716,8 +706,8 @@ var Dash = class Dash {
             }
 
             // App moved
-            let nextApp = newApps.length > newIndex + 1 ? newApps[newIndex + 1]
+            let nextApp = newApps.length > newIndex + 1
-                                                        : null;
+                ? newApps[newIndex + 1] : null;
             let insertHere = nextApp && nextApp == oldApp;
             let alreadyRemoved = removedActors.reduce((result, actor) => {
                 let removedApp = actor.child._delegate.app;
@@ -790,7 +780,7 @@ var Dash = class Dash {
         }
     }
 
-    handleDragOver(source, actor, x, y, time) {
+    handleDragOver(source, actor, x, y, _time) {
         let app = getAppFromSource(source);
 
         // Don't allow favoriting of transient apps
@@ -868,7 +858,7 @@ var Dash = class Dash {
     }
 
     // Draggable target interface
-    acceptDrop(source, actor, x, y, time) {
+    acceptDrop(source, _actor, _x, _y, _time) {
         let app = getAppFromSource(source);
 
         // Don't allow favoriting of transient apps
@@ -899,7 +889,7 @@ var Dash = class Dash {
                 favPos++;
         }
 
-        // No drag placeholder means we don't wan't to favorite the app
+        // No drag placeholder means we don't want to favorite the app
         // and we are dragging it to its original position
         if (!this._dragPlaceholder)
             return true;
@@ -915,5 +905,4 @@ var Dash = class Dash {
 
         return true;
     }
-};
+});
-Signals.addSignalMethods(Dash.prototype);

js/ui/dateMenu.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported DateMenuButton */
 
-const { Clutter, GLib, GnomeDesktop,
+const { Clutter, Gio, GLib, GnomeDesktop,
         GObject, GWeather, Shell, St } = imports.gi;
 
 const Util = imports.misc.util;
@@ -10,8 +11,13 @@ const Calendar = imports.ui.calendar;
 const Weather = imports.misc.weather;
 const System = imports.system;
 
+const { loadInterfaceXML } = imports.misc.fileUtils;
+
 const MAX_FORECASTS = 5;
 
+const ClocksIntegrationIface = loadInterfaceXML('org.gnome.Shell.ClocksIntegration');
+const ClocksProxy = Gio.DBusProxy.makeProxyWrapper(ClocksIntegrationIface);
+
 function _isToday(date) {
     let now = new Date();
     return now.getYear() == date.getYear() &&
@@ -19,22 +25,26 @@ function _isToday(date) {
            now.getDate() == date.getDate();
 }
 
-var TodayButton = class TodayButton {
+function _gDateTimeToDate(datetime) {
-    constructor(calendar) {
+    return new Date(datetime.to_unix() * 1000 + datetime.get_microsecond() / 1000);
+}
+
+var TodayButton = GObject.registerClass(
+class TodayButton extends St.Button {
+    _init(calendar) {
         // Having the ability to go to the current date if the user is already
         // on the current date can be confusing. So don't make the button reactive
         // until the selected date changes.
-        this.actor = new St.Button({ style_class: 'datemenu-today-button',
+        super._init({
-                                     x_expand: true, x_align: St.Align.START,
+            style_class: 'datemenu-today-button',
-                                     can_focus: true,
+            x_align: St.Align.START,
-                                     reactive: false
+            x_expand: true,
-                                   });
+            can_focus: true,
-        this.actor.connect('clicked', () => {
+            reactive: false
-            this._calendar.setDate(new Date(), false);
         });
 
         let hbox = new St.BoxLayout({ vertical: true });
-        this.actor.add_actor(hbox);
+        this.add_actor(hbox);
 
         this._dayLabel = new St.Label({ style_class: 'day-label',
                                         x_align: Clutter.ActorAlign.START });
@@ -44,13 +54,17 @@ var TodayButton = class TodayButton {
         hbox.add_actor(this._dateLabel);
 
         this._calendar = calendar;
-        this._calendar.connect('selected-date-changed', (calendar, date) => {
+        this._calendar.connect('selected-date-changed', (_calendar, datetime) => {
             // Make the button reactive only if the selected date is not the
             // current date.
-            this.actor.reactive = !_isToday(date)
+            this.reactive = !_isToday(_gDateTimeToDate(datetime));
         });
     }
 
+    vfunc_clicked() {
+        this._calendar.setDate(new Date(), false);
+    }
+
     setDate(date) {
         this._dayLabel.set_text(date.toLocaleFormat('%A'));
 
@@ -67,58 +81,73 @@ var TodayButton = class TodayButton {
          * date, e.g. "Tuesday February 17 2015".
          */
         dateFormat = Shell.util_translate_time_string (N_("%A %B %e %Y"));
-        this.actor.accessible_name = date.toLocaleFormat(dateFormat);
+        this.accessible_name = date.toLocaleFormat(dateFormat);
     }
-};
+});
 
-var WorldClocksSection = class WorldClocksSection {
+var WorldClocksSection = GObject.registerClass(
-    constructor() {
+class WorldClocksSection extends St.Button {
+    _init() {
+        super._init({
+            style_class: 'world-clocks-button',
+            x_fill: true,
+            can_focus: true
+        });
         this._clock = new GnomeDesktop.WallClock();
         this._clockNotifyId = 0;
 
         this._locations = [];
 
-        this.actor = new St.Button({ style_class: 'world-clocks-button',
-                                     x_fill: true,
-                                     can_focus: true });
-        this.actor.connect('clicked', () => {
-            this._clockAppMon.activateApp();
-
-            Main.overview.hide();
-            Main.panel.closeCalendar();
-        });
-
         let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
         this._grid = new St.Widget({ style_class: 'world-clocks-grid',
                                      layout_manager: layout });
         layout.hookup_style(this._grid);
 
-        this.actor.child = this._grid;
+        this.child = this._grid;
 
-        this._clockAppMon = new Util.AppSettingsMonitor('org.gnome.clocks.desktop',
+        this._clocksApp = null;
-                                                        'org.gnome.clocks');
+        this._clocksProxy = new ClocksProxy(
-        this._clockAppMon.connect('available-changed',
+            Gio.DBus.session,
-                                  this._sync.bind(this));
+            'org.gnome.clocks',
-        this._clockAppMon.watchSetting('world-clocks',
+            '/org/gnome/clocks',
-                                       this._clocksChanged.bind(this));
+            this._onProxyReady.bind(this),
+            null /* cancellable */,
+            Gio.DBusProxyFlags.DO_NOT_AUTO_START | Gio.DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
+
+        this._settings = new Gio.Settings({
+            schema_id: 'org.gnome.shell.world-clocks'
+        });
+        this._settings.connect('changed', this._clocksChanged.bind(this));
+        this._clocksChanged();
+
+        this._appSystem = Shell.AppSystem.get_default();
+        this._appSystem.connect('installed-changed',
+            this._sync.bind(this));
         this._sync();
     }
 
-    _sync() {
+    vfunc_clicked() {
-        this.actor.visible = this._clockAppMon.available;
+        if (this._clocksApp)
+            this._clocksApp.activate();
+
+        Main.overview.hide();
+        Main.panel.closeCalendar();
     }
 
-    _clocksChanged(settings) {
+    _sync() {
+        this._clocksApp = this._appSystem.lookup_app('org.gnome.clocks.desktop');
+        this.visible = this._clocksApp != null;
+    }
+
+    _clocksChanged() {
         this._grid.destroy_all_children();
         this._locations = [];
 
         let world = GWeather.Location.get_world();
-        let clocks = settings.get_value('world-clocks').deep_unpack();
+        let clocks = this._settings.get_value('locations').deep_unpack();
         for (let i = 0; i < clocks.length; i++) {
-            if (!clocks[i].location)
+            let l = world.deserialize(clocks[i]);
-                continue;
+            if (l && l.get_timezone() != null)
-            let l = world.deserialize(clocks[i].location);
-            if (l)
                 this._locations.push({ location: l });
         }
 
@@ -128,13 +157,14 @@ var WorldClocksSection = class WorldClocksSection {
         });
 
         let layout = this._grid.layout_manager;
-        let title = (this._locations.length == 0) ? _("Add world clocks…")
+        let title = (this._locations.length == 0)
-                                                  : _("World Clocks");
+            ? _("Add world clocks…")
+            : _("World Clocks");
         let header = new St.Label({ style_class: 'world-clocks-header',
                                     x_align: Clutter.ActorAlign.START,
                                     text: title });
         layout.attach(header, 0, 0, 2, 1);
-        this.actor.label_actor = header;
+        this.label_actor = header;
 
         let localOffset = GLib.DateTime.new_now_local().get_utc_offset();
 
@@ -196,30 +226,42 @@ var WorldClocksSection = class WorldClocksSection {
             l.actor.text = Util.formatTime(now, { timeOnly: true });
         }
     }
-};
 
-var WeatherSection = class WeatherSection {
+    _onProxyReady(proxy, error) {
-    constructor() {
+        if (error) {
+            log(`Failed to create GNOME Clocks proxy: ${error}`);
+            return;
+        }
+
+        this._clocksProxy.connect('g-properties-changed',
+            this._onClocksPropertiesChanged.bind(this));
+        this._onClocksPropertiesChanged();
+    }
+
+    _onClocksPropertiesChanged() {
+        if (this._clocksProxy.g_name_owner == null)
+            return;
+
+        this._settings.set_value('locations',
+            new GLib.Variant('av', this._clocksProxy.Locations));
+    }
+});
+
+var WeatherSection = GObject.registerClass(
+class WeatherSection extends St.Button {
+    _init() {
+        super._init({
+            style_class: 'weather-button',
+            x_fill: true,
+            can_focus: true
+        });
+
         this._weatherClient = new Weather.WeatherClient();
 
-        this.actor = new St.Button({ style_class: 'weather-button',
-                                     x_fill: true,
-                                     can_focus: true });
-        this.actor.connect('clicked', () => {
-            this._weatherClient.activateApp();
-
-            Main.overview.hide();
-            Main.panel.closeCalendar();
-        });
-        this.actor.connect('notify::mapped', () => {
-            if (this.actor.mapped)
-                this._weatherClient.update();
-        });
-
         let box = new St.BoxLayout({ style_class: 'weather-box',
-                                      vertical: true });
+                                     vertical: true });
 
-        this.actor.child = box;
+        this.child = box;
 
         let titleBox = new St.BoxLayout();
         titleBox.add_child(new St.Label({ style_class: 'weather-header',
@@ -242,6 +284,18 @@ var WeatherSection = class WeatherSection {
         this._sync();
     }
 
+    vfunc_map() {
+        this._weatherClient.update();
+        super.vfunc_map();
+    }
+
+    vfunc_clicked() {
+        this._weatherClient.activateApp();
+
+        Main.overview.hide();
+        Main.panel.closeCalendar();
+    }
+
     _getInfos() {
         let info = this._weatherClient.info;
         let forecasts = info.get_forecast_list();
@@ -249,12 +303,12 @@ var WeatherSection = class WeatherSection {
         let current = info;
         let infos = [info];
         for (let i = 0; i < forecasts.length; i++) {
-            let [ok, timestamp] = forecasts[i].get_value_update();
+            let [ok_, timestamp] = forecasts[i].get_value_update();
             let datetime = new Date(timestamp * 1000);
             if (!_isToday(datetime))
                 continue; // Ignore forecasts from other days
 
-            [ok, timestamp] = current.get_value_update();
+            [ok_, timestamp] = current.get_value_update();
             let currenttime = new Date(timestamp * 1000);
             if (currenttime.getHours() == datetime.getHours())
                 continue; // Enforce a minimum interval of 1h
@@ -275,7 +329,7 @@ var WeatherSection = class WeatherSection {
 
         let col = 0;
         infos.forEach(fc => {
-            let [ok, timestamp] = fc.get_value_update();
+            let [ok_, timestamp] = fc.get_value_update();
             let timeStr = Util.formatTime(new Date(timestamp * 1000), {
                 timeOnly: true
             });
@@ -332,23 +386,27 @@ var WeatherSection = class WeatherSection {
     }
 
     _sync() {
-        this.actor.visible = this._weatherClient.available;
+        this.visible = this._weatherClient.available;
 
-        if (!this.actor.visible)
+        if (!this.visible)
             return;
 
         this._titleLocation.visible = this._weatherClient.hasLocation;
 
         this._updateForecasts();
     }
-};
+});
 
-var MessagesIndicator = class MessagesIndicator {
+var MessagesIndicator = GObject.registerClass(
-    constructor() {
+class MessagesIndicator extends St.Icon {
-        this.actor = new St.Icon({ icon_name: 'message-indicator-symbolic',
+    _init() {
-                                   icon_size: 16,
+        super._init({
-                                   visible: false, y_expand: true,
+            icon_name: 'message-indicator-symbolic',
-                                   y_align: Clutter.ActorAlign.CENTER });
+            icon_size: 16,
+            visible: false,
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
 
         this._sources = [];
 
@@ -357,11 +415,11 @@ var MessagesIndicator = class MessagesIndicator {
         Main.messageTray.connect('queue-changed', this._updateCount.bind(this));
 
         let sources = Main.messageTray.getSources();
-        sources.forEach(source => { this._onSourceAdded(null, source); });
+        sources.forEach(source => this._onSourceAdded(null, source));
     }
 
     _onSourceAdded(tray, source) {
-        source.connect('count-updated', this._updateCount.bind(this));
+        source.connect('notify::count', this._updateCount.bind(this));
         this._sources.push(source);
         this._updateCount();
     }
@@ -373,19 +431,19 @@ var MessagesIndicator = class MessagesIndicator {
 
     _updateCount() {
         let count = 0;
-        this._sources.forEach(source => { count += source.unseenCount; });
+        this._sources.forEach(source => (count += source.unseenCount));
         count -= Main.messageTray.queueCount;
 
-        this.actor.visible = (count > 0);
+        this.visible = (count > 0);
     }
-};
+});
 
 var IndicatorPad = GObject.registerClass(
 class IndicatorPad extends St.Widget {
     _init(actor) {
         this._source = actor;
-        this._source.connect('notify::visible', () => { this.queue_relayout(); });
+        this._source.connect('notify::visible', () => this.queue_relayout());
-        this._source.connect('notify::size', () => { this.queue_relayout(); });
+        this._source.connect('notify::size', () => this.queue_relayout());
         super._init();
     }
 
@@ -459,7 +517,6 @@ class CalendarColumnLayout extends Clutter.BoxLayout {
 var DateMenuButton = GObject.registerClass(
 class DateMenuButton extends PanelMenu.Button {
     _init() {
-        let item;
         let hbox;
         let vbox;
 
@@ -472,14 +529,13 @@ class DateMenuButton extends PanelMenu.Button {
         this._indicator = new MessagesIndicator();
 
         let box = new St.BoxLayout();
-        box.add_actor(new IndicatorPad(this._indicator.actor));
+        box.add_actor(new IndicatorPad(this._indicator));
         box.add_actor(this._clockDisplay);
-        box.add_actor(this._indicator.actor);
+        box.add_actor(this._indicator);
-
-        this.actor.label_actor = this._clockDisplay;
-        this.actor.add_actor(box);
-        this.actor.add_style_class_name ('clock-display');
 
+        this.label_actor = this._clockDisplay;
+        this.add_actor(box);
+        this.add_style_class_name ('clock-display');
 
         let layout = new FreezableBinLayout();
         let bin = new St.Widget({ layout_manager: layout });
@@ -491,11 +547,11 @@ class DateMenuButton extends PanelMenu.Button {
         bin.add_actor(hbox);
 
         this._calendar = new Calendar.Calendar();
-        this._calendar.connect('selected-date-changed',
+        this._calendar.connect('selected-date-changed', (_calendar, datetime) => {
-                               (calendar, date) => {
+            let date = _gDateTimeToDate(datetime);
-                                   layout.frozen = !_isToday(date);
+            layout.frozen = !_isToday(date);
-                                   this._messageList.setDate(date);
+            this._messageList.setDate(date);
-                               });
+        });
 
         this.menu.connect('open-state-changed', (menu, isOpen) => {
             // Whenever the menu is opened, select today
@@ -509,19 +565,19 @@ class DateMenuButton extends PanelMenu.Button {
 
         // Fill up the first column
         this._messageList = new Calendar.CalendarMessageList();
-        hbox.add(this._messageList.actor, { expand: true, y_fill: false, y_align: St.Align.START });
+        hbox.add(this._messageList, { expand: true, y_fill: false, y_align: St.Align.START });
 
         // Fill up the second column
-        let boxLayout = new CalendarColumnLayout(this._calendar.actor);
+        let boxLayout = new CalendarColumnLayout(this._calendar);
         vbox = new St.Widget({ style_class: 'datemenu-calendar-column',
                                layout_manager: boxLayout });
         boxLayout.hookup_style(vbox);
         hbox.add(vbox);
 
         this._date = new TodayButton(this._calendar);
-        vbox.add_actor(this._date.actor);
+        vbox.add_actor(this._date);
 
-        vbox.add_actor(this._calendar.actor);
+        vbox.add_actor(this._calendar);
 
         this._displaysSection = new St.ScrollView({ style_class: 'datemenu-displays-section vfade',
                                                     x_expand: true, x_fill: true,
@@ -534,10 +590,10 @@ class DateMenuButton extends PanelMenu.Button {
         this._displaysSection.add_actor(displaysBox);
 
         this._clocksItem = new WorldClocksSection();
-        displaysBox.add(this._clocksItem.actor, { x_fill: true });
+        displaysBox.add(this._clocksItem, { x_fill: true });
 
         this._weatherItem = new WeatherSection();
-        displaysBox.add(this._weatherItem.actor, { x_fill: true });
+        displaysBox.add(this._weatherItem, { x_fill: true });
 
         // Done with hbox for calendar and event list
 

js/ui/dialog.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Dialog, MessageDialogContent */
 
 const { Clutter, Gio, GObject, Pango, St } = imports.gi;
 
@@ -25,9 +26,9 @@ class Dialog extends St.Widget {
 
     _createDialog() {
         this._dialog = new St.BoxLayout({ style_class: 'modal-dialog',
-                                          x_align:     Clutter.ActorAlign.CENTER,
+                                          x_align: Clutter.ActorAlign.CENTER,
-                                          y_align:     Clutter.ActorAlign.CENTER,
+                                          y_align: Clutter.ActorAlign.CENTER,
-                                          vertical:    true });
+                                          vertical: true });
 
         // modal dialogs are fixed width and grow vertically; set the request
         // mode accordingly so wrapped labels are handled correctly during
@@ -38,13 +39,13 @@ class Dialog extends St.Widget {
         this.contentLayout = new St.BoxLayout({ vertical: true,
                                                 style_class: "modal-dialog-content-box" });
         this._dialog.add(this.contentLayout,
-                         { expand:  true,
+                         { expand: true,
-                           x_fill:  true,
+                           x_fill: true,
-                           y_fill:  true,
+                           y_fill: true,
                            x_align: St.Align.MIDDLE,
                            y_align: St.Align.START });
 
-        this.buttonLayout = new St.Widget ({ layout_manager: new Clutter.BoxLayout({ homogeneous:true }) });
+        this.buttonLayout = new St.Widget ({ layout_manager: new Clutter.BoxLayout({ homogeneous: true }) });
         this._dialog.add(this.buttonLayout,
                          { x_align: St.Align.MIDDLE,
                            y_align: St.Align.START });
@@ -116,11 +117,11 @@ class Dialog extends St.Widget {
 
         let button = new St.Button({ style_class: 'modal-dialog-linked-button',
                                      button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                     reactive:    true,
+                                     reactive: true,
-                                     can_focus:   true,
+                                     can_focus: true,
-                                     x_expand:    true,
+                                     x_expand: true,
-                                     y_expand:    true,
+                                     y_expand: true,
-                                     label:       label });
+                                     label: label });
         button.connect('clicked', action);
 
         buttonInfo['button'] = button;
@@ -175,15 +176,13 @@ var MessageDialogContent = GObject.registerClass({
             this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
         });
 
-        let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
+        let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
                           line_wrap: true };
-        Object.assign(this._subtitle.clutter_text, textProps);
+        this._subtitle.clutter_text.set(textProps);
-        Object.assign(this._body.clutter_text, textProps);
+        this._body.clutter_text.set(textProps);
 
-        if (!params.hasOwnProperty('style_class'))
+        let defaultParams = { style_class: 'message-dialog-main-layout' };
-            params.style_class = 'message-dialog-main-layout';
+        super._init(Object.assign(defaultParams, params));
-
-        super._init(params);
 
         this.messageBox = new St.BoxLayout({ style_class: 'message-dialog-content',
                                              x_expand: true,
@@ -214,7 +213,10 @@ var MessageDialogContent = GObject.registerClass({
     }
 
     set icon(icon) {
-        Object.assign(this._icon, { gicon: icon, visible: icon != null });
+        this._icon.set({
+            gicon: icon,
+            visible: icon != null
+        });
         this.notify('icon');
     }
 
@@ -231,7 +233,10 @@ var MessageDialogContent = GObject.registerClass({
     }
 
     _setLabel(label, prop, value) {
-        Object.assign(label, { text: value || '', visible: value != null });
+        label.set({
+            text: value || '',
+            visible: value != null
+        });
         this.notify(prop);
     }
 

js/ui/dnd.js

@@ -1,18 +1,18 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported addDragMonitor, removeDragMonitor, makeDraggable */
 
 const { Clutter, GLib, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;
 
 // Time to scale down to maxDragActorSize
-var SCALE_ANIMATION_TIME = 0.25;
+var SCALE_ANIMATION_TIME = 250;
 // Time to animate to original position on cancel
-var SNAP_BACK_ANIMATION_TIME = 0.25;
+var SNAP_BACK_ANIMATION_TIME = 250;
 // Time to animate to original position on success
-var REVERT_ANIMATION_TIME = 0.75;
+var REVERT_ANIMATION_TIME = 750;
 
 var DragMotionResult = {
     NO_DROP:   0,
@@ -111,9 +111,6 @@ var _Draggable = class _Draggable {
         if (event.get_button() != 1)
             return Clutter.EVENT_PROPAGATE;
 
-        if (Tweener.getTweenCount(actor))
-            return Clutter.EVENT_PROPAGATE;
-
         this._buttonDown = true;
         this._grabActor(event.get_device());
 
@@ -139,9 +136,6 @@ var _Draggable = class _Draggable {
             !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
             return Clutter.EVENT_PROPAGATE;
 
-        if (Tweener.getTweenCount(actor))
-            return Clutter.EVENT_PROPAGATE;
-
         this._buttonDown = true;
         this._grabActor(event.get_device(), event.get_event_sequence());
 
@@ -428,20 +422,22 @@ var _Draggable = class _Draggable {
                 // to the final position because that tween would
                 // fight with updates as the user continues dragging
                 // the mouse; instead we do the position computations in
-                // an onUpdate() function.
+                // a ::new-frame handler.
-                Tweener.addTween(this._dragActor,
+                this._dragActor.ease({
-                                 { scale_x: scale * origScale,
+                    scale_x: scale * origScale,
-                                   scale_y: scale * origScale,
+                    scale_y: scale * origScale,
-                                   time: SCALE_ANIMATION_TIME,
+                    duration: SCALE_ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
+                    mode: Clutter.AnimationMode.EASE_OUT_QUAD
-                                   onUpdate() {
+                });
-                                       let currentScale = this._dragActor.scale_x / origScale;
+
-                                       this._dragOffsetX = currentScale * origDragOffsetX;
+                this._dragActor.get_transition('scale-x').connect('new-frame', () => {
-                                       this._dragOffsetY = currentScale * origDragOffsetY;
+                    let currentScale = this._dragActor.scale_x / origScale;
-                                       this._dragActor.set_position(this._dragX + this._dragOffsetX,
+                    this._dragOffsetX = currentScale * origDragOffsetX;
-                                                                    this._dragY + this._dragOffsetY);
+                    this._dragOffsetY = currentScale * origDragOffsetY;
-                                   },
+                    this._dragActor.set_position(
-                                   onUpdateScope: this });
+                        this._dragX + this._dragOffsetX,
+                        this._dragY + this._dragOffsetY);
+                });
             }
         }
     }
@@ -504,7 +500,7 @@ var _Draggable = class _Draggable {
 
         while (target) {
             if (target._delegate && target._delegate.handleDragOver) {
-                let [r, targX, targY] = target.transform_stage_point(this._dragX, this._dragY);
+                let [r_, targX, targY] = target.transform_stage_point(this._dragX, this._dragY);
                 // We currently loop through all parents on drag-over even if one of the children has handled it.
                 // We can check the return value of the function and break the loop if it's true if we don't want
                 // to continue checking the parents.
@@ -561,11 +557,11 @@ var _Draggable = class _Draggable {
             let dropFunc = dragMonitors[i].dragDrop;
             if (dropFunc)
                 switch (dropFunc(dropEvent)) {
-                    case DragDropResult.FAILURE:
+                case DragDropResult.FAILURE:
-                    case DragDropResult.SUCCESS:
+                case DragDropResult.SUCCESS:
-                        return true;
+                    return true;
-                    case DragDropResult.CONTINUE:
+                case DragDropResult.CONTINUE:
-                        continue;
+                    continue;
                 }
         }
 
@@ -576,20 +572,25 @@ var _Draggable = class _Draggable {
 
         while (target) {
             if (target._delegate && target._delegate.acceptDrop) {
-                let [r, targX, targY] = target.transform_stage_point(dropX, dropY);
+                let [r_, targX, targY] = target.transform_stage_point(dropX, dropY);
-                if (target._delegate.acceptDrop(this.actor._delegate,
+                let accepted = false;
-                                                this._dragActor,
+                try {
-                                                targX,
+                    accepted = target._delegate.acceptDrop(this.actor._delegate,
-                                                targY,
+                        this._dragActor, targX, targY, event.get_time());
-                                                event.get_time())) {
+                } catch (e) {
+                    // On error, skip this target
+                    logError(e, "Skipping drag target");
+                }
+                if (accepted) {
                     // If it accepted the drop without taking the actor,
                     // handle it ourselves.
                     if (this._dragActor && this._dragActor.get_parent() == Main.uiGroup) {
                         if (this._restoreOnSuccess) {
                             this._restoreDragActor(event.get_time());
                             return true;
-                        } else
+                        } else {
                             this._dragActor.destroy();
+                        }
                     }
 
                     this._dragState = DragState.INIT;
@@ -613,15 +614,15 @@ var _Draggable = class _Draggable {
         if (this._dragActorSource && this._dragActorSource.visible) {
             // Snap the clone back to its source
             [x, y] = this._dragActorSource.get_transformed_position();
-            let [sourceScaledWidth, sourceScaledHeight] = this._dragActorSource.get_transformed_size();
+            let [sourceScaledWidth] = this._dragActorSource.get_transformed_size();
-            scale = sourceScaledWidth ? this._dragActor.width / sourceScaledWidth : 0;
+            scale = sourceScaledWidth ? sourceScaledWidth / this._dragActor.width : 0;
         } else if (this._dragOrigParent) {
             // Snap the actor back to its original position within
             // its parent, adjusting for the fact that the parent
             // may have been moved or scaled
             let [parentX, parentY] = this._dragOrigParent.get_transformed_position();
-            let [parentWidth, parentHeight] = this._dragOrigParent.get_size();
+            let [parentWidth] = this._dragOrigParent.get_size();
-            let [parentScaledWidth, parentScaledHeight] = this._dragOrigParent.get_transformed_size();
+            let [parentScaledWidth] = this._dragOrigParent.get_transformed_size();
             let parentScale = 1.0;
             if (parentWidth != 0)
                 parentScale = parentScaledWidth / parentWidth;
@@ -657,13 +658,13 @@ var _Draggable = class _Draggable {
 
         let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();
 
-        this._animateDragEnd(eventTime,
+        this._animateDragEnd(eventTime, {
-                             { x: snapBackX,
+            x: snapBackX,
-                               y: snapBackY,
+            y: snapBackY,
-                               scale_x: snapBackScale,
+            scale_x: snapBackScale,
-                               scale_y: snapBackScale,
+            scale_y: snapBackScale,
-                               time: SNAP_BACK_ANIMATION_TIME,
+            duration: SNAP_BACK_ANIMATION_TIME
-                             });
+        });
     }
 
     _restoreDragActor(eventTime) {
@@ -675,26 +676,27 @@ var _Draggable = class _Draggable {
         this._dragActor.set_scale(restoreScale, restoreScale);
         this._dragActor.opacity = 0;
 
-        this._animateDragEnd(eventTime,
+        this._animateDragEnd(eventTime, {
-                             { time: REVERT_ANIMATION_TIME });
+            duration: REVERT_ANIMATION_TIME
+        });
     }
 
     _animateDragEnd(eventTime, params) {
         this._animationInProgress = true;
 
-        params['opacity']          = this._dragOrigOpacity;
-        params['transition']       = 'easeOutQuad';
-        params['onComplete']       = this._onAnimationComplete;
-        params['onCompleteScope']  = this;
-        params['onCompleteParams'] = [this._dragActor, eventTime];
-
         // start the animation
-        Tweener.addTween(this._dragActor, params)
+        this._dragActor.ease(Object.assign(params, {
+            opacity: this._dragOrigOpacity,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => {
+                this._onAnimationComplete(this._dragActor, eventTime);
+            }
+        }));
     }
 
     _finishAnimation() {
         if (!this._animationInProgress)
-            return
+            return;
 
         this._animationInProgress = false;
         if (!this._buttonDown)

js/ui/edgeDragAction.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported EdgeDragAction */
 
 const { Clutter, GObject, Meta, St } = imports.gi;
 
@@ -16,7 +17,7 @@ var EdgeDragAction = GObject.registerClass({
         this._allowedModes = allowedModes;
         this.set_n_touch_points(1);
 
-        global.display.connect('grab-op-begin', () => { this.cancel(); });
+        global.display.connect('grab-op-begin', () => this.cancel());
     }
 
     _getMonitorRect(x, y) {
@@ -26,7 +27,7 @@ var EdgeDragAction = GObject.registerClass({
         return global.display.get_monitor_geometry(monitorIndex);
     }
 
-    vfunc_gesture_prepare(actor) {
+    vfunc_gesture_prepare(_actor) {
         if (this.get_n_current_points() == 0)
             return false;
 
@@ -42,7 +43,7 @@ var EdgeDragAction = GObject.registerClass({
                 (this._side == St.Side.BOTTOM && y > monitorRect.y + monitorRect.height - EDGE_THRESHOLD));
     }
 
-    vfunc_gesture_progress(actor) {
+    vfunc_gesture_progress(_actor) {
         let [startX, startY] = this.get_press_coords(0);
         let [x, y] = this.get_motion_coords(0);
         let offsetX = Math.abs (x - startX);
@@ -62,7 +63,7 @@ var EdgeDragAction = GObject.registerClass({
         return true;
     }
 
-    vfunc_gesture_end(actor) {
+    vfunc_gesture_end(_actor) {
         let [startX, startY] = this.get_press_coords(0);
         let [x, y] = this.get_motion_coords(0);
         let monitorRect = this._getMonitorRect(startX, startY);

js/ui/endSessionDialog.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported init, EndSessionDialog */
 /*
  * Copyright 2010-2016 Red Hat, Inc
  *
@@ -16,10 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-const Mainloop = imports.mainloop;
-
 const { AccountsService, Clutter, Gio,
-        GLib, Pango, Polkit, Shell, St }  = imports.gi;
+        GLib, GObject, Pango, Polkit, Shell, St }  = imports.gi;
 
 const CheckBox = imports.ui.checkBox;
 const GnomeSession = imports.misc.gnomeSession;
@@ -29,13 +28,9 @@ const UserWidget = imports.ui.userWidget;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
-let _endSessionDialog = null;
-
 const _ITEM_ICON_SIZE = 48;
 const _DIALOG_ICON_SIZE = 48;
 
-var GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
-
 const EndSessionDialogIface = loadInterfaceXML('org.gnome.SessionManager.EndSessionDialog');
 
 const logoutDialogContent = {
@@ -53,7 +48,7 @@ const logoutDialogContent = {
     },
     showBatteryWarning: false,
     confirmButtons: [{ signal: 'ConfirmedLogout',
-                       label:  C_("button", "Log Out") }],
+                       label: C_("button", "Log Out") }],
     iconStyleClass: 'end-session-dialog-logout-icon',
     showOtherSessions: false,
 };
@@ -69,9 +64,9 @@ const shutdownDialogContent = {
     checkBoxText: C_("checkbox", "Install pending software updates"),
     showBatteryWarning: true,
     confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label:  C_("button", "Restart") },
+                       label: C_("button", "Restart") },
                      { signal: 'ConfirmedShutdown',
-                       label:  C_("button", "Power Off") }],
+                       label: C_("button", "Power Off") }],
     iconName: 'system-shutdown-symbolic',
     iconStyleClass: 'end-session-dialog-shutdown-icon',
     showOtherSessions: true,
@@ -86,7 +81,7 @@ const restartDialogContent = {
     },
     showBatteryWarning: false,
     confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label:  C_("button", "Restart") }],
+                       label: C_("button", "Restart") }],
     iconName: 'view-refresh-symbolic',
     iconStyleClass: 'end-session-dialog-shutdown-icon',
     showOtherSessions: true,
@@ -102,7 +97,7 @@ const restartUpdateDialogContent = {
     },
     showBatteryWarning: true,
     confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label:  C_("button", "Restart &amp; Install") }],
+                       label: C_("button", "Restart &amp; Install") }],
     unusedFutureButtonForTranslation: C_("button", "Install &amp; Power Off"),
     unusedFutureCheckBoxForTranslation: C_("checkbox", "Power off after updates are installed"),
     iconName: 'view-refresh-symbolic',
@@ -122,18 +117,18 @@ const restartUpgradeDialogContent = {
     disableTimer: true,
     showBatteryWarning: false,
     confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label:  C_("button", "Restart &amp; Install") }],
+                       label: C_("button", "Restart &amp; Install") }],
     iconName: 'view-refresh-symbolic',
     iconStyleClass: 'end-session-dialog-shutdown-icon',
     showOtherSessions: true,
 };
 
 const DialogType = {
-  LOGOUT: 0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */,
+    LOGOUT: 0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */,
-  SHUTDOWN: 1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */,
+    SHUTDOWN: 1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */,
-  RESTART: 2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */,
+    RESTART: 2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */,
-  UPDATE_RESTART: 3,
+    UPDATE_RESTART: 3,
-  UPGRADE_RESTART: 4
+    UPGRADE_RESTART: 4
 };
 
 const DialogContent = {
@@ -159,7 +154,7 @@ function findAppFromInhibitor(inhibitor) {
     let desktopFile;
     try {
         [desktopFile] = inhibitor.GetAppIdSync();
-    } catch(e) {
+    } catch (e) {
         // XXX -- sometimes JIT inhibitors generated by gnome-session
         // get removed too soon. Don't fail in this case.
         log('gnome-session gave us a dead inhibitor: %s'.format(inhibitor.get_object_path()));
@@ -212,10 +207,10 @@ function _setCheckBoxLabel(checkBox, text) {
 
     if (text) {
         label.set_text(text);
-        checkBox.actor.show();
+        checkBox.show();
     } else {
         label.set_text('');
-        checkBox.actor.hide();
+        checkBox.hide();
     }
 }
 
@@ -223,25 +218,25 @@ function init() {
     // This always returns the same singleton object
     // By instantiating it initially, we register the
     // bus object, etc.
-    _endSessionDialog = new EndSessionDialog();
+    (new EndSessionDialog());
 }
 
-var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
+var EndSessionDialog = GObject.registerClass(
-    constructor() {
+class EndSessionDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'end-session-dialog',
+    _init() {
-                destroyOnClose: false });
+        super._init({ styleClass: 'end-session-dialog',
+                      destroyOnClose: false });
 
         this._loginManager = LoginManager.getLoginManager();
         this._userManager = AccountsService.UserManager.get_default();
         this._user = this._userManager.get_user(GLib.get_user_name());
+        this._updatesPermission = null;
 
         this._pkOfflineProxy = new PkOfflineProxy(Gio.DBus.system,
                                                   'org.freedesktop.PackageKit',
                                                   '/org/freedesktop/PackageKit',
-                                                  (proxy, error) => {
+                                                  this._onPkOfflineProxyCreated.bind(this));
-                                                      if (error)
+
-                                                          log(error.message);
-                                                  });
         this._powerProxy = new UPowerProxy(Gio.DBus.system,
                                            'org.freedesktop.UPower',
                                            '/org/freedesktop/UPower',
@@ -275,8 +270,8 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
 
         this._iconBin = new St.Bin();
         mainContentLayout.add(this._iconBin,
-                              { x_fill:  true,
+                              { x_fill: true,
-                                y_fill:  false,
+                                y_fill: false,
                                 x_align: St.Align.END,
                                 y_align: St.Align.START });
 
@@ -289,7 +284,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
 
         messageLayout.add(this._subjectLabel,
                           { x_fill: false,
-                            y_fill:  false,
+                            y_fill: false,
                             x_align: St.Align.START,
                             y_align: St.Align.START });
 
@@ -298,12 +293,12 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         this._descriptionLabel.clutter_text.line_wrap = true;
 
         messageLayout.add(this._descriptionLabel,
-                          { y_fill:  true,
+                          { y_fill: true,
                             y_align: St.Align.START });
 
         this._checkBox = new CheckBox.CheckBox();
-        this._checkBox.actor.connect('clicked', this._sync.bind(this));
+        this._checkBox.connect('clicked', this._sync.bind(this));
-        messageLayout.add(this._checkBox.actor);
+        messageLayout.add(this._checkBox);
 
         this._batteryWarning = new St.Label({ style_class: 'end-session-dialog-warning',
                                               text: _("Running on battery power: please plug in before installing updates.") });
@@ -336,16 +331,36 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         this._inhibitorSection.add_actor(this._sessionHeader);
         this._inhibitorSection.add_actor(this._sessionList);
 
-        try {
-            this._updatesPermission = Polkit.Permission.new_sync("org.freedesktop.packagekit.trigger-offline-update", null, null);
-        } catch(e) {
-            log('No permission to trigger offline updates: %s'.format(e.toString()));
-        }
-
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
     }
 
+    _onPkOfflineProxyCreated(proxy, error) {
+        if (error) {
+            log(error.message);
+            return;
+        }
+
+        // Creating a D-Bus proxy won't propagate SERVICE_UNKNOWN or NAME_HAS_NO_OWNER
+        // errors if PackageKit is not available, but the GIO implementation will make
+        // sure in that case that the proxy's g-name-owner is set to null, so check that.
+        if (this._pkOfflineProxy.g_name_owner === null) {
+            this._pkOfflineProxy = null;
+            return;
+        }
+
+        // It only makes sense to check for this permission if PackageKit is available.
+        Polkit.Permission.new(
+            'org.freedesktop.packagekit.trigger-offline-update', null, null,
+            (source, res) => {
+                try {
+                    this._updatesPermission = Polkit.Permission.new_finish(res);
+                } catch (e) {
+                    log(`No permission to trigger offline updates: ${e}`);
+                }
+            });
+    }
+
     _onDestroy() {
         this._user.disconnect(this._userLoadedId);
         this._user.disconnect(this._userChangedId);
@@ -361,12 +376,12 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         let subject = dialogContent.subject;
 
         // Use different title when we are installing updates
-        if (dialogContent.subjectWithUpdates && this._checkBox.actor.checked)
+        if (dialogContent.subjectWithUpdates && this._checkBox.checked)
             subject = dialogContent.subjectWithUpdates;
 
         if (dialogContent.showBatteryWarning) {
             // Warn when running on battery power
-            if (this._powerProxy.OnBattery && this._checkBox.actor.checked)
+            if (this._powerProxy.OnBattery && this._checkBox.checked)
                 this._batteryWarning.opacity = 255;
             else
                 this._batteryWarning.opacity = 0;
@@ -390,7 +405,8 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         }
 
         // Use a different description when we are installing a system upgrade
-        if (dialogContent.upgradeDescription) {
+        // if the PackageKit proxy is available (i.e. PackageKit is available).
+        if (this._pkOfflineProxy && dialogContent.upgradeDescription) {
             let name = this._pkOfflineProxy.PreparedUpgrade['name'].deep_unpack();
             let version = this._pkOfflineProxy.PreparedUpgrade['version'].deep_unpack();
 
@@ -413,7 +429,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
             let avatarWidget = new UserWidget.Avatar(this._user,
                                                      { iconSize: _DIALOG_ICON_SIZE,
                                                        styleClass: dialogContent.iconStyleClass });
-            this._iconBin.child = avatarWidget.actor;
+            this._iconBin.child = avatarWidget;
             avatarWidget.update();
         }
 
@@ -427,20 +443,22 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
     _updateButtons() {
         let dialogContent = DialogContent[this._type];
         let buttons = [{ action: this.cancel.bind(this),
-                         label:  _("Cancel"),
+                         label: _("Cancel"),
-                         key:    Clutter.Escape }];
+                         key: Clutter.Escape }];
 
         for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
             let signal = dialogContent.confirmButtons[i].signal;
             let label = dialogContent.confirmButtons[i].label;
-            buttons.push({ action: () => {
+            buttons.push({
-                               this.close(true);
+                action: () => {
-                               let signalId = this.connect('closed', () => {
+                    this.close(true);
-                                   this.disconnect(signalId);
+                    let signalId = this.connect('closed', () => {
-                                   this._confirm(signal);
+                        this.disconnect(signalId);
-                               });
+                        this._confirm(signal);
-                           },
+                    });
-                           label: label });
+                },
+                label: label,
+            });
         }
 
         this.setButtons(buttons);
@@ -467,27 +485,27 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         };
 
         // Offline update not available; just emit the signal
-        if (!this._checkBox.actor.visible) {
+        if (!this._checkBox.visible) {
             callback();
             return;
         }
 
         // Trigger the offline update as requested
-        if (this._checkBox.actor.checked) {
+        if (this._checkBox.checked) {
             switch (signal) {
-                case "ConfirmedReboot":
+            case "ConfirmedReboot":
-                    this._triggerOfflineUpdateReboot(callback);
+                this._triggerOfflineUpdateReboot(callback);
-                    break;
+                break;
-                case "ConfirmedShutdown":
+            case "ConfirmedShutdown":
-                    // To actually trigger the offline update, we need to
+                // To actually trigger the offline update, we need to
-                    // reboot to do the upgrade. When the upgrade is complete,
+                // reboot to do the upgrade. When the upgrade is complete,
-                    // the computer will shut down automatically.
+                // the computer will shut down automatically.
-                    signal = "ConfirmedReboot";
+                signal = "ConfirmedReboot";
-                    this._triggerOfflineUpdateShutdown(callback);
+                this._triggerOfflineUpdateShutdown(callback);
-                    break;
+                break;
-                default:
+            default:
-                    callback();
+                callback();
-                    break;
+                break;
             }
         } else {
             this._triggerOfflineUpdateCancel(callback);
@@ -499,6 +517,12 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
     }
 
     _triggerOfflineUpdateReboot(callback) {
+        // Handle this gracefully if PackageKit is not available.
+        if (!this._pkOfflineProxy) {
+            callback();
+            return;
+        }
+
         this._pkOfflineProxy.TriggerRemote('reboot', (result, error) => {
             if (error)
                 log(error.message);
@@ -508,6 +532,12 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
     }
 
     _triggerOfflineUpdateShutdown(callback) {
+        // Handle this gracefully if PackageKit is not available.
+        if (!this._pkOfflineProxy) {
+            callback();
+            return;
+        }
+
         this._pkOfflineProxy.TriggerRemote('power-off', (result, error) => {
             if (error)
                 log(error.message);
@@ -517,6 +547,12 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
     }
 
     _triggerOfflineUpdateCancel(callback) {
+        // Handle this gracefully if PackageKit is not available.
+        if (!this._pkOfflineProxy) {
+            callback();
+            return;
+        }
+
         this._pkOfflineProxy.CancelRemote((result, error) => {
             if (error)
                 log(error.message);
@@ -529,7 +565,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         let startTime = GLib.get_monotonic_time();
         this._secondsLeft = this._totalSecondsToStayOpen;
 
-        this._timerId = Mainloop.timeout_add_seconds(1, () => {
+        this._timerId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 1, () => {
             let currentTime = GLib.get_monotonic_time();
             let secondsElapsed = ((currentTime - startTime) / 1000000);
 
@@ -551,7 +587,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
 
     _stopTimer() {
         if (this._timerId > 0) {
-            Mainloop.source_remove(this._timerId);
+            GLib.source_remove(this._timerId);
             this._timerId = 0;
         }
 
@@ -584,7 +620,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
     }
 
     _onInhibitorLoaded(inhibitor) {
-        if (this._applications.indexOf(inhibitor) < 0) {
+        if (!this._applications.includes(inhibitor)) {
             // Stale inhibitor
             return;
         }
@@ -620,7 +656,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
 
         let actor = new St.BoxLayout({ style_class: 'end-session-dialog-session-list-item',
                                        can_focus: true });
-        actor.add(avatar.actor);
+        actor.add(avatar);
 
         let nameLabel = new St.Label({ text: userLabelText,
                                        style_class: 'end-session-dialog-session-list-item-name',
@@ -636,7 +672,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         this._loginManager.listSessions(result => {
             let n = 0;
             for (let i = 0; i < result.length; i++) {
-                let[id, uid, userName, seat, sessionPath] = result[i];
+                let [id_, uid_, userName, seat_, sessionPath] = result[i];
                 let proxy = new LogindSession(Gio.DBus.system, 'org.freedesktop.login1', sessionPath);
 
                 if (proxy.Class != 'user')
@@ -679,7 +715,8 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         this._totalSecondsToStayOpen = totalSecondsToStayOpen;
         this._type = type;
 
-        if (this._type == DialogType.RESTART) {
+        // Only consider updates and upgrades if PackageKit is available.
+        if (this._pkOfflineProxy && this._type == DialogType.RESTART) {
             if (this._pkOfflineProxy.UpdateTriggered)
                 this._type = DialogType.UPDATE_RESTART;
             else if (this._pkOfflineProxy.UpgradeTriggered)
@@ -701,7 +738,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         let dialogContent = DialogContent[this._type];
 
         for (let i = 0; i < inhibitorObjectPaths.length; i++) {
-            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], (proxy, error) => {
+            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], proxy => {
                 this._onInhibitorLoaded(proxy);
             });
 
@@ -711,19 +748,20 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         if (dialogContent.showOtherSessions)
             this._loadSessions();
 
-        let updateTriggered = this._pkOfflineProxy.UpdateTriggered;
+        // Only consider updates and upgrades if PackageKit is available.
-        let updatePrepared = this._pkOfflineProxy.UpdatePrepared;
+        let updateTriggered = this._pkOfflineProxy ? this._pkOfflineProxy.UpdateTriggered : false;
+        let updatePrepared = this._pkOfflineProxy ? this._pkOfflineProxy.UpdatePrepared : false;
         let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
 
         _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');
-        this._checkBox.actor.visible = (dialogContent.checkBoxText && updatePrepared && updatesAllowed);
+        this._checkBox.visible = (dialogContent.checkBoxText && updatePrepared && updatesAllowed);
-        this._checkBox.actor.checked = (updatePrepared && updateTriggered);
+        this._checkBox.checked = (updatePrepared && updateTriggered);
 
         // We show the warning either together with the checkbox, or when
         // updates have already been triggered, but the user doesn't have
         // enough permissions to cancel them.
         this._batteryWarning.visible = (dialogContent.showBatteryWarning &&
-                                        (this._checkBox.actor.visible || updatePrepared && updateTriggered && !updatesAllowed));
+                                        (this._checkBox.visible || updatePrepared && updateTriggered && !updatesAllowed));
 
         this._updateButtons();
 
@@ -744,7 +782,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
         });
     }
 
-    Close(parameters, invocation) {
+    Close(_parameters, _invocation) {
         this.close();
     }
-};
+});

js/ui/environment.js

@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported init */
 
 const Config = imports.misc.config;
 
@@ -9,7 +10,7 @@ imports.gi.versions.Gtk = '3.0';
 imports.gi.versions.TelepathyGLib = '0.12';
 imports.gi.versions.TelepathyLogger = '0.2';
 
-const { Clutter, GLib, Shell, St } = imports.gi;
+const { Clutter, GLib, Meta, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
 
 // We can't import shell JS modules yet, because they may have
@@ -57,8 +58,156 @@ function _patchLayoutClass(layoutClass, styleProps) {
     };
 }
 
-function _loggingFunc() {
+function _makeEaseCallback(params, cleanup) {
-    let fields = {'MESSAGE': [].join.call(arguments, ', ')};
+    let onComplete = params.onComplete;
+    delete params.onComplete;
+
+    let onStopped = params.onStopped;
+    delete params.onStopped;
+
+    return isFinished => {
+        cleanup();
+
+        if (onStopped)
+            onStopped(isFinished);
+        if (onComplete && isFinished)
+            onComplete();
+    };
+}
+
+function _getPropertyTarget(actor, propName) {
+    if (!propName.startsWith('@'))
+        return [actor, propName];
+
+    let [type, name, prop] = propName.split('.');
+    switch (type) {
+    case '@layout':
+        return [actor.layout_manager, name];
+    case '@actions':
+        return [actor.get_action(name), prop];
+    case '@constraints':
+        return [actor.get_constraint(name), prop];
+    case '@effects':
+        return [actor.get_effect(name), prop];
+    }
+
+    throw new Error(`Invalid property name ${propName}`);
+}
+
+function _easeActor(actor, params) {
+    actor.save_easing_state();
+
+    if (params.duration != undefined)
+        actor.set_easing_duration(params.duration);
+    delete params.duration;
+
+    if (params.delay != undefined)
+        actor.set_easing_delay(params.delay);
+    delete params.delay;
+
+    let repeatCount = 0;
+    if (params.repeatCount != undefined)
+        repeatCount = params.repeatCount;
+    delete params.repeatCount;
+
+    let autoReverse = false;
+    if (params.autoReverse != undefined)
+        autoReverse = params.autoReverse;
+    delete params.autoReverse;
+
+    if (params.mode != undefined)
+        actor.set_easing_mode(params.mode);
+    delete params.mode;
+
+    let cleanup = () => Meta.enable_unredirect_for_display(global.display);
+    let callback = _makeEaseCallback(params, cleanup);
+
+    // cancel overwritten transitions
+    let animatedProps = Object.keys(params).map(p => p.replace('_', '-', 'g'));
+    animatedProps.forEach(p => actor.remove_transition(p));
+
+    actor.set(params);
+    actor.restore_easing_state();
+
+    let transition = animatedProps.map(p => actor.get_transition(p))
+        .find(t => t !== null);
+
+    if (transition && transition.delay)
+        transition.connect('started', () => Meta.disable_unredirect_for_display(global.display));
+    else
+        Meta.disable_unredirect_for_display(global.display);
+
+    if (transition) {
+        transition.set({ repeatCount, autoReverse });
+        transition.connect('stopped', (t, finished) => callback(finished));
+    } else {
+        callback(true);
+    }
+}
+
+function _easeActorProperty(actor, propName, target, params) {
+    // Avoid pointless difference with ease()
+    if (params.mode)
+        params.progress_mode = params.mode;
+    delete params.mode;
+
+    if (params.duration)
+        params.duration = adjustAnimationTime(params.duration);
+    let duration = Math.floor(params.duration || 0);
+
+    let repeatCount = 0;
+    if (params.repeatCount != undefined)
+        repeatCount = params.repeatCount;
+    delete params.repeatCount;
+
+    let autoReverse = false;
+    if (params.autoReverse != undefined)
+        autoReverse = params.autoReverse;
+    delete params.autoReverse;
+
+    // Copy Clutter's behavior for implicit animations, see
+    // should_skip_implicit_transition()
+    if (actor instanceof Clutter.Actor && !actor.mapped)
+        duration = 0;
+
+    let cleanup = () => Meta.enable_unredirect_for_display(global.display);
+    let callback = _makeEaseCallback(params, cleanup);
+
+    // cancel overwritten transition
+    actor.remove_transition(propName);
+
+    if (duration == 0) {
+        let [obj, prop] = _getPropertyTarget(actor, propName);
+        obj[prop] = target;
+
+        Meta.disable_unredirect_for_display(global.display);
+        callback(true);
+
+        return;
+    }
+
+    let pspec = actor.find_property(propName);
+    let transition = new Clutter.PropertyTransition(Object.assign({
+        property_name: propName,
+        interval: new Clutter.Interval({ value_type: pspec.value_type }),
+        remove_on_complete: true,
+        repeat_count: repeatCount,
+        auto_reverse: autoReverse,
+    }, params));
+    actor.add_transition(propName, transition);
+
+    transition.set_to(target);
+
+    if (transition.delay)
+        transition.connect('started', () => Meta.disable_unredirect_for_display(global.display));
+    else
+        Meta.disable_unredirect_for_display(global.display);
+
+    transition.connect('stopped', (t, finished) => callback(finished));
+}
+
+function _loggingFunc(...args) {
+    let fields = { 'MESSAGE': args.join(', ') };
     let domain = "GNOME Shell";
 
     // If the caller is an extension, add it as metadata
@@ -93,19 +242,55 @@ function init() {
                                             column_spacing: 'spacing-columns' });
     _patchLayoutClass(Clutter.BoxLayout, { spacing: 'spacing' });
 
+    let origSetEasingDuration = Clutter.Actor.prototype.set_easing_duration;
+    Clutter.Actor.prototype.set_easing_duration = function(msecs) {
+        origSetEasingDuration.call(this, adjustAnimationTime(msecs));
+    };
+    let origSetEasingDelay = Clutter.Actor.prototype.set_easing_delay;
+    Clutter.Actor.prototype.set_easing_delay = function(msecs) {
+        origSetEasingDelay.call(this, adjustAnimationTime(msecs));
+    };
+
+    Clutter.Actor.prototype.ease = function(props, easingParams) {
+        _easeActor(this, props, easingParams);
+    };
+    Clutter.Actor.prototype.ease_property = function(propName, target, params) {
+        _easeActorProperty(this, propName, target, params);
+    };
+    St.Adjustment.prototype.ease = function(target, params) {
+        // we're not an actor of course, but we implement the same
+        // transition API as Clutter.Actor, so this works anyway
+        _easeActorProperty(this, 'value', target, params);
+    };
+
     Clutter.Actor.prototype.toString = function() {
         return St.describe_actor(this);
     };
+    // Deprecation warning for former JS classes turned into an actor subclass
+    Object.defineProperty(Clutter.Actor.prototype, 'actor', {
+        get() {
+            let klass = this.constructor.name;
+            let { stack } = new Error();
+            log(`Usage of object.actor is deprecated for ${klass}\n${stack}`);
+            return this;
+        }
+    });
+
+    St.set_slow_down_factor = function(factor) {
+        let { stack } = new Error();
+        log(`St.set_slow_down_factor() is deprecated, use St.Settings.slow_down_factor\n${stack}`);
+        St.Settings.get().slow_down_factor = factor;
+    };
 
     let origToString = Object.prototype.toString;
     Object.prototype.toString = function() {
         let base = origToString.call(this);
         try {
             if ('actor' in this && this.actor instanceof Clutter.Actor)
-                return base.replace(/\]$/, ' delegate for ' + this.actor.toString().substring(1));
+                return base.replace(/\]$/, ` delegate for ${this.actor.toString().substring(1)}`);
             else
                 return base;
-        } catch(e) {
+        } catch (e) {
             return base;
         }
     };
@@ -119,7 +304,7 @@ function init() {
     if (slowdownEnv) {
         let factor = parseFloat(slowdownEnv);
         if (!isNaN(factor) && factor > 0.0)
-            St.set_slow_down_factor(factor);
+            St.Settings.get().slow_down_factor = factor;
     }
 
     // OK, now things are initialized enough that we can import shell JS
@@ -129,3 +314,17 @@ function init() {
     Tweener.init();
     String.prototype.format = Format.format;
 }
+
+// adjustAnimationTime:
+// @msecs: time in milliseconds
+//
+// Adjust @msecs to account for St's enable-animations
+// and slow-down-factor settings
+function adjustAnimationTime(msecs) {
+    let settings = St.Settings.get();
+
+    if (!settings.enable_animations)
+        return 1;
+    return settings.slow_down_factor * msecs;
+}
+