st/theme-context: Invalidate texture cache when scaling changes

The CSS engine is scale-aware, whereas simply setting the
width and height properties directly isn't.

Use CSS to set the folder icon.

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

.gitlab-ci.yml

@@ -1,9 +1,13 @@
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
 stages:
  - review
  - build
  - test
+ - deploy
 
 variables:
+    BUNDLE: "extensions-git.flatpak"
     JS_LOG: "js-report.txt"
     POT_LOG: "pot-update.txt"
 
@@ -46,6 +50,20 @@ eslint:
             - reports
         when: always
 
+potfile_check:
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+    stage: review
+    script:
+        - ./.gitlab-ci/check-potfiles.sh
+    <<: *only_default
+
+no_template_check:
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+    stage: review
+    script:
+        - ./.gitlab-ci/check-template-strings.sh
+    <<: *only_default
+
 build:
     image: registry.gitlab.gnome.org/gnome/mutter/master:v3
     stage: build
@@ -96,3 +114,24 @@ test-pot:
           ' | tee $POT_LOG
         - (! grep -q . $POT_LOG)
     <<: *only_default
+
+flatpak:
+    stage: build
+    variables:
+        SUBPROJECT: "subprojects/extensions-app"
+        # Your manifest path
+        MANIFEST_PATH: "$SUBPROJECT/build-aux/flatpak/org.gnome.Extensions.json"
+        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
+        FLATPAK_MODULE: "gnome-extensions-app"
+        APP_ID: "org.gnome.Extensions"
+        MESON_ARGS: "$SUBPROJECT"
+    extends: .flatpak
+    before_script:
+        - flatpak run --command=$SUBPROJECT/generate-translations.sh
+                      --filesystem=host org.gnome.Sdk//master
+    <<: *only_default
+
+nightly:
+  extends: '.publish_nightly'
+  variables:
+    BUNDLES: '$BUNDLE'

.gitlab-ci/check-commit-log.sh

@@ -19,7 +19,7 @@ fi
 function commit_message_has_url() {
   commit=$1
   commit_message=$(git show -s --format='format:%b' $commit)
-  echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
+  echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(-/\)\?\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
   return $?
 }
 

