Bump version to 3.36.2

Update NEWS.

.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-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,156 @@
+3.36.2
+======
+* Add openPrefs() convenience method for extensions [Florian; !1163]
+* Bring back support for empty StIcons [Andre, Jonas D.; !1173, !1178]
+* Wake up screen when unlocking programmatically [Florian; !1158]
+* Improve handling of scale-factor changes [Georges; !1176]
+* Fix translations of folder names [Florian; #2623]
+* Fix delay on lock screen after entering wrong password [Jonas D.; #2655]
+* Match ASCII alternatives of system actions [Will; #2688]
+* Tone down weekend days with events in calendar [Jakub; #2588]
+* Fix area screenshots on multi-monitor systems [Jonas Å; !1224]
+* Fix stuck lock screen after unlock [Jonas D., Florian; #2446]
+* Fixed crashes [Jonas D., Florian, Carlos; #2584, #2625, !1223, !1218]
+* Misc. bug fixes and cleanups [Jonas Å., Marco, Andre, Florian, Jonas D.;
+  !1155, !1156, !1169, !1168, #2551, #2563, !1172, !1179, !1160, #2562, #2578,
+  !1203, #2649, #2628, #2691, #1615, #2607, !1228]
+
+Contributors:
+  Marco Trevisan (Treviño), Jonas Dreßler, Carlos Garnacho,
+  Andre Moreira Magalhaes, Florian Müllner, Georges Basile Stavracas Neto,
+  Jakub Steiner, Will Thompson, Jonas Ådahl
+
+Translators:
+  Fabio Tomat [fur], Cheng-Chia Tseng [zh_TW], Danial Behzadi [fa],
+  Jiri Grönroos [fi], Ibai Oihanguren Sala [eu], Марко Костић [sr],
+  Rūdolfs Mazurs [lv], Rafael Fontenelle [pt_BR], Petr Kovář [cs],
+  Daniel Rusek [cs]
+
+3.36.1
+======
+* Improve app folders [Jonas D.; !1011]
+* Fix launching ibus daemon [Alynx; !1080]
+* Do not shutdown ibus/xsettings on X11 compositor restart [Carlos; #2329]
+* Hide hint text in entries when preedit is used [Carlos; !1084]
+* Do not load app infos on main thread [Christian; #2282]
+* Don't expose FDO Notifications interface on main bus name [Florian; !547]
+* Fix icon of mobile broadband connections [Cosimo, Reik; !1097, !1105]
+* Fix high-contrast/symbolic icon mix-up [Florian; #2414]
+* Don't ellipsize times in world clock [Florian; !1090]
+* Only check for extension updates if there are any extensions [Florian; !1100]
+* Fix crash when trying to update removed extensions [Florian; #2343]
+* Make Extensions app available as flatpak [Florian; !1081, !1106, !1087, !1133]
+* Display fractional timezones as hours:minutes [Jonas D.; #2438]
+* Fix assigning pad keybindings [Carlos; #2451]
+* Handle embedded newlines in lock screen notifications [Florian; #2463]
+* Fix OSK layout fallback for unsupported variants [Florian; #2471]
+* Do not apply text color to color glyphs (emojis) [Carlos; #850]
+* Check "Install pending software updates" by default [Michael; #2427]
+* Do not warn about missing GDM on each login [Florian; #2432]
+* Fix telepathy chat notifications [Marco; !1112]
+* Fix offline updates support in end session dialog [Michael; #2276]
+* Fix activating notifications by keyboard [Florian; #2319]
+* Remove handling of 'blacklisted' extensions [Florian; !1132]
+* Only update extensions if Extensions app is installed [Florian; #2346]
+* Improve Norwegian on-screen-keyboard layout [Bjørn; !1073]
+* Fix IM support for deleting surrounding text [Takao; !477]
+* Fix blur effect with fractional scaling [Jonas D.; !1000]
+* Use better location name in weather section [Florian; #2468]
+* Fix glitch in sound feedback on volume changes [Florian; !1147]
+* Fix on-screen keyboard regressions [Jonas D.; !1142]
+* Improve screen-reader support [Luke; #2508, #2517]
+* Fix password entry resize on login/lock screen [Florian; #2423]
+* Fix crash when opening app picker [Jonas Å.; !1154]
+* Misc. bug fixes and cleanups [Florian, Sebastian, Jan, Daniel, Philip, Mario,
+  Ray, Marco, Jonas D., Carlos, Georges; #2298, #2305, !1078, !1077, #2334,
+  #2381, !1093, !1098, #2386, !1108, !1109, !1114, !1076, !1072, !1115, !1088,
+  !1101, #2467, !1121, !1122, #2476, !1123, !1117, !1129, !1113, !1102, !1127,
+  #2238, !1131, !1135, !1136, !849, #2504, #2371, !1146, !1141, #2510, !1150]
+
+Contributors:
+  Marco Trevisan (Treviño), Michael Catanzaro, Cosimo Cecchi, Jonas Dreßler,
+  Takao Fujiwara, Carlos Garnacho, Christian Hergert, Sebastian Keller,
+  Reik Keutterling, Bjørn Lie, Florian Müllner, Jwtiyar Nariman,
+  Georges Basile Stavracas Neto, Mario Sanchez Prada, Ray Strode, Jan Tojnar,
+  Daniel van Vugt, Philip Withnall, Luke Yelavich, Alynx Zhou, Jonas Ådahl
+
+Translators:
+  Марко Костић [sr], Jordi Mas [ca], sicklylife [ja], Marek Černocký [cs],
+  Daniel Rusek [cs], Kjartan Maraas [nb], Tim Sabsch [de], Stas Solovey [ru],
+  Peter Mráz [sk], Rafael Fontenelle [pt_BR], Piotr Drąg [pl],
+  Milo Casagrande [it], Anders Jonsson [sv], Yuri Chornoivan [uk],
+  Kukuh Syafaat [id], Guillaume Bernard [fr], Daniel Mustieles [es],
+  Danial Behzadi [fa], Goran Vidović [hr], Yosef Or Boczko [he],
+  Emin Tufan Çetin [tr], Wolfgang Stöggl [de], Ibai Oihanguren Sala [eu],
+  Jwtiyar Nariman [ckb], Aurimas Černius [lt]
+
+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]

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:
+        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/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/meson.build

@@ -1,6 +1,6 @@
 desktop_files = [
   'org.gnome.Shell.desktop',
-  'org.gnome.Extensions.desktop',
+  'org.gnome.Shell.Extensions.desktop',
 ]
 service_files = []
 

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

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+# Keep in sync with subprojects/extensions-app
+Name=Extensions
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=org.gnome.Shell.Extensions
+# Never launch this, just provide name+icon to portal dialog
+Exec=false
+OnlyShowIn=GNOME;
+NoDisplay=true

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 @@
             "£"
           ],
           [
+            "¥"
+          ],
+          [
+            "$",
             "¢"
           ],
           [
-            "€"
+            "¢"
-          ],
-          [
-            "¥"
           ],
           [
             "^",

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

@@ -35,9 +35,9 @@ $app_grid_fg_color: #fff;
 }
 
 /* App Folders */
-.app-folder {
+.app-well-app.app-folder {
-  .overview-icon {
+  background-color: transparentize($osd_bg_color, 0.8);
-  }
+  border-radius: $base_border_radius + 4px; // same as %icon_tile
 }
 
 // expanded folder
@@ -60,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;
@@ -73,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;

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

@@ -153,9 +153,11 @@
   }
 
   .calendar-day-with-events {
+    background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
+    &.calendar-work-day {
        color: lighten($fg_color,10%);
        font-weight: bold;
-    background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
+    }
   }
 
   .calendar-other-month-day {

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;
     }
   }

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

@@ -120,7 +120,7 @@ var AuthPrompt = GObject.registerClass({
     vfunc_key_press_event(keyPressEvent) {
         if (keyPressEvent.keyval == Clutter.KEY_Escape)
             this.cancel();
-        return Clutter.EVENT_PROPAGATE;
+        return super.vfunc_key_press_event(keyPressEvent);
     }
 
     _initEntryRow() {
@@ -184,7 +184,7 @@ var AuthPrompt = GObject.registerClass({
         });
         this._defaultButtonWell.add_constraint(new Clutter.BindConstraint({
             source: this.cancelButton,
-            coordinate: Clutter.BindCoordinate.SIZE,
+            coordinate: Clutter.BindCoordinate.WIDTH,
         }));
         this._mainBox.add_child(this._defaultButtonWell);
 
@@ -424,8 +424,13 @@ var AuthPrompt = GObject.registerClass({
     }
 
     updateSensitivity(sensitive) {
+        if (this._entry.reactive === sensitive)
+            return;
+
         this._entry.reactive = sensitive;
-        this._entry.clutter_text.editable = sensitive;
+
+        if (sensitive)
+            this._entry.grab_key_focus();
     }
 
     vfunc_hide() {

js/gdm/loginDialog.js

@@ -35,7 +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;
 
 var UserListItem = GObject.registerClass({
     Signals: { 'activate': {} },
@@ -178,6 +177,7 @@ var UserList = GObject.registerClass({
     }
 
     vfunc_key_focus_in() {
+        super.vfunc_key_focus_in();
         this._moveFocusToItems();
     }
 
@@ -456,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',
@@ -464,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));
@@ -813,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));
         }

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,7 +1,7 @@
 // -*- 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;
@@ -55,13 +55,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}`);
         }
@@ -122,18 +127,20 @@ var IBusManager = class {
     }
 
     _initPanelService(ibus, result) {
-        let success = false;
         try {
-            success = !!this._ibus.request_name_async_finish(result);
+            this._ibus.request_name_async_finish(result);
         } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                return;
                 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._panelService.connect('set-cursor-location', (ps, x, y, w, h) => {
@@ -169,9 +176,6 @@ var IBusManager = class {
             this._engineChanged(this._ibus, engine.get_name());
         });
         this._updateReadiness();
-        } else {
-            this._clear();
-        }
     }
 
     _updateReadiness() {

js/misc/inputMethod.js

@@ -97,8 +97,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/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/systemActions.js

@@ -83,13 +83,17 @@ const SystemActions = GObject.registerClass({
         this._canHavePowerOff = true;
         this._canHaveSuspend = true;
 
+        function tokenizeKeywords(keywords) {
+            return keywords.split(';').map(keyword => GLib.str_tokenize_and_fold(keyword, null)).flat(2);
+        }
+
         this._actions = new Map();
         this._actions.set(POWER_OFF_ACTION_ID, {
             // Translators: The name of the power-off action in search
             name: C_("search-result", "Power Off"),
             iconName: 'system-shutdown-symbolic',
             // Translators: A list of keywords that match the power-off action, separated by semicolons
-            keywords: _('power off;shutdown;reboot;restart;halt;stop').split(/[; ]/),
+            keywords: tokenizeKeywords(_('power off;shutdown;reboot;restart;halt;stop')),
             available: false,
         });
         this._actions.set(LOCK_SCREEN_ACTION_ID, {
@@ -97,7 +101,7 @@ const SystemActions = GObject.registerClass({
             name: C_("search-result", "Lock Screen"),
             iconName: 'system-lock-screen-symbolic',
             // Translators: A list of keywords that match the lock screen action, separated by semicolons
-            keywords: _("lock screen").split(/[; ]/),
+            keywords: tokenizeKeywords(_('lock screen')),
             available: false,
         });
         this._actions.set(LOGOUT_ACTION_ID, {
@@ -105,7 +109,7 @@ const SystemActions = GObject.registerClass({
             name: C_("search-result", "Log Out"),
             iconName: 'application-exit-symbolic',
             // Translators: A list of keywords that match the logout action, separated by semicolons
-            keywords: _("logout;log out;sign off").split(/[; ]/),
+            keywords: tokenizeKeywords(_('logout;log out;sign off')),
             available: false,
         });
         this._actions.set(SUSPEND_ACTION_ID, {
@@ -113,7 +117,7 @@ const SystemActions = GObject.registerClass({
             name: C_("search-result", "Suspend"),
             iconName: 'media-playback-pause-symbolic',
             // Translators: A list of keywords that match the suspend action, separated by semicolons
-            keywords: _("suspend;sleep").split(/[; ]/),
+            keywords: tokenizeKeywords(_('suspend;sleep')),
             available: false,
         });
         this._actions.set(SWITCH_USER_ACTION_ID, {
@@ -121,14 +125,14 @@ const SystemActions = GObject.registerClass({
             name: C_("search-result", "Switch User"),
             iconName: 'system-switch-user-symbolic',
             // Translators: A list of keywords that match the switch user action, separated by semicolons
-            keywords: _("switch user").split(/[; ]/),
+            keywords: tokenizeKeywords(_('switch user')),
             available: false,
         });
         this._actions.set(LOCK_ORIENTATION_ACTION_ID, {
             name: '',
             iconName: '',
             // Translators: A list of keywords that match the lock orientation action, separated by semicolons
-            keywords: _("lock orientation;unlock orientation;screen;rotation").split(/[; ]/),
+            keywords: tokenizeKeywords(_('lock orientation;unlock orientation;screen;rotation')),
             available: false,
         });
 
@@ -277,7 +281,7 @@ const SystemActions = GObject.registerClass({
 
     getMatchingActions(terms) {
         // terms is a list of strings
-        terms = terms.map(term => term.toLowerCase());
+        terms = terms.map(term => GLib.str_tokenize_and_fold(term, null)[0]);
 
         let results = [];
 

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/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/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) {
@@ -1061,25 +1060,25 @@ class WindowSwitcher extends SwitcherPopup.SwitcherList {
     vfunc_allocate(box, flags) {
         let themeNode = this.get_theme_node();
         let contentBox = themeNode.get_content_box(box);
+        const labelHeight = this._label.height;
+        const totalLabelHeight =
+            labelHeight + themeNode.get_padding(St.Side.BOTTOM);
 
-        let childBox = new Clutter.ActorBox();
+        box.y2 -= totalLabelHeight;
-        childBox.x1 = contentBox.x1;
+        super.vfunc_allocate(box, flags);
-        childBox.x2 = contentBox.x2;
-        childBox.y2 = contentBox.y2;
-        childBox.y1 = childBox.y2 - this._label.height;
-        this._label.allocate(childBox, flags);
-
-        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM);
-        childBox.x1 = box.x1;
-        childBox.x2 = box.x2;
-        childBox.y1 = box.y1;
-        childBox.y2 = box.y2 - totalLabelHeight;
-        super.vfunc_allocate(childBox, flags);
 
         // Hooking up the parent vfunc will call this.set_allocation() with
         // the height without the label height, so call it again with the
         // correct size here.
+        box.y2 += totalLabelHeight;
         this.set_allocation(box, flags);
+
+        const childBox = new Clutter.ActorBox();
+        childBox.x1 = contentBox.x1;
+        childBox.x2 = contentBox.x2;
+        childBox.y2 = contentBox.y2;
+        childBox.y1 = childBox.y2 - labelHeight;
+        this._label.allocate(childBox, flags);
     }
 
     highlight(index, justOutline) {

js/ui/animation.js

@@ -15,8 +15,7 @@ class Animation extends St.Bin {
         const themeContext = St.ThemeContext.get_for_stage(global.stage);
 
         super._init({
-            width: width * themeContext.scale_factor,
+            style: `width: ${width}px; height: ${height}px;`,
-            height: height * themeContext.scale_factor,
         });
 
         this.connect('destroy', this._onDestroy.bind(this));

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/%s'.format(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,10 @@ function _findBestFolderName(apps) {
     }, commonCategories);
 
     for (let category of commonCategories) {
-        let keyfile = new GLib.KeyFile();
+        const directory = '%s.directory'.format(category);
-        let path = 'desktop-directories/%s.directory'.format(category);
+        const translated = Shell.util_get_translated_folder_name(directory);
-
+        if (translated !== null)
-        try {
+            return translated;
-            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 +158,10 @@ var BaseAppView = GObject.registerClass({
 
         this._items = new Map();
         this._orderedItems = [];
+
+        this._animateLaterId = 0;
+        this._viewLoadedHandlerId = 0;
+        this._viewIsReady = false;
     }
 
     _childFocused(_actor) {
@@ -204,6 +197,7 @@ var BaseAppView = GObject.registerClass({
             this._items.set(icon.id, icon);
         });
 
+        this._viewIsReady = true;
         this.emit('view-loaded');
     }
 
@@ -253,6 +247,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 +267,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._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();
@@ -392,10 +420,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 +461,10 @@ var AllView = GObject.registerClass({
 
     _redisplay() {
         super._redisplay();
+
+        this._folderIcons.forEach(icon => {
+            icon.view._redisplay();
+        });
         this._refilterApps();
     }
 
@@ -699,8 +733,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;
         });
@@ -1259,8 +1291,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)
@@ -1308,7 +1340,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({
@@ -1324,7 +1356,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();
     }
 
@@ -1346,12 +1377,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);
@@ -1429,6 +1460,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);
@@ -1459,8 +1506,6 @@ class FolderView extends BaseAppView {
         } else {
             this._folder.set_strv('apps', folderApps);
         }
-
-        return true;
     }
 });
 
@@ -1494,26 +1539,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)
@@ -1541,29 +1586,32 @@ var FolderIcon = GObject.registerClass({
         return this.view.getAllItems().map(item => item.id);
     }
 
-    _onDragBegin() {
+    _setHoveringByDnd(hovering) {
+        if (this._iconIsHovering == hovering)
+            return;
+
+        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;
@@ -1582,27 +1630,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;
     }
@@ -1617,11 +1656,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) {
@@ -1902,6 +1941,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;
@@ -1910,6 +1950,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
@@ -2025,7 +2067,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:
@@ -2074,11 +2115,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', () => {
@@ -2090,9 +2127,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;
@@ -2339,7 +2373,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;
 
@@ -2351,6 +2395,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;
@@ -2360,32 +2406,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;
@@ -2393,6 +2420,8 @@ var AppIcon = GObject.registerClass({
         if (!this._canAccept(source))
             return DND.DragMotionResult.CONTINUE;
 
+        this._setHoveringByDnd(true);
+
         return DND.DragMotionResult.MOVE_DROP;
     }
 
@@ -2437,7 +2466,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(
@@ -2533,7 +2562,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
                                  'org.gtk.Actions', 'Activate',
                                  GLib.Variant.new('(sava{sv})',
                                                   ['details', [args], null]),
-                                 null, 0, -1, null, null);
+                                 null, 0, -1, null);
                         Main.overview.hide();
                     });
                 });
@@ -2554,7 +2583,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
     }
 
     popup(_activatingButton) {
-        this._redisplay();
+        this._rebuildMenu();
         this.open();
     }
 };

js/ui/boxpointer.js

@@ -197,6 +197,11 @@ var BoxPointer = GObject.registerClass({
     }
 
     vfunc_allocate(box, flags) {
+        if (this._sourceActor && this._sourceActor.mapped) {
+            this._reposition(box);
+            this._updateFlip(box);
+        }
+
         this.set_allocation(box, flags);
 
         let themeNode = this.get_theme_node();
@@ -230,12 +235,6 @@ var BoxPointer = GObject.registerClass({
             break;
         }
         this.bin.allocate(childBox, flags);
-
-        if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition(box);
-            this._updateFlip(box);
-            this.set_allocation(box, flags);
-        }
     }
 
     _drawBorder(area) {

js/ui/calendar.js

@@ -837,7 +837,8 @@ class EventsSection extends MessageList.MessageListSection {
         this._title.connect('clicked', this._onTitleClicked.bind(this));
         this._title.connect('key-focus-in', this._onKeyFocusIn.bind(this));
 
-        Shell.AppSystem.get_default().connect('installed-changed',
+        this._appSys = Shell.AppSystem.get_default();
+        this._appSys.connect('installed-changed',
             this._appInstalledChanged.bind(this));
         this._appInstalledChanged();
     }
@@ -931,10 +932,13 @@ class EventsSection extends MessageList.MessageListSection {
         Main.overview.hide();
         Main.panel.closeCalendar();
 
-        let app = this._getCalendarApp();
+        let appInfo = this._getCalendarApp();
-        if (app.get_id() == 'evolution.desktop')
+        if (appInfo.get_id() === 'org.gnome.Evolution.desktop') {
-            app = Gio.DesktopAppInfo.new('evolution-calendar.desktop');
+            let app = this._appSys.lookup_app('evolution-calendar.desktop');
-        app.launch([], global.create_app_launch_context(0, -1));
+            if (app)
+                appInfo = app.app_info;
+        }
+        appInfo.launch([], global.create_app_launch_context(0, -1));
     }
 
     setDate(date) {
@@ -1149,17 +1153,22 @@ class CalendarMessageList extends St.Widget {
         let hbox = new St.BoxLayout({ style_class: 'message-list-controls' });
         box.add_child(hbox);
 
-        hbox.add_child(new St.Label({
+        const dndLabel = new St.Label({
             text: _('Do Not Disturb'),
             y_align: Clutter.ActorAlign.CENTER,
-        }));
+        });
+        hbox.add_child(dndLabel);
 
         this._dndSwitch = new DoNotDisturbSwitch();
         this._dndButton = new St.Button({
             can_focus: true,
+            toggle_mode: true,
             child: this._dndSwitch,
+            label_actor: dndLabel,
         });
-        this._dndButton.connect('clicked', () => this._dndSwitch.toggle());
+        this._dndButton.bind_property('checked',
+            this._dndSwitch, 'state',
+            GObject.BindingFlags.BIDIRECTIONAL | GObject.BindingFlags.SYNC_CREATE);
         hbox.add_child(this._dndButton);
 
         this._clearButton = new St.Button({

js/ui/checkBox.js

@@ -1,5 +1,5 @@
 /* exported CheckBox */
-const { Clutter, GObject, Pango, St } = imports.gi;
+const { Atk, Clutter, GObject, Pango, St } = imports.gi;
 
 var CheckBox = GObject.registerClass(
 class CheckBox extends St.Button {
@@ -15,6 +15,7 @@ class CheckBox extends St.Button {
             toggle_mode: true,
             can_focus: true,
         });
+        this.set_accessible_role(Atk.Role.CHECK_BOX);
 
         this._box = new St.Bin({ y_align: Clutter.ActorAlign.START });
         container.add_actor(this._box);
@@ -22,6 +23,7 @@ class CheckBox extends St.Button {
         this._label = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
         this._label.clutter_text.set_line_wrap(true);
         this._label.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE);
+        this.set_label_actor(this._label);
         container.add_actor(this._label);
 
         if (label)

js/ui/closeDialog.js

@@ -188,6 +188,8 @@ var CloseDialog = GObject.registerClass({
         global.stage.disconnect(this._keyFocusChangedId);
         this._keyFocusChangedId = 0;
 
+        this._dialog._dialog.remove_all_transitions();
+
         let dialog = this._dialog;
         this._dialog = null;
         this._removeWindowEffect();

js/ui/components/keyring.js

@@ -111,15 +111,11 @@ class KeyringDialog extends ModalDialog.ModalDialog {
     }
 
     _updateSensitivity(sensitive) {
-        if (this._passwordEntry) {
+        if (this._passwordEntry)
             this._passwordEntry.reactive = sensitive;
-            this._passwordEntry.clutter_text.editable = sensitive;
-        }
 
-        if (this._confirmEntry) {
+        if (this._confirmEntry)
             this._confirmEntry.reactive = sensitive;
-            this._confirmEntry.clutter_text.editable = sensitive;
-        }
 
         this._continueButton.can_focus = sensitive;
         this._continueButton.reactive = sensitive;

js/ui/components/networkAgent.js

@@ -4,13 +4,15 @@
 const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
-const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 
+Gio._promisify(Shell.NetworkAgent.prototype,
+    'search_vpn_plugin', 'search_vpn_plugin_finish');
+
 const VPN_UI_GROUP = 'VPN Plugin UI';
 
 var NetworkSecretDialog = GObject.registerClass(
@@ -615,14 +617,6 @@ var NetworkAgent = class {
         this._vpnRequests = { };
         this._notifications = { };
 
-        this._pluginDir = Gio.file_new_for_path(Config.VPNDIR);
-        try {
-            let monitor = this._pluginDir.monitor(Gio.FileMonitorFlags.NONE, null);
-            monitor.connect('changed', () => (this._vpnCacheBuilt = false));
-        } catch (e) {
-            log('Failed to create monitor for VPN plugin dir: %s'.format(e.message));
-        }
-
         this._native.connect('new-request', this._newRequest.bind(this));
         this._native.connect('cancel-request', this._cancelRequest.bind(this));
 
@@ -766,13 +760,11 @@ var NetworkAgent = class {
         }
     }
 
-    _vpnRequest(requestId, connection, hints, flags) {
+    async _vpnRequest(requestId, connection, hints, flags) {
         let vpnSetting = connection.get_setting_vpn();
         let serviceType = vpnSetting.service_type;
 
-        this._buildVPNServiceCache();
+        let binary = await this._findAuthBinary(serviceType);
-
-        let binary = this._vpnBinaries[serviceType];
         if (!binary) {
             log('Invalid VPN service type (cannot find authentication binary)');
 
@@ -788,36 +780,30 @@ var NetworkAgent = class {
         this._vpnRequests[requestId] = vpnRequest;
     }
 
-    _buildVPNServiceCache() {
+    async _findAuthBinary(serviceType) {
-        if (this._vpnCacheBuilt)
+        let plugin;
-            return;
 
-        this._vpnCacheBuilt = true;
+        try {
-        this._vpnBinaries = { };
+            plugin = await this._native.search_vpn_plugin(serviceType);
-
+        } catch (e) {
-        NM.VpnPluginInfo.list_load().forEach(plugin => {
+            logError(e);
-            let service = plugin.get_service();
+            return null;
-            let fileName = plugin.get_auth_dialog();
-            let supportsHints = plugin.supports_hints();
-            let externalUIMode = false;
-
-            let prop = plugin.lookup_property('GNOME', 'supports-external-ui-mode');
-            if (prop) {
-                prop = prop.trim().toLowerCase();
-                externalUIMode = ['true', 'yes', 'on', '1'].includes(prop);
         }
 
-            if (GLib.file_test(fileName, GLib.FileTest.IS_EXECUTABLE)) {
+        const fileName = plugin.get_auth_dialog();
-                let binary = { fileName, externalUIMode, supportsHints };
+        if (!GLib.file_test(fileName, GLib.FileTest.IS_EXECUTABLE)) {
-                this._vpnBinaries[service] = binary;
-
-                plugin.get_aliases().forEach(alias => {
-                    this._vpnBinaries[alias] = binary;
-                });
-            } else {
             log('VPN plugin at %s is not executable'.format(fileName));
+            return null;
         }
-        });
+
+        const prop = plugin.lookup_property('GNOME', 'supports-external-ui-mode');
+        const trimmedProp = prop ? prop.trim().toLowerCase() : '';
+
+        return {
+            fileName,
+            supportsHints: plugin.supports_hints(),
+            externalUIMode: ['true', 'yes', 'on', '1'].includes(trimmedProp),
+        };
     }
 };
 var Component = NetworkAgent;

js/ui/components/polkitAgent.js

@@ -327,6 +327,8 @@ var AuthenticationDialog = GObject.registerClass({
         }
 
         let resetDialog = () => {
+            this._sessionRequestTimeoutId = 0;
+
             if (this.state != ModalDialog.State.OPENED)
                 return;
 

js/ui/components/telepathyClient.js

@@ -2,7 +2,6 @@
 /* exported Component */
 
 const { Clutter, Gio, GLib, GObject, St } = imports.gi;
-const Lang = imports.lang;
 
 var Tpl = null;
 var Tp = null;
@@ -40,35 +39,58 @@ var NotificationDirection = {
     RECEIVED: 'chat-received',
 };
 
-function makeMessageFromTpMessage(tpMessage, direction) {
+const ChatMessage = HAVE_TP ? GObject.registerClass({
-    let [text, flags_] = tpMessage.to_text();
+    Properties: {
-
+        'message-type': GObject.ParamSpec.int(
-    let timestamp = tpMessage.get_sent_timestamp();
+            'message-type', 'message-type', 'message-type',
-    if (timestamp == 0)
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-        timestamp = tpMessage.get_received_timestamp();
+            Math.min(...Object.values(Tp.ChannelTextMessageType)),
-
+            Math.max(...Object.values(Tp.ChannelTextMessageType)),
-    return {
+            Tp.ChannelTextMessageType.NORMAL),
-        messageType: tpMessage.get_message_type(),
+        'text': GObject.ParamSpec.string(
-        text,
+            'text', 'text', 'text',
-        sender: tpMessage.sender.alias,
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-        timestamp,
+            null),
+        'sender': GObject.ParamSpec.string(
+            'sender', 'sender', 'sender',
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            null),
+        'timestamp': GObject.ParamSpec.int64(
+            'timestamp', 'timestamp', 'timestamp',
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            0, Number.MAX_SAFE_INTEGER, 0),
+        'direction': GObject.ParamSpec.string(
+            'direction', 'direction', 'direction',
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            null),
+    },
+}, class ChatMessageClass extends GObject.Object {
+    static newFromTpMessage(tpMessage, direction) {
+        return new ChatMessage({
+            'message-type': tpMessage.get_message_type(),
+            'text': tpMessage.to_text()[0],
+            'sender': tpMessage.sender.alias,
+            'timestamp': direction === NotificationDirection.RECEIVED
+                ? tpMessage.get_received_timestamp() : tpMessage.get_sent_timestamp(),
             direction,
-    };
+        });
     }
 
+    static newFromTplTextEvent(tplTextEvent) {
+        let direction =
+            tplTextEvent.get_sender().get_entity_type() === Tpl.EntityType.SELF
+                ? NotificationDirection.SENT : NotificationDirection.RECEIVED;
 
-function makeMessageFromTplEvent(event) {
+        return new ChatMessage({
-    let sent = event.get_sender().get_entity_type() == Tpl.EntityType.SELF;
+            'message-type': tplTextEvent.get_message_type(),
-    let direction = sent ? NotificationDirection.SENT : NotificationDirection.RECEIVED;
+            'text': tplTextEvent.get_message(),
-
+            'sender': tplTextEvent.get_sender().get_alias(),
-    return {
+            'timestamp': tplTextEvent.get_timestamp(),
-        messageType: event.get_message_type(),
-        text: event.get_message(),
-        sender: event.get_sender().get_alias(),
-        timestamp: event.get_timestamp(),
             direction,
-    };
+        });
     }
+}) : null;
+
 
 var TelepathyComponent = class {
     constructor() {
@@ -270,12 +292,12 @@ class TelepathyClient extends Tp.BaseClient {
 var ChatSource = HAVE_TP ? GObject.registerClass(
 class ChatSource extends MessageTray.Source {
     _init(account, conn, channel, contact, client) {
-        super._init(contact.get_alias());
-
         this._account = account;
         this._contact = contact;
         this._client = client;
 
+        super._init(contact.get_alias());
+
         this.isChat = true;
         this._pendingMessages = [];
 
@@ -431,7 +453,7 @@ class ChatSource extends MessageTray.Source {
     _displayPendingMessages(logManager, result) {
         let [success_, events] = logManager.get_filtered_events_finish(result);
 
-        let logMessages = events.map(makeMessageFromTplEvent);
+        let logMessages = events.map(e => ChatMessage.newFromTplTextEvent(e));
         this._ensureNotification();
 
         let pendingTpMessages = this._channel.get_pending_messages();
@@ -443,7 +465,8 @@ class ChatSource extends MessageTray.Source {
             if (message.get_message_type() == Tp.ChannelTextMessageType.DELIVERY_REPORT)
                 continue;
 
-            pendingMessages.push(makeMessageFromTpMessage(message, NotificationDirection.RECEIVED));
+            pendingMessages.push(ChatMessage.newFromTpMessage(message,
+                NotificationDirection.RECEIVED));
 
             this._pendingMessages.push(message);
         }
@@ -541,7 +564,8 @@ class ChatSource extends MessageTray.Source {
         this._pendingMessages.push(message);
         this.countUpdated();
 
-        message = makeMessageFromTpMessage(message, NotificationDirection.RECEIVED);
+        message = ChatMessage.newFromTpMessage(message,
+            NotificationDirection.RECEIVED);
         this._notification.appendMessage(message);
 
         // Wait a bit before notifying for the received message, a handler
@@ -566,7 +590,8 @@ class ChatSource extends MessageTray.Source {
     // our client and other clients as well.
     _messageSent(channel, message, _flags, _token) {
         this._ensureNotification();
-        message = makeMessageFromTpMessage(message, NotificationDirection.SENT);
+        message = ChatMessage.newFromTpMessage(message,
+            NotificationDirection.SENT);
         this._notification.appendMessage(message);
     }
 
@@ -630,11 +655,19 @@ class ChatSource extends MessageTray.Source {
     }
 }) : null;
 
+const ChatNotificationMessage = HAVE_TP ? GObject.registerClass(
+class ChatNotificationMessage extends GObject.Object {
+    _init(props = {}) {
+        super._init();
+        this.set(props);
+    }
+}) : null;
+
 var ChatNotification = HAVE_TP ? GObject.registerClass({
     Signals: {
-        'message-removed': { param_types: [Tp.Message.$gtype] },
+        'message-removed': { param_types: [ChatNotificationMessage.$gtype] },
-        'message-added': { param_types: [Tp.Message.$gtype] },
+        'message-added': { param_types: [ChatNotificationMessage.$gtype] },
-        'timestamp-changed': { param_types: [Tp.Message.$gtype] },
+        'timestamp-changed': { param_types: [ChatNotificationMessage.$gtype] },
     },
 }, class ChatNotification extends MessageTray.Notification {
     _init(source) {
@@ -735,21 +768,24 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({
                                       styles: [],
                                       timestamp: currentTime,
                                       noTimestamp: false });
+        const { noTimestamp } = props;
+        delete props.noTimestamp;
 
         // Reset the old message timeout
         if (this._timestampTimeoutId)
             GLib.source_remove(this._timestampTimeoutId);
         this._timestampTimeoutId = 0;
 
-        let message = { realMessage: props.group != 'meta',
+        let message = new ChatNotificationMessage({
-                        showTimestamp: false };
+            realMessage: props.group !== 'meta',
-        Lang.copyProperties(props, message);
+            showTimestamp: false,
-        delete message.noTimestamp;
+            ...props,
+        });
 
         this.messages.unshift(message);
         this.emit('message-added', message);
 
-        if (!props.noTimestamp) {
+        if (!noTimestamp) {
             let timestamp = props.timestamp;
             if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME) {
                 this.appendTimestamp();

js/ui/dateMenu.js

@@ -180,14 +180,27 @@ class WorldClocksSection extends St.Button {
 
             let time = new St.Label({ style_class: 'world-clocks-time' });
 
-            let otherOffset = this._getTimeAtLocation(l).get_utc_offset();
+            const utcOffset = this._getTimeAtLocation(l).get_utc_offset();
-            let offset = (otherOffset - localOffset) / GLib.TIME_SPAN_HOUR;
+            const offsetCurrentTz = utcOffset - localOffset;
-            let fmt = Math.trunc(offset) == offset ? '%s%.0f' : '%s%.1f';
+            const offsetHours = Math.abs(offsetCurrentTz) / GLib.TIME_SPAN_HOUR;
-            let prefix = offset >= 0 ? '+' : '-';
+            const offsetMinutes =
-            let tz = new St.Label({ style_class: 'world-clocks-timezone',
+                (Math.abs(offsetCurrentTz) % GLib.TIME_SPAN_HOUR) /
-                                    text: fmt.format(prefix, Math.abs(offset)),
+                GLib.TIME_SPAN_MINUTE;
+
+            const prefix = offsetCurrentTz >= 0 ? '+' : '-';
+            const text = offsetMinutes === 0
+                ? '%s%d'.format(prefix, offsetHours)
+                : '%s%d\u2236%d'.format(prefix, offsetHours, offsetMinutes);
+
+            const tz = new St.Label({
+                style_class: 'world-clocks-timezone',
+                text,
                 x_align: Clutter.ActorAlign.END,
-                                    y_align: Clutter.ActorAlign.CENTER });
+                y_align: Clutter.ActorAlign.CENTER,
+            });
+
+            time.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+            tz.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
 
             if (this._grid.text_direction == Clutter.TextDirection.RTL) {
                 layout.attach(tz, 0, i + 1, 1, 1);
@@ -384,6 +397,20 @@ class WeatherSection extends St.Button {
         layout.attach(label, 0, 0, 1, 1);
     }
 
+    _findBestLocationName(loc) {
+        const locName = loc.get_name();
+
+        if (loc.get_level() === GWeather.LocationLevel.CITY ||
+            !loc.has_coords())
+            return locName;
+
+        const world = GWeather.Location.get_world();
+        const city = world.find_nearest_city(...loc.get_coords());
+        const cityName = city.get_name();
+
+        return locName.includes(cityName) ? cityName : locName;
+    }
+
     _updateForecasts() {
         this._forecastGrid.destroy_all_children();
 
@@ -392,13 +419,8 @@ class WeatherSection extends St.Button {
             return;
         }
 
-        let info = this._weatherClient.info;
+        const { info } = this._weatherClient;
-        let loc = info.get_location();
+        this._titleLocation.text = this._findBestLocationName(info.location);
-        if (loc.get_level() !== GWeather.LocationLevel.CITY && loc.has_coords()) {
-            let world = GWeather.Location.get_world();
-            loc = world.find_nearest_city(...loc.get_coords());
-        }
-        this._titleLocation.text = loc.get_name();
 
         if (this._weatherClient.loading) {
             this._setStatusLabel(_("Loading…"));

js/ui/endSessionDialog.js

@@ -346,10 +346,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
 
         // Use a different description when we are installing a system upgrade
         // if the PackageKit proxy is available (i.e. PackageKit is available).
-        if (this._pkOfflineProxy && dialogContent.upgradeDescription) {
+        if (dialogContent.upgradeDescription) {
-            let name = this._pkOfflineProxy.PreparedUpgrade['name'].deep_unpack();
+            const { name, version } = this._updateInfo.PreparedUpgrade;
-            let version = this._pkOfflineProxy.PreparedUpgrade['version'].deep_unpack();
-
             if (name != null && version != null)
                 description = dialogContent.upgradeDescription(name, version);
         }
@@ -608,16 +606,46 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         });
     }
 
-    OpenAsync(parameters, invocation) {
+    async _getUpdateInfo() {
+        const connection = this._pkOfflineProxy.get_connection();
+        const reply = await connection.call(
+            this._pkOfflineProxy.g_name,
+            this._pkOfflineProxy.g_object_path,
+            'org.freedesktop.DBus.Properties',
+            'GetAll',
+            new GLib.Variant('(s)', [this._pkOfflineProxy.g_interface_name]),
+            null,
+            Gio.DBusCallFlags.NONE,
+            -1,
+            null);
+        const [info] = reply.recursiveUnpack();
+        return info;
+    }
+
+    async OpenAsync(parameters, invocation) {
         let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters;
         this._totalSecondsToStayOpen = totalSecondsToStayOpen;
         this._type = type;
 
+        try {
+            this._updateInfo = await this._getUpdateInfo();
+        } catch (e) {
+            if (this._pkOfflineProxy !== null)
+                log('Failed to get update info from PackageKit: %s'.format(e.message));
+
+            this._updateInfo = {
+                UpdateTriggered: false,
+                UpdatePrepared: false,
+                UpgradeTriggered: false,
+                PreparedUpgrade: {},
+            };
+        }
+
         // Only consider updates and upgrades if PackageKit is available.
         if (this._pkOfflineProxy && this._type == DialogType.RESTART) {
-            if (this._pkOfflineProxy.UpdateTriggered)
+            if (this._updateInfo.UpdateTriggered)
                 this._type = DialogType.UPDATE_RESTART;
-            else if (this._pkOfflineProxy.UpgradeTriggered)
+            else if (this._updateInfo.UpgradeTriggered)
                 this._type = DialogType.UPGRADE_RESTART;
         }
 
@@ -646,9 +674,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         if (dialogContent.showOtherSessions)
             this._loadSessions();
 
-        // Only consider updates and upgrades if PackageKit is available.
+        let updateTriggered = this._updateInfo.UpdateTriggered;
-        let updateTriggered = this._pkOfflineProxy ? this._pkOfflineProxy.UpdateTriggered : false;
+        let updatePrepared = this._updateInfo.UpdatePrepared;
-        let updatePrepared = this._pkOfflineProxy ? this._pkOfflineProxy.UpdatePrepared : false;
         let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
 
         _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');

js/ui/environment.js

@@ -10,8 +10,13 @@ imports.gi.versions.Gtk = '3.0';
 imports.gi.versions.TelepathyGLib = '0.12';
 imports.gi.versions.TelepathyLogger = '0.2';
 
-const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
+const System = imports.system;
+
+Gio._promisify(Gio.DBusConnection.prototype, 'call', 'call_finish');
+
+let _localTimeZone = null;
 
 // We can't import shell JS modules yet, because they may have
 // variable initializations, etc, that depend on init() already having
@@ -285,6 +290,13 @@ function init() {
         },
     });
 
+    Gio._LocalFilePrototype.touch_async = function (callback) {
+        Shell.util_touch_file_async(this, callback);
+    };
+    Gio._LocalFilePrototype.touch_finish = function (result) {
+        return Shell.util_touch_file_finish(this, result);
+    };
+
     St.set_slow_down_factor = function (factor) {
         let { stack } = new Error();
         log(`St.set_slow_down_factor() is deprecated, use St.Settings.slow_down_factor\n${stack}`);
@@ -304,9 +316,25 @@ function init() {
         }
     };
 
+    // Override to clear our own timezone cache as well
+    const origClearDateCaches = System.clearDateCaches;
+    System.clearDateCaches = function () {
+        _localTimeZone = null;
+        origClearDateCaches();
+    };
+
     // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=508783
     Date.prototype.toLocaleFormat = function (format) {
-        let dt = GLib.DateTime.new_from_unix_local(this.getTime() / 1000);
+        if (_localTimeZone === null)
+            _localTimeZone = GLib.TimeZone.new_local();
+
+        let dt = GLib.DateTime.new(_localTimeZone,
+            this.getFullYear(),
+            this.getMonth() + 1,
+            this.getDate(),
+            this.getHours(),
+            this.getMinutes(),
+            this.getSeconds());
         return dt ? dt.format(format) : '';
     };
 

js/ui/extensionDownloader.js

@@ -56,6 +56,15 @@ function uninstallExtension(uuid) {
         return false;
 
     FileUtils.recursivelyDeleteDir(extension.dir, true);
+
+    try {
+        const updatesDir = Gio.File.new_for_path(GLib.build_filenamev(
+            [global.userdatadir, 'extension-updates', extension.uuid]));
+        FileUtils.recursivelyDeleteDir(updatesDir, true);
+    } catch (e) {
+        // not an error
+    }
+
     return true;
 }
 
@@ -99,6 +108,9 @@ function gotExtensionZipFile(session, message, uuid, dir, callback, errback) {
 }
 
 function downloadExtensionUpdate(uuid) {
+    if (!Main.extensionManager.updatesSupported)
+        return;
+
     let dir = Gio.File.new_for_path(
         GLib.build_filenamev([global.userdatadir, 'extension-updates', uuid]));
 
@@ -117,6 +129,9 @@ function downloadExtensionUpdate(uuid) {
 }
 
 function checkForUpdates() {
+    if (!Main.extensionManager.updatesSupported)
+        return;
+
     let metadatas = {};
     Main.extensionManager.getUuids().forEach(uuid => {
         let extension = Main.extensionManager.lookup(uuid);
@@ -127,6 +142,9 @@ function checkForUpdates() {
         metadatas[uuid] = extension.metadata;
     });
 
+    if (Object.keys(metadatas).length === 0)
+        return; // nothing to update
+
     let versionCheck = global.settings.get_boolean(
         'disable-extension-version-validation');
     let params = {
@@ -144,9 +162,7 @@ function checkForUpdates() {
         let operations = JSON.parse(message.response_body.data);
         for (let uuid in operations) {
             let operation = operations[uuid];
-            if (operation == 'blacklist')
+            if (operation === 'upgrade' || operation === 'downgrade')
-                uninstallExtension(uuid);
-            else if (operation == 'upgrade' || operation == 'downgrade')
                 downloadExtensionUpdate(uuid);
         }
     });

js/ui/extensionSystem.js

@@ -60,6 +60,11 @@ var ExtensionManager = class {
         ExtensionDownloader.checkForUpdates();
     }
 
+    get updatesSupported() {
+        const appSys = Shell.AppSystem.get_default();
+        return appSys.lookup_app('org.gnome.Extensions.desktop') !== null;
+    }
+
     lookup(uuid) {
         return this._extensions.get(uuid);
     }
@@ -210,6 +215,25 @@ var ExtensionManager = class {
         return true;
     }
 
+    openExtensionPrefs(uuid, parentWindow, options) {
+        const extension = this.lookup(uuid);
+        if (!extension || !extension.hasPrefs)
+            return false;
+
+        Gio.DBus.session.call(
+            'org.gnome.Shell.Extensions',
+            '/org/gnome/Shell/Extensions',
+            'org.gnome.Shell.Extensions',
+            'OpenExtensionPrefs',
+            new GLib.Variant('(ssa{sv})', [uuid, parentWindow, options]),
+            null,
+            Gio.DBusCallFlags.NONE,
+            -1,
+            null,
+            (conn, res) => conn.call_finish(res));
+        return true;
+    }
+
     notifyExtensionUpdate(uuid) {
         let extension = this.lookup(uuid);
         if (!extension)
@@ -481,6 +505,9 @@ var ExtensionManager = class {
     }
 
     _installExtensionUpdates() {
+        if (!this.updatesSupported)
+            return;
+
         FileUtils.collectFromDatadirs('extension-updates', true, (dir, info) => {
             let fileType = info.get_file_type();
             if (fileType !== Gio.FileType.DIRECTORY)
@@ -489,9 +516,14 @@ var ExtensionManager = class {
             let extensionDir = Gio.File.new_for_path(
                 GLib.build_filenamev([global.userdatadir, 'extensions', uuid]));
 
+            try {
                 FileUtils.recursivelyDeleteDir(extensionDir, false);
                 FileUtils.recursivelyMoveDir(dir, extensionDir);
+            } catch (e) {
+                log('Failed to install extension updates for %s'.format(uuid));
+            } finally {
                 FileUtils.recursivelyDeleteDir(dir, true);
+            }
         });
     }
 

js/ui/keyboard.js

@@ -498,7 +498,7 @@ var Key = GObject.registerClass({
 var KeyboardModel = class {
     constructor(groupName) {
         let names = [groupName];
-        if (names.includes('+'))
+        if (groupName.includes('+'))
             names.push(groupName.replace(/\+.*/, ''));
         names.push('us');
 
@@ -1120,10 +1120,11 @@ var KeyboardManager = class KeyBoardManager {
 
         this._lastDevice = null;
         Meta.get_backend().connect('last-device-changed', (backend, device) => {
-            if (device.get_device_name().indexOf('XTEST') < 0) {
+            if (device.device_type === Clutter.InputDeviceType.KEYBOARD_DEVICE)
+                return;
+
             this._lastDevice = device;
             this._syncEnabled();
-            }
         });
         this._syncEnabled();
     }
@@ -1148,9 +1149,9 @@ var KeyboardManager = class KeyBoardManager {
             this._keyboard = new Keyboard();
         } else if (!enabled && this._keyboard) {
             this._keyboard.setCursorLocation(null);
-            Main.layoutManager.hideKeyboard(true);
             this._keyboard.destroy();
             this._keyboard = null;
+            Main.layoutManager.hideKeyboard(true);
         }
     }
 
@@ -1256,6 +1257,10 @@ class Keyboard extends St.BoxLayout {
         return this._keyboardVisible && super.visible;
     }
 
+    set visible(visible) {
+        super.visible = visible;
+    }
+
     _onFocusPositionChanged(focusTracker) {
         let rect = focusTracker.getCurrentRect();
         this.setCursorLocation(focusTracker.currentWindow, rect.x, rect.y, rect.width, rect.height);
@@ -1868,6 +1873,10 @@ var KeyboardController = class {
         Main.inputMethod.disconnect(this._notifyContentPurposeId);
         Main.inputMethod.disconnect(this._notifyContentHintsId);
         Main.inputMethod.disconnect(this._notifyInputPanelStateId);
+
+        // Make sure any buttons pressed by the virtual device are released
+        // immediately instead of waiting for the next GC cycle
+        this._virtualDevice.run_dispose();
     }
 
     _onSourcesModified() {

js/ui/layout.js

@@ -612,10 +612,20 @@ var LayoutManager = GObject.registerClass({
 
         let signalId = this._systemBackground.connect('loaded', () => {
             this._systemBackground.disconnect(signalId);
+
+            // We're mostly prepared for the startup animation
+            // now, but since a lot is going on asynchronously
+            // during startup, let's defer the startup animation
+            // until the event loop is uncontended and idle.
+            // This helps to prevent us from running the animation
+            // when the system is bogged down
+            const id = GLib.idle_add(GLib.PRIORITY_LOW, () => {
                 this._systemBackground.show();
                 global.stage.show();
-
                 this._prepareStartupAnimation();
+                return GLib.SOURCE_REMOVE;
+            });
+            GLib.Source.set_name_by_id(id, '[gnome-shell] Startup Animation');
         });
     }
 
@@ -672,17 +682,7 @@ var LayoutManager = GObject.registerClass({
 
         this.emit('startup-prepared');
 
-        // We're mostly prepared for the startup animation
-        // now, but since a lot is going on asynchronously
-        // during startup, let's defer the startup animation
-        // until the event loop is uncontended and idle.
-        // This helps to prevent us from running the animation
-        // when the system is bogged down
-        let id = GLib.idle_add(GLib.PRIORITY_LOW, () => {
         this._startupAnimation();
-            return GLib.SOURCE_REMOVE;
-        });
-        GLib.Source.set_name_by_id(id, '[gnome-shell] this._startupAnimation');
     }
 
     _startupAnimation() {
@@ -765,7 +765,7 @@ var LayoutManager = GObject.registerClass({
             this._keyboardHeightNotifyId = 0;
         }
         this.keyboardBox.ease({
-            translation_y: this.keyboardBox.height,
+            translation_y: 0,
             opacity: 0,
             duration: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
             mode: Clutter.AnimationMode.EASE_IN_QUAD,

js/ui/lookingGlass.js

@@ -1127,7 +1127,7 @@ class LookingGlass extends St.BoxLayout {
             else if (symbol == Clutter.KEY_Page_Down)
                 this._notebook.nextTab();
         }
-        return Clutter.EVENT_PROPAGATE;
+        return super.vfunc_key_press_event(keyPressEvent);
     }
 
     open() {

js/ui/main.js

@@ -93,6 +93,9 @@ let _a11ySettings = null;
 let _themeResource = null;
 let _oskResource = null;
 
+Gio._promisify(Gio._LocalFilePrototype, 'delete_async', 'delete_finish');
+Gio._promisify(Gio._LocalFilePrototype, 'touch_async', 'touch_finish');
+
 function _sessionUpdated() {
     if (sessionMode.isPrimary)
         _loadDefaultStylesheet();
@@ -129,6 +132,8 @@ function start() {
         notifyError(msg, detail);
     });
 
+    let currentDesktop = GLib.getenv('XDG_CURRENT_DESKTOP');
+    if (!currentDesktop || !currentDesktop.split(':').includes('GNOME'))
         Gio.DesktopAppInfo.set_desktop_env('GNOME');
 
     sessionMode = new SessionMode.SessionMode();
@@ -142,6 +147,11 @@ function start() {
     shellDBusService = new ShellDBus.GnomeShell();
     shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();
 
+    const watchId = Gio.DBus.session.watch_name('org.gnome.Shell.Notifications',
+        Gio.BusNameWatcherFlags.AUTO_START,
+        bus => bus.unwatch_name(watchId),
+        bus => bus.unwatch_name(watchId));
+
     _sessionUpdated();
 }
 
@@ -271,11 +281,8 @@ function _initializeUI() {
         }
 
         if (sessionMode.currentMode !== 'gdm' &&
-            sessionMode.currentMode !== 'initial-setup' &&
+            sessionMode.currentMode !== 'initial-setup')
-            screenShield === null) {
+            _handleLockScreenWarning();
-            notify(_('Screen Lock disabled'),
-                   _('Screen Locking requires the GNOME display manager.'));
-        }
 
         LoginManager.registerSessionWithGDM();
 
@@ -288,6 +295,32 @@ function _initializeUI() {
     });
 }
 
+async function _handleLockScreenWarning() {
+    const path = '%s/lock-warning-shown'.format(global.userdatadir);
+    const file = Gio.File.new_for_path(path);
+
+    const hasLockScreen = screenShield !== null;
+    if (hasLockScreen) {
+        try {
+            await file.delete_async(0, null);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                logError(e);
+        }
+    } else {
+        try {
+            if (!await file.touch_async())
+                return;
+        } catch (e) {
+            logError(e);
+        }
+
+        notify(
+            _('Screen Lock disabled'),
+            _('Screen Locking requires the GNOME display manager.'));
+    }
+}
+
 function _getStylesheet(name) {
     let stylesheet;
 
@@ -361,7 +394,8 @@ function reloadThemeResource() {
     if (_themeResource)
         _themeResource._unregister();
 
-    _themeResource = Gio.Resource.load('%s/gnome-shell-theme.gresource'.format(global.datadir));
+    _themeResource = Gio.Resource.load('%s/%s'.format(global.datadir,
+        sessionMode.themeResourceName));
     _themeResource._register();
 }
 
@@ -487,7 +521,9 @@ function pushModal(actor, params) {
     let prevFocusDestroyId;
     if (prevFocus != null) {
         prevFocusDestroyId = prevFocus.connect('destroy', () => {
-            let index = _findModal(actor);
+            const index = modalActorFocusStack.findIndex(
+                record => record.prevFocus === prevFocus);
+
             if (index >= 0)
                 modalActorFocusStack[index].prevFocus = null;
         });

js/ui/messageList.js

@@ -530,7 +530,7 @@ var Message = GObject.registerClass({
             this.close();
             return Clutter.EVENT_STOP;
         }
-        return Clutter.EVENT_PROPAGATE;
+        return super.vfunc_key_press_event(keyEvent);
     }
 });
 

js/ui/messageTray.js

@@ -762,12 +762,10 @@ var Source = GObject.registerClass({
 
         this.notifications = [];
 
-        this._policy = null;
+        this._policy = this._createPolicy();
     }
 
     get policy() {
-        if (!this._policy)
-            this._policy = this._createPolicy();
         return this._policy;
     }
 
@@ -880,8 +878,6 @@ var Source = GObject.registerClass({
     }
 
     destroy(reason) {
-        this.policy.destroy();
-
         let notifications = this.notifications;
         this.notifications = [];
 
@@ -890,6 +886,7 @@ var Source = GObject.registerClass({
 
         this.emit('destroy', reason);
 
+        this.policy.destroy();
         this.run_dispose();
     }
 

js/ui/mpris.js

@@ -251,6 +251,10 @@ class MediaSection extends MessageList.MessageListSection {
         return !this.empty && Calendar.isToday(this._date);
     }
 
+    get allowed() {
+        return !Main.sessionMode.isGreeter;
+    }
+
     _addPlayer(busName) {
         if (this._players.get(busName))
             return;

js/ui/notificationDaemon.js

@@ -416,11 +416,11 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
 var FdoNotificationDaemonSource = GObject.registerClass(
 class FdoNotificationDaemonSource extends MessageTray.Source {
     _init(title, pid, sender, appId) {
-        super._init(title);
-
         this.pid = pid;
         this.app = this._getApp(appId);
 
+        super._init(title);
+
         this.initialTitle = title;
 
         if (this.app)
@@ -631,12 +631,12 @@ class GtkNotificationDaemonAppSource extends MessageTray.Source {
         if (!app)
             throw new InvalidAppError();
 
-        super._init(app.get_name());
-
         this._appId = appId;
         this._app = app;
         this._objectPath = objectPath;
 
+        super._init(app.get_name());
+
         this._notifications = {};
         this._notificationPending = false;
     }

js/ui/overviewControls.js

@@ -473,6 +473,7 @@ class ControlsManager extends St.Widget {
 
         // A workspace might have been inserted or removed before the active
         // one, causing the adjustment to go out of sync, so update the value
+        this._workspaceAdjustment.remove_transition('value');
         this._workspaceAdjustment.value = activeIndex;
     }
 

js/ui/padOsd.js

@@ -89,7 +89,7 @@ var PadChooser = GObject.registerClass({
 });
 
 var KeybindingEntry = GObject.registerClass({
-    Signals: { 'keybinding-edited': {} },
+    Signals: { 'keybinding-edited': { param_types: [GObject.TYPE_STRING] } },
 }, class KeybindingEntry extends St.Entry {
     _init() {
         super._init({ hint_text: _("New shortcut…"), style: 'width: 10em' });

js/ui/panel.js

@@ -100,7 +100,7 @@ class AppMenu extends PopupMenu.PopupMenu {
                          'org.gtk.Actions', 'Activate',
                          GLib.Variant.new('(sava{sv})',
                                           ['details', [args], null]),
-                         null, 0, -1, null, null);
+                         null, 0, -1, null);
             });
         });
 
@@ -964,7 +964,7 @@ class Panel extends St.Widget {
             return Clutter.EVENT_STOP;
         }
 
-        return Clutter.EVENT_PROPAGATE;
+        return super.vfunc_key_press_event(keyEvent);
     }
 
     _toggleMenu(indicator) {

js/ui/remoteSearch.js

@@ -247,7 +247,7 @@ var RemoteSearchProvider = class {
             if (error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                 return;
 
-            log('Received error from DBus search provider %s: %s'.format(this.id, String(error)));
+            log('Received error from D-Bus search provider %s: %s'.format(this.id, String(error)));
             callback([]);
             return;
         }
@@ -274,7 +274,7 @@ var RemoteSearchProvider = class {
     _getResultMetasFinished(results, error, callback) {
         if (error) {
             if (!error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                log('Received error from DBus search provider %s during GetResultMetas: %s'.format(this.id, String(error)));
+                log('Received error from D-Bus search provider %s during GetResultMetas: %s'.format(this.id, String(error)));
             callback([]);
             return;
         }

js/ui/screenShield.js

@@ -498,6 +498,8 @@ var ScreenShield = class {
         if (Main.sessionMode.currentMode == 'unlock-dialog')
             Main.sessionMode.popMode('unlock-dialog');
 
+        this.emit('wake-up-screen');
+
         if (this._isGreeter) {
             // We don't want to "deactivate" any more than
             // this. In particular, we don't want to drop
@@ -519,6 +521,9 @@ var ScreenShield = class {
             this._isModal = false;
         }
 
+        this._longLightbox.lightOff();
+        this._shortLightbox.lightOff();
+
         this._lockDialogGroup.ease({
             translation_y: -global.screen_height,
             duration: Overview.ANIMATION_TIME,
@@ -533,8 +538,6 @@ var ScreenShield = class {
             this._dialog = null;
         }
 
-        this._longLightbox.lightOff();
-        this._shortLightbox.lightOff();
         this.actor.hide();
 
         if (this._becameActiveId != 0) {

js/ui/screenshot.js

@@ -84,7 +84,7 @@ var ScreenshotService = class {
         }
     }
 
-    _createStream(filename) {
+    _createStream(filename, invocation) {
         if (filename == '')
             return [Gio.MemoryOutputStream.new_resizable(), null];
 
@@ -94,6 +94,7 @@ var ScreenshotService = class {
                 let stream = file.replace(null, false, Gio.FileCreateFlags.NONE, null);
                 return [stream, file];
             } catch (e) {
+                invocation.return_value(GLib.Variant.new('(bs)', [false, '']));
                 return [null, null];
             }
         }
@@ -104,15 +105,15 @@ var ScreenshotService = class {
                 return [stream, file];
             } catch (e) {
                 if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS))
-                    return [null, null];
+                    break;
             }
         }
 
+        invocation.return_value(GLib.Variant.new('(bs)', [false, '']));
         return [null, null];
     }
 
-    _onScreenshotComplete(result, area, stream, file, flash, invocation) {
+    _onScreenshotComplete(area, stream, file, flash, invocation) {
-        if (result) {
         if (flash) {
             let flashspot = new Flashspot(area);
             flashspot.fire(() => {
@@ -121,7 +122,6 @@ var ScreenshotService = class {
         } else {
             this._removeShooterForSender(invocation.get_sender());
         }
-        }
 
         stream.close(null);
 
@@ -134,7 +134,7 @@ var ScreenshotService = class {
             clipboard.set_content(St.ClipboardType.CLIPBOARD, 'image/png', bytes);
         }
 
-        let retval = GLib.Variant.new('(bs)', [result, filenameUsed]);
+        let retval = GLib.Variant.new('(bs)', [true, filenameUsed]);
         invocation.return_value(retval);
     }
 
@@ -169,17 +169,20 @@ var ScreenshotService = class {
         if (!screenshot)
             return;
 
-        let [stream, file] = this._createStream(filename);
+        let [stream, file] = this._createStream(filename, invocation);
+        if (!stream)
+            return;
 
         screenshot.screenshot_area(x, y, width, height, stream,
             (o, res) => {
                 try {
-                    let [result, area] =
+                    let [success_, area] =
                         screenshot.screenshot_area_finish(res);
                     this._onScreenshotComplete(
-                        result, area, stream, file, flash, invocation);
+                        area, stream, file, flash, invocation);
                 } catch (e) {
-                    invocation.return_gerror(e);
+                    this._removeShooterForSender(invocation.get_sender());
+                    invocation.return_value(new GLib.Variant('(bs)', [false, '']));
                 }
             });
     }
@@ -190,17 +193,20 @@ var ScreenshotService = class {
         if (!screenshot)
             return;
 
-        let [stream, file] = this._createStream(filename);
+        let [stream, file] = this._createStream(filename, invocation);
+        if (!stream)
+            return;
 
         screenshot.screenshot_window(includeFrame, includeCursor, stream,
             (o, res) => {
                 try {
-                    let [result, area] =
+                    let [success_, area] =
                         screenshot.screenshot_window_finish(res);
                     this._onScreenshotComplete(
-                        result, area, stream, file, flash, invocation);
+                        area, stream, file, flash, invocation);
                 } catch (e) {
-                    invocation.return_gerror(e);
+                    this._removeShooterForSender(invocation.get_sender());
+                    invocation.return_value(new GLib.Variant('(bs)', [false, '']));
                 }
             });
     }
@@ -211,17 +217,20 @@ var ScreenshotService = class {
         if (!screenshot)
             return;
 
-        let [stream, file] = this._createStream(filename);
+        let [stream, file] = this._createStream(filename, invocation);
+        if (!stream)
+            return;
 
         screenshot.screenshot(includeCursor, stream,
             (o, res) => {
                 try {
-                    let [result, area] =
+                    let [success_, area] =
                         screenshot.screenshot_finish(res);
                     this._onScreenshotComplete(
-                        result, area, stream, file, flash, invocation);
+                        area, stream, file, flash, invocation);
                 } catch (e) {
-                    invocation.return_gerror(e);
+                    this._removeShooterForSender(invocation.get_sender());
+                    invocation.return_value(new GLib.Variant('(bs)', [false, '']));
                 }
             });
     }

js/ui/sessionMode.js

@@ -15,6 +15,7 @@ const _modes = {
     'restrictive': {
         parentMode: null,
         stylesheetName: 'gnome-shell.css',
+        themeResourceName: 'gnome-shell-theme.gresource',
         hasOverview: false,
         showCalendarEvents: false,
         allowSettings: false,

js/ui/shellDBus.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported GnomeShell, ScreenSaverDBus */
 
-const { Gio, GLib, Meta, Shell } = imports.gi;
+const { Gio, GLib, Meta } = imports.gi;
 
 const Config = imports.misc.config;
 const ExtensionDownloader = imports.ui.extensionDownloader;
@@ -255,6 +255,17 @@ var GnomeShellExtensions = class {
     constructor() {
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellExtensionsIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell');
+
+        this._userExtensionsEnabled = this.UserExtensionsEnabled;
+        global.settings.connect('changed::disable-user-extensions', () => {
+            if (this._userExtensionsEnabled === this.UserExtensionsEnabled)
+                return;
+
+            this._userExtensionsEnabled = this.UserExtensionsEnabled;
+            this._dbusImpl.emit_property_changed('UserExtensionsEnabled',
+                new GLib.Variant('b', this._userExtensionsEnabled));
+        });
+
         Main.extensionManager.connect('extension-state-changed',
                                       this._extensionStateChanged.bind(this));
     }
@@ -301,20 +312,18 @@ var GnomeShellExtensions = class {
     }
 
     LaunchExtensionPrefs(uuid) {
-        let appSys = Shell.AppSystem.get_default();
+        this.OpenExtensionPrefs(uuid, '', {});
-        let app = appSys.lookup_app('org.gnome.Extensions.desktop');
-        let info = app.get_app_info();
-        let timestamp = global.display.get_current_time_roundtrip();
-        info.launch_uris([`extension:///${uuid}`],
-                         global.create_app_launch_context(timestamp, -1));
     }
 
-    ReloadExtension(uuid) {
+    OpenExtensionPrefs(uuid, parentWindow, options) {
-        let extension = Main.extensionManager.lookup(uuid);
+        Main.extensionManager.openExtensionPrefs(uuid, parentWindow, options);
-        if (!extension)
+    }
-            return;
 
-        Main.extensionManager.reloadExtension(extension);
+    ReloadExtensionAsync(params, invocation) {
+        invocation.return_error_literal(
+            Gio.DBusError,
+            Gio.DBusError.NOT_SUPPORTED,
+            'ReloadExtension is deprecated and does not work');
     }
 
     CheckForUpdates() {
@@ -325,6 +334,14 @@ var GnomeShellExtensions = class {
         return Config.PACKAGE_VERSION;
     }
 
+    get UserExtensionsEnabled() {
+        return !global.settings.get_boolean('disable-user-extensions');
+    }
+
+    set UserExtensionsEnabled(enable) {
+        global.settings.set_boolean('disable-user-extensions', !enable);
+    }
+
     _extensionStateChanged(_, newState) {
         let state = ExtensionUtils.serializeExtension(newState);
         this._dbusImpl.emit_signal('ExtensionStateChanged',

js/ui/shellMountOperation.js

@@ -447,12 +447,8 @@ var ShellMountPasswordDialog = GObject.registerClass({
         let useKeyfiles = this._keyfilesCheckbox.checked;
         this._passwordEntry.reactive = !useKeyfiles;
         this._passwordEntry.can_focus = !useKeyfiles;
-        this._passwordEntry.clutter_text.editable = !useKeyfiles;
-        this._passwordEntry.clutter_text.selectable = !useKeyfiles;
         this._pimEntry.reactive = !useKeyfiles;
         this._pimEntry.can_focus = !useKeyfiles;
-        this._pimEntry.clutter_text.editable = !useKeyfiles;
-        this._pimEntry.clutter_text.selectable = !useKeyfiles;
         this._rememberChoice.reactive = !useKeyfiles;
         this._rememberChoice.can_focus = !useKeyfiles;
         this._keyfilesLabel.visible = useKeyfiles;

js/ui/slider.js

@@ -43,10 +43,10 @@ var Slider = GObject.registerClass({
         let [hasHandleColor, handleBorderColor] =
             themeNode.lookup_color('-slider-handle-border-color', false);
 
-        let wholeHandleRadius = Math.ceil(handleRadius);
+        const ceiledHandleRadius = Math.ceil(handleRadius + handleBorderWidth);
-        let handleX = wholeHandleRadius +
+        const handleX = ceiledHandleRadius +
-            (width - 2 * wholeHandleRadius) * this._value / this._maxValue;
+            (width - 2 * ceiledHandleRadius) * this._value / this._maxValue;
-        let handleY = height / 2;
+        const handleY = height / 2;
 
         let color = themeNode.get_foreground_color();
         Clutter.cairo_set_source_color(cr, color);
@@ -186,7 +186,7 @@ var Slider = GObject.registerClass({
             this.value = Math.max(0, Math.min(this._value + delta, this._maxValue));
             return Clutter.EVENT_STOP;
         }
-        return Clutter.EVENT_PROPAGATE;
+        return super.vfunc_key_press_event(keyPressEvent);
     }
 
     _moveHandle(absX, _absY) {

js/ui/status/accessibility.js

@@ -139,14 +139,14 @@ class ATIndicator extends PanelMenu.Button {
             interfaceSettings.is_writable(KEY_ICON_THEME),
             enabled => {
                 if (enabled) {
-                    interfaceSettings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
                     interfaceSettings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
+                    interfaceSettings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
                 } else if (!hasHC) {
-                    interfaceSettings.set_string(KEY_GTK_THEME, gtkTheme);
                     interfaceSettings.set_string(KEY_ICON_THEME, iconTheme);
+                    interfaceSettings.set_string(KEY_GTK_THEME, gtkTheme);
                 } else {
-                    interfaceSettings.reset(KEY_GTK_THEME);
                     interfaceSettings.reset(KEY_ICON_THEME);
+                    interfaceSettings.reset(KEY_GTK_THEME);
                 }
             });
 

js/ui/status/location.js

@@ -64,7 +64,7 @@ class Indicator extends PanelMenu.SystemIndicator {
 
         this._item.label.text = _("Location Enabled");
         this._onOffAction = this._item.menu.addAction(_("Disable"), this._onOnOffAction.bind(this));
-        this._item.menu.addSettingsAction(_("Privacy Settings"), 'gnome-privacy-panel.desktop');
+        this._item.menu.addSettingsAction(_('Privacy Settings'), 'gnome-location-panel.desktop');
 
         this.menu.addMenuItem(this._item);
 

js/ui/status/volume.js

@@ -138,11 +138,12 @@ var StreamSlider = class {
     }
 
     _notifyVolumeChange() {
-        if (this._stream.state === Gvc.MixerStreamState.RUNNING)
-            return; // feedback not necessary while playing
-
         if (this._volumeCancellable)
             this._volumeCancellable.cancel();
+        this._volumeCancellable = null;
+
+        if (this._stream.state === Gvc.MixerStreamState.RUNNING)
+            return; // feedback not necessary while playing
 
         this._volumeCancellable = new Gio.Cancellable();
         let player = global.display.get_sound_player();

js/ui/swipeTracker.js

@@ -58,7 +58,7 @@ const TouchpadSwipeGesture = GObject.registerClass({
         this._orientation = Clutter.Orientation.VERTICAL;
         this._enabled = true;
 
-        global.stage.connect('captured-event', this._handleEvent.bind(this));
+        global.stage.connect('captured-event::touchpad', this._handleEvent.bind(this));
     }
 
     get enabled() {

js/ui/switcherPopup.js

@@ -130,7 +130,7 @@ var SwitcherPopup = GObject.registerClass({
             let [x_, y_, mods] = global.get_pointer();
             if (!(mods & this._modifierMask)) {
                 this._finish(global.get_current_time());
-                return false;
+                return true;
             }
         } else {
             this._resetNoModsTimeout();
@@ -228,7 +228,9 @@ var SwitcherPopup = GObject.registerClass({
     }
 
     vfunc_scroll_event(scrollEvent) {
-        this._scrollHandler(scrollEvent.scroll_direction);
+        this._disableHover();
+
+        this._scrollHandler(scrollEvent.direction);
         return Clutter.EVENT_PROPAGATE;
     }
 
@@ -253,7 +255,15 @@ var SwitcherPopup = GObject.registerClass({
 
     _itemRemovedHandler(n) {
         if (this._items.length > 0) {
-            let newIndex = Math.min(n, this._items.length - 1);
+            let newIndex;
+
+            if (n < this._selectedIndex)
+                newIndex = this._selectedIndex - 1;
+            else if (n === this._selectedIndex)
+                newIndex = Math.min(n, this._items.length - 1);
+            else if (n > this._selectedIndex)
+                return; // No need to select something new in this case
+
             this._select(newIndex);
         } else {
             this.fadeAndDestroy();
@@ -417,9 +427,8 @@ var SwitcherList = GObject.registerClass({
         bbox.set_child(item);
         this._list.add_actor(bbox);
 
-        let n = this._items.length;
+        bbox.connect('clicked', () => this._onItemClicked(bbox));
-        bbox.connect('clicked', () => this._onItemClicked(n));
+        bbox.connect('motion-event', () => this._onItemEnter(bbox));
-        bbox.connect('motion-event', () => this._onItemEnter(n));
 
         bbox.label_actor = label;
 
@@ -434,16 +443,23 @@ var SwitcherList = GObject.registerClass({
         this.emit('item-removed', index);
     }
 
-    _onItemClicked(index) {
+    addAccessibleState(index, state) {
-        this._itemActivated(index);
+        this._items[index].add_accessible_state(state);
     }
 
-    _onItemEnter(index) {
+    removeAccessibleState(index, state) {
-        // Avoid reentrancy
+        this._items[index].remove_accessible_state(state);
-        if (index != this._currentItemEntered) {
-            this._currentItemEntered = index;
-            this._itemEntered(index);
     }
+
+    _onItemClicked(item) {
+        this._itemActivated(this._items.indexOf(item));
+    }
+
+    _onItemEnter(item) {
+        // Avoid reentrancy
+        if (item !== this._items[this._highlighted])
+            this._itemEntered(this._items.indexOf(item));
+
         return Clutter.EVENT_PROPAGATE;
     }
 
@@ -468,40 +484,40 @@ var SwitcherList = GObject.registerClass({
         let [result_, posX, posY_] = this.transform_stage_point(absItemX, 0);
         let [containerWidth] = this.get_transformed_size();
         if (posX + this._items[index].get_width() > containerWidth)
-            this._scrollToRight();
+            this._scrollToRight(index);
         else if (this._items[index].allocation.x1 - value < 0)
-            this._scrollToLeft();
+            this._scrollToLeft(index);
 
     }
 
-    _scrollToLeft() {
+    _scrollToLeft(index) {
         let adjustment = this._scrollView.hscroll.adjustment;
         let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();
 
-        let item = this._items[this._highlighted];
+        let item = this._items[index];
 
         if (item.allocation.x1 < value)
-            value = Math.min(0, item.allocation.x1);
+            value = Math.max(0, item.allocation.x1);
         else if (item.allocation.x2 > value + pageSize)
-            value = Math.max(upper, item.allocation.x2 - pageSize);
+            value = Math.min(upper, item.allocation.x2 - pageSize);
 
         this._scrollableRight = true;
         adjustment.ease(value, {
             progress_mode: Clutter.AnimationMode.EASE_OUT_QUAD,
             duration: POPUP_SCROLL_TIME,
             onComplete: () => {
-                if (this._highlighted == 0)
+                if (index === 0)
                     this._scrollableLeft = false;
                 this.queue_relayout();
             },
         });
     }
 
-    _scrollToRight() {
+    _scrollToRight(index) {
         let adjustment = this._scrollView.hscroll.adjustment;
         let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();
 
-        let item = this._items[this._highlighted];
+        let item = this._items[index];
 
         if (item.allocation.x1 < value)
             value = Math.max(0, item.allocation.x1);
@@ -513,7 +529,7 @@ var SwitcherList = GObject.registerClass({
             progress_mode: Clutter.AnimationMode.EASE_OUT_QUAD,
             duration: POPUP_SCROLL_TIME,
             onComplete: () => {
-                if (this._highlighted == this._items.length - 1)
+                if (index === this._items.length - 1)
                     this._scrollableRight = false;
                 this.queue_relayout();
             },

js/ui/unlockDialog.js

@@ -115,7 +115,7 @@ var NotificationsBox = GObject.registerClass({
         box.add_child(textBox);
 
         let title = new St.Label({
-            text: source.title,
+            text: source.title.replace(/\n/g, ' '),
             style_class: 'unlock-dialog-notification-label',
         });
         textBox.add(title);
@@ -129,9 +129,10 @@ var NotificationsBox = GObject.registerClass({
 
             let body = '';
             if (n.bannerBodyText) {
+                const bodyText = n.bannerBodyText.replace(/\n/g, ' ');
                 body = n.bannerBodyMarkup
-                    ? n.bannerBodyText
+                    ? bodyText
-                    : GLib.markup_escape_text(n.bannerBodyText, -1);
+                    : GLib.markup_escape_text(bodyText, -1);
             }
 
             let label = new St.Label({ style_class: 'unlock-dialog-notification-count-text' });
@@ -556,12 +557,13 @@ var UnlockDialog = GObject.registerClass({
         this._otherUserButton = new St.Button({
             style_class: 'modal-dialog-button button switch-user-button',
             accessible_name: _('Log in as another user'),
-            can_focus: true,
+            reactive: false,
-            reactive: true,
+            opacity: 0,
             x_align: Clutter.ActorAlign.END,
             y_align: Clutter.ActorAlign.END,
             child: new St.Icon({ icon_name: 'system-users-symbolic' }),
         });
+        this._otherUserButton.set_pivot_point(0.5, 0.5);
         this._otherUserButton.connect('clicked', this._otherUserClicked.bind(this));
 
         let screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
@@ -603,7 +605,7 @@ var UnlockDialog = GObject.registerClass({
         this._showPrompt();
 
         if (GLib.unichar_isgraph(unichar))
-            this.addCharacter(unichar);
+            this._authPrompt.addCharacter(unichar);
 
         return Clutter.EVENT_PROPAGATE;
     }
@@ -666,7 +668,7 @@ var UnlockDialog = GObject.registerClass({
         this._promptBox.add_child(this._authPrompt);
 
         this._authPrompt.reset();
-        this._updateSensitivity(true);
+        this._authPrompt.updateSensitivity(true);
     }
 
     _maybeDestroyAuthPrompt() {
@@ -682,13 +684,6 @@ var UnlockDialog = GObject.registerClass({
         }
     }
 
-    _updateSensitivity(sensitive) {
-        this._authPrompt.updateSensitivity(sensitive);
-
-        this._otherUserButton.reactive = sensitive;
-        this._otherUserButton.can_focus = sensitive;
-    }
-
     _showClock() {
         if (this._activePage === this._clock)
             return;
@@ -720,6 +715,11 @@ var UnlockDialog = GObject.registerClass({
         this._promptBox.visible = progress > 0;
         this._clock.visible = progress < 1;
 
+        this._otherUserButton.set({
+            reactive: progress > 0,
+            can_focus: progress > 0,
+        });
+
         const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage);
 
         this._promptBox.set({
@@ -735,6 +735,12 @@ var UnlockDialog = GObject.registerClass({
             scale_y: FADE_OUT_SCALE + (1 - FADE_OUT_SCALE) * (1 - progress),
             translation_y: -FADE_OUT_TRANSLATION * progress * scaleFactor,
         });
+
+        this._otherUserButton.set({
+            opacity: 255 * progress,
+            scale_x: FADE_OUT_SCALE + (1 - FADE_OUT_SCALE) * progress,
+            scale_y: FADE_OUT_SCALE + (1 - FADE_OUT_SCALE) * progress,
+        });
     }
 
     _fail() {
@@ -755,7 +761,7 @@ var UnlockDialog = GObject.registerClass({
     }
 
     _escape() {
-        if (this.allowCancel)
+        if (this._authPrompt && this.allowCancel)
             this._authPrompt.cancel();
     }
 
@@ -829,11 +835,6 @@ var UnlockDialog = GObject.registerClass({
             this._authPrompt.cancel();
     }
 
-    addCharacter(unichar) {
-        this._showPrompt();
-        this._authPrompt.addCharacter(unichar);
-    }
-
     finish(onComplete) {
         this._ensureAuthPrompt();
         this._authPrompt.finish(onComplete);

js/ui/viewSelector.js

@@ -44,7 +44,7 @@ function getTermsForSearchString(searchString) {
 
 var TouchpadShowOverviewAction = class {
     constructor(actor) {
-        actor.connect('captured-event', this._handleEvent.bind(this));
+        actor.connect('captured-event::touchpad', this._handleEvent.bind(this));
     }
 
     _handleEvent(actor, event) {

js/ui/windowAttentionHandler.js

@@ -57,11 +57,11 @@ var WindowAttentionHandler = class {
 var WindowAttentionSource = GObject.registerClass(
 class WindowAttentionSource extends MessageTray.Source {
     _init(app, window) {
-        super._init(app.get_name());
-
         this._window = window;
         this._app = app;
 
+        super._init(app.get_name());
+
         this.signalIDs = [];
         this.signalIDs.push(this._window.connect('notify::demands-attention',
                                                  this._sync.bind(this)));

js/ui/windowManager.js

@@ -82,8 +82,10 @@ class DisplayChangeDialog extends ModalDialog.ModalDialog {
     }
 
     _formatCountDown() {
-        let fmt = ngettext("Settings changes will revert in %d second",
+        const fmt = ngettext(
-                           "Settings changes will revert in %d seconds");
+            'Settings changes will revert in %d second',
+            'Settings changes will revert in %d seconds',
+            this._countDown);
         return fmt.format(this._countDown);
     }
 
@@ -896,12 +898,37 @@ var WindowManager = class {
             }
         });
 
-        global.display.connect('x11-display-opened', () => {
+        global.display.connect('init-xserver', (display, task) => {
             IBusManager.getIBusManager().restartDaemon(['--xim']);
-            Shell.util_start_systemd_unit('gnome-session-x11-services.target', 'fail');
+            Shell.util_start_systemd_unit('gsd-xsettings.target', 'fail');
+
+            /* Leave this watchdog timeout so don't block indefinitely here */
+            let timeoutId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
+                Gio.DBus.session.unwatch_name(watchId);
+                log('Warning: Failed to start gsd-xsettings');
+                task.return_boolean(true);
+                timeoutId = 0;
+                return GLib.SOURCE_REMOVE;
+            });
+
+            /* When gsd-xsettings daemon is started, we are good to resume */
+            let watchId = Gio.DBus.session.watch_name(
+                'org.gnome.SettingsDaemon.XSettings',
+                Gio.BusNameWatcherFlags.NONE,
+                () => {
+                    Gio.DBus.session.unwatch_name(watchId);
+                    if (timeoutId > 0) {
+                        task.return_boolean(true);
+                        GLib.source_remove(timeoutId);
+                    }
+                },
+                null);
+            return true;
         });
         global.display.connect('x11-display-closing', () => {
-            Shell.util_stop_systemd_unit('gnome-session-x11-services.target', 'fail');
+            if (!Meta.is_wayland_compositor())
+                return;
+            Shell.util_stop_systemd_unit('gsd-xsettings.target', 'fail');
             IBusManager.getIBusManager().restartDaemon();
         });
 
@@ -1259,7 +1286,6 @@ var WindowManager = class {
         actorClone.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
         actorClone.set_position(oldFrameRect.x, oldFrameRect.y);
         actorClone.set_size(oldFrameRect.width, oldFrameRect.height);
-        Main.uiGroup.add_actor(actorClone);
 
         if (this._clearAnimationInfo(actor))
             this._shellwm.completed_size_change(actor);
@@ -1290,6 +1316,8 @@ var WindowManager = class {
         this._resizePending.delete(actor);
         this._resizing.add(actor);
 
+        Main.uiGroup.add_child(actorClone);
+
         // Now scale and fade out the clone
         actorClone.ease({
             x: targetRect.x,

js/ui/workspace.js

@@ -404,7 +404,7 @@ var WindowClone = GObject.registerClass({
             return true;
         }
 
-        return false;
+        return super.vfunc_key_press_event(keyEvent);
     }
 
     _onClicked() {

lint/eslintrc-gjs.yml

@@ -226,4 +226,4 @@ globals:
   printerr: readonly
   window: readonly
 parserOptions:
-  ecmaVersion: 2017
+  ecmaVersion: 2019

lint/eslintrc-shell.yml

@@ -17,7 +17,6 @@ rules:
 overrides:
   - files: js/**
     excludedFiles:
-      - js/extensionPrefs/*
       - js/portalHelper/*
     globals:
       global: readonly
@@ -25,3 +24,8 @@ overrides:
       C_: readonly
       N_: readonly
       ngettext: readonly
+  - files: subprojects/extensions-app/js/**
+    globals:
+      _: readonly
+      C_: readonly
+      N_: readonly

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.35.91',
+  version: '3.36.2',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )
@@ -25,12 +25,12 @@ gio_req = '>= 2.56.0'
 gi_req = '>= 1.49.1'
 gjs_req = '>= 1.63.2'
 gtk_req = '>= 3.15.0'
-mutter_req = '>= 3.35.91'
+mutter_req = '>= 3.36.0'
 polkit_req = '>= 0.100'
 schemas_req = '>= 3.33.1'
 startup_req = '>= 0.11'
 ibus_req = '>= 1.5.2'
-gnome_desktop_req = '>= 3.34.2'
+gnome_desktop_req = '>= 3.35.90'
 
 bt_req = '>= 3.9.0'
 gst_req = '>= 0.11.92'
@@ -58,6 +58,7 @@ desktopdir = join_paths(datadir, 'applications')
 icondir = join_paths(datadir, 'icons')
 ifacedir = join_paths(datadir, 'dbus-1', 'interfaces')
 localedir = join_paths(datadir, 'locale')
+metainfodir = join_paths(datadir, 'metainfo')
 portaldir = join_paths(datadir, 'xdg-desktop-portal', 'portals')
 schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 servicedir = join_paths(datadir, 'dbus-1', 'services')
@@ -114,12 +115,8 @@ if get_option('networkmanager')
   nm_deps += dependency('libnm', version: nm_req)
   nm_deps += dependency('libsecret-1', version: secret_req)
 
-  vpndir = nm_deps[0].get_pkgconfig_variable('vpnservicedir')
-
   have_networkmanager = true
 else
-  vpndir = prefix
-
   have_networkmanager = false
 endif
 
@@ -142,6 +139,7 @@ endif
 mutter_typelibdir = mutter_dep.get_pkgconfig_variable('typelibdir')
 python = find_program('python3')
 sassc = find_program('sassc')
+gjs = find_program('gjs')
 
 cc = meson.get_compiler('c')
 
@@ -244,13 +242,40 @@ libgvc = subproject('gvc',
 )
 libgvc_gir = libgvc.get_variable('libgvc_gir')
 
-if get_option('extensions_tool')
+libshew = subproject('shew',
-  subproject('extensions-tool',
   default_options: [
-      'man=@0@'.format(get_option('man')),
     'package_name=@0@'.format(meson.project_name()),
   ]
 )
+
+libshew_version = libshew.get_variable('package_version')
+assert(libshew_version == meson.project_version(),
+  'shew version does not match project version')
+
+if get_option('extensions_tool')
+  extension_tool = subproject('extensions-tool',
+    default_options: [
+      'package_name=@0@'.format(meson.project_name()),
+    ]
+  )
+
+  extension_tool_version = extension_tool.get_variable('package_version')
+  assert(extension_tool_version == meson.project_version(),
+    'extension-tool version does not match project version'
+  )
+endif
+
+if get_option('extensions_app')
+  extensions_app = subproject('extensions-app',
+    default_options: [
+      'package_name=@0@'.format(meson.project_name()),
+    ]
+  )
+
+  extensions_app_version = extensions_app.get_variable('package_version')
+  assert(extensions_app_version == meson.project_version(),
+    'Extensions app version does not match project version'
+  )
 endif
 
 
@@ -268,3 +293,36 @@ if get_option('gtk_doc')
 endif
 
 meson.add_install_script('meson/postinstall.py')
+
+summary_options = {
+  'networkmanager': get_option('networkmanager'),
+  'systemd': get_option('systemd'),
+  'extensions_app': get_option('extensions_app'),
+  'extensions_tool': get_option('extensions_tool'),
+  'man': get_option('man'),
+  'gtk_doc': get_option('gtk_doc'),
+}
+
+summary_build = {
+  'buildtype': get_option('buildtype'),
+  'debug': get_option('debug'),
+}
+
+summary_dirs = {
+  'prefix': get_option('prefix'),
+  'bindir': get_option('bindir'),
+  'libdir': get_option('libdir'),
+  'libexecdir': get_option('libexecdir'),
+  'datadir': get_option('datadir'),
+  'sysconfdir': get_option('sysconfdir'),
+}
+
+if get_option('man')
+  summary_dirs += { 'mandir': get_option('mandir') }
+endif
+
+if meson.version().version_compare('>= 0.53.0')
+  summary(summary_dirs, section: 'Directories')
+  summary(summary_build, section: 'Build Configuration')
+  summary(summary_options, section: 'Build Options')
+endif

meson_options.txt

@@ -4,6 +4,12 @@ option('extensions_tool',
   description: 'Build gnome-extensions CLI tool'
 )
 
+option('extensions_app',
+  type: 'boolean',
+  value: true,
+  description: 'Build gnome-extensions GUI application'
+)
+
 option('gtk_doc',
   type: 'boolean',
   value: false,

po/LINGUAS

@@ -10,6 +10,7 @@ bn_IN
 bs
 ca
 ca@valencia
+ckb
 cs
 da
 de

po/POTFILES.in

@@ -1,13 +1,10 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/50-gnome-shell-system.xml
-data/org.gnome.Extensions.desktop.in.in
 data/org.gnome.Shell.desktop.in.in
 data/org.gnome.shell.gschema.xml.in
 data/org.gnome.Shell.PortalHelper.desktop.in.in
-js/extensionPrefs/main.js
+js/dbusServices/extensions/ui/extension-prefs-dialog.ui
-js/extensionPrefs/ui/extension-row.ui
-js/extensionPrefs/ui/extensions-window.ui
 js/gdm/authPrompt.js
 js/gdm/loginDialog.js
 js/gdm/util.js
@@ -81,6 +78,11 @@ src/shell-global.c
 src/shell-keyring-prompt.c
 src/shell-polkit-authentication-agent.c
 src/shell-util.c
+subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in
+subprojects/extensions-app/data/org.gnome.Extensions.desktop.in.in
+subprojects/extensions-app/js/main.js
+subprojects/extensions-app/data/ui/extension-row.ui
+subprojects/extensions-app/data/ui/extensions-window.ui
 subprojects/extensions-tool/src/command-create.c
 subprojects/extensions-tool/src/command-disable.c
 subprojects/extensions-tool/src/command-enable.c

po/ca.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2020-02-17 22:27+0000\n"
+"POT-Creation-Date: 2020-03-21 18:07+0000\n"
 "PO-Revision-Date: 2020-02-18 20:44+0100\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -45,15 +45,6 @@ msgstr "Mostra totes les aplicacions"
 msgid "Open the application menu"
 msgstr "Obre el menú d'aplicació"
 
-#: data/org.gnome.Extensions.desktop.in.in:4 js/extensionPrefs/main.js:218
-#: js/extensionPrefs/ui/extensions-window.ui:61
-msgid "Extensions"
-msgstr "Extensions"
-
-#: data/org.gnome.Extensions.desktop.in.in:7
-msgid "Configure GNOME Shell Extensions"
-msgstr "Configureu les extensions del GNOME Shell"
-
 #: data/org.gnome.Shell.desktop.in.in:4
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
@@ -200,7 +191,7 @@ msgid ""
 msgstr ""
 "El GNOME Shell us demanarà la contrasenya quan es munti un dispositiu "
 "encriptat o un sistema de fitxers remot. Si es pot desar la contrasenya per "
-"utilitzar-lo en el futur, es mostrarà la casella de selecció «Recorda la "
+"a utilitzar-la en el futur, es mostrarà la casella de selecció «Recorda la "
 "contrasenya». Aquesta clau estableix el valor per defecte d'aquesta casella "
 "de selecció."
 
@@ -237,48 +228,48 @@ msgstr ""
 
 #: data/org.gnome.shell.gschema.xml.in:119
 msgid "Keybinding to open the application menu"
-msgstr "Vinculació per obrir el menú d'aplicació"
+msgstr "Vinculació per a obrir el menú d'aplicació"
 
 #: data/org.gnome.shell.gschema.xml.in:120
 msgid "Keybinding to open the application menu."
-msgstr "La vinculació per obrir el menú d'aplicació."
+msgstr "La vinculació per a obrir el menú d'aplicació."
 
 #: data/org.gnome.shell.gschema.xml.in:126
 msgid "Keybinding to open the “Show Applications” view"
-msgstr "Vinculació de tecles per obrir la vista «Mostra les aplicacions»"
+msgstr "Vinculació de tecles per a obrir la vista «Mostra les aplicacions»"
 
 #: data/org.gnome.shell.gschema.xml.in:127
 msgid ""
 "Keybinding to open the “Show Applications” view of the Activities Overview."
 msgstr ""
-"Vinculació de tecles per obrir la vista «Mostra les aplicacions» de les "
+"Vinculació de tecles per a obrir la vista «Mostra les aplicacions» de les "
 "activitats de la vista general."
 
 #: data/org.gnome.shell.gschema.xml.in:134
 msgid "Keybinding to open the overview"
-msgstr "Vinculació per obrir la vista general"
+msgstr "Vinculació per a obrir la vista general"
 
 #: data/org.gnome.shell.gschema.xml.in:135
 msgid "Keybinding to open the Activities Overview."
-msgstr "Vinculació per obrir la vista general d'activitats."
+msgstr "Vinculació per a obrir la vista general d'activitats."
 
 #: data/org.gnome.shell.gschema.xml.in:141
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr ""
-"La vinculació per commutar la visibilitat de la llista de notificacions"
+"La vinculació per a commutar la visibilitat de la llista de notificacions"
 
 #: data/org.gnome.shell.gschema.xml.in:142
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr ""
-"La vinculació per commutar la visibilitat de la llista de notificacions."
+"La vinculació per a commutar la visibilitat de la llista de notificacions."
 
 #: data/org.gnome.shell.gschema.xml.in:148
 msgid "Keybinding to focus the active notification"
-msgstr "Vinculació per posar el focus a la notificació activa"
+msgstr "Vinculació per a posar el focus a la notificació activa"
 
 #: data/org.gnome.shell.gschema.xml.in:149
 msgid "Keybinding to focus the active notification."
-msgstr "Vinculació per posar el focus a la notificació activa."
+msgstr "Vinculació per a posar el focus a la notificació activa."
 
 #: data/org.gnome.shell.gschema.xml.in:155
 msgid "Switch to application 1"
@@ -415,32 +406,56 @@ msgstr ""
 msgid "Network Login"
 msgstr "Inici de sessió de xarxa"
 
-#: js/extensionPrefs/main.js:140
+#: js/extensionPrefs/data/metainfo/org.gnome.Extensions.metainfo.xml.in:5
+#: js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in:4
+#: js/extensionPrefs/js/main.js:241
+#: js/extensionPrefs/data/ui/extensions-window.ui:61
+msgid "Extensions"
+msgstr "Extensions"
+
+#: js/extensionPrefs/data/metainfo/org.gnome.Extensions.metainfo.xml.in:6
+#: js/extensionPrefs/js/main.js:242
+msgid "Manage your GNOME Extensions"
+msgstr "Gestioneu les extensions del GNOME Shell"
+
+#: js/extensionPrefs/data/metainfo/org.gnome.Extensions.metainfo.xml.in:35
+msgid ""
+"GNOME Extensions handles updating extensions, configuring extension "
+"preferences and removing or disabling unwanted extensions."
+msgstr ""
+"Les extensions del GNOME gestiona les actualitzacions de les extensions, configurant "
+"les preferències de l'extensió i suprimint o desactivant les extensions no desitjades."
+
+#: js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in:7
+msgid "Configure GNOME Shell Extensions"
+msgstr "Configureu les extensions del GNOME Shell"
+
+#: js/extensionPrefs/js/main.js:163
 #, javascript-format
 msgid "Remove “%s”?"
 msgstr "Voleu suprimir «%s»?"
 
-#: js/extensionPrefs/main.js:141
+#: js/extensionPrefs/js/main.js:164
 msgid ""
 "If you remove the extension, you need to return to download it if you want "
 "to enable it again"
 msgstr ""
 "Si suprimiu una extensió, us cal tornar-la a baixar si voleu habilitar-la de "
-"nou."
+"nou"
 
-#: js/extensionPrefs/main.js:144 js/ui/audioDeviceSelection.js:57
+#: js/extensionPrefs/js/main.js:167 js/gdm/authPrompt.js:135
-#: js/ui/components/networkAgent.js:107 js/ui/components/polkitAgent.js:139
+#: js/ui/audioDeviceSelection.js:57 js/ui/components/networkAgent.js:109
-#: js/ui/endSessionDialog.js:374 js/ui/extensionDownloader.js:165
+#: js/ui/components/polkitAgent.js:139 js/ui/endSessionDialog.js:374
-#: js/ui/shellMountOperation.js:376 js/ui/shellMountOperation.js:386
+#: js/ui/extensionDownloader.js:177 js/ui/shellMountOperation.js:376
-#: js/ui/status/network.js:913
+#: js/ui/shellMountOperation.js:386 js/ui/status/network.js:913
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: js/extensionPrefs/main.js:145
+#: js/extensionPrefs/js/main.js:168
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: js/extensionPrefs/main.js:217
+#: js/extensionPrefs/js/main.js:240
 msgid "translator-credits"
 msgstr ""
 "Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>\n"
@@ -448,15 +463,12 @@ msgstr ""
 "Gil Forcada <gilforcada@guifi.net>\n"
 "Jordi Mas i Hernàndez <jmas@softcatala.org>"
 
-#: js/extensionPrefs/main.js:219
+#: js/extensionPrefs/js/main.js:284
-msgid "Manage your GNOME Extensions"
+#: js/extensionPrefs/data/ui/extensions-window.ui:223
-msgstr "Gestioneu les extensions del GNOME Shell"
-
-#: js/extensionPrefs/main.js:261 js/extensionPrefs/ui/extensions-window.ui:222
 msgid "Something’s gone wrong"
 msgstr "Alguna cosa ha anat malament"
 
-#: js/extensionPrefs/main.js:268
+#: js/extensionPrefs/js/main.js:291
 msgid ""
 "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 "
@@ -465,61 +477,61 @@ msgstr ""
 "Hi ha un problema: no es poden mostrar els paràmetres per a aquesta "
 "extensió. Us recomanem que informeu del problema als autors de l'extensió."
 
-#: js/extensionPrefs/main.js:275
+#: js/extensionPrefs/js/main.js:298
 msgid "Technical Details"
 msgstr "Detalls tècnics"
 
-#: js/extensionPrefs/main.js:310
+#: js/extensionPrefs/js/main.js:333
 msgid "Copy Error"
 msgstr "Copia l'error"
 
-#: js/extensionPrefs/main.js:337
+#: js/extensionPrefs/js/main.js:360
 msgid "Homepage"
 msgstr "Pàgina d'inici"
 
-#: js/extensionPrefs/main.js:338
+#: js/extensionPrefs/js/main.js:361
 msgid "Visit extension homepage"
 msgstr "Visiteu la pàgina d'inici de l'extensió"
 
-#: js/extensionPrefs/main.js:449
+#: js/extensionPrefs/js/main.js:478
 #, javascript-format
 msgid "%d extension will be updated on next login."
 msgid_plural "%d extensions will be updated on next login."
 msgstr[0] "%d extensió serà actualitzada la següent vegada que entreu."
 msgstr[1] "%d extensions seran actualitzades la següent vegada que entreu."
 
-#: js/extensionPrefs/ui/extension-row.ui:100
+#: js/extensionPrefs/data/ui/extension-row.ui:100
 #: subprojects/extensions-tool/src/command-create.c:211
 #: subprojects/extensions-tool/src/main.c:173
 msgid "Description"
 msgstr "Descripció"
 
-#: js/extensionPrefs/ui/extension-row.ui:123
+#: js/extensionPrefs/data/ui/extension-row.ui:123
 #: subprojects/extensions-tool/src/main.c:185
 msgid "Version"
 msgstr "Versió"
 
-#: js/extensionPrefs/ui/extension-row.ui:151
+#: js/extensionPrefs/data/ui/extension-row.ui:151
 msgid "Author"
 msgstr "Autoria"
 
-#: js/extensionPrefs/ui/extension-row.ui:175
+#: js/extensionPrefs/data/ui/extension-row.ui:175
 msgid "Website"
 msgstr "Lloc web"
 
-#: js/extensionPrefs/ui/extension-row.ui:192
+#: js/extensionPrefs/data/ui/extension-row.ui:192
 msgid "Remove…"
 msgstr "Suprimeix…"
 
-#: js/extensionPrefs/ui/extensions-window.ui:8
+#: js/extensionPrefs/data/ui/extensions-window.ui:8
 msgid "Help"
 msgstr "Ajuda"
 
-#: js/extensionPrefs/ui/extensions-window.ui:12
+#: js/extensionPrefs/data/ui/extensions-window.ui:12
 msgid "About Extensions"
 msgstr "Quant a les extensions"
 
-#: js/extensionPrefs/ui/extensions-window.ui:27
+#: js/extensionPrefs/data/ui/extensions-window.ui:27
 msgid ""
 "To find and add extensions, visit <a href=\"https://extensions.gnome.org"
 "\">extensions.gnome.org</a>."
@@ -527,11 +539,11 @@ msgstr ""
 "Per visitar i afegir extensions, visiteu <a href=\"https://extensions.gnome."
 "org\">extensions.gnome.org</a>."
 
-#: js/extensionPrefs/ui/extensions-window.ui:35
+#: js/extensionPrefs/data/ui/extensions-window.ui:35
 msgid "Warning"
 msgstr "Avís"
 
-#: js/extensionPrefs/ui/extensions-window.ui:46
+#: js/extensionPrefs/data/ui/extensions-window.ui:46
 msgid ""
 "Extensions can cause system issues, including performance problems. If you "
 "encounter problems with your system, it is recommended to disable all "
@@ -541,19 +553,19 @@ msgstr ""
 "rendiment. Si us trobeu amb problemes amb el sistema, us recomanem "
 "inhabilitar totes les extensions."
 
-#: js/extensionPrefs/ui/extensions-window.ui:133
+#: js/extensionPrefs/data/ui/extensions-window.ui:134
 msgid "Manually Installed"
 msgstr "Instal·lada manualment"
 
-#: js/extensionPrefs/ui/extensions-window.ui:157
+#: js/extensionPrefs/data/ui/extensions-window.ui:158
 msgid "Built-In"
 msgstr "Integrada"
 
-#: js/extensionPrefs/ui/extensions-window.ui:198
+#: js/extensionPrefs/data/ui/extensions-window.ui:199
 msgid "No Installed Extensions"
 msgstr "No hi ha cap extensió instal·lada"
 
-#: js/extensionPrefs/ui/extensions-window.ui:234
+#: js/extensionPrefs/data/ui/extensions-window.ui:235
 msgid ""
 "We’re very sorry, but it was not possible to get the list of installed "
 "extensions. Make sure you are logged into GNOME and try again."
@@ -561,15 +573,15 @@ msgstr ""
 "No s'ha pogut obtenir la llista d'extensions instal·lades. Assegureu-vos que "
 "heu entrat al GNOME i torneu a provar-ho."
 
-#: js/extensionPrefs/ui/extensions-window.ui:287
+#: js/extensionPrefs/data/ui/extensions-window.ui:288
 msgid "Log Out…"
 msgstr "Surt…"
 
 #. Cisco LEAP
-#: js/gdm/authPrompt.js:235 js/ui/components/networkAgent.js:202
+#: js/gdm/authPrompt.js:237 js/ui/components/networkAgent.js:204
-#: js/ui/components/networkAgent.js:218 js/ui/components/networkAgent.js:242
+#: js/ui/components/networkAgent.js:220 js/ui/components/networkAgent.js:244
-#: js/ui/components/networkAgent.js:263 js/ui/components/networkAgent.js:283
+#: js/ui/components/networkAgent.js:265 js/ui/components/networkAgent.js:285
-#: js/ui/components/networkAgent.js:293 js/ui/components/polkitAgent.js:277
+#: js/ui/components/networkAgent.js:295 js/ui/components/polkitAgent.js:277
 #: js/ui/shellMountOperation.js:326
 msgid "Password"
 msgstr "Contrasenya"
@@ -592,8 +604,8 @@ msgstr "(p. ex. l'usuari o %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: js/gdm/loginDialog.js:917 js/ui/components/networkAgent.js:238
+#: js/gdm/loginDialog.js:917 js/ui/components/networkAgent.js:240
-#: js/ui/components/networkAgent.js:261 js/ui/components/networkAgent.js:279
+#: js/ui/components/networkAgent.js:263 js/ui/components/networkAgent.js:281
 msgid "Username"
 msgstr "Nom d'usuari"
 
@@ -845,44 +857,44 @@ msgstr "Denega l'accés"
 msgid "Grant Access"
 msgstr "Permet l'accés"
 
-#: js/ui/appDisplay.js:906
+#: js/ui/appDisplay.js:898
 msgid "Unnamed Folder"
 msgstr "Carpeta sense nom"
 
-#: js/ui/appDisplay.js:929
+#: js/ui/appDisplay.js:921
 msgid "Frequently used applications will appear here"
 msgstr "Les aplicacions utilitzades freqüentment apareixeran aquí"
 
-#: js/ui/appDisplay.js:1064
+#: js/ui/appDisplay.js:1056
 msgid "Frequent"
 msgstr "Freqüent"
 
-#: js/ui/appDisplay.js:1071
+#: js/ui/appDisplay.js:1063
 msgid "All"
 msgstr "Totes"
 
 #. Translators: This is the heading of a list of open windows
-#: js/ui/appDisplay.js:2454 js/ui/panel.js:75
+#: js/ui/appDisplay.js:2446 js/ui/panel.js:75
 msgid "Open Windows"
 msgstr "Obre finestres"
 
-#: js/ui/appDisplay.js:2474 js/ui/panel.js:82
+#: js/ui/appDisplay.js:2466 js/ui/panel.js:82
 msgid "New Window"
 msgstr "Finestra nova"
 
-#: js/ui/appDisplay.js:2485
+#: js/ui/appDisplay.js:2477
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Inicia usant una targeta gràfica dedicada"
 
-#: js/ui/appDisplay.js:2513 js/ui/dash.js:239
+#: js/ui/appDisplay.js:2505 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Suprimeix dels preferits"
 
-#: js/ui/appDisplay.js:2519
+#: js/ui/appDisplay.js:2511
 msgid "Add to Favorites"
 msgstr "Afegeix als preferits"
 
-#: js/ui/appDisplay.js:2529 js/ui/panel.js:93
+#: js/ui/appDisplay.js:2521 js/ui/panel.js:93
 msgid "Show Details"
 msgstr "Mostra els detalls"
 
@@ -1030,30 +1042,30 @@ msgid "All Day"
 msgstr "Tot el dia"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: js/ui/calendar.js:867
+#: js/ui/calendar.js:868
 msgctxt "calendar heading"
 msgid "%A, %B %-d"
 msgstr "%A %-d %B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: js/ui/calendar.js:870
+#: js/ui/calendar.js:871
 msgctxt "calendar heading"
 msgid "%A, %B %-d, %Y"
 msgstr "%A %d %B de %Y"
 
-#: js/ui/calendar.js:1096
+#: js/ui/calendar.js:1100
 msgid "No Notifications"
 msgstr "Cap notificació"
 
-#: js/ui/calendar.js:1099
+#: js/ui/calendar.js:1103
 msgid "No Events"
 msgstr "Cap cita"
 
-#: js/ui/calendar.js:1153
+#: js/ui/calendar.js:1157
 msgid "Do Not Disturb"
 msgstr "No molesteu"
 
-#: js/ui/calendar.js:1167
+#: js/ui/calendar.js:1171
 msgid "Clear"
 msgstr "Neteja-ho"
 
@@ -1101,38 +1113,38 @@ msgstr ""
 msgid "Open with %s"
 msgstr "Obre amb %s"
 
-#: js/ui/components/networkAgent.js:89
+#: js/ui/components/networkAgent.js:91
 msgid ""
 "Alternatively you can connect by pushing the “WPS” button on your router."
 msgstr "També us podeu connectar prement el botó «WPS» del vostre encaminador."
 
-#: js/ui/components/networkAgent.js:101 js/ui/status/network.js:223
+#: js/ui/components/networkAgent.js:103 js/ui/status/network.js:223
 #: js/ui/status/network.js:314 js/ui/status/network.js:916
 msgid "Connect"
 msgstr "Connecta"
 
-#: js/ui/components/networkAgent.js:208
+#: js/ui/components/networkAgent.js:210
 msgid "Key"
 msgstr "Clau"
 
-#: js/ui/components/networkAgent.js:246 js/ui/components/networkAgent.js:269
+#: js/ui/components/networkAgent.js:248 js/ui/components/networkAgent.js:271
 msgid "Private key password"
 msgstr "Contrasenya de la clau privada"
 
-#: js/ui/components/networkAgent.js:267
+#: js/ui/components/networkAgent.js:269
 msgid "Identity"
 msgstr "Identitat"
 
-#: js/ui/components/networkAgent.js:281
+#: js/ui/components/networkAgent.js:283
 msgid "Service"
 msgstr "Servei"
 
-#: js/ui/components/networkAgent.js:310 js/ui/components/networkAgent.js:338
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:340
-#: js/ui/components/networkAgent.js:685 js/ui/components/networkAgent.js:706
+#: js/ui/components/networkAgent.js:679 js/ui/components/networkAgent.js:700
 msgid "Authentication required"
 msgstr "Cal autenticació"
 
-#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:686
+#: js/ui/components/networkAgent.js:313 js/ui/components/networkAgent.js:680
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -1141,42 +1153,42 @@ msgstr ""
 "Per accedir a la xarxa sense fil «%s» calen les contrasenyes o les claus "
 "d'encriptació."
 
-#: js/ui/components/networkAgent.js:315 js/ui/components/networkAgent.js:690
+#: js/ui/components/networkAgent.js:317 js/ui/components/networkAgent.js:684
 msgid "Wired 802.1X authentication"
 msgstr "Autenticació 802.1X amb fil"
 
-#: js/ui/components/networkAgent.js:317
+#: js/ui/components/networkAgent.js:319
 msgid "Network name"
 msgstr "Nom de la xarxa"
 
-#: js/ui/components/networkAgent.js:322 js/ui/components/networkAgent.js:694
+#: js/ui/components/networkAgent.js:324 js/ui/components/networkAgent.js:688
 msgid "DSL authentication"
 msgstr "Autenticació DSL"
 
-#: js/ui/components/networkAgent.js:329 js/ui/components/networkAgent.js:699
+#: js/ui/components/networkAgent.js:331 js/ui/components/networkAgent.js:693
 msgid "PIN code required"
 msgstr "Cal que introduïu el codi PIN"
 
-#: js/ui/components/networkAgent.js:330 js/ui/components/networkAgent.js:700
+#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:694
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Cal que introduïu el codi PIN del dispositiu de banda ampla mòbil"
 
-#: js/ui/components/networkAgent.js:331
+#: js/ui/components/networkAgent.js:333
 msgid "PIN"
 msgstr "PIN"
 
-#: js/ui/components/networkAgent.js:339 js/ui/components/networkAgent.js:691
+#: js/ui/components/networkAgent.js:341 js/ui/components/networkAgent.js:685
-#: js/ui/components/networkAgent.js:695 js/ui/components/networkAgent.js:707
+#: js/ui/components/networkAgent.js:689 js/ui/components/networkAgent.js:701
-#: js/ui/components/networkAgent.js:711
+#: js/ui/components/networkAgent.js:705
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Cal introduir una contrasenya per connectar-vos a «%s»."
 
-#: js/ui/components/networkAgent.js:674 js/ui/status/network.js:1691
+#: js/ui/components/networkAgent.js:668 js/ui/status/network.js:1691
 msgid "Network Manager"
 msgstr "Gestor de connexions de xarxa"
 
-#: js/ui/components/networkAgent.js:710
+#: js/ui/components/networkAgent.js:704
 msgid "VPN password"
 msgstr "Contrasenya VPN"
 
@@ -1246,23 +1258,23 @@ msgstr "Afegeix rellotges del món…"
 msgid "World Clocks"
 msgstr "Rellotges del món"
 
-#: js/ui/dateMenu.js:276
+#: js/ui/dateMenu.js:289
 msgid "Weather"
 msgstr "El temps"
 
-#: js/ui/dateMenu.js:391
+#: js/ui/dateMenu.js:404
 msgid "Select a location…"
 msgstr "Trieu una ubicació…"
 
-#: js/ui/dateMenu.js:404
+#: js/ui/dateMenu.js:417
 msgid "Loading…"
 msgstr "S'està carregant…"
 
-#: js/ui/dateMenu.js:414
+#: js/ui/dateMenu.js:427
 msgid "Go online for weather information"
 msgstr "Vés en línia per a informació sobre el temps"
 
-#: js/ui/dateMenu.js:416
+#: js/ui/dateMenu.js:429
 msgid "Weather information is currently unavailable"
 msgstr "La informació sobre el temps no està disponible"
 
@@ -1418,15 +1430,15 @@ msgstr "%s (remot)"
 msgid "%s (console)"
 msgstr "%s (consola)"
 
-#: js/ui/extensionDownloader.js:169
+#: js/ui/extensionDownloader.js:181
 msgid "Install"
 msgstr "Instal·la"
 
-#: js/ui/extensionDownloader.js:175
+#: js/ui/extensionDownloader.js:187
 msgid "Install Extension"
 msgstr "Instal·la l'extensió"
 
-#: js/ui/extensionDownloader.js:176
+#: js/ui/extensionDownloader.js:188
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Voleu baixar i instal·lar «%s» d'extensions.gnome.org?"
@@ -1538,59 +1550,59 @@ msgstr "Deixa-ho desactivat"
 msgid "Region & Language Settings"
 msgstr "Configuració de regió i idioma"
 
-#: js/ui/lookingGlass.js:659
+#: js/ui/lookingGlass.js:665
 msgid "No extensions installed"
 msgstr "No hi ha cap extensió instal·lada"
 
 #. Translators: argument is an extension UUID.
-#: js/ui/lookingGlass.js:714
+#: js/ui/lookingGlass.js:720
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s no ha emès cap error."
 
-#: js/ui/lookingGlass.js:720
+#: js/ui/lookingGlass.js:726
 msgid "Hide Errors"
 msgstr "Amaga els errors"
 
-#: js/ui/lookingGlass.js:724 js/ui/lookingGlass.js:789
+#: js/ui/lookingGlass.js:730 js/ui/lookingGlass.js:795
 msgid "Show Errors"
 msgstr "Mostra els errors"
 
-#: js/ui/lookingGlass.js:733
+#: js/ui/lookingGlass.js:739
 msgid "Enabled"
 msgstr "Habilitat"
 
 #. translators:
 #. * The device has been disabled
-#: js/ui/lookingGlass.js:736 subprojects/gvc/gvc-mixer-control.c:1892
+#: js/ui/lookingGlass.js:742 subprojects/gvc/gvc-mixer-control.c:1892
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: js/ui/lookingGlass.js:738
+#: js/ui/lookingGlass.js:744
 msgid "Error"
 msgstr "Error"
 
-#: js/ui/lookingGlass.js:740
+#: js/ui/lookingGlass.js:746
 msgid "Out of date"
 msgstr "Fora d'hora"
 
-#: js/ui/lookingGlass.js:742
+#: js/ui/lookingGlass.js:748
 msgid "Downloading"
 msgstr "S'està baixant"
 
-#: js/ui/lookingGlass.js:771
+#: js/ui/lookingGlass.js:777
 msgid "View Source"
 msgstr "Mostra el codi font"
 
-#: js/ui/lookingGlass.js:780
+#: js/ui/lookingGlass.js:786
 msgid "Web Page"
 msgstr "Pàgina web"
 
-#: js/ui/main.js:267
+#: js/ui/main.js:274
 msgid "Logged in as a privileged user"
 msgstr "Sessió iniciada com a usuari privilegiat"
 
-#: js/ui/main.js:268
+#: js/ui/main.js:275
 msgid ""
 "Running a session as a privileged user should be avoided for security "
 "reasons. If possible, you should log in as a normal user."
@@ -1598,11 +1610,11 @@ msgstr ""
 "Cal evitar iniciar sessions com a usuari privilegiat per raons de seguretat. "
 "Si és possible, entreu com a un usuari normal."
 
-#: js/ui/main.js:274
+#: js/ui/main.js:281
 msgid "Screen Lock disabled"
 msgstr "La pantalla de bloqueig està inhabilitada"
 
-#: js/ui/main.js:275
+#: js/ui/main.js:282
 msgid "Screen Locking requires the GNOME display manager."
 msgstr "El bloqueig de pantalla requereix el gestor de pantalla del GNOME."
 
@@ -1634,7 +1646,7 @@ msgstr "Vista general"
 #. characters.
 #: js/ui/overview.js:107
 msgid "Type to search"
-msgstr "Teclegeu per començar la cerca"
+msgstr "Teclegeu per a cercar"
 
 #: js/ui/padOsd.js:95
 msgid "New shortcut…"
@@ -1674,11 +1686,11 @@ msgstr "Premeu un botó per a configurar"
 
 #: js/ui/padOsd.js:864
 msgid "Press Esc to exit"
-msgstr "Premeu Esc per sortir"
+msgstr "Premeu Esc per a sortir"
 
 #: js/ui/padOsd.js:867
 msgid "Press any key to exit"
-msgstr "Premeu qualsevol tecla per sortir"
+msgstr "Premeu qualsevol tecla per a sortir"
 
 #: js/ui/panel.js:109
 msgid "Quit"
@@ -1690,12 +1702,12 @@ msgstr "Surt"
 msgid "Activities"
 msgstr "Activitats"
 
-#: js/ui/panel.js:707
+#: js/ui/panel.js:713
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "Sistema"
 
-#: js/ui/panel.js:820
+#: js/ui/panel.js:826
 msgid "Top Bar"
 msgstr "Barra superior"
 
@@ -1915,11 +1927,11 @@ msgstr "Clic secundari"
 msgid "Dwell Click"
 msgstr "Clic en passar per sobre"
 
-#: js/ui/status/keyboard.js:825
+#: js/ui/status/keyboard.js:826
 msgid "Keyboard"
 msgstr "Teclat"
 
-#: js/ui/status/keyboard.js:847
+#: js/ui/status/keyboard.js:848
 msgid "Show Keyboard Layout"
 msgstr "Mostra la disposició del teclat"
 
@@ -2333,22 +2345,26 @@ msgstr "Només l'integrat"
 
 #. Translators: This is a time format for a date in
 #. long format
-#: js/ui/unlockDialog.js:372
+#: js/ui/unlockDialog.js:370
 msgid "%A %B %-d"
 msgstr "%A %-d %B"
 
-#: js/ui/unlockDialog.js:378
+#: js/ui/unlockDialog.js:376
 msgid "Swipe up to unlock"
-msgstr "Llisqueu amunt per desbloquejar"
+msgstr "Llisqueu amunt per a desbloquejar"
 
-#: js/ui/unlockDialog.js:379
+#: js/ui/unlockDialog.js:377
 msgid "Click or press a key to unlock"
-msgstr "Feu clic o premeu una tecla per desbloquejar"
+msgstr "Feu clic o premeu una tecla per a desbloquejar"
 
-#: js/ui/unlockDialog.js:552
+#: js/ui/unlockDialog.js:549
 msgid "Unlock Window"
 msgstr "Desbloqueja la finestra"
 
+#: js/ui/unlockDialog.js:558
+msgid "Log in as another user"
+msgstr "Entra amb un altre usuari"
+
 #: js/ui/viewSelector.js:181
 msgid "Applications"
 msgstr "Aplicacions"
@@ -2464,19 +2480,19 @@ msgstr "Tanca"
 msgid "Evolution Calendar"
 msgstr "Calendari de l'Evolution"
 
-#: src/main.c:460 subprojects/extensions-tool/src/main.c:249
+#: src/main.c:458 subprojects/extensions-tool/src/main.c:249
 msgid "Print version"
 msgstr "Mostra la versió"
 
-#: src/main.c:466
+#: src/main.c:464
 msgid "Mode used by GDM for login screen"
 msgstr "El mode que utilitzarà el GDM per a la pantalla d'entrada"
 
-#: src/main.c:472
+#: src/main.c:470
 msgid "Use a specific mode, e.g. “gdm” for login screen"
 msgstr "Utilitza un mode específic, p. ex. «gdm» per la pantalla d'entrada"
 
-#: src/main.c:478
+#: src/main.c:476
 msgid "List possible modes"
 msgstr "Llista els modes possibles"
 
@@ -2814,7 +2830,7 @@ msgstr "Instal·la un paquet d'extensió"
 #: subprojects/extensions-tool/src/main.c:262
 #, c-format
 msgid "Use “%s” to get detailed help.\n"
-msgstr "Feu servir «%s» per obtenir ajuda detallada.\n"
+msgstr "Feu servir «%s» per a obtenir ajuda detallada.\n"
 
 #. translators:
 #. * The number of sound outputs on a particular device
@@ -2851,9 +2867,6 @@ msgstr "Sons del sistema"
 #~ msgid "Enter Password…"
 #~ msgstr "Introduïu la contrasenya…"
 
-#~ msgid "Log in as another user"
-#~ msgstr "Entra amb un altre usuari"
-
 #~ msgid "Browse in Software"
 #~ msgstr "Navega al Programari"