.gitlab-ci/check-potfiles.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+srcdirs="js src subprojects/extensions-tool"
+globs=('*.js' '*.c')
+
+# find source files that contain gettext keywords
+files=$(grep -lR ${globs[@]/#/--include=} '\(gettext\|[^I_)]_\)(' $srcdirs)
+
+# find those that aren't listed in POTFILES.in
+missing=$(for f in $files; do ! grep -q ^$f po/POTFILES.in && echo $f; done)
+
+if [ ${#missing} -eq 0 ]; then
+  exit 0
+fi
+
+cat >&2 <<EOT
+
+The following files are missing from po/POTFILES.po:
+
+EOT
+for f in $missing; do
+  echo "  $f" >&2
+done
+echo >&2
+
+exit 1

.gitlab-ci/check-template-strings.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# find files from POTFILES.in that use js template strings
+baddies=$(grep -l '${' $(grep ^js po/POTFILES.in))
+
+if [ ${#baddies} -eq 0 ]; then
+  exit 0
+fi
+
+cat >&2 <<EOT
+
+xgettext cannot handle template strings properly, so we ban their use
+in files with translatable strings.
+
+The following files are listed in po/POTFILES.in and use template strings:
+
+EOT
+for f in $baddies; do
+  echo "  $f" >&2
+done
+echo >&2
+
+exit 1

.gitlab-ci/run-eslint.sh

@@ -23,7 +23,7 @@ run_eslint() {
   mkdir -p $(dirname $output)
   touch $output
 
-  eslint -f unix ${!extra_args} -o $output js
+  eslint -f unix ${!extra_args} -o $output js subprojects/extensions-app/js
 }
 
 list_commit_range_additions() {

NEWS

@@ -1,3 +1,138 @@
+3.36.0
+======
+* Fix off-by-1900 error in date conversions [Florian; !1061]
+* Fix crash on startup with topIcons* extension enabled [Florian; #2308]
+* Don't require gsd-xsettings for X11 support on wayland [Olivier; !1065]
+* Fix ibus support in Xorg session [Carlos; #1690]
+* Improve Extensions D-Bus API [Florian; !1074]
+* Allow session modes to specify alternative resource name [Marco; !1063]
+* Fix link to location settings in aggregate menu [Sebastian; #2316]
+* Fix illegible app folder titles with light theme [ub; !1059]
+* Really fix visual glitch in sliders [Jonas; #1569]
+
+Contributors:
+  Marco Trevisan (Treviño), Jonas Dreßler, Olivier Fourdan, Carlos Garnacho,
+  Sebastian Keller, Florian Müllner, ub
+
+Translators:
+  Aman Alam [pa], Goran Vidović [hr], Aurimas Černius [lt],
+  Milo Casagrande [it], Daniel Korostil [uk], sicklylife [ja],
+  Marek Černocký [cs], Nathan Follens [nl]
+
+3.35.92
+=======
+* Plug a memory leak [Jonas D.; !1015]
+* Fix missing "back" button on login screen [Florian; #2228]
+* Fix width of window preview titles in overview [Jonas D.; #58]
+* Fix looking glass text with light style variant [Feichtmeier; !1023]
+* Center unlock entry [Florian; !1021]
+* Hide overlay scrollbars in notification popup [Jonas D.; !1013]
+* Work around add_actor() slowness in icon spring animation [Daniel; !1002]
+* Add disable-animations heuristics [Jonas Å.; !757]
+* Fix visual glitches in on-screen keyboard [Carlos; #2214]
+* Fix clearing changed textures from cache [Florian; #2244]
+* Fix visual glitch in sliders [Daniel; #1569]
+* Stop using dedicated lock screen background [Florian; !1001]
+* Fix entries disappearing after authentication errors [Florian; #2236]
+* Fix crash when animations are disabled [Florian; #2255]
+* Fix passing pointer events to clients when magnified [Jonas D.; !993]
+* Fix keynav on new lock screen [Florian; #2210]
+* Avoid short-lived allocations on actor removal [Christian; #2263]
+* Fix super-sized default avatars in user list [Florian, Sam; #2242]
+* Leave overview when locking the screen [Jonas D.; !1043]
+* Hide message list on login screen [Florian; #2241]
+* Avoid IO on the main thread [Christian, Florian; !1050, !1051]
+* Fix window animations getting stuck when client doesn't respond [Jonas; !1055]
+* Only subscribe to touchpad events for touchpad gestures [Daniel; !925]
+* Start X11 session services before Xwayland clients [Carlos; !836, !1056]
+* Only show switch-user button with unlock prompt [Florian; !1029]
+* Misc. bug fixes and cleanups [Jonas D., Florian, Georges, Jonas Å., Daniel,
+  Jakub, Philippe; !1018, !1020, !1024, !1027, !1026, !1022, !1031, !1035,
+  !1032, !1025, !1039, #2157, !1037, !1042, !1047, !1048, #2270, !1046,
+  !167, !1016]
+
+Contributors:
+  Jonas Dreßler, Feichtmeier, Carlos Garnacho, Christian Hergert, Sam Hewitt,
+  Florian Müllner, Georges Basile Stavracas Neto, Jakub Steiner, Philippe Troin,
+  Daniel van Vugt, Jonas Ådahl
+
+Translators:
+  Danial Behzadi [fa], Efstathios Iosifidis [el], Daniel Mustieles [es],
+  Sabri Ünal [tr], sicklylife [ja], Piotr Drąg [pl], Jordi Mas [ca],
+  Anders Jonsson [sv], Chao-Hsiung Liao [zh_TW], Asier Sarasua Garmendia [eu],
+  Rafael Fontenelle [pt_BR], Марко Костић [sr], Changwoo Ryu [ko],
+  Charles Monzat [fr], Jiri Grönroos [fi], Jor Teron [mjw], Bruce Cowan [en_GB],
+  Emin Tufan Çetin [tr], Alan Mortensen [da], Balázs Úr [hu], Fran Dieguez [gl],
+  Kukuh Syafaat [id]
+
+3.35.91
+=======
+* Improve magnifier [Carlos; !984]
+* Only enable OSK automatically if touch-mode is enabled [Carlos; #872]
+* Merge screen shield and unlock dialog to new lock screen [Georges; !872]
+* Improve ShellBlur effect [Jonas; !991]
+* Adapt user avatar for new lock screen [Umang, Georges; !922]
+* Animate prompt transition on lock screen [Florian; !972]
+* Reduce font-size in dialog titles if text doesn't fit [Jonas; !1012]
+* Various lock screen improvements and bug fixes [Jakub, Florian, Georges;
+  !996, !997, !999, #2212, !998, !1006, #2215, #2213]
+* Misc. bug fixes and cleanups [Daniel, Florian, Jakub, nana-4, Jonas; #2170,
+  #2167, !936, !988, #2187, !994, !995, !938, #2194, #2203, !1004, !977, !1014]
+
+Contributors:
+  Jonas Dreßler, Carlos Garnacho, Umang Jain, Daniel Mustieles, Florian Müllner,
+  Georges Basile Stavracas Neto, Jakub Steiner, Daniel van Vugt, nana-4
+
+Translators:
+  Daniel Mustieles [es, pt_BR], Rafael Fontenelle [pt_BR], Danial Behzadi [fa],
+  Anders Jonsson [sv], Asier Sarasua Garmendia [eu], Aurimas Černius [lt],
+  Bruce Cowan [en_GB], sicklylife [ja], Fran Dieguez [gl], Kukuh Syafaat [id],
+  Emin Tufan Çetin [tr], Jiri Grönroos [fi], Jordi Mas [ca], Claude Paroz [fr],
+  Ask Hjorth Larsen [da], Марко Костић [sr], Piotr Drąg [pl],
+  Charles Monzat [fr], Balázs Úr [hu]
+
+3.35.90
+=======
+* Update default favorite apps [Michael; !907]
+* Add Shell.Blur effect [Georges; !864, !924]
+* Overhaul scroll/swipe gestures [Alexander; !821, !825, !826]
+* Fix VPN connections when delaying request [Florian; #2008]
+* Overhaul theme [Sam, Jakub, nana-4; !904, !931, !957]
+* Improve visual appearance of Weather integration [Florian; #1143]
+* Implement new system dialog designs [Jonas; #1343]
+* Animate position changes of app icons [Georges; !882]
+* Add St.Viewport [Georges; !929]
+* Make app folders behave as dialogs [Georges; !896]
+* Add do-not-disturb functionality to calendar popup [Florian; #239]
+* Show hint actor in focused entries [Jonas; !944]
+* Switch screen-recorder back to VP8 [Björn; #256]
+* Allow to run perf-tool as wayland compositor [Olivier; !941]
+* Handle extension updates [Florian; !945]
+* Animate showing and hiding caps-lock warning [Jonas; !952]
+* Support "auto" lengths in CSS [Florian; !971]
+* Turn extension-prefs into the offical Extensions app [Florian; #1968]
+* Sandbox the portal helper [Michael; !983]
+* Misc. bug fixes and cleanups [Florian, Björn, Jakub, Alexander, Daniel V.,
+  Jonas, nana-4, Carlos, Sebastian, Daniel G., Georges, Piotr; !918, !917,
+  !919, !920, #763, #791659, !927, #2091, !930, !926, !888, !934, !168, #2133,
+  #682, #2142, #2131, !943, #2132, #1958, #2146, !951, #1779, #2130, !964,
+  !965, !948, #2151, #1746, !967, !760, !968, !970, !973, #2169, #2176, !978,
+  !980, !979, #2177, !981, #2180, !974]
+
+Contributors:
+  Michael Catanzaro, Björn Daase, Jonas Dreßler, Piotr Drąg, Olivier Fourdan,
+  Carlos Garnacho, Sam Hewitt, Sebastian Keller, Andre Klapper,
+  Alexander Mikhaylenko, Daniel García Moreno, Florian Müllner,
+  Georges Basile Stavracas Neto, Jakub Steiner, Daniel van Vugt, nana-4
+
+Translators:
+  Asier Sarasua Garmendia [eu], Daniel Mustieles [es], Andrej Shadura [sk],
+  Carmen Bianca BAKKER [eo], Sucipto [id], Dušan Kazik [sk], Goran Vidović [hr],
+  sicklylife [ja], Kukuh Syafaat [id], Yi-Jyun Pan [zh_TW],
+  Rafael Fontenelle [pt_BR], Jordi Mas [ca], Jiri Grönroos [fi],
+  Fabio Tomat [fur], Umarzuki Bin Mochlis Moktar [ms], Daniel Korostil [uk],
+  Jor Teron [mjw], Anders Jonsson [sv], Aurimas Černius [lt]
+
 3.35.3
 ======
 * Add discrete GPU support for NVidia drivers [Bastien; #1810]

data/cldr2json/cldr2json.py

@@ -161,12 +161,16 @@ def convert_file(source_file, destination_path):
     try:
         xkb_name = locale_to_xkb(root["locale"], root["name"])
     except KeyError as e:
-        logging.warn(e)
+        logging.warning(e)
         return False
     destination_file = os.path.join(destination_path, xkb_name + ".json")
 
-    with open(destination_file, 'w', encoding="utf-8") as dest_fd:
+    try:
-        json.dump(root, dest_fd, ensure_ascii=False, indent=2, sort_keys=True)
+        with open(destination_file, 'x', encoding="utf-8") as dest_fd:
+            json.dump(root, dest_fd, ensure_ascii=False, indent=2, sort_keys=True)
+    except FileExistsError as e:
+        logging.info("File %s exists, not updating", destination_file)
+        return False
 
     logging.debug("written %s", destination_file)
 

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

@@ -199,14 +199,37 @@
 
     <!--
         LaunchExtensionPrefs:
-        @uuid: The UUID of the extension
+        Deprecated for OpenExtensionPrefs
-
-        Launch preferences of an extension.
     -->
     <method name="LaunchExtensionPrefs">
       <arg type="s" direction="in" name="uuid"/>
     </method>
 
+    <!--
+        OpenExtensionPrefs:
+        @uuid: The UUID of the extension
+        @parent_window: Identifier for the application window
+        @options: Vardict with further options
+
+        Opens the prefs dialog of extension @uuid.
+
+        The following @options are recognized:
+
+        <variablelist>
+          <varlistentry>
+            <term>modal b</term>
+            <listitem>
+              <para>Whether the prefs window should be modal, default: false</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="OpenExtensionPrefs">
+      <arg type="s" direction="in" name="uuid"/>
+      <arg type="s" direction="in" name="parent_window"/>
+      <arg type="a{sv}" direction="in" name="options"/>
+    </method>
+
     <!--
         CheckForUpdates:
         Update all extensions for which updates are available
@@ -234,5 +257,11 @@
     -->
     <property name="ShellVersion" type="s" access="read"/>
 
+    <!--
+        UserExtensionsEnabled:
+        Whether user extensions are enabled
+    -->
+    <property name="UserExtensionsEnabled" type="b" access="readwrite"/>
+
   </interface>
 </node>

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

@@ -57,5 +57,19 @@
     <method name="GetWindows">
       <arg name="windows" direction="out" type="a{ta{sv}}" />
     </method>
+
+    <!--
+       AnimationsEnabled:
+       @short_description: Whether the shell animations are enabled
+
+       By default determined by the org.gnome.desktop.interface enable-animations
+       gsetting, but may be overridden, e.g. if there is an active screen cast or
+       remote desktop session that asked for animations to be disabled.
+
+       Since: 2
+    -->
+    <property name="AnimationsEnabled" type="b" access="read"/>
+
+    <property name="version" type="u" access="read"/>
   </interface>
 </node>

data/gnome-shell-theme.gresource.xml

@@ -9,16 +9,9 @@
     <file>dash-placeholder.svg</file>
     <file>gnome-shell.css</file>
     <file>gnome-shell-high-contrast.css</file>
-    <file>key-enter.svg</file>
-    <file>key-hide.svg</file>
-    <file>key-layout.svg</file>
-    <file>key-shift.svg</file>
-    <file>key-shift-uppercase.svg</file>
-    <file>key-shift-latched-uppercase.svg</file>
     <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
     <file>no-events.svg</file>
     <file>no-notifications.svg</file>
-    <file>noise-texture.png</file>
     <file>pad-osd.css</file>
     <file alias="icons/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
     <file alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
@@ -26,6 +19,11 @@
     <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 alias="icons/keyboard-caps-lock-filled-symbolic.svg">keyboard-caps-lock-filled-symbolic.svg</file>
+    <file alias="icons/keyboard-enter-symbolic.svg">keyboard-enter-symbolic.svg</file>
+    <file alias="icons/keyboard-hide-symbolic.svg">keyboard-hide-symbolic.svg</file>
+    <file alias="icons/keyboard-layout-filled-symbolic.svg">keyboard-layout-filled-symbolic.svg</file>
+    <file alias="icons/keyboard-shift-filled-symbolic.svg">keyboard-shift-filled-symbolic.svg</file>
     <file>process-working.svg</file>
     <file>toggle-off.svg</file>
     <file>toggle-off-dark.svg</file>

data/gnome-shell-wayland.service.in

@@ -19,6 +19,10 @@ Before=gnome-session-initialized.target
 [Service]
 Type=notify
 ExecStart=@bindir@/gnome-shell
+
+# unset some environment variables that were set by the shell and won't work now that the shell is gone
+ExecStopPost=-systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY
+
 # Exit code 1 means we are probably *not* dealing with an extension failure
 SuccessExitStatus=1
 # On wayland we cannot restart

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

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

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

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

data/meson.build

@@ -1,6 +1,5 @@
 desktop_files = [
   'org.gnome.Shell.desktop',
-  'org.gnome.Extensions.desktop',
 ]
 service_files = []
 
@@ -43,7 +42,6 @@ endforeach
 
 
 subdir('dbus-interfaces')
-subdir('icons')
 subdir('theme')
 
 data_resources = [

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

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

data/osk-layouts/no.json

@@ -12,7 +12,9 @@
             "w"
           ],
           [
-            "e"
+            "e",
+            "é",
+            "ë"
           ],
           [
             "r"
@@ -21,30 +23,58 @@
             "t"
           ],
           [
-            "y"
+            "y",
+            "ý",
+            "ÿ"
           ],
           [
-            "u"
+            "u",
+            "ú",
+            "ü",
+            "û",
+            "ù",
+            "ū"
           ],
           [
-            "i"
+            "i",
+            "í",
+            "ï"
           ],
           [
-            "o"
+            "o",
+            "ó",
+            "ô",
+            "ò",
+            "õ",
+            "œ",
+            "ō"
           ],
           [
             "p"
+          ],
+          [
+            "å"
           ]
         ],
         [
           [
-            "a"
+            "a",
+            "á",
+            "ä",
+            "à",
+            "â",
+            "ã",
+            "ā"
           ],
           [
-            "s"
+            "s",
+            "ß",
+            "ś",
+            "š"
           ],
           [
-            "d"
+            "d",
+            "ð"
           ],
           [
             "f"
@@ -62,7 +92,16 @@
             "k"
           ],
           [
-            "l"
+            "l",
+            "ł"
+          ],
+          [
+            "ø",
+            "ö"
+          ],
+          [
+            "æ",
+            "ä"
           ]
         ],
         [
@@ -82,7 +121,9 @@
             "b"
           ],
           [
-            "n"
+            "n",
+            "ñ",
+            "ń"
           ],
           [
             "m"
@@ -121,7 +162,9 @@
             "W"
           ],
           [
-            "E"
+            "E",
+            "É",
+            "Ë"
           ],
           [
             "R"
@@ -130,30 +173,58 @@
             "T"
           ],
           [
-            "Y"
+            "Y",
+            "Ý",
+            "Ÿ"
           ],
           [
-            "U"
+            "U",
+            "Ú",
+            "Ü",
+            "Û",
+            "Ù",
+            "Ū"
           ],
           [
-            "I"
+            "I",
+            "Í",
+            "Ï"
           ],
           [
-            "O"
+            "O",
+            "Ó",
+            "Ô",
+            "Ò",
+            "Õ",
+            "Œ",
+            "Ō"
           ],
           [
             "P"
+          ],
+          [
+            "Å"
           ]
         ],
         [
           [
-            "A"
+            "A",
+            "Á",
+            "Ä",
+            "À",
+            "Â",
+            "Ã",
+            "Ā"
           ],
           [
-            "S"
+            "S",
+            "SS",
+            "Ś",
+            "Š"
           ],
           [
-            "D"
+            "D",
+            "Ð"
           ],
           [
             "F"
@@ -171,7 +242,16 @@
             "K"
           ],
           [
-            "L"
+            "L",
+            "Ł"
+          ],
+          [
+            "Ø",
+            "Ö"
+          ],
+          [
+            "Æ",
+            "Ä"
           ]
         ],
         [
@@ -191,7 +271,9 @@
             "B"
           ],
           [
-            "N"
+            "N",
+            "Ñ",
+            "Ń"
           ],
           [
             "M"
@@ -277,10 +359,10 @@
             "#"
           ],
           [
-            "$",
+            "€",
             "¢",
             "£",
-            "€",
+            "$",
             "¥",
             "₱"
           ],
@@ -419,13 +501,14 @@
             "£"
           ],
           [
+            "¥"
+          ],
+          [
+            "$",
             "¢"
           ],
           [
-            "€"
+            "¢"
-          ],
-          [
-            "¥"
           ],
           [
             "^",
@@ -504,4 +587,4 @@
   ],
   "locale": "nb",
   "name": "Norwegian Bokmål"
-}
+}

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

@@ -19,13 +19,13 @@ $error_color: #ff8080;
 $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
 $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
 
-$osd_fg_color: $fg_color;
+$osd_fg_color: #eeeeec;
-$osd_text_color: if($variant == 'light', #000, #fff);
+$osd_text_color: white;
-$osd_bg_color: if($variant == 'light', rgba(255,255,255,0.9), transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04));
+$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
-$osd_borders_color: if($variant == 'light', rgba(255,255,255,0.1), rgba(0,0,0,0.7));
+$osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: if($variant == 'light', rgba(0,0,0,0.1), lighten($osd_bg_color, 7%));
+$osd_outer_borders_color: transparentize(white, 0.84);
 
 $shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
 
@@ -40,4 +40,4 @@ $backdrop_bg_color: $bg_color;
 $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
 $backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
-$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);

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

@@ -54,8 +54,8 @@ $base_font_size: 11;
 $text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
 
 // icons
-// $base_icon_size: 1.09em;
+$base_icon_size: 1.09em;
-$base_icon_size: 16px;
+// $base_icon_size: 16px;
 
 // Stage
 stage {
@@ -91,13 +91,9 @@ stage {
 
 // icon tiles
 %icon_tile {
-  background-color: transparent; // no background
-  color: $osd_fg_color;
   border-radius: $base_border_radius + 4px;
   padding: $base_padding;
-  border-width: 2px;
+  border: 2px solid transparent;
-  border-style: solid;
-  border-color: transparent;
   transition-duration: 100ms;
   text-align: center;
 }
@@ -155,14 +151,17 @@ stage {
 
 
 // notification styling
-%notification_bubble {
+@mixin notification_bubble($flat: false) {
   border-width: 1px;
   border-style: solid;
-  border-radius:$base_border_radius + 2px;
+  border-radius: $base_border_radius + 2px;
-  padding: 0;
   margin: $base_margin;
 
-  @include button(normal);
+  @if $flat {
+    @include button(undecorated);
+  } @else {
+    @include button(normal);
+  }
 
   &:focus {
     @include button(focus);

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

@@ -137,7 +137,7 @@
   // normal button
   @if $t==normal {
     color: $tc;
-    background-color: lighten($c, 3%) !important;
+    background-color: lighten($c, 3%);
     border-color: draw_border_color($c);
     @include draw_shadows($button_shadow);
     // box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
@@ -150,14 +150,14 @@
     color: $tc;
     text-shadow: 0 1px $text_shadow_color;
     icon-shadow: 0 1px $text_shadow_color;
-    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.7);
+    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.4);
     //border-color: $selected_bg_color;
   }
 
   // hover button
   @else if $t==hover {
     color: $tc;
-    background-color: lighten($c, if($variant == 'light', 8%, 5%)) !important;
+    background-color: lighten($c, if($variant == 'light', 8%, 5%));
     border-color: if($variant == 'light', draw_border_color(lighten($c, 7%)), draw_border_color($c));
     @include draw_shadows($button_shadow);
     text-shadow: 0 1px $text_shadow_color;
@@ -167,7 +167,7 @@
   // active button
   @else if $t==active {
     color: $tc;
-    background-color: darken($c,3%) !important;
+    background-color: darken($c,3%);
     border-color: draw_border_color(if($variant == 'light', $c, darken($c,7%)));
     text-shadow: none;
     icon-shadow: none;
@@ -178,7 +178,7 @@
   @else if $t==insensitive {
     color: $insensitive_fg_color;
     border-color: $insensitive_borders_color;
-    background-color: $insensitive_bg_color !important;
+    background-color: $insensitive_bg_color;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
@@ -194,3 +194,38 @@
     icon-shadow: none;
   }
 }
+
+// overview icons
+@mixin overview-icon($color) {
+  .overview-icon {
+    @extend %icon_tile;
+    color: $color;
+  }
+
+  &:hover,
+  &:selected {
+    .overview-icon {
+      background-color: transparentize($color, .9);
+    }
+  }
+
+  &:focus {
+    .overview-icon {
+      background-color: transparentize($color, .7);
+      // border-color: $selected_bg_color;
+    }
+  }
+
+  &:drop {
+    .overview-icon {
+      background-color: transparentize($selected_bg_color, .15);
+    }
+  }
+
+  &:active,
+  &:checked {
+    .overview-icon {
+      background-color: transparentize(darken($osd_bg_color, 10%), .5);
+    }
+  }
+}

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

@@ -5,34 +5,47 @@
 //
 
 /* WIDGETS */
-@import 'widgets/app-grid';
+
-@import 'widgets/app-switcher';
+// Primary widgets
-@import 'widgets/buttons';
+@import 'widgets/base';
-@import 'widgets/calendar';
-@import 'widgets/check-box';
-@import 'widgets/corner-ripple';
-@import 'widgets/dash';
-@import 'widgets/dialogs';
 @import 'widgets/entries';
-@import 'widgets/hotplug';
+@import 'widgets/buttons';
-@import 'widgets/ibus-popup';
+@import 'widgets/check-box';
-@import 'widgets/keyboard';
+@import 'widgets/switches';
-@import 'widgets/login-dialog';
+@import 'widgets/slider';
-@import 'widgets/looking-glass';
-@import 'widgets/message-list';
-@import 'widgets/notifications';
-@import 'widgets/misc';
-@import 'widgets/network-dialog';
-@import 'widgets/osd';
-@import 'widgets/overview';
-@import 'widgets/panel';
-@import 'widgets/popovers';
-@import 'widgets/screen-shield';
 @import 'widgets/scrollbars';
+// Popovers
+@import 'widgets/popovers';
+@import 'widgets/calendar';
+@import 'widgets/message-list';
+@import 'widgets/ibus-popup';
+// Notifications
+@import 'widgets/notifications';
+@import 'widgets/hotplug';
+// Dialogs
+@import 'widgets/dialogs';
+@import 'widgets/network-dialog';
+// OSDs
+@import 'widgets/osd';
+@import 'widgets/switcher-popup';
+@import 'widgets/workspace-switcher';
+// Panel
+@import 'widgets/panel';
+@import 'widgets/corner-ripple';
+// Overview
+@import 'widgets/overview';
+@import 'widgets/window-picker';
 @import 'widgets/search-entry';
 @import 'widgets/search-results';
-@import 'widgets/slider';
+@import 'widgets/app-grid';
-@import 'widgets/switches';
+@import 'widgets/dash';
+@import 'widgets/workspace-thumbnails';
+// A11y / misc
+@import 'widgets/a11y';
+@import 'widgets/misc';
 @import 'widgets/tiled-previews';
-@import 'widgets/window-picker';
+@import 'widgets/keyboard';
-@import 'widgets/workspace-switcher';
+@import 'widgets/looking-glass';
+// Lock / login screens
+@import 'widgets/login-dialog';
+@import 'widgets/screen-shield';

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

@@ -0,0 +1,24 @@
+// Pointer location
+.ripple-pointer-location {
+  width: $ripple_size;
+  height: $ripple_size;
+  border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
+  background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
+  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
+}
+
+// Pointer accessibility notifications
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: $selected_bg_color;
+  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
+}
+
+// Screen zoom/Magnifier
+.magnifier-zoom-region {
+  border: 2px solid $selected_bg_color;
+
+  &.full-screen { border-width: 0; }
+}

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

@@ -11,7 +11,6 @@ $app_icon_padding: 24px;
 
   .overview-icon {
     icon-size: $app_icon_size;
-    StIcon { margin-bottom: $base_margin; } // margin on icon so label isn't close
   }
 }
 
@@ -21,68 +20,24 @@ $app_icon_padding: 24px;
 
 $app_grid_fg_color: #fff;
 
-// Outline for low res icons
-.lowres-icon {
-  icon-shadow: 0 1px 2px rgba(0,0,0,0.3);
-}
-
-// Dropshadow for large icons
-.icon-dropshadow {
-  icon-shadow: 0 1px 2px rgba(0,0,0,0.4);
-}
-
 // Icon tiles in the app grid
 .app-well-app,
-.app-folder {
+%app-well-app {
+  @include overview-icon($app_grid_fg_color);
 
-  .overview-icon {
+  .overview-icon.overview-icon-with-label {
-    @extend %icon_tile;
+    padding: 10px 8px 5px 8px;
-    color: $app_grid_fg_color !important;
-  }
 
-  &:selected {
+    > StBoxLayout {
-    .overview-icon {
+      spacing: $base_spacing;
-      background-color: transparentize($osd_bg_color,0.7);
-      color: $app_grid_fg_color;
-    }
-  }
-
-  &:hover,
-  &:focus,
-  &:selected {
-    .overview-icon {
-      background-color: transparentize($osd_fg_color,0.9);
-      color: $osd_fg_color;
-    }
-  }
-
-  &:focus {
-    .overview-icon {
-      background-color: transparentize($osd_fg_color,0.7  );
-      // border-color: $selected_bg_color;
-      color: $app_grid_fg_color;
-    }
-  }
-
-  &:drop {
-    .overview-icon {
-      background-color: transparentize($selected_bg_color,.15);
-    }
-  }
-
-  &:active,
-  &:checked {
-    .overview-icon {
-      background-color: transparentize(darken($osd_bg_color,10%), 0.5);
     }
   }
 }
 
 /* App Folders */
-.app-folder {
+.app-well-app.app-folder {
-  .overview-icon {
+  background-color: transparentize($osd_bg_color, 0.8);
-    @extend %icon_tile;
+  border-radius: $base_border_radius + 4px; // same as %icon_tile
-  }
 }
 
 // expanded folder
@@ -105,7 +60,7 @@ $app_grid_fg_color: #fff;
     & .folder-name-entry { width: 300px }
 
     /* FIXME: this is to keep the label in sync with the entry */
-    & .folder-name-label { padding: 5px 7px }
+    & .folder-name-label { padding: 5px 7px; color: $osd_fg_color; }
 
     & .edit-folder-button {
       @extend %button;
@@ -118,10 +73,6 @@ $app_grid_fg_color: #fff;
       & > StIcon { icon-size: 16px }
     }
   }
-
-  & StButton#vhandle,
-  & StButton#vhandle:hover,
-  & StButton#vhandle:active { background-color: transparent; }
 }
 .app-folder-dialog-container {
   padding: 12px;
@@ -178,11 +129,6 @@ $app_grid_fg_color: #fff;
   padding: 0px 88px 10px 88px;
 }
 
-.app-well-app > .overview-icon.overview-icon-with-label {
-  padding: 10px 8px 5px 8px;
-  spacing: $base_spacing;
-}
-
 // Label when no frequent apps
 .no-frequent-applications-label { @extend %status_text; }
 
@@ -202,41 +148,35 @@ $app_grid_fg_color: #fff;
 }
 
 // buttons
-.app-view-control { 
+.app-view-control {
-  padding: $base_padding $base_padding*5;
+  padding: 4px 32px;
-  margin: 0;
+  margin: 0 4px;
-  background-color: transparentize($osd_bg_color, 0.5);
-  border-width: 1px;
-  color: darken($osd_fg_color, 25%);
 
-  &:hover {
+  &, &:hover, &:checked {
-    background-color: transparentize($osd_bg_color, 0.5) !important;
+    @include button(undecorated);
-    box-shadow:none !important;
     color: darken($osd_fg_color, 25%);
   }
 
+  &:hover {
+    color: $osd_fg_color;
+    box-shadow: inset 0 -2px darken($osd_fg_color, 25%);
+  }
+
   &:active {
-    box-shadow: none;
+    box-shadow: inset 0 -2px $osd_fg_color;
-    background-color: $selected_bg_color !important;
-    &:hover {
-      background-color: lighten($selected_bg_color, 11%) !important;
-    }
   }
 
   &:checked {
-    background-color: $selected_bg_color !important;
+    color: $osd_fg_color;
-    color: $selected_fg_color;
+    box-shadow: inset 0 -2px $selected_bg_color;
-    box-shadow: none;
-    &:active { background-color: darken($selected_bg_color, 4%) !important; }
-    &:hover { background-color: lighten($selected_bg_color, 7%) !important; }
   }
 
   &:first-child {
-    border-right-width: 0 !important;
+    border-right-width: 0;
-    border-radius: $base_border_radius 0 0 $base_border_radius;
+    border-radius: 0;
   }
 
   &:last-child {
-    border-radius: 0 $base_border_radius $base_border_radius 0;
+    border-radius: 0;
   }
 }

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

@@ -0,0 +1,18 @@
+// Links
+.shell-link {
+  color: $link_color;
+
+  &:hover {
+    color: lighten($link_color, 10%);
+  }
+}
+
+// Outline for low res icons
+.lowres-icon {
+  icon-shadow: 0 1px 2px rgba(black, 0.3);
+}
+
+// Dropshadow for large icons
+.icon-dropshadow {
+  icon-shadow: 0 1px 2px rgba(black, 0.4);
+}

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

@@ -1,87 +1,65 @@
 /* Date/Time Menu */
 
-.clock-display-box { spacing: $base_spacing; }
+.clock-display-box {
+  spacing: $base_spacing / 2;
+
+  .clock {
+    padding-left: $base_padding;
+    padding-right: $base_padding;
+  }
+}
 
 // overall menu
 #calendarArea {
   padding:0;
-  margin:0;
 }
 
 // Calendar menu side column
 .datemenu-calendar-column {
-  spacing: 0;
+  spacing: $base_spacing;
   border: 0 solid $bubble_borders_color;
-  padding: $base_padding * 2;
+  padding: 0 $base_padding * 2;
-  padding-bottom: 3em; // account for the notifications clear button
-  padding-top:0;
 
   &:ltr {margin-right: $base_margin * 2; border-left-width: 1px; }
   &:rtl {margin-left: $base_margin * 2; border-right-width: 1px; }
 
-  // today button (the date)
-  .datemenu-today-button {
-    padding: $base_padding * 1.5;
-    margin: $base_margin;
-    border: 1px solid transparent;
-    border-radius: $base_border_radius + 2px;
-
-    &:hover { @include button(hover);}
-    &:focus { @include button(focus);}
-
-    &:active {
-      @include button(active);
-    }
-
-    // weekday label
-    .day-label {
-      @include fontsize($base_font_size+1);
-      font-weight: bold;
-    }
-
-    // date label
-    .date-label {
-      @include fontsize($base_font_size+7);
-      font-weight: 1000;
-    }
-  }
-
-  // calendar
-  .calendar {
-    @extend %notification_bubble;
-    margin:$base_margin !important;
-    margin-bottom: $base_padding + $base_margin !important;
-    padding:$base_padding !important;
-
-    // more below for sub-elements
-  }
-
   .datemenu-displays-section {
-    margin:0;
   }
 
   .datemenu-displays-box {
     spacing: $base_spacing;
-    margin:0;
-
-    // world clocks and weather
-    .world-clocks-button,
-    .weather-button {
-      @extend %notification_bubble;
-      padding:$base_padding !important;
-    }
   }
 }
 
 .events-section-title {
+  @include notification_bubble($flat: true);
   color: desaturate(darken($fg_color,40%), 10%);
   font-weight: bold;
-  border-radius: 4px;
   padding: .4em;
 }
 
+/* today button (the date) */
+.datemenu-today-button {
+  @include notification_bubble($flat: true);
+  padding: $base_padding * 1.5;
+
+  // weekday label
+  .day-label {
+    @include fontsize($base_font_size+1);
+    font-weight: bold;
+  }
+
+  // date label
+  .date-label {
+    @include fontsize($base_font_size+7);
+    font-weight: 1000;
+  }
+}
+
 /* Calendar */
 .calendar {
+  @include notification_bubble;
+  padding: $base_padding;
 
   // month
   .calendar-month-label {
@@ -132,6 +110,7 @@
       @include fontsize($base_font_size - 4);
     }
   }
+
   .calendar-day { //border collapse hack - see calendar.js
     border-width: 0;
   }
@@ -140,8 +119,12 @@
     border-top-width: 1px;
   }
 
-  .calendar-day-left { border-left-width: 1px; }
+  .calendar-day-left {
+    border-left-width: 1px;
+  }
+
   .calendar-work-day {}
+
   .calendar-nonwork-day {
     color: $insensitive_fg_color;
   }
@@ -161,13 +144,14 @@
     &:active,&:selected {
       background-color: $selected_bg_color;
       color: $selected_fg_color;
+
       &:hover,&:focus {
         background-color:lighten($selected_bg_color, 3%);
         color: $selected_fg_color;
       }
     }
-
   }
+
   .calendar-day-with-events {
     color: lighten($fg_color,10%);
     font-weight: bold;
@@ -176,7 +160,6 @@
 
   .calendar-other-month-day {
     color: transparentize($fg_color ,0.5);
-    opacity: 0.5;
   }
 
   .calendar-week-number {
@@ -192,51 +175,16 @@
   }
 }
 
+/* World clocks */
+.world-clocks-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
 
-/* Weather */
+  .world-clocks-grid {
-.weather-box {
-  spacing: $base_spacing;
-  padding:$base_padding;
-
-  .weather-header {
-    color: desaturate(darken($fg_color,40%), 10%);
-    font-weight: bold;
-    &.location {
-      font-weight: normal;
-      @include fontsize($base_font_size - 1);
-    }
-  }
-
-  .weather-grid {
-    margin-top: $base_margin;
     spacing-rows: $base_spacing;
     spacing-columns: $base_spacing * 2;
   }
 
-  .weather-forecast-time {
-    color: darken($fg_color,30%);
-    font-feature-settings: "tnum";
-    @include fontsize($base_font_size - 2);
-    font-weight: normal;
-    padding-top: 0.2em;
-    padding-bottom: 0.4em;
-  }
-
-  .weather-forecast-icon {
-    icon-size: $base_icon_size * 2;
-  }
-
-  .weather-forecast-temp {
-    font-weight: bold;
-  }
-}
-
-/* World clocks */
-.world-clocks-grid {
-  padding:$base_padding;
-  spacing-rows: $base_spacing;
-  spacing-columns: $base_spacing * 2;
-
   // title
   .world-clocks-header {
     color: desaturate(darken($fg_color,40%), 10%);
@@ -266,3 +214,49 @@
     @include fontsize($base_font_size - 1);
   }
 }
+
+/* Weather */
+.weather-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
+
+  .weather-box {
+    spacing: $base_spacing + $base_margin;
+  }
+
+  .weather-header-box {
+    spacing: $base_spacing;
+  }
+
+  .weather-header {
+    color: desaturate(darken($fg_color,40%), 10%);
+    font-weight: bold;
+
+    &.location {
+      font-weight: normal;
+      @include fontsize($base_font_size - 1);
+    }
+  }
+
+  .weather-grid {
+    spacing-rows: $base_spacing;
+    spacing-columns: $base_spacing * 2;
+  }
+
+  .weather-forecast-time {
+    color: darken($fg_color,30%);
+    font-feature-settings: "tnum";
+    @include fontsize($base_font_size - 2);
+    font-weight: normal;
+    padding-top: 0.2em;
+    padding-bottom: 0.4em;
+  }
+
+  .weather-forecast-icon {
+    icon-size: $base_icon_size * 2;
+  }
+
+  .weather-forecast-temp {
+    font-weight: bold;
+  }
+}

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

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

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

@@ -9,12 +9,11 @@ $dash_border_radius: $modal_radius * 1.5;
   @include fontsize($base_font_size - 2);
   padding: ($dash_spacing / 2) 0;
 
-  //fixme: can't have non uniform borders :(
   border-radius: 0 $dash_border_radius $dash_border_radius 0; 
-  border-left-width: 0 !important;
+  border-left-width: 0;
-  &:rtl { 
+  &:rtl {
     border-radius: $dash_border_radius 0 0 $dash_border_radius;
-    border-right-width: 0 !important;
+    border-right-width: 0;
   }
 
   .placeholder {
@@ -49,36 +48,13 @@ $dash_border_radius: $modal_radius * 1.5;
 
 // Show apps button
 .show-apps {
-  color: $osd_fg_color;
+  @include overview-icon($osd_fg_color);
 
-  & .overview-icon {
-    @extend %icon_tile;
-    color: $osd_fg_color;
-  }
-
-  &:hover,
   &:focus,
-  &:selected {
+  &:checked {
-    .overview-icon {
-      background-color: transparentize($osd_fg_color,0.9);
-      color: $osd_fg_color;
-    }
-  }
-
-  &:drop .overview-icon {
-    background-color: transparentize($selected_bg_color,.15);
-  }
-
-  &:active, &:checked {
     .overview-icon {
       background-color: darken($osd_bg_color,10%);
-    }
-  }
-
-  &:checked, &:focus {
-     .show-apps-icon {
       color: $fg_color;
-      transition-duration: 100ms;
     }
   }
 }

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

@@ -1,5 +1,9 @@
 /* Modal Dialogs */
 
+.headline {
+  @include fontsize($base_font_size + 1);
+}
+
 .modal-dialog {
   border-radius: $modal_radius;
   @extend %bubble_panel;
@@ -15,12 +19,7 @@
   }
 }
 
-.mount-dialog-subject {
-  @include fontsize($base_font_size + 3);
-}
-
 /* End Session Dialog */
-
 .end-session-dialog {
   width: 30em;
 
@@ -38,6 +37,11 @@
     text-align: center;
     font-size: 18pt;
     font-weight: 800;
+
+    &.leightweight {
+      font-size: 13pt;
+      font-weight: 800;
+    }
   }
   .message-dialog-description { text-align: center; }
 }
@@ -162,8 +166,3 @@
 .audio-selection-device-icon {
   icon-size: $base_icon_size * 4;
 }
-
-/* Access Dialog */
-.access-dialog {
-  spacing: 30px;
-}

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

@@ -1,4 +1,9 @@
 // IBus Candidate Popup
+
+.candidate-popup-boxpointer {
+  @extend .popup-menu-boxpointer;
+}
+
 .candidate-popup-content {
   padding: 0.5em;
   spacing: 0.3em;

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

@@ -10,7 +10,7 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
 // draw keys using button function
 #keyboard {
   background-color: transparentize(if($variant=='light', darken($bg_color, 5%), darken($bg_color, 8%)), 0.1);
-  box-shadow: inset 0 1px 0 0 $osd_outer_borders_color !important;
+  box-shadow: inset 0 1px 0 0 $osd_outer_borders_color;
 
   .page-indicator {
     padding: $base_padding;
@@ -52,10 +52,6 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
 
   // non-character keys
   &.default-key {
-
-    // size of the icon asset
-    background-size: 24px;
-
     @include button(normal, $c:$default_key_bg_color);
     &:hover, &:checked {@include button(hover, $c: $default_key_bg_color);}
     &:active { @include button(active, $c: $default_key_bg_color);}
@@ -63,19 +59,14 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
 
   // enter key is suggested-action
   &.enter-key {
-    background-image: url("resource:///org/gnome/shell/theme/key-enter.svg");
-
     @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
     &:hover, &:checked { @include button(hover, $c: lighten($selected_bg_color, 3%));}
     &:active {@include button(active, $c: darken($selected_bg_color, 2%));}
   }
 
-  // key assets
+  &.shift-key-uppercase { color: $selected_bg_color }
-  &.shift-key-lowercase {background-image: url("resource:///org/gnome/shell/theme/key-shift.svg");}
+
-  &.shift-key-uppercase {background-image: url("resource:///org/gnome/shell/theme/key-shift-uppercase.svg");}
+  StIcon { icon-size: 1.125em; }
-  &.shift-key-uppercase:latched {background-image: url("resource:///org/gnome/shell/theme/key-shift-latched-uppercase.svg");}
-  &.hide-key {background-image: url("resource:///org/gnome/shell/theme/key-hide.svg");}
-  &.layout-key {background-image: url("resource:///org/gnome/shell/theme/key-layout.svg");}
 }
 
 // long press on a key popup
@@ -121,4 +112,4 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
   @include fontsize($base_font_size + 3);
   spacing: 12px;
   min-height: 20pt;
-}
+}

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

@@ -68,12 +68,30 @@
       }
     }
   }
+
+  .cancel-button,
+  .switch-user-button,
+  .login-dialog-session-list-button {
+    padding: 0;
+    border-radius: 99px;
+    width: $base_icon_size * 2;
+    height: $base_icon_size * 2;
+    border-color: transparentize($bg_color,0.7);
+    background-color: transparentize($bg_color,0.7);
+
+    StIcon { icon-size: $base_icon_size; }
+  }
+
+  .caps-lock-warning-label,
+  .login-dialog-message-warning {
+    color: $osd_fg_color;
+  }
 }
 
 .login-dialog-logo-bin { padding: 24px 0px; }
 .login-dialog-banner { color: darken($osd_fg_color,10%); }
-.login-dialog-button-box { spacing: 5px; }
+.login-dialog-button-box { width: 23em; spacing: 5px; }
-.login-dialog-message-warning { color: $warning_color; }
+.login-dialog-message { text-align: center; }
 .login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
 .login-dialog-user-selection-box { padding: 100px 0px; }
 .login-dialog-not-listed-label {
@@ -100,7 +118,7 @@
 }
 
 .login-dialog-user-list-item {
-  border-radius: 5px;
+  border-radius: $base_border_radius + 4px;
   padding: 6px;
   color: darken($osd_fg_color,30%);
   &:ltr .user-widget { padding-right: 1em; }
@@ -113,20 +131,27 @@
   &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
 }
 
-.login-dialog-username,
 .user-widget-label {
   color: $osd_fg_color;
+}
+
+.user-widget.horizontal .user-widget-label {
   @include fontsize($base_font_size + 2);
   font-weight: bold;
   text-align: left;
   padding-left: 15px;
-}
 
-.user-widget-label {
   &:ltr { padding-left: 14px; }
   &:rtl { padding-right: 14px; }
 }
 
+.user-widget.vertical .user-widget-label {
+  @include fontsize($base_font_size + 5);
+  text-align: center;
+  font-weight: normal;
+  padding-top: 16px;
+}
+
 .login-dialog-prompt-layout {
   padding-top: 24px;
   padding-bottom: 12px;
@@ -134,18 +159,12 @@
   width: 23em;
 }
 
+.login-dialog-prompt-entry {
+  height: 1.5em;
+}
+
 .login-dialog-prompt-label {
   color: darken($osd_fg_color, 20%);
   @include fontsize($base_font_size + 1);
   padding-top: 1em;
 }
-
-.login-dialog-session-list-button StIcon {
-  icon-size: 1.25em;
-}
-
-.login-dialog-session-list-button {
-  color: darken($osd_fg_color,30%);
-  &:hover,&:focus { color: $osd_fg_color; }
-  &:active { color: darken($osd_fg_color, 50%); }
-}

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

@@ -5,14 +5,14 @@
   background-color: $osd_bg_color;
   spacing: $base_spacing;
   padding: 4px;
-  border: 2px solid transparentize($osd_fg_color, 0.8);
+  border: 1px solid transparentize($osd_fg_color, 0.8);
-  border-top-width:0;
+  border-radius: $base_border_radius;
-  border-radius: 0 0 $base_border_radius $base_border_radius;
+  color: $osd_fg_color;
 
   & > #Toolbar {
     border: none;
     border-radius: $base_border_radius;
-    background-color: darken($osd_bg_color, 10%);
+    background-color: $osd_bg_color;
   }
 
   .labels { spacing: $base_spacing; }
@@ -20,19 +20,18 @@
     -natural-hpadding: $base_padding * 2;
     -minimum-hpadding: 6px;
     font-weight: bold;
-    color: $fg_color;
+    color: darken($osd_fg_color, 15%);
     transition-duration: 100ms;
     padding-left: .3em;
     padding-right: .3em;
+    border-bottom-width: 2px;
     &:hover {
-      color: white;
+      color: $osd_fg_color;
-      text-shadow: black 0px 2px 2px;
     }
     &:selected {
       border-bottom-width: 2px;
-      border-color: lighten($selected_bg_color,5%);
+      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color, 5%);
-      color: white;
+      color: $osd_fg_color;
-      text-shadow: black 0px 2px 2px;
     }
   }
   StBoxLayout#EvalBox { padding: 4px; spacing: $base_spacing; }
@@ -41,12 +40,17 @@
 
 .lg-dialog {
   StEntry {
-    selection-background-color: #bbbbbb;
+    background-color: transparentize(lighten($osd_bg_color, 5%), 0.4);
-    selected-color: $osd_bg_color;
+    color: $osd_fg_color;
+    border-color: transparentize($osd_fg_color, 0.8);
+    min-height: 22px;
+    selection-background-color: $selected_bg_color;
+    selected-color: $selected_fg_color;
   }
   .shell-link {
-    color: #999999;
+    color: $link_color;
-    &:hover { color: #dddddd; }
+    &:hover { color: lighten($link_color, 10%); }
+    &:active { color: darken($link_color, 10%); }
    }
 }
 
@@ -60,7 +64,7 @@
 }
 
 .lg-obj-inspector-button {
-    border: 1px solid gray;
+    border: 1px solid $osd_borders_color;
     padding: 4px;
     border-radius: $base_border_radius;
     &:hover { border: 1px solid #ffffff; }
@@ -75,7 +79,8 @@
 }
 
 .lg-extension {
-    border: 1px solid $osd_borders_color;
+    border: 1px solid lighten($osd_borders_color, 5%);
+    background-color: lighten($osd_bg_color, 5%);
     border-radius: $base_border_radius;
     padding: 4px;
 }

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

@@ -11,7 +11,7 @@
 
 .message-list-sections {
   spacing: $base_spacing;
-  margin: $base_margin * 4; // to account for scrollbar
+  margin: 0 $base_margin * 4; // to account for scrollbar
 }
 
 .message-list-section,
@@ -19,40 +19,61 @@
   spacing: $base_spacing;
 }
 
-.message-list-section-list {
-  &:ltr {padding:0;}
-  &:rtl {padding:0;}
-}
-
 // do-not-disturb + clear button
 .message-list-controls {
-  margin: $base_margin $base_margin*2;
+  margin: ($base_margin * 2) ($base_margin * 4) 0;
-  spacing: $base_spacing;
+  // NOTE: remove the padding if notification_bubble could remove margin for drop shadow
+  padding: $base_margin;
+  spacing: $base_spacing * 2;
 }
 
 // message bubbles
 .message {
-  @extend %notification_bubble;
+  @include notification_bubble;
 
-  // title
+  // icon container
-  .message-title {
+  .message-icon-bin {
-    color: $fg_color;
+    padding: ($base_padding * 3) 0 ($base_padding * 3) ($base_padding * 2);
-    font-weight: bold;
+
-    margin-bottom:4px;
+    &:rtl {
+      padding: ($base_padding * 3) ($base_padding * 2) ($base_padding * 3) 0;
+    }
+
+    // icon size and color
+    > StIcon {
+      icon-size: $base_icon_size*2; // 32px
+      -st-icon-style: symbolic;
+    }
+
+    // fallback
+    > .fallback-app-icon {
+      width: $base_icon_size;
+      height: $base_icon_size;
+    }
   }
 
   // content
   .message-content {
-    color: darken($fg_color, 10%);
+    padding: $base_padding + $base_margin * 2;
-    padding: $base_padding 0;
+    spacing: 4px;
-    margin:$base_margin * 2;
+  }
-    &:ltr {
+
-      margin-left: $base_margin;
+  // title
-      padding-right:$base_padding;
+  .message-title {
-    }
+    font-weight: bold;
-    &:rtl {
+  }
-      margin-right: $base_margin;
+
-      padding-left:$base_padding;
+  // secondary container in title box
+  .message-secondary-bin {
+    padding: 0 $base_margin * 2;
+
+    // notification time stamp
+    > .event-time {
+      color: transparentize($fg_color, 0.5);
+      @include fontsize($base_font_size - 2);
+      text-align: right;
+      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
+      padding-bottom: 0.13em;
     }
   }
 
@@ -63,48 +84,15 @@
     &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
   }
 
-
+  // body
-  // icon container
+  .message-body {
-  .message-icon-bin {
+    color: darken($fg_color, 10%);
-    padding: $base_padding;
-    margin:$base_padding 0;
-
-    &:rtl {
-      // padding: $base_padding;
-    }
-
-    // icon size and color
-    > StIcon {
-      color: $fg_color;
-      icon-size: $base_icon_size*2; // 32px
-      -st-icon-style: symbolic;
-
-      padding:0;
-      margin:$base_padding;
-    }
-
-    // fallback
-    > .fallback-app-icon {
-      width: $base_icon_size;
-      height: $base_icon_size;
-    }
-  }
-
-  // secondary container in title box
-  .message-secondary-bin {
-    padding: 0;
-
-    // notification time stamp
-    > .event-time {
-      color: transparentize($fg_color, 0.5);
-      @include fontsize($base_font_size - 2);
-      text-align: right;
-      margin: 0 $base_margin * 2;
-      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
-      padding-bottom: $base_padding;
-    }
   }
+}
 
+// URLs in messages
+.url-highlighter {
+  link-color: $link_color;
 }
 
 /* Media Controls */
@@ -125,9 +113,9 @@
 
   &:insensitive { color: darken($fg_color,40%); }
   
-  // fix border-radius for last button on hover
+  // fix border-radius for last button
-  &:last-child:ltr { &:hover {border-radius:  0 $base_border_radius+2 $base_border_radius+2 0;} }
+  &:last-child:ltr { border-radius: 0 $base_border_radius+2 $base_border_radius+2 0; }
-  &:last-child:rtl { &:hover {border-radius: $base_border_radius+2 0 0 $base_border_radius+2;} }
+  &:last-child:rtl { border-radius: $base_border_radius+2 0 0 $base_border_radius+2; }
 }
 
 // album-art
@@ -142,6 +130,5 @@
     border: 1px solid transparent;
     border-radius: $base_border_radius;
     icon-size: $base_icon_size * 2 !important;
-    padding: $base_padding * 2;
   }
 }

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

@@ -1,32 +1,9 @@
-// Links/URLs
-.shell-link {
-  color: $link_color;
-  &:hover { color: lighten($link_color,10%); }
-}
-
-.url-highlighter { link-color: $link_color; }
-
 // Rubberband for select-area screenshots
 .select-area-rubberband {
   background-color: transparentize($selected_bg_color,0.7);
   border: 1px solid $selected_bg_color;
 }
 
-// Pointer accessibility notifications
-.pie-timer {
-  width: 60px;
-  height: 60px;
-  -pie-border-width: 3px;
-  -pie-border-color: $selected_bg_color;
-  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
-}
-
-// Screen zoom/Magnifier
-.magnifier-zoom-region {
-  border: 2px solid $selected_bg_color;
-  &.full-screen { border-width: 0; }
-}
-
 // User icon
 .user-icon {
   background-size: contain;
@@ -35,22 +12,33 @@
   &:hover {
     color: lighten($osd_fg_color,30%);
   }
+
+  & StIcon {
+    background-color: transparentize($osd_fg_color,0.95);
+    border-radius: 99px;
+  }
 }
 
-// Input Source Switcher
+.user-widget.vertical .user-icon {
-.input-source-switcher-symbol {
+  icon-size: $base_icon_size * 6; // 128px
-  font-size: 34pt;
+
-  width: 96px;
+  & StIcon {
-  height: 96px;
+    padding: $base_padding * 3 + 2px; // 20px
+    padding-top: $base_padding * 3; // 18 px
+    padding-bottom: $base_padding * 3 + 4px; // 22px
+    width: $base_icon_size * 5.5; height:  $base_icon_size * 5.5; // 88px;
+  }
 }
 
-// Window cycler highlight
+.user-widget.horizontal .user-icon {
-.cycler-highlight {
+  icon-size: $base_icon_size * 4; // 64px
-  border: 5px solid $selected_bg_color;
+
+  & StIcon {
+    padding: $base_padding * 2 ; // 12px
+    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
+  }
 }
 
-// Text
-.headline { @include fontsize($base_font_size + 1); }
 .lightbox { background-color: black; }
 .flashspot { background-color: white; }
 

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

@@ -7,39 +7,8 @@ $notification_banner_width: 34em;
 .notification-banner {
   min-height: $notification_banner_height;
   width: $notification_banner_width;
-  @include fontsize($base_font_size);
-  margin: $base_margin;
-  border-radius: $modal_radius;
-
-  .message-title { color: $fg_color }
-  .message-content { color: $fg_color; }
-
-  &:hover { background: $bg_color; }
-  &, &:focus, &:active {
-    background-color: $bg_color;
-    .message-title { color: $fg_color }
-    .message-content { color: $fg_color; }
-  }
-
-  // icon
-  .message-icon-bin > StIcon {
-    icon-size: $base_icon_size * 2;
-    color: $fg_color;
-  }
-
-  .notification-icon {
-    padding: 5px;
-  }
-
-  .notification-content {
-    padding: 5px;
-    spacing: 5px;
-  }
-
-  .secondary-icon { icon-size: $base_icon_size; }
 
   .notification-actions {
-    padding-top: 0;
     spacing: 0;
   }
 
@@ -63,8 +32,6 @@ $notification_banner_width: 34em;
   border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
 }
 
-.secondary-icon { icon-size: $base_icon_size; }
-
 // chat bubbles
 .chat-body { spacing: 5px; }
 .chat-response { margin: 5px; }
@@ -87,4 +54,4 @@ $notification_banner_width: 34em;
   font-weight: bold;
   color: lighten($fg_color,18%);
   &:rtl { padding-left: 0; padding-right: 4px; }
-}
+}

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

@@ -2,8 +2,8 @@
 // a.k.a. the panel
 
 $panel_corner_radius: $base_border_radius+1;
-$panel_bg_color: if($variant == 'light', rgba(0,0,0,0.9), #000);
+$panel_bg_color: #000;
-$panel_fg_color: if($variant == 'light', darken($fg_color, 15%), darken($fg_color, 10%));
+$panel_fg_color: #ccc;
 $panel_height: 1.86em;
 
 
@@ -15,8 +15,7 @@ $panel_height: 1.86em;
 
   // transparent panel on lock & login screens
   &.unlock-screen,
-  &.login-screen,
+  &.login-screen {
-  &.lock-screen {
     background-color: transparent;
 
     .panel-corner {
@@ -55,9 +54,6 @@ $panel_height: 1.86em;
     }
 
     &:active, &:overview, &:focus, &:checked {
-      background-color: $panel_bg_color; // Trick due to St limitations. It needs a background to draw a box-shadow
-      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
-
       color: lighten($panel_fg_color, 20%);
     }
 
@@ -77,13 +73,32 @@ $panel_height: 1.86em;
 
     // lock & login screen styles
     .unlock-screen &,
-    .login-screen &,
+    .login-screen & {
-    .lock-screen & {
       color: lighten($fg_color, 10%);
       &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
     }
   }
 
+  .panel-button {
+    &:active, &:overview, &:focus, &:checked {
+      // Trick due to St limitations. It needs a background to draw a box-shadow
+      background-color: rgba(0, 0, 0, 0.01);
+      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
+    }
+  }
+
+  .panel-button.clock-display {
+    // Move highlight from .panel-button to .clock
+    &:active, &:overview, &:focus, &:checked {
+      box-shadow: none;
+
+      .clock {
+        background-color: rgba(0, 0, 0, 0.01);
+        box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
+      }
+    }
+  }
+
   .panel-status-indicators-box,
   .panel-status-menu-box {
     spacing: 2px;

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

@@ -3,8 +3,7 @@
 $popover_arrow_height: 12px;
 
 //.the popover itself
-.popup-menu-boxpointer,
+.popup-menu-boxpointer {
-.candidate-popup-boxpointer {
   -arrow-border-radius: $base_border_radius+4;
   -arrow-background-color: $bg_color;
   -arrow-border-width: 1px;
@@ -83,11 +82,20 @@ $popover_arrow_height: 12px;
 
 // separator
 .popup-separator-menu-item {
-  //-margin-horizontal: 24px;
+  padding: 0;
-  height: 1px; //not really the whole box
+
-  margin: 6px 64px;
+  .popup-separator-menu-item-separator {
-  background-color: lighten($borders_color, 2%);
+    //-margin-horizontal: 24px;
-  border: none !important;
+    height: 1px; //not really the whole box
+    margin: 6px 64px;
+    background-color: lighten($borders_color, 2%);
+    .popup-sub-menu & { //submenu separators
+      margin: 0 64px 0 32px;
+      @if $variant == 'dark' {
+        background-color: lighten($bg_color,10%);
+      }
+    }
+  }
 }
 
 // desktop background menu
@@ -118,4 +126,4 @@ $popover_arrow_height: 12px;
       margin-right: $base_icon_size;
     }
   }
-}
+}

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

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

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

@@ -3,19 +3,16 @@
 // search overview container
 #searchResultsContent {
   max-width: 1024px;
+  spacing: $base_margin * 2;
 }
 
 // search results sections "the boxes"
 .search-section {
+  // This should be equal to #searchResultsContent spacing
   spacing: $base_margin * 2;
-  padding:0 !important;
+
-  margin:0 !important;
-  background-color:transparent;
-  box-shadow:none;
-  border:none;
   // separator
   .search-section-separator { 
-    // margin-top: $base_padding * 2;
     // height: 1px;
     // background-color: $osd_outer_borders_color;
     height: 0;
@@ -32,8 +29,24 @@
   text-shadow: 0 1px if($variant == 'light', rgba(255,255,255,0.2), rgba(0,0,0,0.2));
   color: $osd_fg_color;
   padding: $base_padding * 3;
-  margin: $base_margin 0;
+  // This is the space between the provider icon and the results container
-  spacing: 0;
+  spacing: $base_margin * 2;
+}
+
+%search-section-content-item {
+  @extend %icon_tile;
+
+  &:focus,
+  &:hover,
+  &:selected {
+    background-color: transparentize($osd_fg_color, .9);
+    transition-duration: 200ms;
+  }
+
+  &:active,
+  &:checked {
+    background-color: transparentize(darken($osd_bg_color, 10%), .1);
+  }
 }
 
 // "no results" text
@@ -43,54 +56,12 @@
 
 // Search results with icons
 .grid-search-result {
-  > .overview-icon {
+  @extend %app-well-app;
-    @extend %icon_tile;
-    color: $osd_fg_color;
-  }
-
-  > .overview-icon.overview-icon-with-label {
-    padding: 10px 8px 5px 8px;
-    spacing: $base_spacing;
-  }
-
-  &:hover,
-  &:focus,
-  &:selected {
-    .overview-icon {
-      background-color: transparentize($osd_bg_color,0.8);
-      color: $osd_fg_color;
-    }
-  }
-
-  &:drop .overview-icon {
-    background-color: transparentize($selected_bg_color,.15);
-  }
-
-  &:active .overview-icon,
-  &:checked .overview-icon {
-    background-color: transparentize(darken($osd_bg_color,10%), 0.5);
-  }
 }
 
 // search result provider
 .search-provider-icon {
-  @extend %icon_tile;
+  @extend %search-section-content-item;
-
-  padding: $base_padding;
-  spacing: 0;
-  margin-right: $base_margin * 2;
-
-  &:focus,
-  &:selected,
-  &:hover {
-    background-color: transparentize($osd_fg_color,.9);
-    transition-duration: 200ms;
-  }
-
-  &:active,
-  &:checked {
-    background-color: transparentize(darken($osd_bg_color,10%),.1);
-  }
 
   // content
   .list-search-provider-content {
@@ -113,34 +84,16 @@
 
 // search result listitem
 .list-search-result {
-  @extend %icon_tile;
+  @extend %search-section-content-item;
-  spacing: 0;
-  padding: $base_padding;
-  color: $osd_fg_color;
-
-  border-radius: $base_border_radius + 2px !important;
-
-  &:focus,
-  &:selected,
-  &:hover {
-    background-color: transparentize($osd_fg_color,.9);
-    transition-duration: 200ms;
-  }
-  &:active,
-  &:checked {
-    background-color: transparentize(darken($osd_bg_color,10%),.1);
-  }
 
   // content
   .list-search-result-content {
-    spacing: 0;
+    spacing: $base_padding;
   }
 
-  // list item title
+  // list item title (with leading icon)
   .list-search-result-title {
-    color: $osd_fg_color;
     spacing: $base_spacing * 2;
-    padding-right: $base_padding;
     // font-weight: bold;
   }
 

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

@@ -15,13 +15,11 @@
     border: 1px solid transparent;
 
     &:outlined {
-      border: 1px solid darken($borders_color,5%);
+      background-color: transparentize($osd_fg_color, 0.7);
-      background-color: transparentize($osd_fg_color, 0.9);
-      box-shadow: inset 0 2px 2px 0 rgba(0,0,0,0.4);
     }
 
     &:selected {
-      background-color: transparentize($osd_fg_color, 0.9);
+      background-color: transparentize($osd_fg_color, 0.7);
       color: $osd_fg_color;
     }
   }
@@ -52,4 +50,16 @@
   &:highlighted {
     color: $fg_color;
   }
-}
+}
+
+// Input Source Switcher
+.input-source-switcher-symbol {
+  font-size: 34pt;
+  width: 96px;
+  height: 96px;
+}
+
+// Window cycler highlight
+.cycler-highlight {
+  border: 5px solid $selected_bg_color;
+}

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

@@ -1,7 +1,7 @@
 /* Window Picker */
 
-$window_picker_spacing: $base_spacing * 8; // 48px
+$window_picker_spacing: $base_spacing * 2; // 16px
-$window_picker_padding: $base_padding * 10; // 60px
+$window_picker_padding: $base_padding * 2; // 16px
 
 $window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);
 
@@ -63,4 +63,4 @@ $window_close_button_padding: 3px;
   &:active {
     background-color: darken($selected_bg_color, 5%);
   }
-}
+}

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

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

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

@@ -0,0 +1,32 @@
+/* Workspace pager */
+
+// thumbnails in overview
+.workspace-thumbnails {
+  @extend %overview_panel;
+  visible-width: 32px; //amount visible before hover
+  spacing: $base_spacing;
+  padding: $base_padding;
+
+  border-radius: $modal_radius 0 0 $modal_radius;
+  border-right-width: 0;
+
+  &:rtl {
+    border-radius: 0 $modal_radius $modal_radius 0;
+    border-left-width: 0;
+  }
+
+  // drag and drop indicator
+  .placeholder {
+    background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
+    background-size: contain;
+    height: 24px;
+  }
+}
+
+// selected indicator
+.workspace-thumbnail-indicator {
+  border: 3px solid $selected_bg_color;
+  border-radius: 3px;
+  padding: 0px;
+  // background-color: transparentize($selected_bg_color, 0.9);
+}

data/theme/key-enter.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="keyboard-key" width="24" height="24">
-    <path overflow="visible" font-weight="400" style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" d="M10 23H8.5c-.398 0-.796-.14-1.079-.422L.345 15.5l7.078-7.078C7.704 8.14 8.102 8 8.5 8H10v1.5c0 .398-.14.796-.422 1.079L4.657 15.5l4.921 4.922c.282.282.422.68.422 1.078z" color="#000" font-family="Bitstream Vera Sans" fill="#fff"/>
-    <path overflow="visible" d="M22 1.5v9a5 5 0 01-5 5H4" style="marker:none" color="#000" fill="none" stroke="#fff" stroke-width="3"/>
-</svg>

data/theme/key-hide.svg

@@ -1,3 +0,0 @@
-<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <path d="M12 20.875L.562 9.438C.171 9.046 0 8.51 0 8V6h2c.511 0 1.046.17 1.438.563L12 15.125l8.563-8.562C20.953 6.17 21.488 6 22 6h2v2c0 .511-.17 1.046-.563 1.438z" fill="#e5e5e5"/>
-</svg>

data/theme/key-layout.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="keyboard-key" width="24" height="24">
-    <path d="M4.5 2v21" fill="#e5e5e5" fill-rule="evenodd" stroke="#e5e5e5" stroke-width="3"/>
-    <path d="M4 12h6l2 4h8V6h-6l-2-4H4z" fill="none" stroke="#e5e5e5" stroke-width="2" stroke-linejoin="round"/>
-    <path d="M4 12h6l2 4h8V6h-6l-2-4H4z" fill="#e5e5e5" fill-rule="evenodd"/>
-</svg>

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

@@ -1,3 +0,0 @@
-<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <path style="marker:none" d="M12 0L2 12h6v6h8v-6h6zM8 21v3h8v-3z" color="#000" overflow="visible" fill="#3584e4"/>
-</svg>

data/theme/key-shift-uppercase.svg

@@ -1,3 +0,0 @@
-<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <path d="M8 22v-8H2L12 2l10 12h-6v8z" style="marker:none" color="#000" overflow="visible" fill="#3584e4"/>
-</svg>

data/theme/key-shift.svg

@@ -1,3 +0,0 @@
-<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <path d="M8 22v-8H2L12 2l10 12h-6v8z" style="marker:none" color="#000" overflow="visible" fill="#bebebe"/>
-</svg>

data/theme/keyboard-caps-lock-filled-symbolic.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+    <g fill="#2e3436">
+        <path d="M6 8H2.937l5.126-5.781L13.186 8H10v2H6z" style="marker:none" color="#000" overflow="visible"/>
+        <path d="M6 11h4v2H6z" style="marker:none"/>
+    </g>
+</svg>

data/theme/keyboard-enter-symbolic.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+    <g font-weight="400" fill="#2e3436">
+        <path d="M11.994 3v4.004c.002.666-.183.72-.445.852-.262.13-.555.144-.555.144H4v2h6.994s.71.014 1.45-.355c.738-.37 1.552-1.313 1.55-2.645V3z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1;marker:none" color="#000" font-family="sans-serif" overflow="visible"/>
+        <path d="M6 12v-1c0-.257-.13-.528-.313-.719l-1.28-1.303 1.28-1.26C5.87 7.529 6 7.258 6 7V6H5c-.31 0-.552.09-.75.281L1.594 8.978l2.656 2.74c.198.192.44.282.75.282z" style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" color="#bebebe" font-family="Bitstream Vera Sans" overflow="visible"/>
+    </g>
+</svg>

data/theme/keyboard-hide-symbolic.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+    <g color="#000" fill="#2e3436">
+        <path d="M4.707 5.293L3.293 6.707 8 11.414l4.707-4.707-1.414-1.414L8 8.586z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1;marker:none" font-weight="400" font-family="sans-serif" overflow="visible"/>
+        <path d="M12 6V5h1v1zM3 6V5h1v1z" style="marker:none" overflow="visible"/>
+        <path d="M3 6c0-.554.446-1 1-1s1 .446 1 1-.446 1-1 1-1-.446-1-1zM11 6c0-.554.446-1 1-1s1 .446 1 1-.446 1-1 1-1-.446-1-1z" style="marker:none" overflow="visible"/>
+    </g>
+</svg>

data/theme/keyboard-layout-filled-symbolic.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+    <g fill="#2e3436" fill-rule="evenodd">
+        <path d="M2 1v14h2V1z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" color="#000" font-weight="400" font-family="sans-serif" overflow="visible"/>
+        <path d="M3 1a1 1 0 00-1 1v6a1 1 0 001 1h3.383l.722 1.447A1 1 0 008 11h5a1 1 0 001-1V4a1 1 0 00-1-1H9.617l-.722-1.447A1 1 0 008 1zm1 2h3.383l.722 1.447A1 1 0 009 5h3v4H8.617l-.722-1.447A1 1 0 007 7H4z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" color="#000" font-weight="400" font-family="sans-serif" overflow="visible"/>
+        <path d="M3 8h4l1 2h5V4H9L8 2H3z"/>
+    </g>
+</svg>

data/theme/keyboard-shift-filled-symbolic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+    <path d="M6 13V9H2.937l5.126-5.781L13.186 9H10v4z" style="marker:none" color="#000" overflow="visible" fill="#2e3436"/>
+</svg>

data/theme/meson.build

@@ -6,8 +6,9 @@ theme_sources = files([
   'gnome-shell-sass/_drawing.scss',
   'gnome-shell-sass/_high-contrast-colors.scss',
   'gnome-shell-sass/_widgets.scss',
+  'gnome-shell-sass/widgets/_a11y.scss',
   'gnome-shell-sass/widgets/_app-grid.scss',
-  'gnome-shell-sass/widgets/_app-switcher.scss',
+  'gnome-shell-sass/widgets/_base.scss',
   'gnome-shell-sass/widgets/_buttons.scss',
   'gnome-shell-sass/widgets/_calendar.scss',
   'gnome-shell-sass/widgets/_check-box.scss',
@@ -33,10 +34,12 @@ theme_sources = files([
   'gnome-shell-sass/widgets/_search-entry.scss',
   'gnome-shell-sass/widgets/_search-results.scss',
   'gnome-shell-sass/widgets/_slider.scss',
+  'gnome-shell-sass/widgets/_switcher-popup.scss',
   'gnome-shell-sass/widgets/_switches.scss',
   'gnome-shell-sass/widgets/_tiled-previews.scss',
   'gnome-shell-sass/widgets/_window-picker.scss',
-  'gnome-shell-sass/widgets/_workspace-switcher.scss'
+  'gnome-shell-sass/widgets/_workspace-switcher.scss',
+  'gnome-shell-sass/widgets/_workspace-thumbnails.scss'
 ])
 
 styles = [

data/theme/toggle-off-dark.svg

@@ -1 +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>
+<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" stroke="#151515"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#282828"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none" fill="url(#b)"/></g></svg>

data/update-osk-layouts.sh

@@ -1,10 +1,9 @@
 #!/bin/env bash
 
 CLDR_LAYOUTS_TARBALL="http://www.unicode.org/Public/cldr/latest/keyboards.zip"
-CLDR2JSON_GIT="git://repo.or.cz/cldr2json.git"
 
 WORKDIR=".osk-layout-workbench"
-CLDR2JSON="$WORKDIR/cldr2json/cldr2json.py"
+CLDR2JSON="cldr2json/cldr2json.py"
 SRCDIR="$WORKDIR/keyboards/android"
 DESTDIR="osk-layouts"
 GRESOURCE_FILE="gnome-shell-osk-layouts.gresource.xml"
@@ -20,7 +19,6 @@ mkdir -p "osk-layouts"
 # Download stuff on the work dir
 pushd $WORKDIR
 gio copy $CLDR_LAYOUTS_TARBALL .
-git clone $CLDR2JSON_GIT
 unzip keyboards.zip
 popd
 

js/dbusServices/dbus-service.in

@@ -0,0 +1,5 @@
+imports.package.start({
+    name: '@PACKAGE_NAME@',
+    prefix: '@prefix@',
+    libdir: '@libdir@',
+});

js/dbusServices/dbus-service.service.in

@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=@service@
+Exec=@gjs@ @pkgdatadir@/@service@

js/dbusServices/dbusService.js

@@ -0,0 +1,177 @@
+/* exported DBusService, ServiceImplementation */
+
+const { Gio, GLib } = imports.gi;
+
+const Signals = imports.signals;
+
+const IDLE_SHUTDOWN_TIME = 2; // s
+
+var ServiceImplementation = class {
+    constructor(info, objectPath) {
+        this._objectPath = objectPath;
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(info, this);
+
+        this._injectTracking('return_dbus_error');
+        this._injectTracking('return_error_literal');
+        this._injectTracking('return_gerror');
+        this._injectTracking('return_value');
+        this._injectTracking('return_value_with_unix_fd_list');
+
+        this._senders = new Map();
+        this._holdCount = 0;
+
+        this._hasSignals = this._dbusImpl.get_info().signals.length > 0;
+        this._shutdownTimeoutId = 0;
+
+        // subclasses may override this to disable automatic shutdown
+        this._autoShutdown = true;
+    }
+
+    // subclasses may override this to own additional names
+    register() {
+    }
+
+    export() {
+        this._dbusImpl.export(Gio.DBus.session, this._objectPath);
+    }
+
+    unexport() {
+        this._dbusImpl.unexport();
+    }
+
+    hold() {
+        this._holdCount++;
+    }
+
+    release() {
+        if (this._holdCount === 0) {
+            logError(new Error('Unmatched call to release()'));
+            return;
+        }
+
+        this._holdCount--;
+
+        if (this._holdCount === 0)
+            this._queueShutdownCheck();
+    }
+
+    /**
+     * _handleError:
+     * @param {Gio.DBusMethodInvocation}
+     * @param {Error}
+     *
+     * Complete @invocation with an appropriate error if @error is set;
+     * useful for implementing early returns from method implementations.
+     *
+     * @returns {bool} - true if @invocation was completed
+     */
+
+    _handleError(invocation, error) {
+        if (error === null)
+            return false;
+
+        if (error instanceof GLib.Error) {
+            invocation.return_gerror(error);
+        } else {
+            let name = error.name;
+            if (!name.includes('.')) // likely a normal JS error
+                name = `org.gnome.gjs.JSError.${name}`;
+            invocation.return_dbus_error(name, error.message);
+        }
+
+        return true;
+    }
+
+    _maybeShutdown() {
+        if (!this._autoShutdown)
+            return;
+
+        if (this._holdCount > 0)
+            return;
+
+        this.emit('shutdown');
+    }
+
+    _queueShutdownCheck() {
+        if (this._shutdownTimeoutId)
+            GLib.source_remove(this._shutdownTimeoutId);
+
+        this._shutdownTimeoutId = GLib.timeout_add_seconds(
+            GLib.PRIORITY_DEFAULT, IDLE_SHUTDOWN_TIME,
+            () => {
+                this._shutdownTimeoutId = 0;
+                this._maybeShutdown();
+
+                return GLib.SOURCE_REMOVE;
+            });
+    }
+
+    _trackSender(sender) {
+        if (this._senders.has(sender))
+            return;
+
+        this.hold();
+        this._senders.set(sender,
+            this._dbusImpl.get_connection().watch_name(
+                sender,
+                Gio.BusNameWatcherFlags.NONE,
+                null,
+                () => this._untrackSender(sender)));
+    }
+
+    _untrackSender(sender) {
+        const id = this._senders.get(sender);
+
+        if (id)
+            this._dbusImpl.get_connection().unwatch_name(id);
+
+        if (this._senders.delete(sender))
+            this.release();
+    }
+
+    _injectTracking(methodName) {
+        const { prototype } = Gio.DBusMethodInvocation;
+        const origMethod = prototype[methodName];
+        const that = this;
+
+        prototype[methodName] = function (...args) {
+            origMethod.apply(this, args);
+
+            if (that._hasSignals)
+                that._trackSender(this.get_sender());
+
+            that._queueShutdownCheck();
+        };
+    }
+};
+Signals.addSignalMethods(ServiceImplementation.prototype);
+
+var DBusService = class {
+    constructor(name, service) {
+        this._name = name;
+        this._service = service;
+        this._loop = new GLib.MainLoop(null, false);
+
+        this._service.connect('shutdown', () => this._loop.quit());
+    }
+
+    run() {
+        // Bail out when not running under gnome-shell
+        Gio.DBus.watch_name(Gio.BusType.SESSION,
+            'org.gnome.Shell',
+            Gio.BusNameWatcherFlags.NONE,
+            null,
+            () => this._loop.quit());
+
+        this._service.register();
+
+        Gio.DBus.own_name(Gio.BusType.SESSION,
+            this._name,
+            Gio.BusNameOwnerFlags.REPLACE,
+            () => this._service.export(),
+            null,
+            () => this._loop.quit());
+
+        this._loop.run();
+    }
+};

js/dbusServices/extensions/css/application.css

@@ -0,0 +1,2 @@
+.expander-frame > * { border-top-width: 0; }
+.expander-toolbar { border: 0 solid @borders; border-top-width: 1px; }

js/dbusServices/extensions/extensionsService.js

@@ -0,0 +1,274 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported ExtensionsService */
+
+const { Gdk, Gio, GLib, GObject, Gtk, Shew } = imports.gi;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+
+const { loadInterfaceXML } = imports.misc.fileUtils;
+const { ServiceImplementation } = imports.dbusService;
+
+const ExtensionsIface = loadInterfaceXML('org.gnome.Shell.Extensions');
+const ExtensionsProxy = Gio.DBusProxy.makeProxyWrapper(ExtensionsIface);
+
+var ExtensionsService = class extends ServiceImplementation {
+    constructor() {
+        super(ExtensionsIface, '/org/gnome/Shell/Extensions');
+
+        this._proxy = new ExtensionsProxy(Gio.DBus.session,
+            'org.gnome.Shell', '/org/gnome/Shell');
+
+        this._proxy.connectSignal('ExtensionStateChanged',
+            (proxy, sender, params) => {
+                this._dbusImpl.emit_signal('ExtensionStateChanged',
+                    new GLib.Variant('(sa{sv})', params));
+            });
+
+        this._proxy.connect('g-properties-changed', () => {
+            this._dbusImpl.emit_property_changed('UserExtensionsEnabled',
+                new GLib.Variant('b', this._proxy.UserExtensionsEnabled));
+        });
+    }
+
+    get ShellVersion() {
+        return this._proxy.ShellVersion;
+    }
+
+    get UserExtensionsEnabled() {
+        return this._proxy.UserExtensionsEnabled;
+    }
+
+    set UserExtensionsEnabled(enable) {
+        this._proxy.UserExtensionsEnabled = enable;
+    }
+
+    ListExtensionsAsync(params, invocation) {
+        this._proxy.ListExtensionsRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(a{sa{sv}})', res));
+        });
+    }
+
+    GetExtensionInfoAsync(params, invocation) {
+        this._proxy.GetExtensionInfoRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(a{sv})', res));
+        });
+    }
+
+    GetExtensionErrorsAsync(params, invocation) {
+        this._proxy.GetExtensionErrorsRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(as)', res));
+        });
+    }
+
+    InstallRemoteExtensionAsync(params, invocation) {
+        this._proxy.InstallRemoteExtensionRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(s)', res));
+        });
+    }
+
+    UninstallExtensionAsync(params, invocation) {
+        this._proxy.UninstallExtensionRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(b)', res));
+        });
+    }
+
+    EnableExtensionAsync(params, invocation) {
+        this._proxy.EnableExtensionRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(b)', res));
+        });
+    }
+
+    DisableExtensionAsync(params, invocation) {
+        this._proxy.DisableExtensionRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(b)', res));
+        });
+    }
+
+    LaunchExtensionPrefsAsync([uuid], invocation) {
+        this.OpenExtensionPrefsAsync([uuid, '', {}], invocation);
+    }
+
+    OpenExtensionPrefsAsync(params, invocation) {
+        const [uuid, parentWindow, options] = params;
+
+        this._proxy.GetExtensionInfoRemote(uuid, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            const [serialized] = res;
+            const extension = ExtensionUtils.deserializeExtension(serialized);
+
+            const window = new ExtensionPrefsDialog(extension);
+            window.realize();
+
+            let externalWindow = null;
+
+            if (parentWindow)
+                externalWindow = Shew.ExternalWindow.new_from_handle(parentWindow);
+
+            if (externalWindow)
+                externalWindow.set_parent_of(window.window);
+
+            if (options.modal)
+                window.modal = options.modal.get_boolean();
+
+            window.connect('destroy', () => this.release());
+            this.hold();
+
+            window.show();
+
+            invocation.return_value(null);
+        });
+    }
+
+    CheckForUpdatesAsync(params, invocation) {
+        this._proxy.CheckForUpdatesRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(null);
+        });
+    }
+};
+
+var ExtensionPrefsDialog = GObject.registerClass({
+    GTypeName: 'ExtensionPrefsDialog',
+    Template: 'resource:///org/gnome/Shell/Extensions/ui/extension-prefs-dialog.ui',
+    InternalChildren: [
+        'headerBar',
+        'stack',
+        'expander',
+        'expanderArrow',
+        'revealer',
+        'errorView',
+    ],
+}, class ExtensionPrefsDialog extends Gtk.Window {
+    _init(extension) {
+        super._init();
+
+        this._uuid = extension.uuid;
+        this._url = extension.metadata.url || '';
+
+        this._headerBar.title = extension.metadata.name;
+
+        this._actionGroup = new Gio.SimpleActionGroup();
+        this.insert_action_group('win', this._actionGroup);
+
+        this._initActions();
+        this._addCustomStylesheet();
+
+        this._gesture = new Gtk.GestureMultiPress({
+            widget: this._expander,
+            button: 0,
+            exclusive: true,
+        });
+
+        this._gesture.connect('released', (gesture, nPress) => {
+            if (nPress === 1)
+                this._revealer.reveal_child = !this._revealer.reveal_child;
+        });
+
+        this._revealer.connect('notify::reveal-child', () => {
+            this._expanderArrow.icon_name = this._revealer.reveal_child
+                ? 'pan-down-symbolic'
+                : 'pan-end-symbolic';
+        });
+
+        try {
+            ExtensionUtils.installImporter(extension);
+
+            // give extension prefs access to their own extension object
+            ExtensionUtils.getCurrentExtension = () => extension;
+
+            const prefsModule = extension.imports.prefs;
+            prefsModule.init(extension.metadata);
+
+            const widget = prefsModule.buildPrefsWidget();
+            this._stack.add(widget);
+            this._stack.visible_child = widget;
+        } catch (e) {
+            this._setError(e);
+        }
+    }
+
+    _setError(exc) {
+        this._errorView.buffer.text = `${exc}\n\nStack trace:\n`;
+        // Indent stack trace.
+        this._errorView.buffer.text +=
+            exc.stack.split('\n').map(line => `  ${line}`).join('\n');
+
+        // markdown for pasting in gitlab issues
+        let lines = [
+            `The settings of extension ${this._uuid} had an error:`,
+            '```',
+            `${exc}`,
+            '```',
+            '',
+            'Stack trace:',
+            '```',
+            exc.stack.replace(/\n$/, ''), // stack without trailing newline
+            '```',
+            '',
+        ];
+        this._errorMarkdown = lines.join('\n');
+        this._actionGroup.lookup('copy-error').enabled = true;
+    }
+
+    _initActions() {
+        let action;
+
+        action = new Gio.SimpleAction({
+            name: 'copy-error',
+            enabled: false,
+        });
+        action.connect('activate', () => {
+            const clipboard = Gtk.Clipboard.get_default(this.get_display());
+            clipboard.set_text(this._errorMarkdown, -1);
+        });
+        this._actionGroup.add_action(action);
+
+        action = new Gio.SimpleAction({
+            name: 'show-url',
+            enabled: this._url !== '',
+        });
+        action.connect('activate', () => {
+            Gio.AppInfo.launch_default_for_uri(this._url,
+                this.get_display().get_app_launch_context());
+        });
+        this._actionGroup.add_action(action);
+    }
+
+    _addCustomStylesheet() {
+        let provider = new Gtk.CssProvider();
+        let uri = 'resource:///org/gnome/Shell/Extensions/css/application.css';
+        try {
+            provider.load_from_file(Gio.File.new_for_uri(uri));
+        } catch (e) {
+            logError(e, 'Failed to add application style');
+        }
+        Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),
+            provider,
+            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+});

js/dbusServices/extensions/main.js

@@ -0,0 +1,20 @@
+/* exported main */
+
+imports.gi.versions.Gdk = '3.0';
+imports.gi.versions.Gtk = '3.0';
+
+const { Gtk } = imports.gi;
+const pkg = imports.package;
+
+const { DBusService } = imports.dbusService;
+const { ExtensionsService } = imports.extensionsService;
+
+function main() {
+    Gtk.init(null);
+    pkg.initFormat();
+
+    const service = new DBusService(
+        'org.gnome.Shell.Extensions',
+        new ExtensionsService());
+    service.run();
+}

js/dbusServices/extensions/ui/extension-prefs-dialog.ui

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <template class="ExtensionPrefsDialog" parent="GtkWindow">
+    <property name="default_width">600</property>
+    <property name="default_height">400</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerBar">
+        <property name="visible">True</property>
+        <property name="show_close_button">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkStack" id="stack">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="visible">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="propagate_natural_height">True</property>
+            <child>
+              <object class="GtkViewport">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="margin">100</property>
+                    <property name="margin_bottom">60</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Something’s gone wrong</property>
+                        <attributes>
+                          <attribute name="scale" value="1.44"/> <!-- x-large -->
+                        </attributes>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">We’re very sorry, but there’s been a problem: the settings for this extension can’t be displayed. We recommend that you report the issue to the extension authors.</property>
+                        <property name="justify">center</property>
+                        <property name="wrap">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="margin_top">12</property>
+                        <child>
+                          <object class="GtkFrame" id="expander">
+                            <property name="visible">True</property>
+                            <property name="hexpand">True</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkEventBox">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="visible">True</property>
+                                    <property name="margin">12</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkImage" id="expanderArrow">
+                                        <property name="visible">True</property>
+                                        <property name="icon_name">pan-end-symbolic</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Technical Details</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkRevealer" id="revealer">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkFrame">
+                                <property name="visible">True</property>
+                                <property name="shadow_type">in</property>
+                                <style>
+                                  <class name="expander-frame"/>
+                                </style>
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="visible">True</property>
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkTextView" id="errorView">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="monospace">True</property>
+                                        <property name="editable">False</property>
+                                        <property name="wrap_mode">word</property>
+                                        <property name="left_margin">12</property>
+                                        <property name="right_margin">12</property>
+                                        <property name="top_margin">12</property>
+                                        <property name="bottom_margin">12</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolbar">
+                                        <property name="visible">True</property>
+                                        <style>
+                                          <class name="expander-toolbar"/>
+                                        </style>
+                                        <child>
+                                          <object class="GtkToolItem">
+                                            <property name="visible">True</property>
+                                            <child>
+                                              <object class="GtkButton">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="action_name">win.copy-error</property>
+                                                <style>
+                                                  <class name="flat"/>
+                                                  <class name="image-button"/>
+                                                </style>
+                                                <child>
+                                                  <object class="GtkImage">
+                                                    <property name="visible">True</property>
+                                                    <property name="icon_name">edit-copy-symbolic</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSeparatorToolItem">
+                                            <property name="visible">True</property>
+                                            <property name="draw">False</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkToolItem">
+                                            <property name="visible">True</property>
+                                            <child>
+                                              <object class="GtkButton" id="homeButton">
+                                                <property name="visible"
+                                                          bind-source="homeButton"
+                                                          bind-property="sensitive"
+                                                          bind-flags="sync-create"/>
+                                                <property name="label" translatable="yes">Homepage</property>
+                                                <property name="tooltip_text" translatable="yes">Visit extension homepage</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="no_show_all">True</property>
+                                                <property name="action_name">win.show-url</property>
+                                                <style>
+                                                  <class name="flat"/>
+                                                </style>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>

js/dbusServices/meson.build

@@ -0,0 +1,42 @@
+launcherconf = configuration_data()
+launcherconf.set('PACKAGE_NAME', meson.project_name())
+launcherconf.set('prefix', prefix)
+launcherconf.set('libdir', libdir)
+
+dbus_services = {
+  'org.gnome.Shell.Extensions': 'extensions',
+  'org.gnome.Shell.Notifications': 'notifications',
+}
+
+config_dir = '@0@/..'.format(meson.current_build_dir())
+
+foreach service, dir : dbus_services
+  configure_file(
+    input: 'dbus-service.in',
+    output: service,
+    configuration: launcherconf,
+    install_dir: pkgdatadir,
+  )
+
+  serviceconf = configuration_data()
+  serviceconf.set('service', service)
+  serviceconf.set('gjs', gjs.path())
+  serviceconf.set('pkgdatadir', pkgdatadir)
+
+  configure_file(
+    input: 'dbus-service.service.in',
+    output: service + '.service',
+    configuration: serviceconf,
+    install_dir: servicedir
+  )
+
+  gnome.compile_resources(
+    service + '.src',
+    service + '.src.gresource.xml',
+    dependencies: [config_js],
+    source_dir: ['.', '..', dir, config_dir],
+    gresource_bundle: true,
+    install: true,
+    install_dir: pkgdatadir
+  )
+endforeach

js/dbusServices/notifications/main.js

@@ -0,0 +1,11 @@
+/* exported main */
+
+const { DBusService } = imports.dbusService;
+const { NotificationDaemon } = imports.notificationDaemon;
+
+function main() {
+    const service = new DBusService(
+        'org.gnome.Shell.Notifications',
+        new NotificationDaemon());
+    service.run();
+}

js/dbusServices/notifications/notificationDaemon.js

@@ -0,0 +1,80 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported NotificationDaemon */
+
+const { Gio, GLib } = imports.gi;
+
+const { loadInterfaceXML } = imports.misc.fileUtils;
+const { ServiceImplementation } = imports.dbusService;
+
+const NotificationsIface = loadInterfaceXML('org.freedesktop.Notifications');
+const NotificationsProxy = Gio.DBusProxy.makeProxyWrapper(NotificationsIface);
+
+var NotificationDaemon = class extends ServiceImplementation {
+    constructor() {
+        super(NotificationsIface, '/org/freedesktop/Notifications');
+
+        this._autoShutdown = false;
+
+        this._proxy = new NotificationsProxy(Gio.DBus.session,
+            'org.gnome.Shell',
+            '/org/freedesktop/Notifications',
+            (proxy, error) => {
+                if (error)
+                    log(error.message);
+            });
+
+        this._proxy.connectSignal('ActionInvoked',
+            (proxy, sender, params) => {
+                this._dbusImpl.emit_signal('ActionInvoked',
+                    new GLib.Variant('(us)', params));
+            });
+        this._proxy.connectSignal('NotificationClosed',
+            (proxy, sender, params) => {
+                this._dbusImpl.emit_signal('NotificationClosed',
+                    new GLib.Variant('(uu)', params));
+            });
+    }
+
+    register() {
+        Gio.DBus.session.own_name(
+            'org.freedesktop.Notifications',
+            Gio.BusNameOwnerFlags.REPLACE,
+            null, null);
+    }
+
+    NotifyAsync(params, invocation) {
+        this._proxy.NotifyRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(u)', res));
+        });
+    }
+
+    CloseNotificationAsync(params, invocation) {
+        this._proxy.CloseNotificationRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(null);
+        });
+    }
+
+    GetCapabilitiesAsync(params, invocation) {
+        this._proxy.GetCapabilitiesRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(as)', res));
+        });
+    }
+
+    GetServerInformationAsync(params, invocation) {
+        this._proxy.GetServerInformationRemote(...params, (res, error) => {
+            if (this._handleError(invocation, error))
+                return;
+
+            invocation.return_value(new GLib.Variant('(ssss)', res));
+        });
+    }
+};

js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Shell/Extensions/js">
+    <file>main.js</file>
+    <file>extensionsService.js</file>
+    <file>dbusService.js</file>
+
+    <file>misc/config.js</file>
+    <file>misc/extensionUtils.js</file>
+    <file>misc/fileUtils.js</file>
+    <file>misc/params.js</file>
+  </gresource>
+
+  <gresource prefix="/org/gnome/Shell/Extensions">
+    <file>css/application.css</file>
+    <file>ui/extension-prefs-dialog.ui</file>
+  </gresource>
+</gresources>

js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Shell/Notifications/js">
+    <file>main.js</file>
+    <file>notificationDaemon.js</file>
+    <file>dbusService.js</file>
+
+    <file>misc/config.js</file>
+    <file>misc/fileUtils.js</file>
+  </gresource>
+</gresources>

js/gdm/authPrompt.js

@@ -47,12 +47,15 @@ var AuthPrompt = GObject.registerClass({
         super._init({
             style_class: 'login-dialog-prompt-layout',
             vertical: true,
+            x_expand: true,
+            x_align: Clutter.ActorAlign.CENTER,
         });
 
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
 
         this._gdmClient = gdmClient;
         this._mode = mode;
+        this._defaultButtonWellActor = null;
 
         let reauthenticationOnly;
         if (this._mode == AuthPromptMode.UNLOCK_ONLY)
@@ -71,15 +74,6 @@ var AuthPrompt = GObject.registerClass({
         this._userVerifier.connect('ovirt-user-authenticated', this._onOVirtUserAuthenticated.bind(this));
         this.smartcardDetected = this._userVerifier.smartcardDetected;
 
-        this.connect('next', () => {
-            this.updateSensitivity(false);
-            this.startSpinning();
-            if (this._queryingService)
-                this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-            else
-                this._preemptiveAnswer = this._entry.text;
-        });
-
         this.connect('destroy', this._onDestroy.bind(this));
 
         this._userWell = new St.Bin({
@@ -87,19 +81,75 @@ var AuthPrompt = GObject.registerClass({
             y_expand: true,
         });
         this.add_child(this._userWell);
-        this._label = new St.Label({
-            style_class: 'login-dialog-prompt-label',
-            x_expand: false,
-            y_expand: true,
-        });
 
-        this.add_child(this._label);
+        this._hasCancelButton = this._mode === AuthPromptMode.UNLOCK_OR_LOG_IN;
+
+        this._initEntryRow();
+
+        let capsLockPlaceholder = new St.Label();
+        this.add_child(capsLockPlaceholder);
+
+        this._capsLockWarningLabel = new ShellEntry.CapsLockWarning({
+            x_expand: true,
+            x_align: Clutter.ActorAlign.CENTER,
+        });
+        this.add_child(this._capsLockWarningLabel);
+
+        this._capsLockWarningLabel.bind_property('visible',
+            capsLockPlaceholder, 'visible',
+            GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.INVERT_BOOLEAN);
+
+        this._message = new St.Label({
+            opacity: 0,
+            styleClass: 'login-dialog-message',
+            y_expand: true,
+            x_expand: true,
+            y_align: Clutter.ActorAlign.START,
+            x_align: Clutter.ActorAlign.CENTER,
+        });
+        this._message.clutter_text.line_wrap = true;
+        this._message.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this.add_child(this._message);
+    }
+
+    _onDestroy() {
+        this._userVerifier.destroy();
+        this._userVerifier = null;
+    }
+
+    vfunc_key_press_event(keyPressEvent) {
+        if (keyPressEvent.keyval == Clutter.KEY_Escape)
+            this.cancel();
+        return super.vfunc_key_press_event(keyPressEvent);
+    }
+
+    _initEntryRow() {
+        this._mainBox = new St.BoxLayout({
+            style_class: 'login-dialog-button-box',
+            vertical: false,
+        });
+        this.add_child(this._mainBox);
+
+        this.cancelButton = new St.Button({
+            style_class: 'modal-dialog-button button cancel-button',
+            accessible_name: _('Cancel'),
+            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+            reactive: this._hasCancelButton,
+            can_focus: this._hasCancelButton,
+            x_align: Clutter.ActorAlign.START,
+            y_align: Clutter.ActorAlign.CENTER,
+            child: new St.Icon({ icon_name: 'go-previous-symbolic' }),
+        });
+        if (this._hasCancelButton)
+            this.cancelButton.connect('clicked', () => this.cancel());
+        else
+            this.cancelButton.opacity = 0;
+        this._mainBox.add_child(this.cancelButton);
 
         let entryParams = {
             style_class: 'login-dialog-prompt-entry',
             can_focus: true,
-            x_expand: false,
+            x_expand: true,
-            y_expand: true,
         };
 
         this._entry = null;
@@ -111,104 +161,57 @@ var AuthPrompt = GObject.registerClass({
         ShellEntry.addContextMenu(this._passwordEntry, { actionMode: Shell.ActionMode.NONE });
 
         this._entry = this._passwordEntry;
-        this.add_child(this._entry);
+        this._mainBox.add_child(this._entry);
-
         this._entry.grab_key_focus();
 
-        this._capsLockWarningLabel = new ShellEntry.CapsLockWarning();
+        [this._textEntry, this._passwordEntry].forEach(entry => {
-        this.add_child(this._capsLockWarningLabel);
+            entry.clutter_text.connect('text-changed', () => {
+                if (!this._userVerifier.hasPendingMessages)
+                    this._fadeOutMessage();
+            });
 
-        this._message = new St.Label({
+            entry.clutter_text.connect('activate', () => {
-            opacity: 0,
+                let shouldSpin = entry === this._passwordEntry;
-            styleClass: 'login-dialog-message',
+                if (entry.reactive)
-            x_expand: false,
+                    this._activateNext(shouldSpin);
-            y_expand: true,
+            });
-            y_align: Clutter.ActorAlign.START,
         });
-        this._message.clutter_text.line_wrap = true;
-        this._message.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this.add_child(this._message);
-
-        this._buttonBox = new St.BoxLayout({
-            style_class: 'login-dialog-button-box',
-            vertical: false,
-            y_align: Clutter.ActorAlign.END,
-        });
-        this.add_child(this._buttonBox);
 
         this._defaultButtonWell = new St.Widget({
             layout_manager: new Clutter.BinLayout(),
             x_align: Clutter.ActorAlign.END,
             y_align: Clutter.ActorAlign.CENTER,
         });
-
+        this._defaultButtonWell.add_constraint(new Clutter.BindConstraint({
-        this._initButtons();
+            source: this.cancelButton,
+            coordinate: Clutter.BindCoordinate.SIZE,
+        }));
+        this._mainBox.add_child(this._defaultButtonWell);
 
         this._spinner = new Animation.Spinner(DEFAULT_BUTTON_WELL_ICON_SIZE);
-        this._spinner.opacity = 0;
-        this._spinner.show();
         this._defaultButtonWell.add_child(this._spinner);
     }
 
-    _onDestroy() {
+    _activateNext(shouldSpin) {
-        this._userVerifier.destroy();
+        this.updateSensitivity(false);
-        this._userVerifier = null;
-    }
 
-    vfunc_key_press_event(keyPressEvent) {
+        if (shouldSpin)
-        if (keyPressEvent.keyval == Clutter.KEY_Escape)
+            this.startSpinning();
-            this.cancel();
-        return Clutter.EVENT_PROPAGATE;
-    }
 
-    _initButtons() {
+        if (this._queryingService)
-        this.cancelButton = new St.Button({
+            this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-            style_class: 'modal-dialog-button button',
+        else
-            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+            this._preemptiveAnswer = this._entry.text;
-            reactive: true,
-            can_focus: true,
-            label: _("Cancel"),
-            x_expand: true,
-            x_align: Clutter.ActorAlign.START,
-            y_align: Clutter.ActorAlign.END,
-        });
-        this.cancelButton.connect('clicked', () => this.cancel());
-        this._buttonBox.add_child(this.cancelButton);
 
-        this._buttonBox.add_child(this._defaultButtonWell);
+        this.emit('next');
-        this.nextButton = new St.Button({
-            style_class: 'modal-dialog-button button',
-            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-            reactive: true,
-            can_focus: true,
-            label: _("Next"),
-            x_align: Clutter.ActorAlign.END,
-            y_align: Clutter.ActorAlign.END,
-        });
-        this.nextButton.connect('clicked', () => this.emit('next'));
-        this.nextButton.add_style_pseudo_class('default');
-        this._buttonBox.add_child(this.nextButton);
-
-        this._updateNextButtonSensitivity(this._entry.text.length > 0);
-
-        this._entry.clutter_text.connect('text-changed', () => {
-            if (!this._userVerifier.hasPendingMessages)
-                this._fadeOutMessage();
-
-            this._updateNextButtonSensitivity(this._entry.text.length > 0 || this.verificationStatus == AuthPromptStatus.VERIFYING);
-        });
-        this._entry.clutter_text.connect('activate', () => {
-            if (this.nextButton.reactive)
-                this.emit('next');
-        });
     }
 
     _updateEntry(secret) {
-        if (secret && (this._entry != this._passwordEntry)) {
+        if (secret && this._entry !== this._passwordEntry) {
-            this.replace_child(this._entry, this._passwordEntry);
+            this._mainBox.replace_child(this._entry, this._passwordEntry);
             this._entry = this._passwordEntry;
-        } else if (!secret && (this._entry != this._textEntry)) {
+        } else if (!secret && this._entry !== this._textEntry) {
-            this.replace_child(this._entry, this._textEntry);
+            this._mainBox.replace_child(this._entry, this._textEntry);
             this._entry = this._textEntry;
         }
         this._capsLockWarningLabel.visible = secret;
@@ -226,16 +229,14 @@ var AuthPrompt = GObject.registerClass({
         }
 
         this._updateEntry(secret);
-        this.setQuestion(question);
 
-        if (secret) {
+        // Hack: The question string comes directly from PAM, if it's "Password:"
-            if (this._userVerifier.reauthenticating)
+        // we replace it with our own to allow localization, if it's something
-                this.nextButton.label = _("Unlock");
+        // else we remove the last colon and any trailing or leading spaces.
-            else
+        if (question === 'Password:' || question === 'Password: ')
-                this.nextButton.label = C_("button", "Sign In");
+            this.setQuestion(_('Password'));
-        } else {
+        else
-            this.nextButton.label = _("Next");
+            this.setQuestion(question.replace(/: *$/, '').trim());
-        }
 
         this.updateSensitivity(true);
         this.emit('prompted');
@@ -285,6 +286,7 @@ var AuthPrompt = GObject.registerClass({
         this.setActorInDefaultButtonWell(null);
         this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
         this.cancelButton.reactive = false;
+        this.cancelButton.can_focus = false;
     }
 
     _onReset() {
@@ -292,10 +294,6 @@ var AuthPrompt = GObject.registerClass({
         this.reset();
     }
 
-    addActorToDefaultButtonWell(actor) {
-        this._defaultButtonWell.add_child(actor);
-    }
-
     setActorInDefaultButtonWell(actor, animate) {
         if (!this._defaultButtonWellActor &&
             !actor)
@@ -375,11 +373,9 @@ var AuthPrompt = GObject.registerClass({
     }
 
     setQuestion(question) {
-        this._label.set_text(question);
+        this._entry.hint_text = question;
 
-        this._label.show();
         this._entry.show();
-
         this._entry.grab_key_focus();
     }
 
@@ -427,15 +423,8 @@ var AuthPrompt = GObject.registerClass({
         }
     }
 
-    _updateNextButtonSensitivity(sensitive) {
-        this.nextButton.reactive = sensitive;
-        this.nextButton.can_focus = sensitive;
-    }
-
     updateSensitivity(sensitive) {
-        this._updateNextButtonSensitivity(sensitive && (this._entry.text.length > 0 || this.verificationStatus == AuthPromptStatus.VERIFYING));
         this._entry.reactive = sensitive;
-        this._entry.clutter_text.editable = sensitive;
     }
 
     vfunc_hide() {
@@ -454,18 +443,18 @@ var AuthPrompt = GObject.registerClass({
         if (oldChild)
             oldChild.destroy();
 
-        if (user) {
+        let userWidget = new UserWidget.UserWidget(user, Clutter.Orientation.VERTICAL);
-            let userWidget = new UserWidget.UserWidget(user);
+        this._userWell.set_child(userWidget);
-            userWidget.x_align = Clutter.ActorAlign.START;
+
-            this._userWell.set_child(userWidget);
+        if (!user)
-        }
+            this._updateEntry(false);
     }
 
     reset() {
         let oldStatus = this.verificationStatus;
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-        this.cancelButton.reactive = true;
+        this.cancelButton.reactive = this._hasCancelButton;
-        this.nextButton.label = _("Next");
+        this.cancelButton.can_focus = this._hasCancelButton;
         this._preemptiveAnswer = null;
 
         if (this._userVerifier)
@@ -475,6 +464,7 @@ var AuthPrompt = GObject.registerClass({
         this.clear();
         this._message.opacity = 0;
         this.setUser(null);
+        this._updateEntry(true);
         this.stopSpinning();
 
         if (oldStatus == AuthPromptStatus.VERIFICATION_FAILED)

js/gdm/loginDialog.js

@@ -35,8 +35,6 @@ const UserWidget = imports.ui.userWidget;
 const _FADE_ANIMATION_TIME = 250;
 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 = GObject.registerClass({
     Signals: { 'activate': {} },
@@ -179,6 +177,7 @@ var UserList = GObject.registerClass({
     }
 
     vfunc_key_focus_in() {
+        super.vfunc_key_focus_in();
         this._moveFocusToItems();
     }
 
@@ -312,28 +311,21 @@ var SessionMenuButton = GObject.registerClass({
     _init() {
         let gearIcon = new St.Icon({ icon_name: 'emblem-system-symbolic' });
         let button = new St.Button({
-            style_class: 'login-dialog-session-list-button',
+            style_class: 'modal-dialog-button button login-dialog-session-list-button',
             reactive: true,
             track_hover: true,
             can_focus: true,
             accessible_name: _("Choose Session"),
             accessible_role: Atk.Role.MENU,
+            x_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER,
             child: gearIcon,
         });
 
         super._init({ child: button });
         this._button = button;
 
-        let side = St.Side.TOP;
+        this._menu = new PopupMenu.PopupMenu(this._button, 0, St.Side.BOTTOM);
-        let align = 0;
-        if (Gdm.get_session_ids().length > _MAX_BOTTOM_MENU_ITEMS) {
-            if (this.text_direction == Clutter.TextDirection.RTL)
-                side = St.Side.RIGHT;
-            else
-                side = St.Side.LEFT;
-            align = 0.5;
-        }
-        this._menu = new PopupMenu.PopupMenu(this._button, align, side);
         Main.uiGroup.add_actor(this._menu.actor);
         this._menu.actor.hide();
 
@@ -358,6 +350,7 @@ var SessionMenuButton = GObject.registerClass({
     updateSensitivity(sensitive) {
         this._button.reactive = sensitive;
         this._button.can_focus = sensitive;
+        this.opacity = sensitive ? 255 : 0;
         this._menu.close(BoxPointer.PopupAnimation.NONE);
     }
 
@@ -409,7 +402,10 @@ var SessionMenuButton = GObject.registerClass({
 });
 
 var LoginDialog = GObject.registerClass({
-    Signals: { 'failed': {} },
+    Signals: {
+        'failed': {},
+        'wake-up-screen': {},
+    },
 }, class LoginDialog extends St.Widget {
     _init(parentActor) {
         super._init({ style_class: 'login-dialog', visible: false });
@@ -425,13 +421,13 @@ var LoginDialog = GObject.registerClass({
 
         this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA });
 
-        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_KEY}`,
+        this._settings.connect('changed::%s'.format(GdmUtil.BANNER_MESSAGE_KEY),
                                this._updateBanner.bind(this));
-        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_TEXT_KEY}`,
+        this._settings.connect('changed::%s'.format(GdmUtil.BANNER_MESSAGE_TEXT_KEY),
                                this._updateBanner.bind(this));
-        this._settings.connect(`changed::${GdmUtil.DISABLE_USER_LIST_KEY}`,
+        this._settings.connect('changed::%s'.format(GdmUtil.DISABLE_USER_LIST_KEY),
                                this._updateDisableUserList.bind(this));
-        this._settings.connect(`changed::${GdmUtil.LOGO_KEY}`,
+        this._settings.connect('changed::%s'.format(GdmUtil.LOGO_KEY),
                                this._updateLogo.bind(this));
 
         this._textureCache = St.TextureCache.get_default();
@@ -460,7 +456,6 @@ var LoginDialog = GObject.registerClass({
         let notListedLabel = new St.Label({
             text: _("Not listed?"),
             style_class: 'login-dialog-not-listed-label',
-            x_align: Clutter.ActorAlign.START,
         });
         this._notListedButton = new St.Button({
             style_class: 'login-dialog-not-listed-button',
@@ -468,6 +463,7 @@ var LoginDialog = GObject.registerClass({
             can_focus: true,
             child: notListedLabel,
             reactive: true,
+            x_align: Clutter.ActorAlign.START,
         });
 
         this._notListedButton.connect('clicked', this._hideUserListAskForUsernameAndBeginVerification.bind(this));
@@ -492,6 +488,15 @@ var LoginDialog = GObject.registerClass({
         bannerBox.add_child(this._bannerLabel);
         this._updateBanner();
 
+        this._sessionMenuButton = new SessionMenuButton();
+        this._sessionMenuButton.connect('session-activated',
+            (list, sessionId) => {
+                this._greeter.call_select_session_sync(sessionId, null);
+            });
+        this._sessionMenuButton.opacity = 0;
+        this._sessionMenuButton.show();
+        this.add_child(this._sessionMenuButton);
+
         this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',
                                         x_align: Clutter.ActorAlign.CENTER,
                                         y_align: Clutter.ActorAlign.END });
@@ -505,16 +510,6 @@ var LoginDialog = GObject.registerClass({
             this._onUserListActivated(item);
         });
 
-
-        this._sessionMenuButton = new SessionMenuButton();
-        this._sessionMenuButton.connect('session-activated',
-            (list, sessionId) => {
-                this._greeter.call_select_session_sync(sessionId, null);
-            });
-        this._sessionMenuButton.opacity = 0;
-        this._sessionMenuButton.show();
-        this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton);
-
         this._disableUserList = undefined;
         this._userListLoaded = false;
 
@@ -559,6 +554,23 @@ var LoginDialog = GObject.registerClass({
         return actorBox;
     }
 
+    _getSessionMenuButtonAllocation(dialogBox) {
+        let actorBox = new Clutter.ActorBox();
+
+        let [, , natWidth, natHeight] = this._sessionMenuButton.get_preferred_size();
+
+        if (this.get_text_direction() === Clutter.TextDirection.RTL)
+            actorBox.x1 = dialogBox.x1 + natWidth;
+        else
+            actorBox.x1 = dialogBox.x2 - (natWidth * 2);
+
+        actorBox.y1 = dialogBox.y2 - (natHeight * 2);
+        actorBox.x2 = actorBox.x1 + natWidth;
+        actorBox.y2 = actorBox.y1 + natHeight;
+
+        return actorBox;
+    }
+
     _getCenterActorAllocation(dialogBox, actor) {
         let actorBox = new Clutter.ActorBox();
 
@@ -615,6 +627,10 @@ var LoginDialog = GObject.registerClass({
             logoHeight = logoAllocation.y2 - logoAllocation.y1;
         }
 
+        let sessionMenuButtonAllocation = null;
+        if (this._sessionMenuButton.visible)
+            sessionMenuButtonAllocation = this._getSessionMenuButtonAllocation(dialogBox);
+
         // Then figure out if we're overly constrained and need to
         // try a different layout, or if we have what extra space we
         // can hand out
@@ -713,6 +729,9 @@ var LoginDialog = GObject.registerClass({
 
         if (logoAllocation)
             this._logoBin.allocate(logoAllocation, flags);
+
+        if (sessionMenuButtonAllocation)
+            this._sessionMenuButton.allocate(sessionMenuButtonAllocation, flags);
     }
 
     _ensureUserListLoaded() {
@@ -794,7 +813,7 @@ var LoginDialog = GObject.registerClass({
         if (this._logoFile && this._logoBin.resource_scale > 0) {
             let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
             this._logoBin.add_child(this._textureCache.load_file_async(this._logoFile,
-                                                                       -1, _LOGO_ICON_HEIGHT,
+                                                                       -1, -1,
                                                                        scaleFactor,
                                                                        this._logoBin.resource_scale));
         }
@@ -808,12 +827,10 @@ var LoginDialog = GObject.registerClass({
     }
 
     _onPrompted() {
-        if (this._shouldShowSessionMenuButton()) {
+        const showSessionMenu = this._shouldShowSessionMenuButton();
-            this._sessionMenuButton.updateSensitivity(true);
+
-            this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton);
+        this._sessionMenuButton.updateSensitivity(showSessionMenu);
-        } else {
+        this._sessionMenuButton.visible = showSessionMenu;
-            this._sessionMenuButton.updateSensitivity(false);
-        }
         this._showPrompt();
     }
 
@@ -896,7 +913,8 @@ var LoginDialog = GObject.registerClass({
     }
 
     _askForUsernameAndBeginVerification() {
-        this._authPrompt.setQuestion(_("Username: "));
+        this._authPrompt.setUser(null);
+        this._authPrompt.setQuestion(_('Username'));
 
         this._showRealmLoginHint(this._realmManager.loginFormat);
 
@@ -910,7 +928,6 @@ var LoginDialog = GObject.registerClass({
                 let answer = this._authPrompt.getAnswer();
                 this._user = this._userManager.get_user(answer);
                 this._authPrompt.clear();
-                this._authPrompt.startSpinning();
                 this._authPrompt.begin({ userName: answer });
                 this._updateCancelButton();
             });
@@ -1122,6 +1139,7 @@ var LoginDialog = GObject.registerClass({
         this._authPrompt.hide();
         this._hideBannerView();
         this._sessionMenuButton.close();
+        this._sessionMenuButton.hide();
         this._setUserListExpanded(true);
         this._notListedButton.show();
         this._userList.grab_key_focus();
@@ -1225,13 +1243,18 @@ var LoginDialog = GObject.registerClass({
         return GLib.SOURCE_REMOVE;
     }
 
+    activate() {
+        this._userList.grab_key_focus();
+        this.show();
+    }
+
     open() {
         Main.ctrlAltTabManager.addGroup(this,
                                         _("Login Window"),
                                         'dialog-password-symbolic',
                                         { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
-        this._userList.grab_key_focus();
+        this.activate();
-        this.show();
+
         this.opacity = 0;
 
         Main.pushModal(this, { actionMode: Shell.ActionMode.LOGIN_SCREEN });

js/gdm/util.js

@@ -2,7 +2,7 @@
 /* exported BANNER_MESSAGE_KEY, BANNER_MESSAGE_TEXT_KEY, LOGO_KEY,
             DISABLE_USER_LIST_KEY, fadeInActor, fadeOutActor, cloneAndFadeOutActor */
 
-const { Clutter, Gio, GLib } = imports.gi;
+const { Clutter, Gdm, Gio, GLib } = imports.gi;
 const Signals = imports.signals;
 
 const Batch = imports.gdm.batch;
@@ -12,6 +12,15 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const SmartcardManager = imports.misc.smartcardManager;
 
+Gio._promisify(Gdm.Client.prototype,
+    'open_reauthentication_channel', 'open_reauthentication_channel_finish');
+Gio._promisify(Gdm.Client.prototype,
+    'get_user_verifier', 'get_user_verifier_finish');
+Gio._promisify(Gdm.UserVerifierProxy.prototype,
+    'call_begin_verification_for_user', 'call_begin_verification_for_user_finish');
+Gio._promisify(Gdm.UserVerifierProxy.prototype,
+    'call_begin_verification', 'call_begin_verification_finish');
+
 var PASSWORD_SERVICE_NAME = 'gdm-password';
 var FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
 var SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
@@ -168,14 +177,12 @@ var ShellUserVerifier = class {
 
         this._checkForFingerprintReader();
 
-        if (userName) {
+        // If possible, reauthenticate an already running session,
-            // If possible, reauthenticate an already running session,
+        // so any session specific credentials get updated appropriately
-            // so any session specific credentials get updated appropriately
+        if (userName)
-            this._client.open_reauthentication_channel(userName, this._cancellable,
+            this._openReauthenticationChannel(userName);
-                                                       this._reauthenticationChannelOpened.bind(this));
+        else
-        } else {
+            this._getUserVerifier();
-            this._client.get_user_verifier(this._cancellable, this._userVerifierGot.bind(this));
-        }
     }
 
     cancel() {
@@ -339,10 +346,11 @@ var ShellUserVerifier = class {
         this._verificationFailed(false);
     }
 
-    _reauthenticationChannelOpened(client, result) {
+    async _openReauthenticationChannel(userName) {
         try {
             this._clearUserVerifier();
-            this._userVerifier = client.open_reauthentication_channel_finish(result);
+            this._userVerifier = await this._client.open_reauthentication_channel(
+                userName, this._cancellable);
         } catch (e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                 return;
@@ -351,8 +359,7 @@ var ShellUserVerifier = class {
                 // Gdm emits org.freedesktop.DBus.Error.AccessDenied when there
                 // is no session to reauthenticate. Fall back to performing
                 // verification from this login session
-                client.get_user_verifier(this._cancellable,
+                this._getUserVerifier();
-                                         this._userVerifierGot.bind(this));
                 return;
             }
 
@@ -366,10 +373,11 @@ var ShellUserVerifier = class {
         this._hold.release();
     }
 
-    _userVerifierGot(client, result) {
+    async _getUserVerifier() {
         try {
             this._clearUserVerifier();
-            this._userVerifier = client.get_user_verifier_finish(result);
+            this._userVerifier =
+                await this._client.get_user_verifier(this._cancellable);
         } catch (e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                 return;
@@ -421,35 +429,25 @@ var ShellUserVerifier = class {
         }
     }
 
-    _startService(serviceName) {
+    async _startService(serviceName) {
         this._hold.acquire();
-        if (this._userName) {
+        try {
-            this._userVerifier.call_begin_verification_for_user(serviceName, this._userName, this._cancellable, (obj, result) => {
+            if (this._userName) {
-                try {
+                await this._userVerifier.call_begin_verification_for_user(
-                    obj.call_begin_verification_for_user_finish(result);
+                    serviceName, this._userName, this._cancellable);
-                } catch (e) {
+            } else {
-                    if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                await this._userVerifier.call_begin_verification(
-                        return;
+                    serviceName, this._cancellable);
-                    this._reportInitError('Failed to start verification for user', e);
+            }
-                    return;
+        } catch (e) {
-                }
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-
+                return;
-                this._hold.release();
+            this._reportInitError(this._userName
-            });
+                ? 'Failed to start verification for user'
-        } else {
+                : 'Failed to start verification', e);
-            this._userVerifier.call_begin_verification(serviceName, this._cancellable, (obj, result) => {
+            return;
-                try {
-                    obj.call_begin_verification_finish(result);
-                } catch (e) {
-                    if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                        return;
-                    this._reportInitError('Failed to start verification', e);
-                    return;
-                }
-
-                this._hold.release();
-            });
         }
+        this._hold.release();
     }
 
     _beginVerification() {

js/meson.build

@@ -1,4 +1,5 @@
 subdir('misc')
+subdir('dbusServices')
 
 js_resources = gnome.compile_resources(
   'js-resources', 'js-resources.gresource.xml',
@@ -13,10 +14,3 @@ portal_resources = gnome.compile_resources(
   c_name: 'portal_js_resources',
   dependencies: [config_js]
 )
-
-prefs_resources = gnome.compile_resources(
-  'prefs-resources', 'prefs-resources.gresource.xml',
-  source_dir: ['.', meson.current_build_dir()],
-  c_name: 'prefs_js_resources',
-  dependencies: [config_js]
-)

js/misc/config.js.in

@@ -15,6 +15,5 @@ var LOCALEDIR = '@datadir@/locale';
 /* other standard directories */
 var LIBEXECDIR = '@libexecdir@';
 var PKGDATADIR = '@datadir@/@PACKAGE_NAME@';
-var VPNDIR = '@vpndir@';
 /* g-i package versions */
 var LIBMUTTER_API_VERSION = '@LIBMUTTER_API_VERSION@'

js/misc/extensionUtils.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ExtensionState, ExtensionType, getCurrentExtension,
-   getSettings, initTranslations, isOutOfDate, installImporter,
+   getSettings, initTranslations, openPrefs, isOutOfDate,
-   serializeExtension, deserializeExtension */
+   installImporter, serializeExtension, deserializeExtension */
 
 // Common utils for the extension system and the extension
 // preferences tool
@@ -153,6 +153,27 @@ function getSettings(schema) {
     return new Gio.Settings({ settings_schema: schemaObj });
 }
 
+/**
+ * openPrefs:
+ *
+ * Open the preference dialog of the current extension
+ */
+function openPrefs() {
+    const extension = getCurrentExtension();
+
+    if (!extension)
+        throw new Error('openPrefs() can only be called from extensions');
+
+    try {
+        const extensionManager = imports.ui.main.extensionManager;
+        extensionManager.openExtensionPrefs(extension.uuid, '', {});
+    } catch (e) {
+        if (e.name === 'ImportError')
+            throw new Error('openPrefs() cannot be called from preferences');
+        logError(e, 'Failed to open extension preferences');
+    }
+}
+
 /**
  * versionCheck:
  * @param {string[]} required - an array of versions we're compatible with

js/misc/fileUtils.js

@@ -76,19 +76,15 @@ function loadInterfaceXML(iface) {
         _ifaceResource._register();
     }
 
-    let xml = null;
     let uri = `resource:///org/gnome/shell/dbus-interfaces/${iface}.xml`;
     let f = Gio.File.new_for_uri(uri);
 
     try {
         let [ok_, bytes] = f.load_contents(null);
-        if (bytes instanceof Uint8Array)
+        return imports.byteArray.toString(bytes);
-            xml = imports.byteArray.toString(bytes);
-        else
-            xml = bytes.toString();
     } catch (e) {
         log(`Failed to load D-Bus interface ${iface}`);
     }
 
-    return xml;
+    return null;
 }

js/misc/ibusManager.js

@@ -1,11 +1,20 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported getIBusManager */
 
-const { Gio, GLib, IBus } = imports.gi;
+const { Gio, GLib, IBus, Meta } = imports.gi;
 const Signals = imports.signals;
 
 const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
 
+Gio._promisify(IBus.Bus.prototype,
+    'list_engines_async', 'list_engines_async_finish');
+Gio._promisify(IBus.Bus.prototype,
+    'request_name_async', 'request_name_async_finish');
+Gio._promisify(IBus.Bus.prototype,
+    'get_global_engine_async', 'get_global_engine_async_finish');
+Gio._promisify(IBus.Bus.prototype,
+    'set_global_engine_async', 'set_global_engine_async_finish');
+
 // Ensure runtime version matches
 _checkIBusVersion(1, 5, 2);
 
@@ -55,13 +64,18 @@ var IBusManager = class {
         this._ibus.set_watch_ibus_signal(true);
         this._ibus.connect('global-engine-changed', this._engineChanged.bind(this));
 
-        this._spawn();
+        this._spawn(Meta.is_wayland_compositor() ? [] : ['--xim']);
     }
 
     _spawn(extraArgs = []) {
         try {
             let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs];
-            Gio.Subprocess.new(cmdLine, Gio.SubprocessFlags.NONE);
+            let launcher = Gio.SubprocessLauncher.new(Gio.SubprocessFlags.NONE);
+            // Forward the right X11 Display for ibus-x11
+            let display = GLib.getenv('GNOME_SETUP_DISPLAY');
+            if (display)
+                launcher.setenv('DISPLAY', display, true);
+            launcher.spawnv(cmdLine);
         } catch (e) {
             log(`Failed to launch ibus-daemon: ${e.message}`);
         }
@@ -97,16 +111,14 @@ var IBusManager = class {
 
     _onConnected() {
         this._cancellable = new Gio.Cancellable();
-        this._ibus.list_engines_async(-1, this._cancellable,
+        this._initEngines();
-            this._initEngines.bind(this));
+        this._initPanelService();
-        this._ibus.request_name_async(IBus.SERVICE_PANEL,
-            IBus.BusNameFlag.REPLACE_EXISTING, -1, this._cancellable,
-            this._initPanelService.bind(this));
     }
 
-    _initEngines(ibus, result) {
+    async _initEngines() {
         try {
-            let enginesList = this._ibus.list_engines_async_finish(result);
+            const enginesList =
+                await this._ibus.list_engines_async(-1, this._cancellable);
             for (let i = 0; i < enginesList.length; ++i) {
                 let name = enginesList[i].get_name();
                 this._engines.set(name, enginesList[i]);
@@ -121,56 +133,52 @@ var IBusManager = class {
         }
     }
 
-    _initPanelService(ibus, result) {
+    async _initPanelService() {
-        let success = false;
         try {
-            success = !!this._ibus.request_name_async_finish(result);
+            await this._ibus.request_name_async(IBus.SERVICE_PANEL,
+                IBus.BusNameFlag.REPLACE_EXISTING, -1, this._cancellable);
         } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                return;
+                logError(e);
-            logError(e);
+                this._clear();
+            }
+            return;
         }
 
-        if (success) {
+        this._panelService = new IBus.PanelService({
-            this._panelService = new IBus.PanelService({ connection: this._ibus.get_connection(),
+            connection: this._ibus.get_connection(),
-                                                         object_path: IBus.PATH_PANEL });
+            object_path: IBus.PATH_PANEL,
-            this._candidatePopup.setPanelService(this._panelService);
+        });
-            this._panelService.connect('update-property', this._updateProperty.bind(this));
+        this._candidatePopup.setPanelService(this._panelService);
-            this._panelService.connect('set-cursor-location', (ps, x, y, w, h) => {
+        this._panelService.connect('update-property', this._updateProperty.bind(this));
-                let cursorLocation = { x, y, width: w, height: h };
+        this._panelService.connect('set-cursor-location', (ps, x, y, w, h) => {
-                this.emit('set-cursor-location', cursorLocation);
+            let cursorLocation = { x, y, width: w, height: h };
-            });
+            this.emit('set-cursor-location', cursorLocation);
-            this._panelService.connect('focus-in', (panel, path) => {
+        });
-                if (!GLib.str_has_suffix(path, '/InputContext_1'))
+        this._panelService.connect('focus-in', (panel, path) => {
-                    this.emit('focus-in');
+            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 {
+        try {
-                // IBus versions older than 1.5.10 have a bug which
+            // IBus versions older than 1.5.10 have a bug which
-                // causes spurious set-content-type emissions when
+            // causes spurious set-content-type emissions when
-                // switching input focus that temporarily lose purpose
+            // switching input focus that temporarily lose purpose
-                // and hints defeating its intended semantics and
+            // and hints defeating its intended semantics and
-                // confusing users. We thus don't use it in that case.
+            // confusing users. We thus don't use it in that case.
-                _checkIBusVersion(1, 5, 10);
+            _checkIBusVersion(1, 5, 10);
-                this._panelService.connect('set-content-type', this._setContentType.bind(this));
+            this._panelService.connect('set-content-type', this._setContentType.bind(this));
-            } catch (e) {
+        } catch (e) {
-            }
+        }
+
+        try {
             // If an engine is already active we need to get its properties
-            this._ibus.get_global_engine_async(-1, this._cancellable, (_bus, res) => {
+            const engine =
-                let engine;
+                await this._ibus.get_global_engine_async(-1, this._cancellable);
-                try {
+            this._engineChanged(this._ibus, engine.get_name());
-                    engine = this._ibus.get_global_engine_async_finish(res);
-                    if (!engine)
-                        return;
-                } catch (e) {
-                    return;
-                }
-                this._engineChanged(this._ibus, engine.get_name());
-            });
             this._updateReadiness();
-        } else {
+        } catch (e) {
-            this._clear();
         }
     }
 
@@ -219,7 +227,7 @@ var IBusManager = class {
         return this._engines.get(id);
     }
 
-    setEngine(id, callback) {
+    async setEngine(id, callback) {
         // Send id even if id == this._currentEngineName
         // because 'properties-registered' signal can be emitted
         // while this._ibusSources == null on a lock screen.
@@ -229,18 +237,16 @@ var IBusManager = class {
             return;
         }
 
-        this._ibus.set_global_engine_async(id,
+        try {
-            this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
+            await this._ibus.set_global_engine_async(id,
-            this._cancellable, (_bus, res) => {
+                this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
-                try {
+                this._cancellable);
-                    this._ibus.set_global_engine_async_finish(res);
+        } catch (e) {
-                } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                    if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                logError(e);
-                        logError(e);
+        }
-                }
+        if (callback)
-                if (callback)
+            callback();
-                    callback();
-            });
     }
 
     preloadEngines(ids) {

js/misc/inputMethod.js

@@ -4,6 +4,9 @@ const { Clutter, GLib, Gio, GObject, IBus } = imports.gi;
 
 const Keyboard = imports.ui.status.keyboard;
 
+Gio._promisify(IBus.Bus.prototype,
+    'create_input_context_async', 'create_input_context_async_finish');
+
 var HIDE_PANEL_TIME = 50;
 
 var InputMethod = GObject.registerClass(
@@ -46,15 +49,11 @@ class InputMethod extends Clutter.InputMethod {
         this._currentSource = this._inputSourceManager.currentSource;
     }
 
-    _onConnected() {
+    async _onConnected() {
         this._cancellable = new Gio.Cancellable();
-        this._ibus.create_input_context_async('gnome-shell', -1,
-            this._cancellable, this._setContext.bind(this));
-    }
-
-    _setContext(bus, res) {
         try {
-            this._context = this._ibus.create_input_context_async_finish(res);
+            this._context = await this._ibus.create_input_context_async(
+                'gnome-shell', -1, this._cancellable);
         } catch (e) {
             if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
                 logError(e);
@@ -97,8 +96,13 @@ class InputMethod extends Clutter.InputMethod {
         this.commit(text.get_text());
     }
 
-    _onDeleteSurroundingText() {
+    _onDeleteSurroundingText(_context, offset, nchars) {
-        this.delete_surrounding();
+        try {
+            this.delete_surrounding(offset, nchars);
+        } catch (e) {
+            // We may get out of bounds for negative offset on older mutter
+            this.delete_surrounding(0, nchars + offset);
+        }
     }
 
     _onUpdatePreeditText(_context, text, pos, visible) {

js/misc/introspect.js

@@ -1,10 +1,12 @@
 /* exported IntrospectService */
-const { Gio, GLib, Meta, Shell } = imports.gi;
+const { Gio, GLib, Meta, Shell, St } = imports.gi;
 
 const INTROSPECT_SCHEMA = 'org.gnome.shell';
 const INTROSPECT_KEY = 'introspect';
 const APP_WHITELIST = ['org.freedesktop.impl.portal.desktop.gtk'];
 
+const INTROSPECT_DBUS_API_VERSION = 2;
+
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
 const IntrospectDBusIface = loadInterfaceXML('org.gnome.Shell.Introspect');
@@ -22,6 +24,7 @@ var IntrospectService = class {
         this._runningApplicationsDirty = true;
         this._activeApplication = null;
         this._activeApplicationDirty = true;
+        this._animationsEnabled = true;
 
         this._appSystem = Shell.AppSystem.get_default();
         this._appSystem.connect('app-state-changed',
@@ -30,7 +33,9 @@ var IntrospectService = class {
                                     this._syncRunningApplications();
                                 });
 
-        this._settings = new Gio.Settings({ schema_id: INTROSPECT_SCHEMA });
+        this._introspectSettings = new Gio.Settings({
+            schema_id: INTROSPECT_SCHEMA,
+        });
 
         let tracker = Shell.WindowTracker.get_default();
         tracker.connect('notify::focus-app',
@@ -49,6 +54,11 @@ var IntrospectService = class {
                 (conn, name, owner) => this._whitelistMap.set(name, owner),
                 (conn, name) => this._whitelistMap.delete(name));
         });
+
+        this._settings = St.Settings.get();
+        this._settings.connect('notify::enable-animations',
+            this._syncAnimationsEnabled.bind(this));
+        this._syncAnimationsEnabled();
     }
 
     _isStandaloneApp(app) {
@@ -56,7 +66,7 @@ var IntrospectService = class {
     }
 
     _isIntrospectEnabled() {
-        return this._settings.get_boolean(INTROSPECT_KEY);
+        return this._introspectSettings.get_boolean(INTROSPECT_KEY);
     }
 
     _isSenderWhitelisted(sender) {
@@ -119,9 +129,18 @@ var IntrospectService = class {
                 type == Meta.WindowType.UTILITY;
     }
 
+    _isInvocationAllowed(invocation) {
+        if (this._isIntrospectEnabled())
+            return true;
+
+        if (this._isSenderWhitelisted(invocation.get_sender()))
+            return true;
+
+        return false;
+    }
+
     GetRunningApplicationsAsync(params, invocation) {
-        if (!this._isIntrospectEnabled() &&
+        if (!this._isInvocationAllowed(invocation)) {
-            !this._isSenderWhitelisted(invocation.get_sender())) {
             invocation.return_error_literal(Gio.DBusError,
                                             Gio.DBusError.ACCESS_DENIED,
                                             'App introspection not allowed');
@@ -136,8 +155,7 @@ var IntrospectService = class {
         let apps = this._appSystem.get_running();
         let windowsList = {};
 
-        if (!this._isIntrospectEnabled() &&
+        if (!this._isInvocationAllowed(invocation)) {
-            !this._isSenderWhitelisted(invocation.get_sender())) {
             invocation.return_error_literal(Gio.DBusError,
                                             Gio.DBusError.ACCESS_DENIED,
                                             'App introspection not allowed');
@@ -181,4 +199,21 @@ var IntrospectService = class {
         }
         invocation.return_value(new GLib.Variant('(a{ta{sv}})', [windowsList]));
     }
+
+    _syncAnimationsEnabled() {
+        let wasAnimationsEnabled = this._animationsEnabled;
+        this._animationsEnabled = this._settings.enable_animations;
+        if (wasAnimationsEnabled !== this._animationsEnabled) {
+            let variant = new GLib.Variant('b', this._animationsEnabled);
+            this._dbusImpl.emit_property_changed('AnimationsEnabled', variant);
+        }
+    }
+
+    get AnimationsEnabled() {
+        return this._animationsEnabled;
+    }
+
+    get version() {
+        return INTROSPECT_DBUS_API_VERSION;
+    }
 };

js/misc/loginManager.js

@@ -50,25 +50,22 @@ function canLock() {
 }
 
 
-function registerSessionWithGDM() {
+async function registerSessionWithGDM() {
     log("Registering session with GDM");
-    Gio.DBus.system.call('org.gnome.DisplayManager',
+    try {
-                         '/org/gnome/DisplayManager/Manager',
+        await Gio.DBus.system.call(
-                         'org.gnome.DisplayManager.Manager',
+            'org.gnome.DisplayManager',
-                         'RegisterSession',
+            '/org/gnome/DisplayManager/Manager',
-                         GLib.Variant.new('(a{sv})', [{}]), null,
+            'org.gnome.DisplayManager.Manager',
-                         Gio.DBusCallFlags.NONE, -1, null,
+            'RegisterSession',
-        (source, result) => {
+            GLib.Variant.new('(a{sv})', [{}]), null,
-            try {
+            Gio.DBusCallFlags.NONE, -1, null);
-                source.call_finish(result);
+    } catch (e) {
-            } catch (e) {
+        if (!e.matches(Gio.DBusError, Gio.DBusError.UNKNOWN_METHOD))
-                if (!e.matches(Gio.DBusError, Gio.DBusError.UNKNOWN_METHOD))
+            log(`Error registering session with GDM: ${e.message}`);
-                    log(`Error registering session with GDM: ${e.message}`);
+        else
-                else
+            log('Not calling RegisterSession(): method not exported, GDM too old?');
-                    log("Not calling RegisterSession(): method not exported, GDM too old?");
+    }
-            }
-        }
-    );
 }
 
 let _loginManager = null;
@@ -174,24 +171,19 @@ var LoginManagerSystemd = class {
         this._proxy.SuspendRemote(true);
     }
 
-    inhibit(reason, callback) {
+    async inhibit(reason, callback) {
-        let inVariant = GLib.Variant.new('(ssss)',
+        try {
-                                         ['sleep',
+            const inVariant = new GLib.Variant('(ssss)',
-                                          'GNOME Shell',
+                ['sleep', 'GNOME Shell', reason, 'delay']);
-                                          reason,
+            const [outVariant_, fdList] =
-                                          'delay']);
+                await this._proxy.call_with_unix_fd_list('Inhibit',
-        this._proxy.call_with_unix_fd_list('Inhibit', inVariant, 0, -1, null, null,
+                    inVariant, 0, -1, null, null);
-            (proxy, result) => {
+            const [fd] = fdList.steal_fds();
-                let fd = -1;
+            callback(new Gio.UnixInputStream({ fd }));
-                try {
+        } catch (e) {
-                    let [outVariant_, fdList] = proxy.call_with_unix_fd_list_finish(result);
+            logError(e, 'Error getting systemd inhibitor');
-                    fd = fdList.steal_fds()[0];
+            callback(null);
-                    callback(new Gio.UnixInputStream({ fd }));
+        }
-                } catch (e) {
-                    logError(e, "Error getting systemd inhibitor");
-                    callback(null);
-                }
-            });
     }
 
     _prepareForSleep(proxy, sender, [aboutToSuspend]) {

js/misc/meson.build

@@ -7,7 +7,6 @@ jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
 jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
 jsconf.set('datadir', datadir)
 jsconf.set('libexecdir', libexecdir)
-jsconf.set('vpndir', vpndir)
 
 config_js = configure_file(
   input: 'config.js.in',

js/misc/modemManager.js

@@ -223,7 +223,7 @@ var BroadbandModem = GObject.registerClass({
 }, class BroadbandModem extends ModemBase {
     _init(path, capabilities) {
         super._init({ capabilities });
-        this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
+        this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
         this._proxy_3gpp = new BroadbandModem3gppProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
         this._proxy_cdma = new BroadbandModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
 
@@ -249,7 +249,7 @@ var BroadbandModem = GObject.registerClass({
     }
 
     _reloadSignalQuality() {
-        let [quality, recent_] = this.SignalQuality;
+        let [quality, recent_] = this._proxy.SignalQuality;
         this._setSignalQuality(quality);
     }
 

js/misc/objectManager.js

@@ -57,9 +57,7 @@ var ObjectManager = class {
         // Start out inhibiting load until at least the proxy
         // manager is loaded and the remote objects are fetched
         this._numLoadInhibitors = 1;
-        this._managerProxy.init_async(GLib.PRIORITY_DEFAULT,
+        this._initManagerProxy();
-                                      this._cancellable,
-                                      this._onManagerProxyLoaded.bind(this));
     }
 
     _tryToCompleteLoad() {
@@ -73,7 +71,7 @@ var ObjectManager = class {
         }
     }
 
-    _addInterface(objectPath, interfaceName, onFinished) {
+    async _addInterface(objectPath, interfaceName, onFinished) {
         let info = this._interfaceInfos[interfaceName];
 
         if (!info) {
@@ -89,40 +87,38 @@ var ObjectManager = class {
                                         g_interface_info: info,
                                         g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });
 
-        proxy.init_async(GLib.PRIORITY_DEFAULT, this._cancellable, (initable, result) => {
+        try {
-            try {
+            await proxy.init_async(GLib.PRIORITY_DEFAULT, this._cancellable);
-                initable.init_finish(result);
+        } catch (e) {
-            } catch (e) {
+            logError(e, `could not initialize proxy for interface ${interfaceName}`);
-                logError(e, `could not initialize proxy for interface ${interfaceName}`);
-
-                if (onFinished)
-                    onFinished();
-                return;
-            }
-
-            let isNewObject;
-            if (!this._objects[objectPath]) {
-                this._objects[objectPath] = {};
-                isNewObject = true;
-            } else {
-                isNewObject = false;
-            }
-
-            this._objects[objectPath][interfaceName] = proxy;
-
-            if (!this._interfaces[interfaceName])
-                this._interfaces[interfaceName] = [];
-
-            this._interfaces[interfaceName].push(proxy);
-
-            if (isNewObject)
-                this.emit('object-added', objectPath);
-
-            this.emit('interface-added', interfaceName, proxy);
 
             if (onFinished)
                 onFinished();
-        });
+            return;
+        }
+
+        let isNewObject;
+        if (!this._objects[objectPath]) {
+            this._objects[objectPath] = {};
+            isNewObject = true;
+        } else {
+            isNewObject = false;
+        }
+
+        this._objects[objectPath][interfaceName] = proxy;
+
+        if (!this._interfaces[interfaceName])
+            this._interfaces[interfaceName] = [];
+
+        this._interfaces[interfaceName].push(proxy);
+
+        if (isNewObject)
+            this.emit('object-added', objectPath);
+
+        this.emit('interface-added', interfaceName, proxy);
+
+        if (onFinished)
+            onFinished();
     }
 
     _removeInterface(objectPath, interfaceName) {
@@ -151,9 +147,10 @@ var ObjectManager = class {
         }
     }
 
-    _onManagerProxyLoaded(initable, result) {
+    async _initManagerProxy() {
         try {
-            initable.init_finish(result);
+            await this._managerProxy.init_async(
+                GLib.PRIORITY_DEFAULT, this._cancellable);
         } catch (e) {
             logError(e, `could not initialize object manager for object ${this._serviceName}`);
 

js/misc/systemActions.js

@@ -151,17 +151,17 @@ const SystemActions = GObject.registerClass({
         this._userManager.connect('user-removed',
                                   () => this._updateMultiUser());
 
-        this._lockdownSettings.connect(`changed::${DISABLE_USER_SWITCH_KEY}`,
+        this._lockdownSettings.connect('changed::%s'.format(DISABLE_USER_SWITCH_KEY),
                                        () => this._updateSwitchUser());
-        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
+        this._lockdownSettings.connect('changed::%s'.format(DISABLE_LOG_OUT_KEY),
                                        () => this._updateLogout());
-        global.settings.connect(`changed::${ALWAYS_SHOW_LOG_OUT_KEY}`,
+        global.settings.connect('changed::%s'.format(ALWAYS_SHOW_LOG_OUT_KEY),
                                 () => this._updateLogout());
 
-        this._lockdownSettings.connect(`changed::${DISABLE_LOCK_SCREEN_KEY}`,
+        this._lockdownSettings.connect('changed::%s'.format(DISABLE_LOCK_SCREEN_KEY),
                                        () => this._updateLockScreen());
 
-        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
+        this._lockdownSettings.connect('changed::%s'.format(DISABLE_LOG_OUT_KEY),
                                        () => this._updateHaveShutdown());
 
         this.forceUpdate();

js/misc/util.js

@@ -21,7 +21,7 @@ const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
 const _notTrailingJunk = '[^\\s`!()\\[\\]{};:\'\\".,<>?\u00AB\u00BB\u200E\u200F\u201C\u201D\u2018\u2019\u202A\u202C]';
 
 const _urlRegexp = new RegExp(
-    `(^|${_leadingJunk})` +
+    '(^|%s)'.format(_leadingJunk) +
     '(' +
         '(?:' +
             '(?:http|https|ftp)://' +             // scheme://
@@ -33,12 +33,12 @@ const _urlRegexp = new RegExp(
         '(?:' +                                   // one or more:
             '[^\\s()<>]+' +                       // run of non-space non-()
             '|' +                                 // or
-            `${_balancedParens}` +                // balanced parens
+            '%s'.format(_balancedParens) +        // balanced parens
         ')+' +
         '(?:' +                                   // end with:
-            `${_balancedParens}` +                // balanced parens
+            '%s'.format(_balancedParens) +        // balanced parens
             '|' +                                 // or
-            `${_notTrailingJunk}` +               // last non-junk char
+            '%s'.format(_notTrailingJunk) +       // last non-junk char
         ')' +
     ')', 'gi');
 
@@ -153,7 +153,7 @@ function trySpawnCommandLine(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(/[^:]*: /, '%s\n'.format(_('Could not parse command:')));
         throw err;
     }
 
@@ -445,6 +445,9 @@ function ensureActorVisibleInScrollView(scrollView, actor) {
 }
 
 function wiggle(actor, params) {
+    if (!St.Settings.get().enable_animations)
+        return;
+
     params = Params.parse(params, {
         offset: WIGGLE_OFFSET,
         duration: WIGGLE_DURATION,

js/misc/weather.js

@@ -7,6 +7,8 @@ const PermissionStore = imports.misc.permissionStore;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
+Gio._promisify(Geoclue.Simple, 'new', 'new_finish');
+
 const WeatherIntegrationIface = loadInterfaceXML('org.gnome.Shell.WeatherIntegration');
 
 const WEATHER_BUS_NAME = 'org.gnome.Weather';
@@ -79,16 +81,7 @@ var WeatherClient = class {
         this._weatherApp = null;
         this._weatherProxy = null;
 
-        let nodeInfo = Gio.DBusNodeInfo.new_for_xml(WeatherIntegrationIface);
+        this._createWeatherProxy();
-        Gio.DBusProxy.new(
-            Gio.DBus.session,
-            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',
@@ -146,9 +139,17 @@ var WeatherClient = class {
                (!this._needsAuth || this._weatherAuthorized);
     }
 
-    _onWeatherProxyReady(o, res) {
+    async _createWeatherProxy() {
+        const nodeInfo = Gio.DBusNodeInfo.new_for_xml(WeatherIntegrationIface);
         try {
-            this._weatherProxy = Gio.DBusProxy.new_finish(res);
+            this._weatherProxy = await Gio.DBusProxy.new(
+                Gio.DBus.session,
+                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);
         } catch (e) {
             log(`Failed to create GNOME Weather proxy: ${e}`);
             return;
@@ -239,25 +240,23 @@ var WeatherClient = class {
         }
     }
 
-    _startGClueService() {
+    async _startGClueService() {
         if (this._gclueStarting)
             return;
 
         this._gclueStarting = true;
 
-        Geoclue.Simple.new('org.gnome.Shell', Geoclue.AccuracyLevel.CITY, null,
+        try {
-            (o, res) => {
+            this._gclueService = await Geoclue.Simple.new(
-                try {
+                'org.gnome.Shell', Geoclue.AccuracyLevel.CITY, null);
-                    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);
-                    this._setLocation(this._mostRecentLocation);
+            return;
-                    return;
+        }
-                }
+        this._gclueStarted = true;
-                this._gclueStarted = true;
+        this._gclueService.get_client().distance_threshold = 100;
-                this._gclueService.get_client().distance_threshold = 100;
+        this._updateLocationMonitoring();
-                this._updateLocationMonitoring();
-            });
     }
 
     _onGClueLocationChanged() {

js/portal-resources.gresource.xml

@@ -5,6 +5,5 @@
 
     <file>misc/config.js</file>
     <file>misc/fileUtils.js</file>
-    <file>misc/params.js</file>
   </gresource>
 </gresources>

js/portalHelper/main.js

@@ -23,7 +23,6 @@ const PortalHelperSecurityLevel = {
 };
 
 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;
 
 const HelperDBusInterface = loadInterfaceXML('org.gnome.Shell.PortalHelper');
@@ -103,7 +102,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
         this._headerBar.show();
 
         if (!url) {
-            url = CONNECTIVITY_CHECK_URI;
+            url = 'http://%s'.format(CONNECTIVITY_CHECK_HOST);
             this._originalUrlWasGnome = true;
         } else {
             this._originalUrlWasGnome = false;
@@ -118,6 +117,10 @@ class PortalWindow extends Gtk.ApplicationWindow {
         this._webContext = WebKit.WebContext.new_ephemeral();
         this._webContext.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER);
         this._webContext.set_network_proxy_settings(WebKit.NetworkProxyMode.NO_PROXY, null);
+        if (this._webContext.set_sandbox_enabled) {
+            // We have WebKitGTK 2.26 or newer.
+            this._webContext.set_sandbox_enabled(true);
+        }
 
         this._webView = WebKit.WebView.new_with_context(this._webContext);
         this._webView.connect('decide-policy', this._onDecidePolicy.bind(this));

js/prefs-resources.gresource.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/shell">
-    <file>extensionPrefs/main.js</file>
-
-    <file>misc/config.js</file>
-    <file>misc/extensionUtils.js</file>
-    <file>misc/fileUtils.js</file>
-    <file>misc/params.js</file>
-
-    <file alias="css/application.css">extensionPrefs/css/application.css</file>
-
-    <file alias="ui/extension-row.ui">extensionPrefs/ui/extension-row.ui</file>
-    <file alias="ui/extensions-window.ui">extensionPrefs/ui/extensions-window.ui</file>
-  </gresource>
-</gresources>

js/ui/accessDialog.js

@@ -138,7 +138,7 @@ var AccessDialogDBus = class {
         let [handle, appId, parentWindow_, title, description, 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 && '%s.desktop'.format(appId) != 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');

js/ui/altTab.js

@@ -280,12 +280,10 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
     }
 
     _onDestroy() {
-        super._onDestroy();
-
-        if (this._thumbnails)
-            this._destroyThumbnails();
         if (this._thumbnailTimeoutId != 0)
             GLib.source_remove(this._thumbnailTimeoutId);
+
+        super._onDestroy();
     }
 
     /**
@@ -365,8 +363,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             },
         });
         this._thumbnails = null;
-        if (this._switcherList._items[this._selectedIndex])
+        this._switcherList.removeAccessibleState(this._selectedIndex, Atk.StateType.EXPANDED);
-            this._switcherList._items[this._selectedIndex].remove_accessible_state(Atk.StateType.EXPANDED);
     }
 
     _createThumbnails() {
@@ -395,7 +392,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             },
         });
 
-        this._switcherList._items[this._selectedIndex].add_accessible_state(Atk.StateType.EXPANDED);
+        this._switcherList.addAccessibleState(this._selectedIndex, Atk.StateType.EXPANDED);
     }
 });
 
@@ -776,7 +773,9 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
 
     // We override SwitcherList's _onItemEnter method to delay
     // activation when the thumbnail list is open
-    _onItemEnter(index) {
+    _onItemEnter(item) {
+        const index = this._items.indexOf(item);
+
         if (this._mouseTimeOutId != 0)
             GLib.source_remove(this._mouseTimeOutId);
         if (this._altTabPopup.thumbnailsVisible) {

js/ui/appDisplay.js

@@ -71,15 +71,9 @@ function _getFolderName(folder) {
     let name = folder.get_string('name');
 
     if (folder.get_boolean('translate')) {
-        let keyfile = new GLib.KeyFile();
+        let translated = Shell.util_get_translated_folder_name(name);
-        let path = `desktop-directories/${name}`;
+        if (translated !== null)
-
+            return translated;
-        try {
-            keyfile.load_from_data_dirs(path, GLib.KeyFileFlags.NONE);
-            name = keyfile.get_locale_string('Desktop Entry', 'Name', null);
-        } catch (e) {
-            return name;
-        }
     }
 
     return name;
@@ -120,15 +114,9 @@ function _findBestFolderName(apps) {
     }, commonCategories);
 
     for (let category of commonCategories) {
-        let keyfile = new GLib.KeyFile();
+        let translated = Shell.util_get_translated_folder_name(category);
-        let path = 'desktop-directories/%s.directory'.format(category);
+        if (translated !== null)
-
+            return translated;
-        try {
-            keyfile.load_from_data_dirs(path, GLib.KeyFileFlags.NONE);
-            return keyfile.get_locale_string('Desktop Entry', 'Name', null);
-        } catch (e) {
-            continue;
-        }
     }
 
     return null;
@@ -169,6 +157,10 @@ var BaseAppView = GObject.registerClass({
 
         this._items = new Map();
         this._orderedItems = [];
+
+        this._animateLaterId = 0;
+        this._viewLoadedHandlerId = 0;
+        this._viewIsReady = false;
     }
 
     _childFocused(_actor) {
@@ -204,6 +196,7 @@ var BaseAppView = GObject.registerClass({
             this._items.set(icon.id, icon);
         });
 
+        this._viewIsReady = true;
         this.emit('view-loaded');
     }
 
@@ -219,7 +212,7 @@ var BaseAppView = GObject.registerClass({
         if (this._items.has(id))
             this._items.get(id).navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
         else
-            log(`No such application ${id}`);
+            log('No such application %s'.format(id));
     }
 
     selectApp(id) {
@@ -253,6 +246,18 @@ var BaseAppView = GObject.registerClass({
             Main.overview.dash.showAppsButton);
     }
 
+    _clearAnimateLater() {
+        if (this._animateLaterId) {
+            Meta.later_remove(this._animateLaterId);
+            this._animateLaterId = 0;
+        }
+        if (this._viewLoadedHandlerId) {
+            this.disconnect(this._viewLoadedHandlerId);
+            this._viewLoadedHandlerId = 0;
+        }
+        this._grid.opacity = 255;
+    }
+
     animate(animationDirection, onComplete) {
         if (onComplete) {
             let animationDoneId = this._grid.connect('animation-done', () => {
@@ -261,16 +266,38 @@ var BaseAppView = GObject.registerClass({
             });
         }
 
+        this._clearAnimateLater();
+
         if (animationDirection == IconGrid.AnimationDirection.IN) {
-            let id = this._grid.connect('paint', () => {
+            const doSpringAnimationLater = laterType => {
-                this._grid.disconnect(id);
+                this._animateLaterId = Meta.later_add(laterType,
-                this._doSpringAnimation(animationDirection);
+                    () => {
-            });
+                        this._animateLaterId = 0;
+                        this._doSpringAnimation(animationDirection);
+                        return GLib.SOURCE_REMOVE;
+                    });
+            };
+
+            if (this._viewIsReady) {
+                this._grid.opacity = 0;
+                doSpringAnimationLater(Meta.LaterType.IDLE);
+            } else {
+                this._viewLoadedHandlerId = this.connect('view-loaded',
+                    () => {
+                        this._clearAnimateLater();
+                        doSpringAnimationLater(Meta.LaterType.BEFORE_REDRAW);
+                    });
+            }
         } else {
             this._doSpringAnimation(animationDirection);
         }
     }
 
+    vfunc_unmap() {
+        this._clearAnimateLater();
+        super.vfunc_unmap();
+    }
+
     animateSwitch(animationDirection) {
         this.remove_all_transitions();
         this._grid.remove_all_transitions();
@@ -293,7 +320,7 @@ var BaseAppView = GObject.registerClass({
     }
 
     adaptToSize(_width, _height) {
-        throw new GObject.NotImplementedError(`adaptToSize in ${this.constructor.name}`);
+        throw new GObject.NotImplementedError('adaptToSize in %s'.format(this.constructor.name));
     }
 });
 
@@ -392,10 +419,12 @@ var AllView = GObject.registerClass({
         this._redisplayWorkId = Main.initializeDeferredWork(this, this._redisplay.bind(this));
 
         Shell.AppSystem.get_default().connect('installed-changed', () => {
+            this._viewIsReady = false;
             Main.queueDeferredWork(this._redisplayWorkId);
         });
         this._folderSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.app-folders' });
         this._folderSettings.connect('changed::folder-children', () => {
+            this._viewIsReady = false;
             Main.queueDeferredWork(this._redisplayWorkId);
         });
 
@@ -431,6 +460,10 @@ var AllView = GObject.registerClass({
 
     _redisplay() {
         super._redisplay();
+
+        this._folderIcons.forEach(icon => {
+            icon.view._redisplay();
+        });
         this._refilterApps();
     }
 
@@ -492,7 +525,7 @@ var AllView = GObject.registerClass({
 
         let folders = this._folderSettings.get_strv('folder-children');
         folders.forEach(id => {
-            let path = `${this._folderSettings.path}folders/${id}/`;
+            let path = '%sfolders/%s/'.format(this._folderSettings.path, id);
             let icon = this._items.get(id);
             if (!icon) {
                 icon = new FolderIcon(id, path, this);
@@ -530,8 +563,10 @@ var AllView = GObject.registerClass({
     // Overridden from BaseAppView
     animate(animationDirection, onComplete) {
         this._scrollView.reactive = false;
+        this._swipeTracker.enabled = false;
         let completionFunc = () => {
             this._scrollView.reactive = true;
+            this._swipeTracker.enabled = this.mapped;
             if (onComplete)
                 onComplete();
         };
@@ -697,8 +732,6 @@ var AllView = GObject.registerClass({
 
             // Toggle search entry
             Main.overview.searchEntry.reactive = !isOpen;
-            Main.overview.searchEntry.clutter_text.reactive = !isOpen;
-            Main.overview.searchEntry.clutter_text.editable = !isOpen;
 
             this._displayingPopup = isOpen;
         });
@@ -1257,8 +1290,8 @@ var AppSearchProvider = class AppSearchProvider {
         let results = [];
         groups.forEach(group => {
             group = group.filter(appID => {
-                let app = Gio.DesktopAppInfo.new(appID);
+                const app = this._appSys.lookup_app(appID);
-                return app && app.should_show();
+                return app && app.app_info.should_show();
             });
             results = results.concat(group.sort(
                 (a, b) => usage.compare(a, b)
@@ -1306,7 +1339,7 @@ class FolderView extends BaseAppView {
             x_expand: true,
             y_expand: true,
         });
-        this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
+        this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.EXTERNAL);
         this.add_actor(this._scrollView);
 
         let scrollableContainer = new St.BoxLayout({
@@ -1322,7 +1355,6 @@ class FolderView extends BaseAppView {
         action.connect('pan', this._onPan.bind(this));
         this._scrollView.add_action(action);
 
-        this._folder.connect('changed', this._redisplay.bind(this));
         this._redisplay();
     }
 
@@ -1344,12 +1376,12 @@ class FolderView extends BaseAppView {
         });
         layout.hookup_style(icon);
         let subSize = Math.floor(FOLDER_SUBICON_FRACTION * size);
-        let scale = St.ThemeContext.get_for_stage(global.stage).scale_factor;
 
         let numItems = this._orderedItems.length;
         let rtl = icon.get_text_direction() == Clutter.TextDirection.RTL;
         for (let i = 0; i < 4; i++) {
-            let bin = new St.Bin({ width: subSize * scale, height: subSize * scale });
+            const style = 'width: %dpx; height: %dpx;'.format(subSize, subSize);
+            let bin = new St.Bin({ style });
             if (i < numItems)
                 bin.child = this._orderedItems[i].app.create_icon_texture(subSize);
             layout.attach(bin, rtl ? (i + 1) % 2 : i % 2, Math.floor(i / 2), 1, 1);
@@ -1427,6 +1459,22 @@ class FolderView extends BaseAppView {
         return apps;
     }
 
+    addApp(app) {
+        let folderApps = this._folder.get_strv('apps');
+        folderApps.push(app.id);
+
+        this._folder.set_strv('apps', folderApps);
+
+        // Also remove from 'excluded-apps' if the app id is listed
+        // there. This is only possible on categories-based folders.
+        let excludedApps = this._folder.get_strv('excluded-apps');
+        let index = excludedApps.indexOf(app.id);
+        if (index >= 0) {
+            excludedApps.splice(index, 1);
+            this._folder.set_strv('excluded-apps', excludedApps);
+        }
+    }
+
     removeApp(app) {
         let folderApps = this._folder.get_strv('apps');
         let index = folderApps.indexOf(app.id);
@@ -1457,8 +1505,6 @@ class FolderView extends BaseAppView {
         } else {
             this._folder.set_strv('apps', folderApps);
         }
-
-        return true;
     }
 });
 
@@ -1492,26 +1538,26 @@ var FolderIcon = GObject.registerClass({
 
         this.view = new FolderView(this._folder, id, parentView);
 
-        this._itemDragBeginId = Main.overview.connect(
+        this._iconIsHovering = false;
-            'item-drag-begin', this._onDragBegin.bind(this));
-        this._itemDragEndId = Main.overview.connect(
-            'item-drag-end', this._onDragEnd.bind(this));
 
         this.connect('destroy', this._onDestroy.bind(this));
 
-        this._folder.connect('changed', this._redisplay.bind(this));
+        this._folderChangedId = this._folder.connect(
-        this._redisplay();
+            'changed', this._sync.bind(this));
+        this._sync();
     }
 
     _onDestroy() {
-        Main.overview.disconnect(this._itemDragBeginId);
+        if (this._dragMonitor) {
-        Main.overview.disconnect(this._itemDragEndId);
+            DND.removeDragMonitor(this._dragMonitor);
+            this._dragMonitor = null;
+        }
 
         this.view.destroy();
 
-        if (this._spaceReadySignalId) {
+        if (this._folderChangedId) {
-            this._parentView.disconnect(this._spaceReadySignalId);
+            this._folder.disconnect(this._folderChangedId);
-            this._spaceReadySignalId = 0;
+            delete this._folderChangedId;
         }
 
         if (this._dialog)
@@ -1523,10 +1569,10 @@ var FolderIcon = GObject.registerClass({
     }
 
     vfunc_unmap() {
-        super.vfunc_unmap();
-
         if (this._dialog)
             this._dialog.popdown();
+
+        super.vfunc_unmap();
     }
 
     open() {
@@ -1539,29 +1585,32 @@ var FolderIcon = GObject.registerClass({
         return this.view.getAllItems().map(item => item.id);
     }
 
-    _onDragBegin() {
+    _setHoveringByDnd(hovering) {
-        this._dragMonitor = {
+        if (this._iconIsHovering == hovering)
-            dragMotion: this._onDragMotion.bind(this),
+            return;
-        };
+
-        DND.addDragMonitor(this._dragMonitor);
+        this._iconIsHovering = hovering;
+
+        if (hovering) {
+            this._dragMonitor = {
+                dragMotion: this._onDragMotion.bind(this),
+            };
+            DND.addDragMonitor(this._dragMonitor);
+            this.add_style_pseudo_class('drop');
+        } else {
+            DND.removeDragMonitor(this._dragMonitor);
+            this.remove_style_pseudo_class('drop');
+        }
     }
 
     _onDragMotion(dragEvent) {
-        let target = dragEvent.targetActor;
+        if (!this.contains(dragEvent.targetActor) ||
-
+            !this._canAccept(dragEvent.source))
-        if (!this.contains(target) || !this._canAccept(dragEvent.source))
+            this._setHoveringByDnd(false);
-            this.remove_style_pseudo_class('drop');
-        else
-            this.add_style_pseudo_class('drop');
 
         return DND.DragMotionResult.CONTINUE;
     }
 
-    _onDragEnd() {
-        this.remove_style_pseudo_class('drop');
-        DND.removeDragMonitor(this._dragMonitor);
-    }
-
     _canAccept(source) {
         if (!(source instanceof AppIcon))
             return false;
@@ -1580,27 +1629,18 @@ var FolderIcon = GObject.registerClass({
         if (!this._canAccept(source))
             return DND.DragMotionResult.NO_DROP;
 
+        this._setHoveringByDnd(true);
+
         return DND.DragMotionResult.MOVE_DROP;
     }
 
     acceptDrop(source) {
+        this._setHoveringByDnd(false);
+
         if (!this._canAccept(source))
             return false;
 
-        let app = source.app;
+        this.view.addApp(source.app);
-        let folderApps = this._folder.get_strv('apps');
-        folderApps.push(app.id);
-
-        this._folder.set_strv('apps', folderApps);
-
-        // Also remove from 'excluded-apps' if the app id is listed
-        // there. This is only possible on categories-based folders.
-        let excludedApps = this._folder.get_strv('excluded-apps');
-        let index = excludedApps.indexOf(app.id);
-        if (index >= 0) {
-            excludedApps.splice(index, 1);
-            this._folder.set_strv('excluded-apps', excludedApps);
-        }
 
         return true;
     }
@@ -1615,11 +1655,11 @@ var FolderIcon = GObject.registerClass({
         this.emit('name-changed');
     }
 
-    _redisplay() {
+    _sync() {
+        this.emit('apps-changed');
         this._updateName();
         this.visible = this.view.getAllItems().length > 0;
         this.icon.update();
-        this.emit('apps-changed');
     }
 
     _createIcon(iconSize) {
@@ -1655,10 +1695,6 @@ var AppFolderDialog = GObject.registerClass({
             x_align: Clutter.ActorAlign.CENTER,
             y_align: Clutter.ActorAlign.CENTER,
         });
-        this.add_constraint(new Clutter.BindConstraint({
-            source: Main.overview.viewSelector,
-            coordinate: Clutter.BindCoordinate.ALL,
-        }));
 
         this._source = source;
         this._folder = folder;
@@ -1904,6 +1940,7 @@ var AppFolderDialog = GObject.registerClass({
 
     vfunc_allocate(box, flags) {
         let contentBox = this.get_theme_node().get_content_box(box);
+        contentBox = this._viewBox.get_theme_node().get_content_box(contentBox);
 
         let [, entryBoxHeight] = this._entryBox.get_size();
         let spacing = this._viewBox.layout_manager.spacing;
@@ -1912,6 +1949,8 @@ var AppFolderDialog = GObject.registerClass({
             contentBox.get_width(),
             contentBox.get_height() - entryBoxHeight - spacing);
 
+        this._view._grid.topPadding = 0;
+
         super.vfunc_allocate(box, flags);
 
         // We can only start zooming after receiving an allocation
@@ -2027,7 +2066,6 @@ var AppIcon = GObject.registerClass({
 
         this._delegate = this;
 
-        this._hasDndHover = false;
         this._folderPreviewId = 0;
 
         // Get the isDraggable property without passing it on to the BaseIcon:
@@ -2076,11 +2114,7 @@ var AppIcon = GObject.registerClass({
             });
         }
 
-        this._dragMonitor = null;
+        this._otherIconIsHovering = false;
-        this._itemDragBeginId = Main.overview.connect(
-            'item-drag-begin', this._onDragBegin.bind(this));
-        this._itemDragEndId = Main.overview.connect(
-            'item-drag-end', this._onDragEnd.bind(this));
 
         this._menuTimeoutId = 0;
         this._stateChangedId = this.app.connect('notify::state', () => {
@@ -2092,9 +2126,6 @@ var AppIcon = GObject.registerClass({
     }
 
     _onDestroy() {
-        Main.overview.disconnect(this._itemDragBeginId);
-        Main.overview.disconnect(this._itemDragEndId);
-
         if (this._folderPreviewId > 0) {
             GLib.source_remove(this._folderPreviewId);
             this._folderPreviewId = 0;
@@ -2276,7 +2307,7 @@ var AppIcon = GObject.registerClass({
 
     shellWorkspaceLaunch(params) {
         let { stack } = new Error();
-        log(`shellWorkspaceLaunch is deprecated, use app.open_new_window() instead\n${stack}`);
+        log('shellWorkspaceLaunch is deprecated, use app.open_new_window() instead\n%s'.format(stack));
 
         params = Params.parse(params, { workspace: -1,
                                         timestamp: 0 });
@@ -2341,7 +2372,17 @@ var AppIcon = GObject.registerClass({
     }
 
     _setHoveringByDnd(hovering) {
+        if (this._otherIconIsHovering == hovering)
+            return;
+
+        this._otherIconIsHovering = hovering;
+
         if (hovering) {
+            this._dragMonitor = {
+                dragMotion: this._onDragMotion.bind(this),
+            };
+            DND.addDragMonitor(this._dragMonitor);
+
             if (this._folderPreviewId > 0)
                 return;
 
@@ -2353,6 +2394,8 @@ var AppIcon = GObject.registerClass({
                     return GLib.SOURCE_REMOVE;
                 });
         } else {
+            DND.removeDragMonitor(this._dragMonitor);
+
             if (this._folderPreviewId > 0) {
                 GLib.source_remove(this._folderPreviewId);
                 this._folderPreviewId = 0;
@@ -2362,32 +2405,13 @@ var AppIcon = GObject.registerClass({
         }
     }
 
-    _onDragBegin() {
-        this._dragMonitor = {
-            dragMotion: this._onDragMotion.bind(this),
-        };
-        DND.addDragMonitor(this._dragMonitor);
-    }
-
     _onDragMotion(dragEvent) {
-        let target = dragEvent.targetActor;
+        if (!this.contains(dragEvent.targetActor))
-        let isHovering = target == this || this.contains(target);
+            this._setHoveringByDnd(false);
-        let canDrop = this._canAccept(dragEvent.source);
-        let hasDndHover = isHovering && canDrop;
-
-        if (this._hasDndHover != hasDndHover) {
-            this._setHoveringByDnd(hasDndHover);
-            this._hasDndHover = hasDndHover;
-        }
 
         return DND.DragMotionResult.CONTINUE;
     }
 
-    _onDragEnd() {
-        this.remove_style_pseudo_class('drop');
-        DND.removeDragMonitor(this._dragMonitor);
-    }
-
     handleDragOver(source) {
         if (source == this)
             return DND.DragMotionResult.NO_DROP;
@@ -2395,6 +2419,8 @@ var AppIcon = GObject.registerClass({
         if (!this._canAccept(source))
             return DND.DragMotionResult.CONTINUE;
 
+        this._setHoveringByDnd(true);
+
         return DND.DragMotionResult.MOVE_DROP;
     }
 
@@ -2439,7 +2465,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
         Main.uiGroup.add_actor(this.actor);
     }
 
-    _redisplay() {
+    _rebuildMenu() {
         this.removeAll();
 
         let windows = this._source.app.get_windows().filter(
@@ -2525,19 +2551,18 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
             if (Shell.AppSystem.get_default().lookup_app('org.gnome.Software.desktop')) {
                 this._appendSeparator();
                 let item = this._appendMenuItem(_("Show Details"));
-                item.connect('activate', () => {
+                item.connect('activate', async () => {
                     let id = this._source.app.get_id();
                     let args = GLib.Variant.new('(ss)', [id, '']);
-                    Gio.DBus.get(Gio.BusType.SESSION, null, (o, res) => {
+                    const bus = await Gio.DBus.get(Gio.BusType.SESSION, null);
-                        let bus = Gio.DBus.get_finish(res);
+                    bus.call(
-                        bus.call('org.gnome.Software',
+                        'org.gnome.Software',
-                                 '/org/gnome/Software',
+                        '/org/gnome/Software',
-                                 'org.gtk.Actions', 'Activate',
+                        'org.gtk.Actions', 'Activate',
-                                 GLib.Variant.new('(sava{sv})',
+                        new GLib.Variant.new(
-                                                  ['details', [args], null]),
+                            '(sava{sv})', ['details', [args], null]),
-                                 null, 0, -1, null, null);
+                        null, 0, -1, null);
-                        Main.overview.hide();
+                    Main.overview.hide();
-                    });
                 });
             }
         }
@@ -2556,7 +2581,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
     }
 
     popup(_activatingButton) {
-        this._redisplay();
+        this._rebuildMenu();
         this.open();
     }
 };

js/ui/appFavorites.js

@@ -66,7 +66,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::%s'.format(this.FAVORITE_APPS_KEY), this._onFavsChanged.bind(this));
         this.reload();
     }
 

js/ui/audioDeviceSelection.js

@@ -120,7 +120,7 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
         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 %s could not be loaded!'.format(desktopFile));
             return;
         }
 

js/ui/background.js

@@ -504,12 +504,9 @@ var SystemBackground = GObject.registerClass({
     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) {
             _systemBackground = new Meta.Background({ meta_display: global.display });
             _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
-            _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
         }
 
         super._init({
@@ -518,22 +515,11 @@ var SystemBackground = GObject.registerClass({
             background: _systemBackground,
         });
 
-        let cache = Meta.BackgroundImageCache.get_default();
+        let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-        let image = cache.load(file);
+            this.emit('loaded');
-        if (image.is_loaded()) {
+            return GLib.SOURCE_REMOVE;
-            image = null;
+        });
-            let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+        GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
-                this.emit('loaded');
-                return GLib.SOURCE_REMOVE;
-            });
-            GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
-        } else {
-            let id = image.connect('loaded', () => {
-                this.emit('loaded');
-                image.disconnect(id);
-                image = null;
-            });
-        }
     }
 });