shell: Ignore non-toplevels for ShellWindowTracker::tracked-windows-changed

Popups and other override-redirect windows are meaningless to everything
that depends on the ShellWindowTracker. Ignoring those windows will result
in less ShellApp::windows-changed signal emissions, and less activity in
the AppMenuButton and everything else that depends on them.

Reduces gnome-shell CPU activity while typing on the Epiphany addressbar,
as the pop up animation there results in a number of xdg_popup being
created and destroyed.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/642
https://gitlab.gnome.org/GNOME/mutter/issues/556


(cherry picked from commit db9a7ea7a9)

.gitlab-ci.yml

@@ -15,7 +15,7 @@ variables:
         - merge_requests
 
 check_commit_log:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v1
     stage: review
     variables:
         GIT_DEPTH: "100"
@@ -40,7 +40,7 @@ js_check:
         when: on_failure
 
 build:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
     stage: build
     before_script:
         - .gitlab-ci/checkout-mutter.sh
@@ -58,7 +58,7 @@ build:
             - build
 
 test:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
     stage: test
     before_script:
         - ninja -C mutter/build install
@@ -72,7 +72,7 @@ test:
         when: on_failure
 
 test-pot:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
     stage: test
     before_script:
         - ninja -C mutter/build install

.gitlab-ci/Dockerfile

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

NEWS

@@ -1,75 +1,21 @@
-3.33.3
+3.32.2
 ======
-* Prepare for optional X11 [Carlos; !378]
-* Fix opening window menu [Marco; !557]
-* Reload search providers when installed applications change [Cosimo; !562]
-* Implement locate-pointer accessibility feature [Olivier; #981]
-* Allow to disable window menus via session mode [Cosimo; !569]
-* Implement mouse accessibility [Olivier; !474]
-* Call GDM's RegisterSession() after startup [Iain; !570]
-* Fix extended keys popups being hidden by on-screen keyboard [Marco; !583]
-* Fix top bar being hidden by lock screen [Jonas; !571]
-* Update theme to better match GTK's Adwaita [Frederik; #841]
-* Set up GJS profiler when GJS_TRACE_FD is set [Christian; !573]
-* Misc. bug fixes and cleanups [Jonas, Cosimo, Robert, Florian, Marco, Simon,
-  Laurent, Niels, Will; !551, !555, !464, #1333, !565, !572, !568, !558, #1205,
-  #1336, !579, !576, #1392, !582, !586, #1406, #1351]
-
-Contributors:
-  Laurent Bigonville, Cosimo Cecchi, Piotr Drąg, Jonas Dreßler,
-  Frederik Feichtmeier, Olivier Fourdan, Carlos Garnacho, Niels De Graef,
-  Christian Hergert, Iain Lane, Robert Mader, Florian Müllner, Simon Schampijer,
-  Jakub Steiner, Will Thompson, Marco Trevisan (Treviño)
-
-Translators:
-  Kukuh Syafaat [id], Balázs Meskó [hu], Daniel Mustieles [es],
-  Fabio Tomat [fur], Nathan Follens [nl], Goran Vidović [hr], Jordi Mas [ca]
-
-3.33.2
-======
-* Fix keeping actors visible in scrollviews [Marco; #1061]
-* Move some chrome above popup windows [Jonas D.; !358]
-* Include 'sandboxed-app-id' in winodw introspection info [Florian; #1289]
-* Port to libecal-2.0 [Milan; !501]
-* Support TCRYPT in mount password dialog [segfault; !126]
-* Misc. bug fixes and cleanups [Florian, Marco, Veerasamy; !517, #745, !499,
-  !510, !515, !546, !549]
-
-Contributors:
-  Cosimo Cecchi, Milan Crha, Jonas Dreßler, Florian Müllner, segfault,
-  Veerasamy Sevagen, Marco Trevisan (Treviño)
-
-Translators:
-  Daniel Mustieles [es]
-
-3.33.1
-======
-* Refine the app menu [Florian; #968]
-* Refine window preview style [Feichtmeier; !461]
-* Only emit ::style-changed on actual changes [Carlos; #1153]
-* Disable emoji on-screen keyboard support on X11 [Florian; #1172]
 * Fix tablet button mapping overlay [Carlos; #1220]
-* Don't crash for world clock locations with no timezone [Florian; #1062]
-* Don't leak old on-screen keyboard layout groups [Carlos; mutter#556]
 * Fix ellipsization in dialog subtitles/bodies [Marco; !531]
-* Fix glitch of fullscreen window in workspace switch animation [Jonas D.; !322]
+* Don't crash for world clock locations with no timezone<Paste> [Florian; #1062]
-* Fix distortion of some image contents [Florian; !525]
-* Allow dragging unfocused tiled/maximized windows from top bar [Dylan; #679290]
 * Handle network interface name changes [Fabrice; !534]
+* Don't leak old on-screen keyboard layout groups [Carlos; mutter#556]
 * Avoid unnecessary style changes when computing :first/:last-child
   [Florian; !529]
-* Misc. bug fixes and cleanups [Florian, Marco, Robert, Georges, Carlos, Simon,
+* Misc. bug fixes [Simon, Carlos, Florian; #822, !551, !509,
-  Jonas D.; !487, !441, !502, !503, !504, !506, #822, !551, !512, !509, !511,
+  !511, #1054, !506, #1065]
-  #1054, !524, #1065, !331, !540]
 
 Contributors:
-  Fabrice Bellet, Jonas Dreßler, Feichtmeier, Carlos Garnacho, Robert Mader,
+  Fabrice Bellet, Carlos Garnacho, Simon McVittie, Florian Müllner,
-  Dylan McCall, Simon McVittie, Florian Müllner, Georges Basile Stavracas Neto,
   Marco Trevisan (Treviño)
 
 Translators:
-  Daniel Mustieles [es], Kukuh Syafaat [id], Fabio Tomat [fur],
+  Dingzhong Chen [zh_CN], Tim Sabsch [de]
-  Carmen Bianca BAKKER [eo], Dingzhong Chen [zh_CN], Tim Sabsch [de]
 
 3.32.1
 ======

data/gnome-shell-theme.gresource.xml

@@ -20,16 +20,10 @@
     <file>no-notifications.svg</file>
     <file>noise-texture.png</file>
     <file>pad-osd.css</file>
-    <file alias="icons/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
-    <file alias="icons/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
-    <file alias="icons/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
-    <file alias="icons/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
     <file>process-working.svg</file>
-    <file>toggle-off.svg</file>
+    <file>toggle-off-intl.svg</file>
-    <file>toggle-off-dark.svg</file>
     <file>toggle-off-hc.svg</file>
-    <file>toggle-on.svg</file>
+    <file>toggle-on-intl.svg</file>
-    <file>toggle-on-dark.svg</file>
     <file>toggle-on-hc.svg</file>
   </gresource>
 </gresources>

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

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

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

@@ -3,11 +3,11 @@
 
 
 $base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
-$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
+$bg_color: if($variant == 'light', #f6f5f4, desaturate(#3d3846, 10%));
 $fg_color: if($variant == 'light', #2e3436, #eeeeec);
 
 $selected_fg_color: #ffffff;
-$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
+$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
 $borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
 $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
@@ -21,15 +21,11 @@ $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
 $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
 
 $osd_fg_color: #eeeeec;
-$osd_text_color: white;
+$osd_bg_color: #2e3436;
-$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
-$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
-$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.84);
+$osd_outer_borders_color: transparentize(white, 0.9);
 
 $tooltip_borders_color: $osd_outer_borders_color;
-$shadow_color: transparentize(black, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

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

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

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

@@ -26,7 +26,6 @@ $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.9);
 
 $tooltip_borders_color: $osd_outer_borders_color;
-$shadow_color: transparentize(black, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

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

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

data/theme/pointer-drag-symbolic.svg

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

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

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

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

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

data/theme/toggle-off-dark.svg

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

data/theme/toggle-off-intl.svg

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="46"
+   height="22"
+   viewBox="0 0 46 22"
+   version="1.1"
+   id="svg2751"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="toggle-off-intl.svg">
+  <defs
+     id="defs2745">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3329">
+      <stop
+         style="stop-color:#39393a;stop-opacity:1;"
+         offset="0"
+         id="stop3325" />
+      <stop
+         style="stop-color:#302f30;stop-opacity:1"
+         offset="1"
+         id="stop3327" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3329"
+       id="linearGradient3331"
+       x1="53"
+       y1="294.42917"
+       x2="53"
+       y2="309.80417"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-42.760724)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#535353"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-19.436775"
+     inkscape:cy="-13.499723"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:pagecheckerboard="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3298" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2748">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-291.17916)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#323233;fill-opacity:1;stroke:#272728;stroke-width:1.08532763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       id="rect3296"
+       width="44.446434"
+       height="20.910645"
+       x="0.625"
+       y="291.71494"
+       rx="10.455324"
+       ry="10.073335" />
+    <rect
+       ry="10.455322"
+       rx="10.455322"
+       y="291.71494"
+       x="0.5428465"
+       height="20.910645"
+       width="21.142862"
+       id="rect3300"
+       style="opacity:1;vector-effect:none;fill:url(#linearGradient3331);fill-opacity:1;stroke:#151515;stroke-width:1.08532763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" />
+  </g>
+</svg>

data/theme/toggle-off.svg

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

data/theme/toggle-on-dark.svg

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

data/theme/toggle-on-intl.svg

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="46"
+   height="22"
+   viewBox="0 0 46 22"
+   version="1.1"
+   id="svg2751"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="toggle-on-intl.svg">
+  <defs
+     id="defs2745">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3329">
+      <stop
+         style="stop-color:#39393a;stop-opacity:1;"
+         offset="0"
+         id="stop3325" />
+      <stop
+         style="stop-color:#302f30;stop-opacity:1"
+         offset="1"
+         id="stop3327" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3329"
+       id="linearGradient3331"
+       x1="53"
+       y1="294.42917"
+       x2="53"
+       y2="309.80417"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-19)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#535353"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="13.588971"
+     inkscape:cy="14.124546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:pagecheckerboard="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3298" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2748">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-291.17916)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#15539e;fill-opacity:1;stroke:#030e1b;stroke-width:1.08532763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       id="rect3296"
+       width="44.446434"
+       height="20.910645"
+       x="0.625"
+       y="291.71494"
+       rx="10.455324"
+       ry="10.073335" />
+    <rect
+       ry="10.455322"
+       rx="10.455322"
+       y="291.71494"
+       x="24.30357"
+       height="20.910645"
+       width="21.142862"
+       id="rect3300"
+       style="opacity:1;vector-effect:none;fill:url(#linearGradient3331);fill-opacity:1;stroke:#030e1b;stroke-width:1.08532763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" />
+  </g>
+</svg>

data/theme/toggle-on.svg

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

js/gdm/batch.js

@@ -124,7 +124,7 @@ var Batch = class extends Task {
     }
 
     process() {
-        throw new GObject.NotImplementedError(`process in ${this.constructor.name}`);
+        throw new Error('Not implemented');
     }
 
     runTask() {

js/gdm/loginDialog.js

@@ -325,7 +325,7 @@ var SessionMenuButton = class {
                  this._button.remove_style_pseudo_class('active');
         });
 
-        this._manager = new PopupMenu.PopupMenuManager(this._button,
+        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button },
                                                        { actionMode: Shell.ActionMode.NONE });
         this._manager.addMenu(this._menu);
 
@@ -652,7 +652,7 @@ var LoginDialog = GObject.registerClass({
                      bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);
                      bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);
 
-                     // figure out how tall it would like to be and try to accommodate
+                     // figure out how tall it would like to be and try to accomodate
                      // but don't let it get too close to the logo
                      let [wideMinHeight, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);
 

js/js-resources.gresource.xml

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

js/misc/introspect.js

@@ -42,6 +42,8 @@ var IntrospectService = class {
     }
 
     _isStandaloneApp(app) {
+        let windows = app.get_windows();
+
         return app.get_windows().some(w => w.transient_for == null);
     }
 
@@ -53,11 +55,6 @@ var IntrospectService = class {
        return APP_WHITELIST.includes(sender);
     }
 
-    _getSandboxedAppId(app) {
-        let ids = app.get_windows().map(w => w.get_sandboxed_app_id());
-        return ids.find(id => id != null);
-    }
-
     _syncRunningApplications() {
         let tracker = Shell.WindowTracker.get_default();
         let apps = this._appSystem.get_running();
@@ -79,10 +76,6 @@ var IntrospectService = class {
                 newActiveApplication = app.get_id();
             }
 
-            let sandboxedAppId = this._getSandboxedAppId(app);
-            if (sandboxedAppId)
-                appInfo['sandboxed-app-id'] = new GLib.Variant('s', sandboxedAppId);
-
             newRunningApplications[app.get_id()] = appInfo;
         }
 
@@ -144,7 +137,6 @@ var IntrospectService = class {
                 let frameRect = window.get_frame_rect();
                 let title = window.get_title();
                 let wmClass = window.get_wm_class();
-                let sandboxedAppId = window.get_sandboxed_app_id();
 
                 windowsList[windowId] = {
                     'app-id': GLib.Variant.new('s', app.get_id()),
@@ -161,10 +153,6 @@ var IntrospectService = class {
 
                 if (wmClass != null)
                     windowsList[windowId]['wm-class'] = GLib.Variant.new('s', wmClass);
-
-                if (sandboxedAppId != null)
-                    windowsList[windowId]['sandboxed-app-id'] =
-                        GLib.Variant.new('s', sandboxedAppId);
             }
         }
         invocation.return_value(new GLib.Variant('(a{ta{sv}})', [windowsList]));

js/misc/loginManager.js

@@ -48,28 +48,6 @@ function canLock() {
     }
 }
 
-
-function registerSessionWithGDM() {
-    log("Registering session with GDM");
-    Gio.DBus.system.call('org.gnome.DisplayManager',
-                         '/org/gnome/DisplayManager/Manager',
-                         'org.gnome.DisplayManager.Manager',
-                         'RegisterSession',
-                         GLib.Variant.new('(a{sv})', [{}]), null,
-                         Gio.DBusCallFlags.NONE, -1, null,
-        (source, result) => {
-            try {
-                source.call_finish(result);
-            } catch (e) {
-                if (!e.matches(Gio.DBusError, Gio.DBusError.UNKNOWN_METHOD))
-                    log(`Error registering session with GDM: ${e.message}`);
-                else
-                    log("Not calling RegisterSession(): method not exported, GDM too old?");
-            }
-        }
-    );
-}
-
 let _loginManager = null;
 
 /**

js/misc/systemActions.js

@@ -88,42 +88,42 @@ const SystemActions = GObject.registerClass({
                             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").split(/[; ]/),
+                            keywords: _("power off;shutdown;reboot;restart").split(';'),
                             available: false });
         this._actions.set(LOCK_SCREEN_ACTION_ID,
                           { // Translators: The name of the lock screen action in search
                             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: _("lock screen").split(';'),
                             available: false });
         this._actions.set(LOGOUT_ACTION_ID,
                           { // Translators: The name of the logout action in search
                             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: _("logout;sign off").split(';'),
                             available: false });
         this._actions.set(SUSPEND_ACTION_ID,
                           { // Translators: The name of the suspend action in search
                             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: _("suspend;sleep").split(';'),
                             available: false });
         this._actions.set(SWITCH_USER_ACTION_ID,
                           { // Translators: The name of the switch user action in search
                             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: _("switch user").split(';'),
                             available: false });
         this._actions.set(LOCK_ORIENTATION_ACTION_ID,
                           { // Translators: The name of the lock orientation action in search
                             name: C_("search-result", "Lock Orientation"),
                             iconName: '',
                             // Translators: A list of keywords that match the lock orientation action, separated by semicolons
-                            keywords: _("lock orientation;screen;rotation").split(/[; ]/),
+                            keywords: _("lock orientation;screen;rotation").split(';'),
                             available: false });
 
         this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
@@ -262,7 +262,7 @@ const SystemActions = GObject.registerClass({
         let results = [];
 
         for (let [key, {available, keywords}] of this._actions)
-            if (available && terms.every(t => keywords.some(k => k.startsWith(t))))
+            if (available && terms.every(t => keywords.some(k => (k.indexOf(t) >= 0))))
                 results.push(key);
 
         return results;

js/misc/util.js

@@ -366,7 +366,7 @@ class CloseButton extends St.Button {
     }
 
     _computeBoxPointerOffset() {
-        if (!this._boxPointer || !this._boxPointer.get_stage())
+        if (!this._boxPointer || !this._boxPointer.actor.get_stage())
             return 0;
 
         let side = this._boxPointer.arrowSide;

js/ui/accessDialog.js

@@ -1,4 +1,4 @@
-const { Clutter, Gio, GLib, GObject, Shell } = imports.gi;
+const { Clutter, Gio, GLib, Shell } = imports.gi;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
@@ -15,10 +15,9 @@ var DialogResponse = {
     CLOSED: 2
 };
 
-var AccessDialog = GObject.registerClass(
+var AccessDialog = class extends ModalDialog.ModalDialog {
-class AccessDialog extends ModalDialog.ModalDialog {
+    constructor(invocation, handle, title, subtitle, body, options) {
-    _init(invocation, handle, title, subtitle, body, options) {
+        super({ styleClass: 'access-dialog' });
-        super._init({ styleClass: 'access-dialog' });
 
         this._invocation = invocation;
         this._handle = handle;
@@ -110,7 +109,7 @@ class AccessDialog extends ModalDialog.ModalDialog {
         });
         this.close();
     }
-});
+};
 
 var AccessDialogDBus = class {
     constructor() {

js/ui/altTab.js

@@ -474,10 +474,12 @@ var CyclerList = GObject.registerClass({
     }
 });
 
-var CyclerPopup = GObject.registerClass({
+var CyclerPopup = GObject.registerClass(
-    GTypeFlags: GObject.TypeFlags.ABSTRACT
+class CyclerPopup extends SwitcherPopup.SwitcherPopup {
-}, class CyclerPopup extends SwitcherPopup.SwitcherPopup {
     _init() {
+        if (new.target === CyclerPopup)
+            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
+
         super._init();
 
         this._items = this._getWindows();
@@ -663,14 +665,6 @@ class AppIcon extends St.BoxLayout {
     set_size(size) {
         this.icon = this.app.create_icon_texture(size);
         this._iconBin.child = this.icon;
-        this._iconBin.set_size(size, size);
-    }
-
-    vfunc_get_preferred_width(forHeight) {
-        let [minWidth, ] = super.vfunc_get_preferred_width(forHeight);
-
-        minWidth = Math.max(minWidth, forHeight);
-        return [minWidth, minWidth];
     }
 });
 
@@ -728,11 +722,12 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                 j++;
         }
         let themeNode = this._items[j].get_theme_node();
+        this._list.ensure_style();
 
         let iconPadding = themeNode.get_horizontal_padding();
         let iconBorder = themeNode.get_border_width(St.Side.LEFT) + themeNode.get_border_width(St.Side.RIGHT);
-        let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
+        let [, labelNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
-        let iconSpacing = iconNaturalHeight + iconPadding + iconBorder;
+        let iconSpacing = labelNaturalHeight + iconPadding + iconBorder;
         let totalSpacing = this._list.spacing * (this._items.length - 1);
 
         // We just assume the whole screen here due to weirdness happing with the passed width

js/ui/appDisplay.js

@@ -98,8 +98,8 @@ function clamp(value, min, max) {
 
 class BaseAppView {
     constructor(params, gridParams) {
-        if (this.constructor === BaseAppView)
+        if (new.target === BaseAppView)
-            throw new TypeError(`Cannot instantiate abstract class ${this.constructor.name}`);
+            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
 
         gridParams = Params.parse(gridParams, { xAlign: St.Align.MIDDLE,
                                                 columnLimit: MAX_COLUMNS,
@@ -414,7 +414,7 @@ var AllView = class AllView extends BaseAppView {
         this._refilterApps();
     }
 
-    // Overridden from BaseAppView
+    // Overriden from BaseAppView
     animate(animationDirection, onComplete) {
         this._scrollView.reactive = false;
         let completionFunc = () => {
@@ -632,9 +632,9 @@ var AllView = class AllView extends BaseAppView {
             this._scrollView.get_effect('fade').fade_edges = true;
 
         if (this._availWidth != availWidth || this._availHeight != availHeight || oldNPages != this._grid.nPages()) {
+            this._adjustment.value = 0;
+            this._grid.currentPage = 0;
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
-                this._adjustment.value = 0;
-                this._grid.currentPage = 0;
                 this._pageIndicators.setNPages(this._grid.nPages());
                 this._pageIndicators.setCurrentPage(0);
             });
@@ -1017,7 +1017,7 @@ var FolderView = class FolderView extends BaseAppView {
         Util.ensureActorVisibleInScrollView(this.actor, actor);
     }
 
-    // Overridden from BaseAppView
+    // Overriden from BaseAppView
     animate(animationDirection) {
         this._grid.animatePulse(animationDirection);
     }
@@ -1081,7 +1081,7 @@ var FolderView = class FolderView extends BaseAppView {
 
         let contentBox = this.actor.get_theme_node().get_content_box(pageBox);
         // We only can show icons inside the collection view boxPointer
-        // so we have to subtract the required padding etc of the boxpointer
+        // so we have to substract the required padding etc of the boxpointer
         return [(contentBox.x2 - contentBox.x1) - 2 * this._offsetForEachSide, (contentBox.y2 - contentBox.y1) - 2 * this._offsetForEachSide];
     }
 
@@ -1301,16 +1301,16 @@ var AppFolderPopup = class AppFolderPopup {
                                                        x_expand: true,
                                                        x_align: St.Align.START });
 
-        this._boxPointer.style_class = 'app-folder-popup';
+        this._boxPointer.actor.style_class = 'app-folder-popup';
-        this.actor.add_actor(this._boxPointer);
+        this.actor.add_actor(this._boxPointer.actor);
         this._boxPointer.bin.set_child(this._view.actor);
 
         this.closeButton = Util.makeCloseButton(this._boxPointer);
         this.closeButton.connect('clicked', this.popdown.bind(this));
         this.actor.add_actor(this.closeButton);
 
-        this._boxPointer.bind_property('opacity', this.closeButton, 'opacity',
+        this._boxPointer.actor.bind_property('opacity', this.closeButton, 'opacity',
-                                       GObject.BindingFlags.SYNC_CREATE);
+                                             GObject.BindingFlags.SYNC_CREATE);
 
         global.focus_manager.add_group(this.actor);
 
@@ -1479,7 +1479,7 @@ var AppIcon = class AppIcon {
         this.actor.connect('popup-menu', this._onKeyboardPopupMenu.bind(this));
 
         this._menu = null;
-        this._menuManager = new PopupMenu.PopupMenuManager(this.actor);
+        this._menuManager = new PopupMenu.PopupMenuManager(this);
 
         if (isDraggable) {
             this._draggable = DND.makeDraggable(this.actor);
@@ -1707,20 +1707,25 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
             w => !w.skip_taskbar
         );
 
-        if (windows.length > 0)
+        // Display the app windows menu items and the separator between windows
-            this.addMenuItem(
+        // of the current desktop and other windows.
-                /* Translators: This is the heading of a list of open windows */
+        let workspaceManager = global.workspace_manager;
-                new PopupMenu.PopupSeparatorMenuItem(_("Open Windows"))
+        let activeWorkspace = workspaceManager.get_active_workspace();
-            );
+        let separatorShown = windows.length > 0 && windows[0].get_workspace() != activeWorkspace;
 
-        windows.forEach(window => {
+        for (let i = 0; i < windows.length; i++) {
+            let window = windows[i];
+            if (!separatorShown && window.get_workspace() != activeWorkspace) {
+                this._appendSeparator();
+                separatorShown = true;
+            }
             let title = window.title ? window.title
                                      : this._source.app.get_name();
             let item = this._appendMenuItem(title);
             item.connect('activate', () => {
                 this.emit('activate-window', window);
             });
-        });
+        }
 
         if (!this._source.app.is_window_backed()) {
             this._appendSeparator();

js/ui/audioDeviceSelection.js

@@ -1,4 +1,4 @@
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
 
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
@@ -13,11 +13,10 @@ var AudioDevice = {
 
 const AudioDeviceSelectionIface = loadInterfaceXML('org.gnome.Shell.AudioDeviceSelection');
 
-var AudioDeviceSelectionDialog = GObject.registerClass({
+var AudioDeviceSelectionDialog =
-    Signals: { 'device-selected': { param_types: [GObject.TYPE_UINT] } }
+class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
-}, class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
+    constructor(devices) {
-    _init(devices) {
+        super({ styleClass: 'audio-device-selection-dialog' });
-        super._init({ styleClass: 'audio-device-selection-dialog' });
 
         this._deviceItems = {};
 
@@ -34,6 +33,10 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
             throw new Error('Too few devices for a selection');
     }
 
+    destroy() {
+        super.destroy();
+    }
+
     _buildLayout(devices) {
         let title = new St.Label({ style_class: 'audio-selection-title',
                                    text: _("Select Audio Device"),
@@ -122,7 +125,7 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
         Main.overview.hide();
         app.activate();
     }
-});
+};
 
 var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
     constructor() {

js/ui/background.js

@@ -257,15 +257,14 @@ var Background = class Background {
                 this._refreshAnimation();
             });
 
-        this._settingsChangedSignalId =
+        this._settingsChangedSignalId = this._settings.connect('changed', () => {
-            this._settings.connect('changed', this._emitChangedSignal.bind(this));
+            this.emit('changed');
+        });
 
         this._load();
     }
 
     destroy() {
-        this.background = null;
-
         this._cancellable.cancel();
         this._removeAnimationTimeout();
 
@@ -289,22 +288,6 @@ var Background = class Background {
         if (this._settingsChangedSignalId != 0)
             this._settings.disconnect(this._settingsChangedSignalId);
         this._settingsChangedSignalId = 0;
-
-        if (this._changedIdleId) {
-            GLib.source_remove(this._changedIdleId);
-            this._changedIdleId = 0;
-        }
-    }
-
-    _emitChangedSignal() {
-        if (this._changedIdleId)
-            return;
-
-        this._changedIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-            this._changedIdleId = 0;
-            this.emit('changed');
-            return GLib.SOURCE_REMOVE;
-        });
     }
 
     updateResolution() {
@@ -360,7 +343,7 @@ var Background = class Background {
                                                if (changedFile.equal(file)) {
                                                    let imageCache = Meta.BackgroundImageCache.get_default();
                                                    imageCache.purge(changedFile);
-                                                   this._emitChangedSignal();
+                                                   this.emit('changed');
                                                }
                                            });
         this._fileWatches[key] = signalId;
@@ -716,6 +699,7 @@ var BackgroundManager = class BackgroundManager {
                            time: FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete() {
+                               oldBackgroundActor.background.run_dispose();
                                oldBackgroundActor.destroy();
                            }
                          });

js/ui/backgroundMenu.js

@@ -25,7 +25,7 @@ var BackgroundMenu = class BackgroundMenu extends PopupMenu.PopupMenu {
 function addBackgroundMenu(actor, layoutManager) {
     actor.reactive = true;
     actor._backgroundMenu = new BackgroundMenu(layoutManager);
-    actor._backgroundManager = new PopupMenu.PopupMenuManager(actor);
+    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
     actor._backgroundManager.addMenu(actor._backgroundMenu);
 
     function openMenu(x, y) {

js/ui/boxpointer.js

@@ -33,6 +33,8 @@ var BoxPointer = GObject.registerClass({
     _init(arrowSide, binProperties) {
         super._init();
 
+        this.actor = this;
+
         this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._arrowSide = arrowSide;
@@ -76,6 +78,36 @@ var BoxPointer = GObject.registerClass({
         }
     }
 
+    // BoxPointer.show() and BoxPointer.hide() are here for only compatibility
+    // purposes, and will be removed in 3.32.
+    show(animate, onComplete) {
+        if (animate !== undefined) {
+            try {
+                throw new Error('BoxPointer.show() has been moved to BoxPointer.open(), this code will break in the future.');
+            } catch(e) {
+                logError(e);
+                this.open(animate, onComplete);
+                return;
+            }
+        }
+
+        this.visible = true;
+    }
+
+    hide(animate, onComplete) {
+        if (animate !== undefined) {
+            try {
+                throw new Error('BoxPointer.hide() has been moved to BoxPointer.close(), this code will break in the future.');
+            } catch(e) {
+                logError(e);
+                this.close(animate, onComplete);
+                return;
+            }
+        }
+
+        this.visible = false;
+    }
+
     open(animate, onComplete) {
         let themeNode = this.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
@@ -204,10 +236,13 @@ var BoxPointer = GObject.registerClass({
         this.set_allocation(box, flags);
 
         let themeNode = this.get_theme_node();
+        box = themeNode.get_content_box(box);
+
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let rise = themeNode.get_length('-arrow-rise');
         let childBox = new Clutter.ActorBox();
-        let [availWidth, availHeight] = themeNode.get_content_box(box).get_size();
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
 
         childBox.x1 = 0;
         childBox.y1 = 0;
@@ -236,9 +271,8 @@ var BoxPointer = GObject.registerClass({
         this.bin.allocate(childBox, flags);
 
         if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition(box);
+            this._reposition();
-            this._updateFlip(box);
+            this._updateFlip();
-            this.set_allocation(box, flags);
         }
     }
 
@@ -425,6 +459,10 @@ var BoxPointer = GObject.registerClass({
     }
 
     setPosition(sourceActor, alignment) {
+        // We need to show it now to force an allocation,
+        // so that we can query the correct size.
+        this.show();
+
         if (!this._sourceActor || sourceActor != this._sourceActor) {
             if (this._sourceActorDestroyId) {
                 this._sourceActor.disconnect(this._sourceActorDestroyId);
@@ -440,10 +478,13 @@ var BoxPointer = GObject.registerClass({
                 })
             }
         }
-
         this._arrowAlignment = alignment;
 
-        this.queue_relayout();
+        if (!this._sourceActor)
+            return;
+
+        this._reposition();
+        this._updateFlip();
     }
 
     setSourceAlignment(alignment) {
@@ -455,7 +496,7 @@ var BoxPointer = GObject.registerClass({
         this.setPosition(this._sourceActor, this._arrowAlignment);
     }
 
-    _reposition(allocationBox) {
+    _reposition() {
         let sourceActor = this._sourceActor;
         let alignment = this._arrowAlignment;
         let monitorIndex = Main.layoutManager.findIndexForActor(sourceActor);
@@ -569,7 +610,8 @@ var BoxPointer = GObject.registerClass({
         }
 
         // Actually set the position
-        allocationBox.set_origin(Math.floor(x), Math.floor(y));
+        this.x = Math.floor(x);
+        this.y = Math.floor(y);
     }
 
     // @origin: Coordinate specifying middle of the arrow, along
@@ -623,11 +665,15 @@ var BoxPointer = GObject.registerClass({
         return arrowSide;
     }
 
-    _updateFlip(allocationBox) {
+    _updateFlip() {
         let arrowSide = this._calculateArrowSide(this._userArrowSide);
         if (this._arrowSide != arrowSide) {
             this._arrowSide = arrowSide;
-            this._reposition(allocationBox);
+            this._reposition();
+            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
+                this.queue_relayout();
+                return false;
+            });
 
             this.emit('arrow-side-changed');
         }

js/ui/components/automountManager.js

@@ -5,7 +5,6 @@ const Mainloop = imports.mainloop;
 const Params = imports.misc.params;
 
 const GnomeSession = imports.misc.gnomeSession;
-const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
 var GNOME_SESSION_AUTOMOUNT_INHIBIT = 16;
@@ -200,20 +199,12 @@ var AutomountManager = class {
             // error strings are not unique for the cases in the comments below.
             if (e.message.includes('No key available with this passphrase') || // cryptsetup
                 e.message.includes('No key available to unlock device') ||     // udisks (no password)
-                // libblockdev wrong password opening LUKS device
+                e.message.includes('Error unlocking')) {                       // udisks (wrong password)
-                e.message.includes('Failed to activate device: Incorrect passphrase') ||
-                // cryptsetup returns EINVAL in many cases, including wrong TCRYPT password/parameters
-                e.message.includes('Failed to load device\'s parameters: Invalid argument')) {
-
                 this._reaskPassword(volume);
             } else {
-                if (e.message.includes('Compiled against a version of libcryptsetup that does not support the VeraCrypt PIM setting')) {
-                    Main.notifyError(_("Unable to unlock volume"),
-                        _("The installed udisks version does not support the PIM setting"));
-                }
-
                 if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
                     log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
+
                 this._closeOperation(volume);
             }
         }

js/ui/components/keyring.js

@@ -10,10 +10,9 @@ const CheckBox = imports.ui.checkBox;
 
 var WORK_SPINNER_ICON_SIZE = 16;
 
-var KeyringDialog = GObject.registerClass(
+var KeyringDialog = class extends ModalDialog.ModalDialog {
-class KeyringDialog extends ModalDialog.ModalDialog {
+    constructor() {
-    _init() {
+        super({ styleClass: 'prompt-dialog' });
-        super._init({ styleClass: 'prompt-dialog' });
 
         this.prompt = new Shell.KeyringPrompt();
         this.prompt.connect('show-password', this._onShowPassword.bind(this));
@@ -24,8 +23,20 @@ class KeyringDialog extends ModalDialog.ModalDialog {
         this._content = new Dialog.MessageDialogContent({ icon });
         this.contentLayout.add(this._content);
 
+        // FIXME: Why does this break now?
+        /*
         this.prompt.bind_property('message', this._content, 'title', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('description', this._content, 'body', GObject.BindingFlags.SYNC_CREATE);
+        */
+        this.prompt.connect('notify::message', () => {
+            this._content.title = this.prompt.message;
+        });
+        this._content.title = this.prompt.message;
+
+        this.prompt.connect('notify::description', () => {
+            this._content.body = this.prompt.description;
+        });
+        this._content.body = this.prompt.description;
 
         this._workSpinner = null;
         this._controlTable = null;
@@ -213,7 +224,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
     _onCancelButton() {
         this.prompt.cancel();
     }
-});
+};
 
 var KeyringDummyDialog = class {
     constructor() {

js/ui/components/networkAgent.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, NM, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Config = imports.misc.config;
@@ -12,10 +12,9 @@ const ShellEntry = imports.ui.shellEntry;
 
 const VPN_UI_GROUP = 'VPN Plugin UI';
 
-var NetworkSecretDialog = GObject.registerClass(
+var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
-class NetworkSecretDialog extends ModalDialog.ModalDialog {
+    constructor(agent, requestId, connection, settingName, hints, flags, contentOverride) {
-    _init(agent, requestId, connection, settingName, hints, flags, contentOverride) {
+        super({ styleClass: 'prompt-dialog' });
-        super._init({ styleClass: 'prompt-dialog' });
 
         this._agent = agent;
         this._requestId = requestId;
@@ -348,7 +347,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
 
         return content;
     }
-});
+};
 
 var VPNRequestHandler = class {
     constructor(agent, requestId, authHelper, serviceType, connection, hints, flags) {

js/ui/components/polkitAgent.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const { AccountsService, Clutter, Gio, GLib,
-        GObject, Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
+        Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Animation = imports.ui.animation;
@@ -15,11 +15,9 @@ var DIALOG_ICON_SIZE = 48;
 
 var WORK_SPINNER_ICON_SIZE = 16;
 
-var AuthenticationDialog = GObject.registerClass({
+var AuthenticationDialog = class extends ModalDialog.ModalDialog {
-    Signals: { 'done': { param_types: [GObject.TYPE_BOOLEAN] } }
+    constructor(actionId, body, cookie, userNames) {
-}, class AuthenticationDialog extends ModalDialog.ModalDialog {
+        super({ styleClass: 'prompt-dialog' });
-    _init(actionId, body, cookie, userNames) {
-        super._init({ styleClass: 'prompt-dialog' });
 
         this.actionId = actionId;
         this.message = body;
@@ -27,7 +25,7 @@ var AuthenticationDialog = GObject.registerClass({
         this._wasDismissed = false;
 
         this._sessionUpdatedId = Main.sessionMode.connect('updated', () => {
-            this.visible = !Main.sessionMode.isLocked;
+            this._group.visible = !Main.sessionMode.isLocked;
         });
 
         this.connect('closed', this._onDialogClosed.bind(this));
@@ -328,7 +326,8 @@ var AuthenticationDialog = GObject.registerClass({
 
         this._destroySession();
     }
-});
+};
+Signals.addSignalMethods(AuthenticationDialog.prototype);
 
 var AuthenticationAgent = class {
     constructor() {

js/ui/components/telepathyClient.js

@@ -401,7 +401,7 @@ var ChatSource = class extends MessageTray.Source {
         if (this._client.is_handling_channel(this._channel)) {
             // We are handling the channel, try to pass it to Empathy or Polari
             // (depending on the channel type)
-            // We don't check if either app is available - mission control will
+            // We don't check if either app is availble - mission control will
             // fallback to something else if activation fails
 
             let target;

js/ui/dash.js

@@ -899,7 +899,7 @@ var Dash = class Dash {
                 favPos++;
         }
 
-        // No drag placeholder means we don't want to favorite the app
+        // No drag placeholder means we don't wan't to favorite the app
         // and we are dragging it to its original position
         if (!this._dragPlaceholder)
             return true;

js/ui/dateMenu.js

@@ -476,9 +476,10 @@ class DateMenuButton extends PanelMenu.Button {
         box.add_actor(this._clockDisplay);
         box.add_actor(this._indicator.actor);
 
-        this.label_actor = this._clockDisplay;
+        this.actor.label_actor = this._clockDisplay;
-        this.add_actor(box);
+        this.actor.add_actor(box);
-        this.add_style_class_name ('clock-display');
+        this.actor.add_style_class_name ('clock-display');
+
 
         let layout = new FreezableBinLayout();
         let bin = new St.Widget({ layout_manager: layout });

js/ui/dialog.js

@@ -177,8 +177,8 @@ var MessageDialogContent = GObject.registerClass({
 
         let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
                           line_wrap: true };
-        this._subtitle.clutter_text.set(textProps);
+        Object.assign(this._subtitle.clutter_text, textProps);
-        this._body.clutter_text.set(textProps);
+        Object.assign(this._body.clutter_text, textProps);
 
         if (!params.hasOwnProperty('style_class'))
             params.style_class = 'message-dialog-main-layout';

js/ui/endSessionDialog.js

@@ -19,7 +19,7 @@
 const Mainloop = imports.mainloop;
 
 const { AccountsService, Clutter, Gio,
-        GLib, GObject, Pango, Polkit, Shell, St }  = imports.gi;
+        GLib, Pango, Polkit, Shell, St }  = imports.gi;
 
 const CheckBox = imports.ui.checkBox;
 const GnomeSession = imports.misc.gnomeSession;
@@ -226,11 +226,10 @@ function init() {
     _endSessionDialog = new EndSessionDialog();
 }
 
-var EndSessionDialog = GObject.registerClass(
+var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
-class EndSessionDialog extends ModalDialog.ModalDialog {
+    constructor() {
-    _init() {
+        super({ styleClass: 'end-session-dialog',
-        super._init({ styleClass: 'end-session-dialog',
+                destroyOnClose: false });
-                      destroyOnClose: false });
 
         this._loginManager = LoginManager.getLoginManager();
         this._userManager = AccountsService.UserManager.get_default();
@@ -748,4 +747,4 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
     Close(parameters, invocation) {
         this.close();
     }
-});
+};

js/ui/environment.js

@@ -96,15 +96,6 @@ function init() {
     Clutter.Actor.prototype.toString = function() {
         return St.describe_actor(this);
     };
-    // Deprecation warning for former JS classes turned into an actor subclass
-    Object.defineProperty(Clutter.Actor.prototype, 'actor', {
-        get() {
-            let klass = this.constructor.name;
-            let { stack } = new Error();
-            log(`Usage of object.actor is deprecated for ${klass}\n${stack}`);
-            return this;
-        }
-    });
 
     let origToString = Object.prototype.toString;
     Object.prototype.toString = function() {

js/ui/extensionDownloader.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, Soup, St } = imports.gi;
+const { Clutter, Gio, GLib, Soup, St } = imports.gi;
 
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
@@ -176,10 +176,10 @@ function checkForUpdates() {
     });
 }
 
-var InstallExtensionDialog = GObject.registerClass(
+var InstallExtensionDialog =
 class InstallExtensionDialog extends ModalDialog.ModalDialog {
-    _init(uuid, info, invocation) {
+    constructor(uuid, info, invocation) {
-        super._init({ styleClass: 'extension-dialog' });
+        super({ styleClass: 'extension-dialog' });
 
         this._uuid = uuid;
         this._info = info;
@@ -255,7 +255,7 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
 
         this.close();
     }
-});
+};
 
 function init() {
     _httpSession = new Soup.SessionAsync({ ssl_use_system_ca_file: true });

js/ui/grabHelper.js

@@ -43,9 +43,6 @@ function _popGrabHelper(grabHelper) {
 // call grab().
 var GrabHelper = class GrabHelper {
     constructor(owner, params) {
-        if (!(owner instanceof Clutter.Actor))
-            throw new Error('GrabHelper owner must be a Clutter.Actor');
-
         this._owner = owner;
         this._modalParams = params;
 

js/ui/ibusCandidatePopup.js

@@ -272,7 +272,7 @@ var CandidatePopup = class CandidatePopup {
 
     _setDummyCursorGeometry(x, y, w, h) {
         Main.layoutManager.setDummyCursorGeometry(x, y, w, h);
-        if (this._boxPointer.visible)
+        if (this._boxPointer.actor.visible)
             this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
     }
 
@@ -285,7 +285,7 @@ var CandidatePopup = class CandidatePopup {
         if (isVisible) {
             this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
             this._boxPointer.open(BoxPointer.PopupAnimation.NONE);
-            this._boxPointer.raise_top();
+            this._boxPointer.actor.raise_top();
         } else {
             this._boxPointer.close(BoxPointer.PopupAnimation.NONE);
         }

js/ui/iconGrid.js

@@ -43,6 +43,8 @@ class BaseIcon extends St.Bin {
                       x_fill: true,
                       y_fill: true });
 
+        this.actor = this;
+
         this.connect('destroy', this._onDestroy.bind(this));
 
         this._box = new St.BoxLayout({ vertical: true });
@@ -79,7 +81,7 @@ class BaseIcon extends St.Bin {
     // This can be overridden by a subclass, or by the createIcon
     // parameter to _init()
     createIcon(size) {
-        throw new GObject.NotImplementedError(`createIcon in ${this.constructor.name}`);
+        throw new Error('no implementation of createIcon in ' + this);
     }
 
     setIconSize(size) {
@@ -186,6 +188,8 @@ var IconGrid = GObject.registerClass({
         super._init({ style_class: 'icon-grid',
                       y_align: Clutter.ActorAlign.START });
 
+        this.actor = this;
+
         params = Params.parse(params, { rowLimit: null,
                                         columnLimit: null,
                                         minRows: 1,
@@ -322,7 +326,6 @@ var IconGrid = GObject.registerClass({
                 leftEmptySpace = availWidth - usedWidth;
         }
 
-        let animating = this._clonesAnimating.length > 0;
         let x = box.x1 + leftEmptySpace + this.leftPadding;
         let y = box.y1 + this.topPadding;
         let columnIndex = 0;
@@ -332,11 +335,10 @@ var IconGrid = GObject.registerClass({
 
             if (this._rowLimit && rowIndex >= this._rowLimit ||
                 this._fillParent && childBox.y2 > availHeight - this.bottomPadding) {
-                children[i].opacity = 0;
+                children[i].hide();
             } else {
-                if (!animating)
-                    children[i].opacity = 255;
                 children[i].allocate(childBox, flags);
+                children[i].show();
             }
 
             columnIndex++;
@@ -380,7 +382,7 @@ var IconGrid = GObject.registerClass({
              child != null;
              child = child.get_next_sibling()) {
 
-            if (!child.visible || !child.opacity)
+            if (!child.visible)
                 continue;
 
             let childVolume = child.get_transformed_paint_volume(this);
@@ -418,8 +420,7 @@ var IconGrid = GObject.registerClass({
 
     animatePulse(animationDirection) {
         if (animationDirection != AnimationDirection.IN)
-            throw new GObject.NotImplementedError("Pulse animation only implements " +
+            throw new Error("Pulse animation only implements 'in' animation direction");
-                                                  "'in' animation direction");
 
         this._cancelAnimation();
 
@@ -843,7 +844,7 @@ var PaginatedIconGrid = GObject.registerClass({
         }
     }
 
-    // Overridden from IconGrid
+    // Overriden from IconGrid
     _getChildrenToAnimate() {
         let children = this._getVisibleChildren();
         let firstIndex = this._childrenPerPage * this.currentPage;

js/ui/keyboard.js

@@ -282,11 +282,11 @@ var Key = class Key {
                                                        y_fill: true,
                                                        x_align: St.Align.START });
         this._boxPointer.hide();
-        Main.layoutManager.addTopChrome(this._boxPointer);
+        Main.layoutManager.addChrome(this._boxPointer.actor);
         this._boxPointer.setPosition(this.keyButton, 0.5);
 
         // Adds style to existing keyboard style to avoid repetition
-        this._boxPointer.add_style_class_name('keyboard-subkeys');
+        this._boxPointer.actor.add_style_class_name('keyboard-subkeys');
         this._getExtendedKeys();
         this.keyButton._extended_keys = this._extended_keyboard;
     }
@@ -1049,7 +1049,7 @@ var Keyboard = class Keyboard {
         this._a11yApplicationsSettings.connect('changed', this._syncEnabled.bind(this));
         this._lastDeviceId = null;
         this._suggestions = null;
-        this._emojiKeyVisible = Meta.is_wayland_compositor();
+        this._emojiKeyVisible = true;
 
         this._focusTracker = new FocusTracker();
         this._focusTracker.connect('position-changed', this._onFocusPositionChanged.bind(this));
@@ -1144,7 +1144,6 @@ var Keyboard = class Keyboard {
             this._keyboardController.disconnect(this._keypadVisibleId);
         if (this._focusNotifyId)
             global.stage.disconnect(this._focusNotifyId);
-        this._clearShowIdle();
         this._keyboard = null;
         this.actor.destroy();
         this.actor = null;
@@ -1163,7 +1162,7 @@ var Keyboard = class Keyboard {
         this._keyboardController = new KeyboardController();
 
         this._groups = {};
-        this._currentPage = null;
+        this._current_page = null;
 
         this._suggestions = new Suggestions();
         this.actor.add(this._suggestions.actor,
@@ -1203,12 +1202,10 @@ var Keyboard = class Keyboard {
         this._keyboardNotifyId = this._keyboardController.connect('active-group', this._onGroupChanged.bind(this));
         this._keyboardGroupsChangedId = this._keyboardController.connect('groups-changed', this._onKeyboardGroupsChanged.bind(this));
         this._keyboardStateId = this._keyboardController.connect('panel-state', this._onKeyboardStateChanged.bind(this));
+        this._emojiKeyVisibleId = this._keyboardController.connect('emoji-visible', this._onEmojiKeyVisible.bind(this));
         this._keypadVisibleId = this._keyboardController.connect('keypad-visible', this._onKeypadVisible.bind(this));
         this._focusNotifyId = global.stage.connect('notify::key-focus', this._onKeyFocusChanged.bind(this));
 
-        if (Meta.is_wayland_compositor())
-            this._emojiKeyVisibleId = this._keyboardController.connect('emoji-visible', this._onEmojiKeyVisible.bind(this));
-
         this._relayout();
     }
 
@@ -1230,7 +1227,6 @@ var Keyboard = class Keyboard {
         if (!this._showIdleId) {
           this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
               this.show(Main.layoutManager.focusIndex);
-              this._showIdleId = 0;
               return GLib.SOURCE_REMOVE;
           });
           GLib.Source.set_name_by_id(this._showIdleId, '[gnome-shell] this.show');
@@ -1306,7 +1302,7 @@ var Keyboard = class Keyboard {
             this._languagePopup.destroy();
 
         this._languagePopup = new LanguageSelectionPopup(keyActor);
-        Main.layoutManager.addTopChrome(this._languagePopup.actor);
+        Main.layoutManager.addChrome(this._languagePopup.actor);
         this._languagePopup.open(true);
     }
 
@@ -1357,7 +1353,7 @@ var Keyboard = class Keyboard {
             } else if (switchToLevel == 1) {
                 extraButton.connect('long-press', () => {
                     this._latched = true;
-                    this._setCurrentLevelLatched(this._currentPage, this._latched);
+                    this._setCurrentLevelLatched(this._current_page, this._latched);
                 });
             }
 
@@ -1384,8 +1380,8 @@ var Keyboard = class Keyboard {
     }
 
     _updateCurrentPageVisible() {
-        if (this._currentPage)
+        if (this._current_page)
-            this._currentPage.visible = !this._emojiActive && !this._keypadVisible;
+            this._current_page.visible = !this._emojiActive && !this._keypadVisible;
     }
 
     _setEmojiActive(active) {
@@ -1444,7 +1440,7 @@ var Keyboard = class Keyboard {
 
     _getGridSlots() {
         let numOfHorizSlots = 0, numOfVertSlots;
-        let rows = this._currentPage.get_children();
+        let rows = this._current_page.get_children();
         numOfVertSlots = rows.length;
 
         for (let i = 0; i < rows.length; ++i) {
@@ -1521,24 +1517,13 @@ var Keyboard = class Keyboard {
     _setActiveLayer(activeLevel) {
         let activeGroupName = this._keyboardController.getCurrentGroup();
         let layers = this._groups[activeGroupName];
-        let currentPage = layers[activeLevel];
 
-        if (this._currentPage == currentPage) {
+        if (this._current_page != null) {
-            this._updateCurrentPageVisible();
+            this._setCurrentLevelLatched(this._current_page, false);
-            return;
+            this._current_page.hide();
         }
 
-        if (this._currentPage != null) {
+        this._current_page = layers[activeLevel];
-            this._setCurrentLevelLatched(this._currentPage, false);
-            this._currentPage.disconnect(this._currentPage._destroyID);
-            this._currentPage.hide();
-            delete this._currentPage._destroyID;
-        }
-
-        this._currentPage = currentPage;
-        this._currentPage._destroyID = this._currentPage.connect('destroy', () => {
-            this._currentPage = null;
-        });
         this._updateCurrentPageVisible();
     }
 
@@ -1626,6 +1611,18 @@ var Keyboard = class Keyboard {
         this.setCursorLocation(null);
     }
 
+    _hideSubkeys() {
+        if (this._subkeysBoxPointer) {
+            this._subkeysBoxPointer.hide(BoxPointer.PopupAnimation.FULL);
+            this._subkeysBoxPointer = null;
+        }
+        if (this._capturedEventId) {
+            this.actor.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+        }
+        this._capturedPress = false;
+    }
+
     resetSuggestions() {
         if (this._suggestions)
             this._suggestions.clear();

js/ui/layout.js

@@ -11,7 +11,6 @@ const DND = imports.ui.dnd;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
-const Ripples = imports.ui.ripples;
 
 var STARTUP_ANIMATION_TIME = 0.5;
 var KEYBOARD_ANIMATION_TIME = 0.15;
@@ -217,17 +216,10 @@ var LayoutManager = GObject.registerClass({
         this.uiGroup = new UiActor({ name: 'uiGroup' });
         this.uiGroup.set_flags(Clutter.ActorFlags.NO_LAYOUT);
 
-        global.stage.add_child(this.uiGroup);
-
         global.stage.remove_actor(global.window_group);
         this.uiGroup.add_actor(global.window_group);
 
-        // Using addChrome() to add actors to uiGroup will position actors
+        global.stage.add_child(this.uiGroup);
-        // underneath the top_window_group.
-        // To insert actors at the top of uiGroup, we use addTopChrome() or
-        // add the actor directly using uiGroup.add_actor().
-        global.stage.remove_actor(global.top_window_group);
-        this.uiGroup.add_actor(global.top_window_group);
 
         this.overviewGroup = new St.Widget({ name: 'overviewGroup',
                                              visible: false,
@@ -255,7 +247,7 @@ var LayoutManager = GObject.registerClass({
         this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
                                               reactive: true,
                                               track_hover: true });
-        this.addTopChrome(this.keyboardBox);
+        this.addChrome(this.keyboardBox);
         this._keyboardHeightNotifyId = 0;
 
         // A dummy actor that tracks the mouse or text cursor, based on the
@@ -263,6 +255,9 @@ var LayoutManager = GObject.registerClass({
         this.dummyCursor = new St.Widget({ width: 0, height: 0, opacity: 0 });
         this.uiGroup.add_actor(this.dummyCursor);
 
+        global.stage.remove_actor(global.top_window_group);
+        this.uiGroup.add_actor(global.top_window_group);
+
         let feedbackGroup = Meta.get_feedback_group_for_display(global.display);
         global.stage.remove_actor(feedbackGroup);
         this.uiGroup.add_actor(feedbackGroup);
@@ -807,16 +802,6 @@ var LayoutManager = GObject.registerClass({
         this._trackActor(actor, params);
     }
 
-    // addTopChrome:
-    // @actor: an actor to add to the chrome
-    // @params: (optional) additional params
-    //
-    // Like addChrome(), but adds @actor above all windows, including popups.
-    addTopChrome(actor, params) {
-        this.uiGroup.add_actor(actor);
-        this._trackActor(actor, params);
-    }
-
     // trackChrome:
     // @actor: a descendant of the chrome to begin tracking
     // @params: parameters describing how to track @actor
@@ -1073,7 +1058,8 @@ var LayoutManager = GObject.registerClass({
             }
         }
 
-        global.set_stage_input_region(rects);
+        if (!Meta.is_wayland_compositor())
+            global.set_stage_input_region(rects);
         this._isPopupWindowVisible = isPopupMenuVisible;
 
         let workspaceManager = global.workspace_manager;
@@ -1118,15 +1104,14 @@ var HotCorner = class HotCorner {
                                                     Shell.ActionMode.OVERVIEW);
         this._pressureBarrier.connect('trigger', this._toggleOverview.bind(this));
 
-        let px = 0.0;
+        // Cache the three ripples instead of dynamically creating and destroying them.
-        let py = 0.0;
+        this._ripple1 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
-        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
+        this._ripple2 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
-            px = 1.0;
+        this._ripple3 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
-            py = 0.0;
-        }
 
-        this._ripples = new Ripples.Ripples(px, py, 'ripple-box');
+        layoutManager.uiGroup.add_actor(this._ripple1);
-        this._ripples.addTo(layoutManager.uiGroup);
+        layoutManager.uiGroup.add_actor(this._ripple2);
+        layoutManager.uiGroup.add_actor(this._ripple3);
     }
 
     setBarrierSize(size) {
@@ -1208,12 +1193,53 @@ var HotCorner = class HotCorner {
             this.actor.destroy();
     }
 
+    _animRipple(ripple, delay, time, startScale, startOpacity, finalScale) {
+        // We draw a ripple by using a source image and animating it scaling
+        // outwards and fading away. We want the ripples to move linearly
+        // or it looks unrealistic, but if the opacity of the ripple goes
+        // linearly to zero it fades away too quickly, so we use Tweener's
+        // 'onUpdate' to give a non-linear curve to the fade-away and make
+        // it more visible in the middle section.
+
+        ripple._opacity = startOpacity;
+
+        if (ripple.get_text_direction() == Clutter.TextDirection.RTL)
+            ripple.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
+
+        ripple.visible = true;
+        ripple.opacity = 255 * Math.sqrt(startOpacity);
+        ripple.scale_x = ripple.scale_y = startScale;
+
+        ripple.x = this._x;
+        ripple.y = this._y;
+
+        Tweener.addTween(ripple, { _opacity: 0,
+                                   scale_x: finalScale,
+                                   scale_y: finalScale,
+                                   delay: delay,
+                                   time: time,
+                                   transition: 'linear',
+                                   onUpdate() { ripple.opacity = 255 * Math.sqrt(ripple._opacity); },
+                                   onComplete() { ripple.visible = false; } });
+    }
+
+    _rippleAnimation() {
+        // Show three concentric ripples expanding outwards; the exact
+        // parameters were found by trial and error, so don't look
+        // for them to make perfect sense mathematically
+
+        //                              delay  time  scale opacity => scale
+        this._animRipple(this._ripple1, 0.0,   0.83,  0.25,  1.0,     1.5);
+        this._animRipple(this._ripple2, 0.05,  1.0,   0.0,   0.7,     1.25);
+        this._animRipple(this._ripple3, 0.35,  1.0,   0.0,   0.3,     1);
+    }
+
     _toggleOverview() {
         if (this._monitor.inFullscreen && !Main.overview.visible)
             return;
 
         if (Main.overview.shouldToggleByCornerOrButton()) {
-            this._ripples.playAnimation(this._x, this._y);
+            this._rippleAnimation();
             Main.overview.toggle();
         }
     }

js/ui/lightbox.js

@@ -7,7 +7,7 @@ const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
 var DEFAULT_FADE_FACTOR = 0.4;
-var VIGNETTE_BRIGHTNESS = 0.2;
+var VIGNETTE_BRIGHTNESS = 0.8;
 var VIGNETTE_SHARPNESS = 0.7;
 
 const VIGNETTE_DECLARATIONS = '\

js/ui/locatePointer.js

@@ -1,24 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const { Clutter, Gio, GLib, St } = imports.gi;
-const Ripples = imports.ui.ripples;
-const Main = imports.ui.main;
-
-const LOCATE_POINTER_KEY = "locate-pointer";
-const LOCATE_POINTER_SCHEMA = "org.gnome.desktop.interface"
-
-var locatePointer = class {
-    constructor() {
-        this._settings = new Gio.Settings({schema_id: LOCATE_POINTER_SCHEMA});
-        this._ripples = new Ripples.Ripples(0.5, 0.5, 'ripple-pointer-location');
-        this._ripples.addTo(Main.uiGroup);
-    }
-
-    show() {
-        if (!this._settings.get_boolean("locate-pointer"))
-            return;
-
-        let [x, y, mods] = global.get_pointer();
-        this._ripples.playAnimation(x, y);
-    }
-};

js/ui/magnifier.js

@@ -1272,7 +1272,7 @@ var ZoomRegion = class ZoomRegion {
 
     /**
      * getContrast:
-     * Retrieve the contrast of the magnified view.
+     * Retreive the contrast of the magnified view.
      * @return  Object containing the contrast for the red, green,
      *          and blue channels.
      */

js/ui/main.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
 
 const AccessDialog = imports.ui.accessDialog;
@@ -37,12 +37,9 @@ const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
 const KbdA11yDialog = imports.ui.kbdA11yDialog;
-const LocatePointer = imports.ui.locatePointer;
-const PointerA11yTimeout = imports.ui.pointerA11yTimeout;
 
 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
 const STICKY_KEYS_ENABLE = 'stickykeys-enable';
-const LOG_DOMAIN = 'GNOME Shell';
 const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a';
 
 var componentManager = null;
@@ -77,14 +74,12 @@ var layoutManager = null;
 var kbdA11yDialog = null;
 var inputMethod = null;
 var introspectService = null;
-var locatePointer = null;
 let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
 let _a11ySettings = null;
 let _themeResource = null;
 let _oskResource = null;
-let pointerA11yTimeout = null;
 
 function _sessionUpdated() {
     if (sessionMode.isPrimary)
@@ -97,8 +92,6 @@ function _sessionUpdated() {
     wm.allowKeybinding('overlay-key', Shell.ActionMode.NORMAL |
                                       Shell.ActionMode.OVERVIEW);
 
-    wm.allowKeybinding('locate-pointer-key', Shell.ActionMode.ALL);
-
     wm.setCustomKeybindingHandler('panel-run-dialog',
                                   Shell.ActionMode.NORMAL |
                                   Shell.ActionMode.OVERVIEW,
@@ -172,8 +165,6 @@ function _initializeUI() {
     kbdA11yDialog = new KbdA11yDialog.KbdA11yDialog();
     wm = new WindowManager.WindowManager();
     magnifier = new Magnifier.Magnifier();
-    locatePointer = new LocatePointer.locatePointer();
-
     if (LoginManager.canLock())
         screenShield = new ScreenShield.ScreenShield();
 
@@ -192,8 +183,6 @@ function _initializeUI() {
     layoutManager.init();
     overview.init();
 
-    pointerA11yTimeout = new PointerA11yTimeout.PointerA11yTimeout();
-
     _a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
 
     global.display.connect('overlay-key', () => {
@@ -201,10 +190,6 @@ function _initializeUI() {
             overview.toggle();
     });
 
-    global.connect('locate-pointer', () => {
-        locatePointer.show();
-    });
-
     global.display.connect('show-restart-message', (display, message) => {
         showRestartMessage(message);
         return true;
@@ -244,14 +229,10 @@ function _initializeUI() {
         }
         if (sessionMode.currentMode != 'gdm' &&
             sessionMode.currentMode != 'initial-setup') {
-            GLib.log_structured(LOG_DOMAIN, GLib.LogLevelFlags.LEVEL_MESSAGE, {
+            Shell.Global.log_structured('GNOME Shell started at ' + _startDate,
-                'MESSAGE': `GNOME Shell started at ${_startDate}`,
+                                        ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
-                'MESSAGE_ID': GNOMESHELL_STARTED_MESSAGE_ID
-            });
         }
 
-        LoginManager.registerSessionWithGDM();
-
         let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
         if (perfModuleName) {
             let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
@@ -655,7 +636,7 @@ function _queueBeforeRedraw(workId) {
  * initialization as well, under the assumption that new actors
  * will need it.
  *
- * Returns: A string work identifier
+ * Returns: A string work identifer
  */
 function initializeDeferredWork(actor, callback, props) {
     // Turn into a string so we can use as an object property
@@ -708,13 +689,12 @@ function queueDeferredWork(workId) {
     }
 }
 
-var RestartMessage = GObject.registerClass(
+var RestartMessage = class extends ModalDialog.ModalDialog {
-class RestartMessage extends ModalDialog.ModalDialog {
+    constructor(message) {
-    _init(message) {
+        super({ shellReactive: true,
-        super._init({ shellReactive: true,
+                styleClass: 'restart-message headline',
-                      styleClass: 'restart-message headline',
+                shouldFadeIn: false,
-                      shouldFadeIn: false,
+                destroyOnClose: true });
-                      destroyOnClose: true });
 
         let label = new St.Label({ text: message });
 
@@ -724,7 +704,7 @@ class RestartMessage extends ModalDialog.ModalDialog {
                                         y_align: St.Align.MIDDLE });
         this.buttonLayout.hide();
     }
-});
+};
 
 function showRestartMessage(message) {
     let restartMessage = new RestartMessage(message);

js/ui/messageTray.js

@@ -584,6 +584,7 @@ class SourceActor extends St.Widget {
         this._source = source;
         this._size = size;
 
+        this.actor = this;
         this.connect('destroy', () => {
             this._source.disconnect(this._iconUpdatedId);
             this._actorDestroyed = true;

js/ui/modalDialog.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Atk, Clutter, GObject, Shell, St } = imports.gi;
+const { Atk, Clutter, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Dialog = imports.ui.dialog;
@@ -21,20 +21,8 @@ var State = {
     FADED_OUT: 4
 };
 
-var ModalDialog = GObject.registerClass({
+var ModalDialog = class {
-    Properties: { 'state': GObject.ParamSpec.int('state', 'Dialog state', 'state',
+    constructor(params) {
-                                                 GObject.ParamFlags.READABLE,
-                                                 Math.min(...Object.values(State)),
-                                                 Math.max(...Object.values(State)),
-                                                 State.CLOSED) },
-    Signals: { 'opened': {}, 'closed': {} }
-}, class ModalDialog extends St.Widget {
-    _init(params) {
-        super._init({ visible: false,
-                      x: 0,
-                      y: 0,
-                      accessible_role: Atk.Role.DIALOG });
-
         params = Params.parse(params, { shellReactive: false,
                                         styleClass: null,
                                         actionMode: Shell.ActionMode.SYSTEM_MODAL,
@@ -42,7 +30,7 @@ var ModalDialog = GObject.registerClass({
                                         shouldFadeOut: true,
                                         destroyOnClose: true });
 
-        this._state = State.CLOSED;
+        this.state = State.CLOSED;
         this._hasModal = false;
         this._actionMode = params.actionMode;
         this._shellReactive = params.shellReactive;
@@ -50,25 +38,31 @@ var ModalDialog = GObject.registerClass({
         this._shouldFadeOut = params.shouldFadeOut;
         this._destroyOnClose = params.destroyOnClose;
 
-        Main.layoutManager.modalDialogGroup.add_actor(this);
+        this._group = new St.Widget({ visible: false,
+                                      x: 0,
+                                      y: 0,
+                                      accessible_role: Atk.Role.DIALOG });
+        Main.layoutManager.modalDialogGroup.add_actor(this._group);
 
         let constraint = new Clutter.BindConstraint({ source: global.stage,
                                                       coordinate: Clutter.BindCoordinate.ALL });
-        this.add_constraint(constraint);
+        this._group.add_constraint(constraint);
+
+        this._group.connect('destroy', this._onGroupDestroy.bind(this));
 
         this.backgroundStack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
         this._backgroundBin = new St.Bin({ child: this.backgroundStack,
                                            x_fill: true, y_fill: true });
         this._monitorConstraint = new Layout.MonitorConstraint();
         this._backgroundBin.add_constraint(this._monitorConstraint);
-        this.add_actor(this._backgroundBin);
+        this._group.add_actor(this._backgroundBin);
 
         this.dialogLayout = new Dialog.Dialog(this.backgroundStack, params.styleClass);
         this.contentLayout = this.dialogLayout.contentLayout;
         this.buttonLayout = this.dialogLayout.buttonLayout;
 
         if (!this._shellReactive) {
-            this._lightbox = new Lightbox.Lightbox(this,
+            this._lightbox = new Lightbox.Lightbox(this._group,
                                                    { inhibitEvents: true,
                                                      radialEffect: true });
             this._lightbox.highlight(this._backgroundBin);
@@ -83,16 +77,8 @@ var ModalDialog = GObject.registerClass({
         this._savedKeyFocus = null;
     }
 
-    get state() {
+    destroy() {
-        return this._state;
+        this._group.destroy();
-    }
-
-    _setState(state) {
-        if (this._state == state)
-            return;
-
-        this._state = state;
-        this.notify('state');
     }
 
     clearButtons() {
@@ -110,25 +96,29 @@ var ModalDialog = GObject.registerClass({
         return this.dialogLayout.addButton(buttonInfo);
     }
 
+    _onGroupDestroy() {
+        this.emit('destroy');
+    }
+
     _fadeOpen(onPrimary) {
         if (onPrimary)
             this._monitorConstraint.primary = true;
         else
             this._monitorConstraint.index = global.display.get_current_monitor();
 
-        this._setState(State.OPENING);
+        this.state = State.OPENING;
 
         this.dialogLayout.opacity = 255;
         if (this._lightbox)
             this._lightbox.show();
-        this.opacity = 0;
+        this._group.opacity = 0;
-        this.show();
+        this._group.show();
-        Tweener.addTween(this,
+        Tweener.addTween(this._group,
                          { opacity: 255,
                            time: this._shouldFadeIn ? OPEN_AND_CLOSE_TIME : 0,
                            transition: 'easeOutQuad',
                            onComplete: () => {
-                               this._setState(State.OPENED);
+                               this.state = State.OPENED;
                                this.emit('opened');
                            }
                          });
@@ -158,8 +148,8 @@ var ModalDialog = GObject.registerClass({
     }
 
     _closeComplete() {
-        this._setState(State.CLOSED);
+        this.state = State.CLOSED;
-        this.hide();
+        this._group.hide();
         this.emit('closed');
 
         if (this._destroyOnClose)
@@ -170,12 +160,12 @@ var ModalDialog = GObject.registerClass({
         if (this.state == State.CLOSED || this.state == State.CLOSING)
             return;
 
-        this._setState(State.CLOSING);
+        this.state = State.CLOSING;
         this.popModal(timestamp);
         this._savedKeyFocus = null;
 
         if (this._shouldFadeOut)
-            Tweener.addTween(this,
+            Tweener.addTween(this._group,
                              { opacity: 0,
                                time: OPEN_AND_CLOSE_TIME,
                                transition: 'easeOutQuad',
@@ -193,11 +183,11 @@ var ModalDialog = GObject.registerClass({
             return;
 
         let focus = global.stage.key_focus;
-        if (focus && this.contains(focus))
+        if (focus && this._group.contains(focus))
             this._savedKeyFocus = focus;
         else
             this._savedKeyFocus = null;
-        Main.popModal(this, timestamp);
+        Main.popModal(this._group, timestamp);
         this._hasModal = false;
 
         if (!this._shellReactive)
@@ -211,7 +201,7 @@ var ModalDialog = GObject.registerClass({
         let params = { actionMode: this._actionMode };
         if (timestamp)
             params['timestamp'] = timestamp;
-        if (!Main.pushModal(this, params))
+        if (!Main.pushModal(this._group, params))
             return false;
 
         this._hasModal = true;
@@ -234,10 +224,10 @@ var ModalDialog = GObject.registerClass({
     // can be dismissed by a close call.
     //
     // The main point of this method is to give some indication to the user
-    // that the dialog response has been acknowledged but will take a few
+    // that the dialog reponse has been acknowledged but will take a few
     // moments before being processed.
     // e.g., if a user clicked "Log Out" then the dialog should go away
-    // immediately, but the lightbox should remain until the logout is
+    // imediately, but the lightbox should remain until the logout is
     // complete.
     _fadeOutDialog(timestamp) {
         if (this.state == State.CLOSED || this.state == State.CLOSING)
@@ -252,8 +242,9 @@ var ModalDialog = GObject.registerClass({
                            time:    FADE_OUT_DIALOG_TIME,
                            transition: 'easeOutQuad',
                            onComplete: () => {
-                               this._setState(State.FADED_OUT);
+                               this.state = State.FADED_OUT;
                            }
                          });
     }
-});
+};
+Signals.addSignalMethods(ModalDialog.prototype);

js/ui/overviewControls.js

@@ -122,7 +122,7 @@ var SlidingControl = class {
     }
 
     _getSlide() {
-        throw new GObject.NotImplementedError(`_getSlide in ${this.constructor.name}`);
+        throw new Error('getSlide() must be overridden');
     }
 
     _updateSlide() {

js/ui/panel.js

@@ -66,7 +66,7 @@ function _unpremultiply(color) {
 
 class AppMenu extends PopupMenu.PopupMenu {
     constructor(sourceActor) {
-        super(sourceActor, 0.5, St.Side.TOP);
+        super(sourceActor, 0.0, St.Side.TOP);
 
         this.actor.add_style_class_name('app-menu');
 
@@ -75,9 +75,6 @@ class AppMenu extends PopupMenu.PopupMenu {
 
         this._windowsChangedId = 0;
 
-        /* Translators: This is the heading of a list of open windows */
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem(_("Open Windows")));
-
         this._windowSection = new PopupMenu.PopupMenuSection();
         this.addMenuItem(this._windowSection);
 
@@ -108,8 +105,6 @@ class AppMenu extends PopupMenu.PopupMenu {
             });
         });
 
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
         this.addAction(_("Quit"), () => {
             this._app.request_quit();
         });
@@ -122,7 +117,7 @@ class AppMenu extends PopupMenu.PopupMenu {
 
     _updateDetailsVisibility() {
         let sw = this._appSystem.lookup_app('org.gnome.Software.desktop');
-        this._detailsItem.visible = (sw != null);
+        this._detailsItem.actor.visible = (sw != null);
     }
 
     isEmpty() {
@@ -160,7 +155,7 @@ class AppMenu extends PopupMenu.PopupMenu {
             });
         });
 
-        this._newWindowItem.visible =
+        this._newWindowItem.actor.visible =
             app && app.can_open_new_window() && !actions.includes('new-window');
     }
 
@@ -177,6 +172,13 @@ class AppMenu extends PopupMenu.PopupMenu {
                 Main.activateWindow(window, event.get_time());
             });
         });
+
+        // Add separator between windows of the current desktop and other windows.
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
+        let pos = windows.findIndex(w => w.get_workspace() != activeWorkspace);
+        if (pos >= 0)
+            this._windowSection.addMenuItem(new PopupMenu.PopupSeparatorMenuItem(), pos);
     }
 }
 
@@ -194,7 +196,7 @@ var AppMenuButton = GObject.registerClass({
     _init(panel) {
         super._init(0.0, null, true);
 
-        this.accessible_role = Atk.Role.MENU;
+        this.actor.accessible_role = Atk.Role.MENU;
 
         this._startingApps = [];
 
@@ -204,10 +206,10 @@ var AppMenuButton = GObject.registerClass({
 
         let bin = new St.Bin({ name: 'appMenu' });
         bin.connect('style-changed', this._onStyleChanged.bind(this));
-        this.add_actor(bin);
+        this.actor.add_actor(bin);
 
-        this.bind_property("reactive", this, "can-focus", 0);
+        this.actor.bind_property("reactive", this.actor, "can-focus", 0);
-        this.reactive = false;
+        this.actor.reactive = false;
 
         this._container = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         bin.set_child(this._container);
@@ -263,10 +265,10 @@ var AppMenuButton = GObject.registerClass({
             return;
 
         this._visible = true;
-        this.reactive = true;
+        this.actor.reactive = true;
         this.show();
-        Tweener.removeTweens(this);
+        Tweener.removeTweens(this.actor);
-        Tweener.addTween(this,
+        Tweener.addTween(this.actor,
                          { opacity: 255,
                            time: Overview.ANIMATION_TIME,
                            transition: 'easeOutQuad' });
@@ -277,9 +279,9 @@ var AppMenuButton = GObject.registerClass({
             return;
 
         this._visible = false;
-        this.reactive = false;
+        this.actor.reactive = false;
-        Tweener.removeTweens(this);
+        Tweener.removeTweens(this.actor);
-        Tweener.addTween(this,
+        Tweener.addTween(this.actor,
                          { opacity: 0,
                            time: Overview.ANIMATION_TIME,
                            transition: 'easeOutQuad',
@@ -402,7 +404,7 @@ var AppMenuButton = GObject.registerClass({
             if (this._targetApp) {
                 this._busyNotifyId = this._targetApp.connect('notify::busy', this._sync.bind(this));
                 this._label.set_text(this._targetApp.get_name());
-                this.set_accessible_name(this._targetApp.get_name());
+                this.actor.set_accessible_name(this._targetApp.get_name());
             }
         }
 
@@ -420,7 +422,7 @@ var AppMenuButton = GObject.registerClass({
         else
             this.stopAnimation();
 
-        this.reactive = (visible && !isBusy);
+        this.actor.reactive = (visible && !isBusy);
 
         this._syncIcon();
         this.menu.setApp(this._targetApp);
@@ -459,28 +461,28 @@ var ActivitiesButton = GObject.registerClass(
 class ActivitiesButton extends PanelMenu.Button {
     _init() {
         super._init(0.0, null, true);
-        this.accessible_role = Atk.Role.TOGGLE_BUTTON;
+        this.actor.accessible_role = Atk.Role.TOGGLE_BUTTON;
 
-        this.name = 'panelActivities';
+        this.actor.name = 'panelActivities';
 
         /* Translators: If there is no suitable word for "Activities"
            in your language, you can use the word for "Overview". */
         this._label = new St.Label({ text: _("Activities"),
                                      y_align: Clutter.ActorAlign.CENTER });
-        this.add_actor(this._label);
+        this.actor.add_actor(this._label);
 
-        this.label_actor = this._label;
+        this.actor.label_actor = this._label;
 
-        this.connect('captured-event', this._onCapturedEvent.bind(this));
+        this.actor.connect('captured-event', this._onCapturedEvent.bind(this));
-        this.connect_after('key-release-event', this._onKeyRelease.bind(this));
+        this.actor.connect_after('key-release-event', this._onKeyRelease.bind(this));
 
         Main.overview.connect('showing', () => {
-            this.add_style_pseudo_class('overview');
+            this.actor.add_style_pseudo_class('overview');
-            this.add_accessible_state (Atk.StateType.CHECKED);
+            this.actor.add_accessible_state (Atk.StateType.CHECKED);
         });
         Main.overview.connect('hiding', () => {
-            this.remove_style_pseudo_class('overview');
+            this.actor.remove_style_pseudo_class('overview');
-            this.remove_accessible_state (Atk.StateType.CHECKED);
+            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
         });
 
         this._xdndTimeOut = 0;
@@ -533,7 +535,7 @@ class ActivitiesButton extends PanelMenu.Button {
         let [x, y, mask] = global.get_pointer();
         let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
 
-        if (pickedActor == this && Main.overview.shouldToggleByCornerOrButton())
+        if (pickedActor == this.actor && Main.overview.shouldToggleByCornerOrButton())
             Main.overview.toggle();
 
         Mainloop.source_remove(this._xdndTimeOut);
@@ -747,7 +749,7 @@ class AggregateMenu extends PanelMenu.Button {
         this.menu.box.set_layout_manager(menuLayout);
 
         this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
-        this.add_child(this._indicators);
+        this.actor.add_child(this._indicators);
 
         if (Config.HAVE_NETWORKMANAGER) {
             this._network = new imports.ui.status.network.NMApplet();
@@ -817,7 +819,6 @@ const PANEL_ITEM_IMPLEMENTATIONS = {
     'dateMenu': imports.ui.dateMenu.DateMenuButton,
     'a11y': imports.ui.status.accessibility.ATIndicator,
     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
-    'dwellClick': imports.ui.status.dwellClick.DwellClickIndicator,
 };
 
 var Panel = GObject.registerClass(
@@ -826,6 +827,9 @@ class Panel extends St.Widget {
         super._init({ name: 'panel',
                       reactive: true });
 
+        // For compatibility with extensions that still use the
+        // this.actor field
+        this.actor = this;
         this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._sessionStyle = null;
@@ -972,11 +976,22 @@ class Panel extends St.Widget {
         if (isPress && button != 1)
             return Clutter.EVENT_PROPAGATE;
 
+        let focusWindow = global.display.focus_window;
+        if (!focusWindow)
+            return Clutter.EVENT_PROPAGATE;
+
+        let dragWindow = focusWindow.is_attached_dialog() ? focusWindow.get_transient_for()
+                                                          : focusWindow;
+        if (!dragWindow)
+            return Clutter.EVENT_PROPAGATE;
+
+        let rect = dragWindow.get_frame_rect();
         let [stageX, stageY] = event.get_coords();
 
-        let dragWindow = this._getDraggableWindowForPosition(stageX);
+        let allowDrag = dragWindow.maximized_vertically &&
+                        stageX > rect.x && stageX < rect.x + rect.width;
 
-        if (!dragWindow)
+        if (!allowDrag)
             return Clutter.EVENT_PROPAGATE;
 
         global.display.begin_grab_op(dragWindow,
@@ -1006,7 +1021,7 @@ class Panel extends St.Widget {
             return; // menu not supported by current session mode
 
         let menu = indicator.menu;
-        if (!indicator.reactive)
+        if (!indicator.actor.reactive)
             return;
 
         menu.toggle();
@@ -1028,7 +1043,7 @@ class Panel extends St.Widget {
             return;
 
         let menu = indicator.menu;
-        if (!indicator.reactive)
+        if (!indicator.actor.reactive)
             return;
 
         menu.close();
@@ -1186,21 +1201,4 @@ class Panel extends St.Widget {
                     Main.messageTray.bannerBlocked = isOpen;
             });
     }
-
-    _getDraggableWindowForPosition(stageX) {
-        let workspaceManager = global.workspace_manager;
-        let workspace = workspaceManager.get_active_workspace()
-        let allWindowsByStacking = global.display.sort_windows_by_stacking(
-            workspace.list_windows()
-        ).reverse();
-
-        return allWindowsByStacking.find(metaWindow => {
-            let rect = metaWindow.get_frame_rect();
-            return metaWindow.is_on_primary_monitor() &&
-                   metaWindow.showing_on_its_workspace() &&
-                   metaWindow.get_window_type() != Meta.WindowType.DESKTOP &&
-                   metaWindow.maximized_vertically &&
-                   stageX > rect.x && stageX < rect.x + rect.width
-        });
-    }
 });

js/ui/panelMenu.js

@@ -14,11 +14,12 @@ class ButtonBox extends St.Widget {
 
         super._init(params);
 
+        this.actor = this;
         this._delegate = this;
 
         this.container = new St.Bin({ y_fill: true,
                                       x_fill: true,
-                                      child: this });
+                                      child: this.actor });
 
         this.connect('style-changed', this._onStyleChanged.bind(this));
         this.connect('destroy', this._onDestroy.bind(this));
@@ -104,9 +105,9 @@ var Button = GObject.registerClass({
         this.connect('notify::visible', this._onVisibilityChanged.bind(this));
 
         if (dontCreateMenu)
-            this.menu = new PopupMenu.PopupDummyMenu(this);
+            this.menu = new PopupMenu.PopupDummyMenu(this.actor);
         else
-            this.setMenu(new PopupMenu.PopupMenu(this, menuAlignment, St.Side.TOP, 0));
+            this.setMenu(new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0));
     }
 
     setSensitive(sensitive) {
@@ -144,7 +145,7 @@ var Button = GObject.registerClass({
         if (!this.menu)
             return;
 
-        if (!this.visible)
+        if (!this.actor.visible)
             this.menu.close();
     }
 
@@ -154,10 +155,10 @@ var Button = GObject.registerClass({
 
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
-            let group = global.focus_manager.get_group(this);
+            let group = global.focus_manager.get_group(this.actor);
             if (group) {
                 let direction = (symbol == Clutter.KEY_Left) ? St.DirectionType.LEFT : St.DirectionType.RIGHT;
-                group.navigate_focus(this, direction, false);
+                group.navigate_focus(this.actor, direction, false);
                 return Clutter.EVENT_STOP;
             }
         }
@@ -166,9 +167,9 @@ var Button = GObject.registerClass({
 
     _onOpenStateChanged(menu, open) {
         if (open)
-            this.add_style_pseudo_class('active');
+            this.actor.add_style_pseudo_class('active');
         else
-            this.remove_style_pseudo_class('active');
+            this.actor.remove_style_pseudo_class('active');
 
         // Setting the max-height won't do any good if the minimum height of the
         // menu is higher then the screen; it's useful if part of the menu is

js/ui/pointerA11yTimeout.js

@@ -1,104 +0,0 @@
-const { Clutter, GLib, GObject, Meta, St } = imports.gi;
-const Tweener = imports.ui.tweener;
-const Main = imports.ui.main;
-const Cairo = imports.cairo;
-
-const ANIMATION_STEPS = 36.;
-
-var PieTimer = GObject.registerClass(
-class PieTimer extends St.DrawingArea {
-    _init() {
-        this._x = 0;
-        this._y = 0;
-        this._startTime = 0;
-        this._duration = 0;
-        super._init( { style_class: 'pie-timer',
-                       visible: false,
-                       can_focus: false,
-                       reactive: false });
-    }
-
-    vfunc_repaint() {
-        let node = this.get_theme_node();
-        let backgroundColor = node.get_color('-pie-background-color');
-        let borderColor = node.get_color('-pie-border-color');
-        let borderWidth = node.get_length('-pie-border-width');
-        let [width, height] = this.get_surface_size();
-        let radius = Math.min(width / 2, height / 2);
-
-        let currentTime = GLib.get_monotonic_time() / 1000.0;
-        let ellapsed = currentTime - this._startTime;
-        let angle = (ellapsed / this._duration) * 2 * Math.PI;
-        let startAngle = 3 * Math.PI / 2;
-        let endAngle = startAngle + angle;
-
-        let cr = this.get_context();
-        cr.setLineCap(Cairo.LineCap.ROUND);
-        cr.setLineJoin(Cairo.LineJoin.ROUND);
-        cr.translate(width / 2, height / 2);
-
-        cr.moveTo(0, 0);
-        cr.arc(0, 0, radius - borderWidth, startAngle, endAngle);
-        cr.lineTo(0, 0);
-        cr.closePath();
-
-        cr.setLineWidth(0);
-        Clutter.cairo_set_source_color(cr, backgroundColor);
-        cr.fillPreserve();
-
-        cr.setLineWidth(borderWidth);
-        Clutter.cairo_set_source_color(cr, borderColor);
-        cr.stroke();
-
-        cr.$dispose();
-    }
-
-    start(x, y, duration) {
-        Tweener.removeTweens(this);
-
-        this.x = x - this.width / 2;
-        this.y = y - this.height / 2;
-        this.show();
-        Main.uiGroup.set_child_above_sibling(this, null);
-
-        this._startTime = GLib.get_monotonic_time() / 1000.0;
-        this._duration = duration;
-
-        Tweener.addTween(this,
-                         { opacity: 255,
-                           time: duration / 1000,
-                           transition: 'easeOutQuad',
-                           onUpdateScope: this,
-                           onUpdate() { this.queue_repaint() },
-                           onCompleteScope: this,
-                           onComplete() { this.stop(); }
-                          });
-    }
-
-    stop() {
-        Tweener.removeTweens(this);
-        this.hide();
-    }
-});
-
-var PointerA11yTimeout = class PointerA11yTimeout {
-    constructor() {
-        let manager = Clutter.DeviceManager.get_default();
-        let pieTimer = new PieTimer();
-
-        Main.uiGroup.add_actor(pieTimer);
-
-        manager.connect('ptr-a11y-timeout-started', (manager, device, type, timeout) => {
-            let [x, y, mods] = global.get_pointer();
-            pieTimer.start(x, y, timeout);
-            if (type == Clutter.PointerA11yTimeoutType.GESTURE)
-              global.display.set_cursor(Meta.Cursor.CROSSHAIR);
-        });
-
-        manager.connect('ptr-a11y-timeout-stopped', (manager, device, type) => {
-            pieTimer.stop();
-            if (type == Clutter.PointerA11yTimeoutType.GESTURE)
-              global.display.set_cursor(Meta.Cursor.DEFAULT);
-        });
-    }
-};

js/ui/popupMenu.js

@@ -51,64 +51,49 @@ function arrowIcon(side) {
     return arrow;
 }
 
-var PopupBaseMenuItem = GObject.registerClass({
+var PopupBaseMenuItem = class {
-    Properties: {
+    constructor(params) {
-        'active': GObject.ParamSpec.boolean('active', 'active', 'active',
-                                            GObject.ParamFlags.READWRITE,
-                                            GObject.TYPE_BOOLEAN,
-                                            false),
-        'sensitive': GObject.ParamSpec.boolean('sensitive', 'sensitive', 'sensitive',
-                                               GObject.ParamFlags.READWRITE,
-                                               GObject.TYPE_BOOLEAN,
-                                               true),
-    },
-    Signals: {
-        'activate': { param_types: [Clutter.Event.$gtype] },
-    }
-}, class PopupBaseMenuItem extends St.BoxLayout {
-    _init(params) {
         params = Params.parse (params, { reactive: true,
                                          activate: true,
                                          hover: true,
                                          style_class: null,
                                          can_focus: true
                                        });
-        super._init({ style_class: 'popup-menu-item',
+
-                      reactive: params.reactive,
+        this.actor = new St.BoxLayout({ style_class: 'popup-menu-item',
-                      track_hover: params.reactive,
+                                        reactive: params.reactive,
-                      can_focus: params.can_focus,
+                                        track_hover: params.reactive,
-                      accessible_role: Atk.Role.MENU_ITEM });
+                                        can_focus: params.can_focus,
-        this._delegate = this;
+                                        accessible_role: Atk.Role.MENU_ITEM });
+        this.actor._delegate = this;
 
         this._ornament = Ornament.NONE;
         this._ornamentLabel = new St.Label({ style_class: 'popup-menu-ornament' });
-        this.add(this._ornamentLabel);
+        this.actor.add(this._ornamentLabel);
 
         this._parent = null;
-        this._active = false;
+        this.active = false;
         this._activatable = params.reactive && params.activate;
         this._sensitive = true;
 
         if (!this._activatable)
-            this.add_style_class_name('popup-inactive-menu-item');
+            this.actor.add_style_class_name('popup-inactive-menu-item');
 
         if (params.style_class)
-            this.add_style_class_name(params.style_class);
+            this.actor.add_style_class_name(params.style_class);
 
         if (this._activatable) {
-            this.connect('button-press-event', this._onButtonPressEvent.bind(this));
+            this.actor.connect('button-press-event', this._onButtonPressEvent.bind(this));
-            this.connect('button-release-event', this._onButtonReleaseEvent.bind(this));
+            this.actor.connect('button-release-event', this._onButtonReleaseEvent.bind(this));
-            this.connect('touch-event', this._onTouchEvent.bind(this));
+            this.actor.connect('touch-event', this._onTouchEvent.bind(this));
-            this.connect('key-press-event', this._onKeyPressEvent.bind(this));
+            this.actor.connect('key-press-event', this._onKeyPressEvent.bind(this));
         }
         if (params.reactive && params.hover)
-            this.bind_property('hover', this, 'active', GObject.BindingFlags.SYNC_CREATE);
+            this.actor.connect('notify::hover', this._onHoverChanged.bind(this));
-    }
 
-    get actor() {
+        this.actor.connect('key-focus-in', this._onKeyFocusIn.bind(this));
-        /* This is kept for compatibility with current implementation, and we
+        this.actor.connect('key-focus-out', this._onKeyFocusOut.bind(this));
-           don't want to warn here yet since PopupMenu depends on this */
+        this.actor.connect('destroy', this._onDestroy.bind(this));
-        return this;
     }
 
     _getTopMenu() {
@@ -124,24 +109,24 @@ var PopupBaseMenuItem = GObject.registerClass({
 
     _onButtonPressEvent(actor, event) {
         // This is the CSS active state
-        this.add_style_pseudo_class('active');
+        this.actor.add_style_pseudo_class ('active');
         return Clutter.EVENT_PROPAGATE;
     }
 
     _onButtonReleaseEvent(actor, event) {
-        this.remove_style_pseudo_class('active');
+        this.actor.remove_style_pseudo_class ('active');
         this.activate(event);
         return Clutter.EVENT_STOP;
     }
 
     _onTouchEvent(actor, event) {
         if (event.type() == Clutter.EventType.TOUCH_END) {
-            this.remove_style_pseudo_class('active');
+            this.actor.remove_style_pseudo_class ('active');
             this.activate(event);
             return Clutter.EVENT_STOP;
         } else if (event.type() == Clutter.EventType.TOUCH_BEGIN) {
             // This is the CSS active state
-            this.add_style_pseudo_class('active');
+            this.actor.add_style_pseudo_class ('active');
         }
         return Clutter.EVENT_PROPAGATE;
     }
@@ -166,56 +151,54 @@ var PopupBaseMenuItem = GObject.registerClass({
         return Clutter.EVENT_PROPAGATE;
     }
 
-    vfunc_key_focus_in() {
+    _onKeyFocusIn(actor) {
-        super.vfunc_key_focus_in();
+        this.setActive(true);
-        this.active = true;
     }
 
-    vfunc_key_focus_out() {
+    _onKeyFocusOut(actor) {
-        super.vfunc_key_focus_out();
+        this.setActive(false);
-        this.active = false;
+    }
+
+    _onHoverChanged(actor) {
+        this.setActive(actor.hover);
     }
 
     activate(event) {
         this.emit('activate', event);
     }
 
-    get active() {
+    setActive(active) {
-        return this._active;
-    }
-
-    set active(active) {
         let activeChanged = active != this.active;
         if (activeChanged) {
-            this._active = active;
+            this.active = active;
             if (active) {
-                this.add_style_class_name('selected');
+                this.actor.add_style_class_name('selected');
-                if (this.can_focus)
+                if (this.actor.can_focus)
-                    this.grab_key_focus();
+                    this.actor.grab_key_focus();
             } else {
-                this.remove_style_class_name('selected');
+                this.actor.remove_style_class_name('selected');
                 // Remove the CSS active state if the user press the button and
                 // while holding moves to another menu item, so we don't paint all items.
                 // The correct behaviour would be to set the new item with the CSS
                 // active state as well, but button-press-event is not trigered,
                 // so we should track it in our own, which would involve some work
                 // in the container
-                this.remove_style_pseudo_class('active');
+                this.actor.remove_style_pseudo_class ('active');
             }
-            this.notify('active');
+            this.emit('active-changed', active);
         }
     }
 
     syncSensitive() {
-        let sensitive = this.sensitive;
+        let sensitive = this.getSensitive();
-        this.reactive = sensitive;
+        this.actor.reactive = sensitive;
-        this.can_focus = sensitive;
+        this.actor.can_focus = sensitive;
-        this.notify('sensitive');
+        this.emit('sensitive-changed');
         return sensitive;
     }
 
     getSensitive() {
-        let parentSensitive = this._parent ? this._parent.sensitive : true;
+        let parentSensitive = this._parent ? this._parent.getSensitive() : true;
         return this._activatable && this._sensitive && parentSensitive;
     }
 
@@ -227,12 +210,12 @@ var PopupBaseMenuItem = GObject.registerClass({
         this.syncSensitive();
     }
 
-    get sensitive() {
+    destroy() {
-        return this.getSensitive();
+        this.actor.destroy();
     }
 
-    set sensitive(sensitive) {
+    _onDestroy() {
-        this.setSensitive(sensitive);
+        this.emit('destroy');
     }
 
     setOrnament(ornament) {
@@ -243,38 +226,36 @@ var PopupBaseMenuItem = GObject.registerClass({
 
         if (ornament == Ornament.DOT) {
             this._ornamentLabel.text = '\u2022';
-            this.add_accessible_state(Atk.StateType.CHECKED);
+            this.actor.add_accessible_state(Atk.StateType.CHECKED);
         } else if (ornament == Ornament.CHECK) {
             this._ornamentLabel.text = '\u2713';
-            this.add_accessible_state(Atk.StateType.CHECKED);
+            this.actor.add_accessible_state(Atk.StateType.CHECKED);
         } else if (ornament == Ornament.NONE) {
             this._ornamentLabel.text = '';
-            this.remove_accessible_state(Atk.StateType.CHECKED);
+            this.actor.remove_accessible_state(Atk.StateType.CHECKED);
         }
     }
-});
+};
+Signals.addSignalMethods(PopupBaseMenuItem.prototype);
 
-var PopupMenuItem = GObject.registerClass(
+var PopupMenuItem = class extends PopupBaseMenuItem {
-class PopupMenuItem extends PopupBaseMenuItem {
+    constructor(text, params) {
-    _init(text, params) {
+        super(params);
-        super._init(params);
 
         this.label = new St.Label({ text: text });
-        this.add_child(this.label);
+        this.actor.add_child(this.label);
-        this.label_actor = this.label
+        this.actor.label_actor = this.label
     }
-});
+};
 
-
+var PopupSeparatorMenuItem = class extends PopupBaseMenuItem {
-var PopupSeparatorMenuItem = GObject.registerClass(
+    constructor(text) {
-class PopupSeparatorMenuItem extends PopupBaseMenuItem {
+        super({ reactive: false,
-    _init(text) {
+                can_focus: false});
-        super._init({ reactive: false,
-                      can_focus: false });
 
         this.label = new St.Label({ text: text || '' });
-        this.add(this.label);
+        this.actor.add(this.label);
-        this.label_actor = this.label;
+        this.actor.label_actor = this.label;
 
         this.label.connect('notify::text',
                            this._syncVisibility.bind(this));
@@ -283,78 +264,75 @@ class PopupSeparatorMenuItem extends PopupBaseMenuItem {
         this._separator = new St.Widget({ style_class: 'popup-separator-menu-item',
                                           y_expand: true,
                                           y_align: Clutter.ActorAlign.CENTER });
-        this.add(this._separator, { expand: true });
+        this.actor.add(this._separator, { expand: true });
     }
 
     _syncVisibility() {
         this.label.visible = this.label.text != '';
     }
-});
+};
 
-var Switch = GObject.registerClass(
+var Switch = class {
-class Switch extends St.Bin {
+    constructor(state) {
-    _init(state) {
+        this.actor = new St.Bin({ style_class: 'toggle-switch',
-        super._init({ style_class: 'toggle-switch',
+                                  accessible_role: Atk.Role.CHECK_BOX,
-                      accessible_role: Atk.Role.CHECK_BOX,
+                                  can_focus: true });
-                      can_focus: true });
         this.setToggleState(state);
     }
 
     setToggleState(state) {
         if (state)
-            this.add_style_pseudo_class('checked');
+            this.actor.add_style_pseudo_class('checked');
         else
-            this.remove_style_pseudo_class('checked');
+            this.actor.remove_style_pseudo_class('checked');
         this.state = state;
     }
 
     toggle() {
         this.setToggleState(!this.state);
     }
-});
+};
 
-var PopupSwitchMenuItem = GObject.registerClass({
+var PopupSwitchMenuItem = class extends PopupBaseMenuItem {
-    Signals: { 'toggled': { param_types: [GObject.TYPE_BOOLEAN] }, },
+    constructor(text, active, params) {
-},
+        super(params);
-class PopupSwitchMenuItem extends PopupBaseMenuItem {
-    _init(text, active, params) {
-        super._init(params);
 
         this.label = new St.Label({ text: text });
         this._switch = new Switch(active);
 
-        this.accessible_role = Atk.Role.CHECK_MENU_ITEM;
+        this.actor.accessible_role = Atk.Role.CHECK_MENU_ITEM;
         this.checkAccessibleState();
-        this.label_actor = this.label;
+        this.actor.label_actor = this.label;
 
-        this.add_child(this.label);
+        this.actor.add_child(this.label);
 
         this._statusBin = new St.Bin({ x_align: St.Align.END });
-        this.add(this._statusBin, { expand: true, x_align: St.Align.END });
+        this.actor.add(this._statusBin, { expand: true, x_align: St.Align.END });
 
         this._statusLabel = new St.Label({ text: '',
                                            style_class: 'popup-status-menu-item'
                                          });
-        this._statusBin.child = this._switch;
+        this._statusBin.child = this._switch.actor;
     }
 
     setStatus(text) {
         if (text != null) {
             this._statusLabel.text = text;
             this._statusBin.child = this._statusLabel;
-            this.reactive = false;
+            this.actor.reactive = false;
-            this.accessible_role = Atk.Role.MENU_ITEM;
+            this.actor.accessible_role = Atk.Role.MENU_ITEM;
         } else {
-            this._statusBin.child = this._switch;
+            this._statusBin.child = this._switch.actor;
-            this.reactive = true;
+            this.actor.reactive = true;
-            this.accessible_role = Atk.Role.CHECK_MENU_ITEM;
+            this.actor.accessible_role = Atk.Role.CHECK_MENU_ITEM;
         }
         this.checkAccessibleState();
     }
 
     activate(event) {
-        if (this._switch.mapped)
+        if (this._switch.actor.mapped) {
             this.toggle();
+        }
 
         // we allow pressing space to toggle the switch
         // without closing the menu
@@ -381,30 +359,29 @@ class PopupSwitchMenuItem extends PopupBaseMenuItem {
     }
 
     checkAccessibleState() {
-        switch (this.accessible_role) {
+        switch (this.actor.accessible_role) {
         case Atk.Role.CHECK_MENU_ITEM:
             if (this._switch.state)
-                this.add_accessible_state(Atk.StateType.CHECKED);
+                this.actor.add_accessible_state (Atk.StateType.CHECKED);
             else
-                this.remove_accessible_state(Atk.StateType.CHECKED);
+                this.actor.remove_accessible_state (Atk.StateType.CHECKED);
             break;
         default:
-            this.remove_accessible_state(Atk.StateType.CHECKED);
+            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
         }
     }
-});
+};
 
-var PopupImageMenuItem = GObject.registerClass(
+var PopupImageMenuItem = class extends PopupBaseMenuItem {
-class PopupImageMenuItem extends PopupBaseMenuItem {
+    constructor(text, icon, params) {
-    _init(text, icon, params) {
+        super(params);
-        super._init(params);
 
         this._icon = new St.Icon({ style_class: 'popup-menu-icon',
                                    x_align: Clutter.ActorAlign.END });
-        this.add_child(this._icon);
+        this.actor.add_child(this._icon);
         this.label = new St.Label({ text: text });
-        this.add_child(this.label);
+        this.actor.add_child(this.label);
-        this.label_actor = this.label;
+        this.actor.label_actor = this.label;
 
         this.setIcon(icon);
     }
@@ -416,12 +393,12 @@ class PopupImageMenuItem extends PopupBaseMenuItem {
         else
             this._icon.icon_name = icon;
     }
-});
+};
 
 var PopupMenuBase = class {
     constructor(sourceActor, styleClass) {
-        if (this.constructor === PopupMenuBase)
+        if (new.target === PopupMenuBase)
-            throw new TypeError(`Cannot instantiate abstract class ${this.constructor.name}`);
+            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
 
         this.sourceActor = sourceActor;
         this._parent = null;
@@ -460,21 +437,13 @@ var PopupMenuBase = class {
     }
 
     getSensitive() {
-        let parentSensitive = this._parent ? this._parent.sensitive : true;
+        let parentSensitive = this._parent ? this._parent.getSensitive() : true;
         return this._sensitive && parentSensitive;
     }
 
     setSensitive(sensitive) {
         this._sensitive = sensitive;
-        this.emit('notify::sensitive');
+        this.emit('sensitive-changed');
-    }
-
-    get sensitive() {
-        return this.getSensitive();
-    }
-
-    set sensitive(sensitive) {
-        this.setSensitive(sensitive);
     }
 
     _sessionUpdated() {
@@ -510,7 +479,7 @@ var PopupMenuBase = class {
             app.activate();
         });
 
-        menuItem.visible = Main.sessionMode.allowSettings;
+        menuItem.actor.visible = Main.sessionMode.allowSettings;
         this._settingsActions[desktopFile] = menuItem;
 
         return menuItem;
@@ -519,7 +488,7 @@ var PopupMenuBase = class {
     _setSettingsVisibility(visible) {
         for (let id in this._settingsActions) {
             let item = this._settingsActions[id];
-            item.visible = visible;
+            item.actor.visible = visible;
         }
     }
 
@@ -542,17 +511,16 @@ var PopupMenuBase = class {
 
     _subMenuActiveChanged(submenu, submenuItem) {
         if (this._activeMenuItem && this._activeMenuItem != submenuItem)
-            this._activeMenuItem.active = false;
+            this._activeMenuItem.setActive(false);
         this._activeMenuItem = submenuItem;
         this.emit('active-changed', submenuItem);
     }
 
     _connectItemSignals(menuItem) {
-        menuItem._activeChangeId = menuItem.connect('notify::active', (menuItem) => {
+        menuItem._activeChangeId = menuItem.connect('active-changed', (menuItem, active) => {
-            let active = menuItem.active;
             if (active && this._activeMenuItem != menuItem) {
                 if (this._activeMenuItem)
-                    this._activeMenuItem.active = false;
+                    this._activeMenuItem.setActive(false);
                 this._activeMenuItem = menuItem;
                 this.emit('active-changed', menuItem);
             } else if (!active && this._activeMenuItem == menuItem) {
@@ -560,8 +528,8 @@ var PopupMenuBase = class {
                 this.emit('active-changed', null);
             }
         });
-        menuItem._sensitiveChangeId = menuItem.connect('notify::sensitive', () => {
+        menuItem._sensitiveChangeId = menuItem.connect('sensitive-changed', () => {
-            let sensitive = menuItem.sensitive;
+            let sensitive = menuItem.getSensitive();
             if (!sensitive && this._activeMenuItem == menuItem) {
                 if (!this.actor.navigate_focus(menuItem.actor,
                                                St.DirectionType.TAB_FORWARD,
@@ -572,12 +540,12 @@ var PopupMenuBase = class {
                     menuItem.actor.grab_key_focus();
             }
         });
-        menuItem._activateId = menuItem.connect_after('activate', (menuItem, event) => {
+        menuItem._activateId = menuItem.connect('activate', (menuItem, event) => {
             this.emit('activate', menuItem);
             this.itemActivated(BoxPointer.PopupAnimation.FULL);
         });
 
-        menuItem._parentSensitiveChangeId = this.connect('notify::sensitive', () => {
+        menuItem._parentSensitiveChangeId = this.connect('sensitive-changed', () => {
             menuItem.syncSensitive();
         });
 
@@ -629,7 +597,7 @@ var PopupMenuBase = class {
             return;
         }
 
-        menuItem.show();
+        menuItem.actor.show();
     }
 
     moveMenuItem(menuItem, position) {
@@ -676,8 +644,8 @@ var PopupMenuBase = class {
             let parentClosingId = this.connect('menu-closed', () => {
                 menuItem.emit('menu-closed');
             });
-            let subMenuSensitiveChangedId = this.connect('notify::sensitive', () => {
+            let subMenuSensitiveChangedId = this.connect('sensitive-changed', () => {
-                menuItem.emit('notify::sensitive');
+                menuItem.emit('sensitive-changed');
             });
 
             menuItem.connect('destroy', () => {
@@ -883,9 +851,9 @@ var PopupMenu = class extends PopupMenuBase {
 
     close(animate) {
         if (this._activeMenuItem)
-            this._activeMenuItem.active = false;
+            this._activeMenuItem.setActive(false);
 
-        if (this._boxPointer.visible) {
+        if (this._boxPointer.actor.visible) {
             this._boxPointer.close(animate, () => {
                 this.emit('menu-closed');
             });
@@ -916,10 +884,6 @@ var PopupDummyMenu = class {
         return true;
     }
 
-    get sensitive() {
-        return this.getSensitive();
-    }
-
     open() { this.emit('open-state-changed', true); }
     close() { this.emit('open-state-changed', false); }
     toggle() {}
@@ -959,11 +923,7 @@ var PopupSubMenu = class extends PopupMenuBase {
     }
 
     getSensitive() {
-        return this._sensitive && this.sourceActor.sensitive;
+        return this._sensitive && this.sourceActor._delegate.getSensitive();
-    }
-
-    get sensitive() {
-        return this.getSensitive();
     }
 
     open(animate) {
@@ -1030,7 +990,7 @@ var PopupSubMenu = class extends PopupMenuBase {
         this.emit('open-state-changed', false);
 
         if (this._activeMenuItem)
-            this._activeMenuItem.active = false;
+            this._activeMenuItem.setActive(false);
 
         if (animate && this._needsScrollbar())
             animate = false;
@@ -1062,7 +1022,7 @@ var PopupSubMenu = class extends PopupMenuBase {
 
         if (this.isOpen && event.get_key_symbol() == Clutter.KEY_Left) {
             this.close(BoxPointer.PopupAnimation.FULL);
-            this.sourceActor._delegate.active = true;
+            this.sourceActor._delegate.setActive(true);
             return Clutter.EVENT_STOP;
         }
 
@@ -1093,26 +1053,25 @@ var PopupMenuSection = class extends PopupMenuBase {
     close() { this.emit('open-state-changed', false); }
 };
 
-var PopupSubMenuMenuItem = GObject.registerClass(
+var PopupSubMenuMenuItem = class extends PopupBaseMenuItem {
-class PopupSubMenuMenuItem extends PopupBaseMenuItem {
+    constructor(text, wantIcon) {
-    _init(text, wantIcon) {
+        super();
-        super._init();
 
-        this.add_style_class_name('popup-submenu-menu-item');
+        this.actor.add_style_class_name('popup-submenu-menu-item');
 
         if (wantIcon) {
             this.icon = new St.Icon({ style_class: 'popup-menu-icon' });
-            this.add_child(this.icon);
+            this.actor.add_child(this.icon);
         }
 
         this.label = new St.Label({ text: text,
                                     y_expand: true,
                                     y_align: Clutter.ActorAlign.CENTER });
-        this.add_child(this.label);
+        this.actor.add_child(this.label);
-        this.label_actor = this.label;
+        this.actor.label_actor = this.label;
 
         let expander = new St.Bin({ style_class: 'popup-menu-item-expander' });
-        this.add(expander, { expand: true });
+        this.actor.add(expander, { expand: true });
 
         this._triangle = arrowIcon(St.Side.RIGHT);
         this._triangle.pivot_point = new Clutter.Point({ x: 0.5, y: 0.6 });
@@ -1121,12 +1080,11 @@ class PopupSubMenuMenuItem extends PopupBaseMenuItem {
                                             y_align: Clutter.ActorAlign.CENTER });
         this._triangleBin.add_child(this._triangle);
 
-        this.add_child(this._triangleBin);
+        this.actor.add_child(this._triangleBin);
-        this.add_accessible_state(Atk.StateType.EXPANDABLE);
+        this.actor.add_accessible_state (Atk.StateType.EXPANDABLE);
 
-        this.menu = new PopupSubMenu(this, this._triangle);
+        this.menu = new PopupSubMenu(this.actor, this._triangle);
         this.menu.connect('open-state-changed', this._subMenuOpenStateChanged.bind(this));
-        this.connect('destroy', () => { this.menu.destroy(); });
     }
 
     _setParent(parent) {
@@ -1143,18 +1101,24 @@ class PopupSubMenuMenuItem extends PopupBaseMenuItem {
 
     _subMenuOpenStateChanged(menu, open) {
         if (open) {
-            this.add_style_pseudo_class('open');
+            this.actor.add_style_pseudo_class('open');
             this._getTopMenu()._setOpenedSubMenu(this.menu);
-            this.add_accessible_state(Atk.StateType.EXPANDED);
+            this.actor.add_accessible_state (Atk.StateType.EXPANDED);
-            this.add_style_pseudo_class('checked');
+            this.actor.add_style_pseudo_class('checked');
         } else {
-            this.remove_style_pseudo_class('open');
+            this.actor.remove_style_pseudo_class('open');
             this._getTopMenu()._setOpenedSubMenu(null);
-            this.remove_accessible_state (Atk.StateType.EXPANDED);
+            this.actor.remove_accessible_state (Atk.StateType.EXPANDED);
-            this.remove_style_pseudo_class('checked');
+            this.actor.remove_style_pseudo_class('checked');
         }
     }
 
+    destroy() {
+        this.menu.destroy();
+
+        super.destroy();
+    }
+
     setSubmenuShown(open) {
         if (open)
             this.menu.open(BoxPointer.PopupAnimation.FULL);
@@ -1192,7 +1156,7 @@ class PopupSubMenuMenuItem extends PopupBaseMenuItem {
     _onButtonReleaseEvent(actor) {
         // Since we override the parent, we need to manage what the parent does
         // with the active style class
-        this.remove_style_pseudo_class('active');
+        this.actor.remove_style_pseudo_class ('active');
         this._setOpenState(!this._getOpenState());
         return Clutter.EVENT_PROPAGATE;
     }
@@ -1201,12 +1165,12 @@ class PopupSubMenuMenuItem extends PopupBaseMenuItem {
         if (event.type() == Clutter.EventType.TOUCH_END) {
             // Since we override the parent, we need to manage what the parent does
             // with the active style class
-            this.remove_style_pseudo_class('active');
+            this.actor.remove_style_pseudo_class ('active');
             this._setOpenState(!this._getOpenState());
         }
         return Clutter.EVENT_PROPAGATE;
     }
-});
+};
 
 /* Basic implementation of a menu manager.
  * Call addMenu to add menus
@@ -1215,7 +1179,8 @@ var PopupMenuManager = class {
     constructor(owner, grabParams) {
         grabParams = Params.parse(grabParams,
                                   { actionMode: Shell.ActionMode.POPUP });
-        this._grabHelper = new GrabHelper.GrabHelper(owner, grabParams);
+        this._owner = owner;
+        this._grabHelper = new GrabHelper.GrabHelper(owner.actor, grabParams);
         this._menus = [];
     }
 

js/ui/remoteSearch.js

@@ -89,8 +89,6 @@ function loadRemoteSearchProviders(searchSettings, callback) {
             try {
                 let desktopId = keyfile.get_string(group, 'DesktopId');
                 appInfo = Gio.DesktopAppInfo.new(desktopId);
-                if (!appInfo.should_show())
-                    return;
             } catch (e) {
                 log('Ignoring search provider ' + path + ': missing DesktopId');
                 return;

js/ui/ripples.js

@@ -1,97 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const { Clutter, St } = imports.gi;
-const Tweener = imports.ui.tweener;
-
-// Shamelessly copied from the layout "hotcorner" ripples implementation
-var Ripples = class Ripples {
-    constructor(px, py, styleClass) {
-        this._x = 0;
-        this._y = 0;
-
-        this._px = px;
-        this._py = py;
-
-        this._ripple1 = new St.BoxLayout({ style_class: styleClass,
-                                           opacity: 0,
-                                           can_focus: false,
-                                           reactive: false,
-                                           visible: false });
-        this._ripple1.set_pivot_point(px, py);
-
-        this._ripple2 = new St.BoxLayout({ style_class: styleClass,
-                                           opacity: 0,
-                                           can_focus: false,
-                                           reactive: false,
-                                           visible: false });
-        this._ripple2.set_pivot_point(px, py);
-
-        this._ripple3 = new St.BoxLayout({ style_class: styleClass,
-                                           opacity: 0,
-                                           can_focus: false,
-                                           reactive: false,
-                                           visible: false });
-        this._ripple3.set_pivot_point(px, py);
-    }
-
-    _animRipple(ripple, delay, time, startScale, startOpacity, finalScale) {
-        // We draw a ripple by using a source image and animating it scaling
-        // outwards and fading away. We want the ripples to move linearly
-        // or it looks unrealistic, but if the opacity of the ripple goes
-        // linearly to zero it fades away too quickly, so we use Tweener's
-        // 'onUpdate' to give a non-linear curve to the fade-away and make
-        // it more visible in the middle section.
-
-        ripple.x = this._x;
-        ripple.y = this._y;
-        ripple._opacity = startOpacity;
-        ripple.visible = true;
-        ripple.opacity = 255 * Math.sqrt(startOpacity);
-        ripple.scale_x = ripple.scale_y = startScale;
-        ripple.set_translation( - this._px * ripple.width, - this._py * ripple.height, 0.0);
-
-        Tweener.addTween(ripple, { _opacity: 0,
-                                   scale_x: finalScale,
-                                   scale_y: finalScale,
-                                   delay: delay,
-                                   time: time,
-                                   transition: 'linear',
-                                   onUpdate() { ripple.opacity = 255 * Math.sqrt(ripple._opacity); },
-                                   onComplete() { ripple.visible = false; } });
-    }
-
-    addTo(stage) {
-        if (this._stage !== undefined) {
-            throw new Error('Ripples already added');
-            return;
-        }
-
-        this._stage = stage;
-        this._stage.add_actor(this._ripple1);
-        this._stage.add_actor(this._ripple2);
-        this._stage.add_actor(this._ripple3);
-    }
-
-    playAnimation(x, y) {
-        if (this._stage === undefined) {
-            throw new Error('Ripples not added');
-            return;
-        }
-
-        this._x = x;
-        this._y = y;
-
-        this._stage.set_child_above_sibling(this._ripple1, null);
-        this._stage.set_child_above_sibling(this._ripple2, this._ripple1);
-        this._stage.set_child_above_sibling(this._ripple3, this._ripple2);
-
-        // Show three concentric ripples expanding outwards; the exact
-        // parameters were found by trial and error, so don't look
-        // for them to make perfect sense mathematically
-
-        //                              delay  time  scale opacity => scale
-        this._animRipple(this._ripple1, 0.0,   0.83,  0.25,  1.0,     1.5);
-        this._animRipple(this._ripple2, 0.05,  1.0,   0.0,   0.7,     1.25);
-        this._animRipple(this._ripple3, 0.35,  1.0,   0.0,   0.3,     1);
-    }
-};

js/ui/runDialog.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;
@@ -23,11 +23,10 @@ const EXEC_ARG_KEY = 'exec-arg';
 
 var DIALOG_GROW_TIME = 0.1;
 
-var RunDialog = GObject.registerClass(
+var RunDialog = class extends ModalDialog.ModalDialog {
-class RunDialog extends ModalDialog.ModalDialog {
+    constructor() {
-    _init() {
+        super({ styleClass: 'run-dialog',
-        super._init({ styleClass: 'run-dialog',
+                destroyOnClose: false });
-                      destroyOnClose: false });
 
         this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
         this._terminalSettings = new Gio.Settings({ schema_id: TERMINAL_SCHEMA });
@@ -283,4 +282,5 @@ class RunDialog extends ModalDialog.ModalDialog {
 
         super.open();
     }
-});
+};
+Signals.addSignalMethods(RunDialog.prototype);

js/ui/search.js

@@ -431,9 +431,6 @@ var SearchResults = class {
         this._cancellable = new Gio.Cancellable();
 
         this._registerProvider(new AppDisplay.AppSearchProvider());
-
-        let appSystem = Shell.AppSystem.get_default();
-        appSystem.connect('installed-changed', this._reloadRemoteProviders.bind(this));
         this._reloadRemoteProviders();
     }
 

js/ui/sessionMode.js

@@ -25,7 +25,6 @@ const _modes = {
         hasWorkspaces: false,
         hasWindows: false,
         hasNotifications: false,
-        hasWmMenus: false,
         isLocked: false,
         isGreeter: false,
         isPrimary: false,
@@ -48,7 +47,7 @@ const _modes = {
         panel: {
             left: [],
             center: ['dateMenu'],
-            right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu']
+            right: ['a11y', 'keyboard', 'aggregateMenu']
         },
         panelStyle: 'login-screen'
     },
@@ -73,7 +72,7 @@ const _modes = {
         panel: {
             left: [],
             center: [],
-            right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu']
+            right: ['a11y', 'keyboard', 'aggregateMenu']
         },
         panelStyle: 'unlock-screen'
     },
@@ -87,7 +86,6 @@ const _modes = {
         hasRunDialog: true,
         hasWorkspaces: true,
         hasWindows: true,
-        hasWmMenus: true,
         hasNotifications: true,
         isLocked: false,
         isPrimary: true,
@@ -101,7 +99,7 @@ const _modes = {
         panel: {
             left: ['activities', 'appMenu'],
             center: ['dateMenu'],
-            right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu']
+            right: ['a11y', 'keyboard', 'aggregateMenu']
         }
     }
 };

js/ui/shellEntry.js

@@ -148,7 +148,7 @@ function addContextMenu(entry, params) {
 
     entry.menu = new EntryMenu(entry);
     entry.menu.isPassword = params.isPassword;
-    entry._menuManager = new PopupMenu.PopupMenuManager(entry,
+    entry._menuManager = new PopupMenu.PopupMenuManager({ actor: entry },
                                                         { actionMode: params.actionMode });
     entry._menuManager.addMenu(entry.menu);
 

js/ui/shellMountOperation.js

@@ -1,9 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, Pango, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
-const Animation = imports.ui.animation;
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
@@ -15,7 +14,6 @@ const ShellEntry = imports.ui.shellEntry;
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
 var LIST_ITEM_ICON_SIZE = 48;
-var WORK_SPINNER_ICON_SIZE = 16;
 
 const REMEMBER_MOUNT_PASSWORD_KEY = 'remember-mount-password';
 
@@ -150,7 +148,7 @@ var ShellMountOperation = class {
         }
 
         this._dialogId = this._dialog.connect('response',
-            (object, choice, password, remember, hiddenVolume, systemVolume, pim) => {
+            (object, choice, password, remember) => {
                 if (choice == -1) {
                     this.mountOp.reply(Gio.MountOperationResult.ABORTED);
                 } else {
@@ -160,9 +158,6 @@ var ShellMountOperation = class {
                         this.mountOp.set_password_save(Gio.PasswordSave.NEVER);
 
                     this.mountOp.set_password(password);
-                    this.mountOp.set_is_tcrypt_hidden_volume(hiddenVolume);
-                    this.mountOp.set_is_tcrypt_system_volume(systemVolume);
-                    this.mountOp.set_pim(pim);
                     this.mountOp.reply(Gio.MountOperationResult.HANDLED);
                 }
             });
@@ -269,11 +264,9 @@ var ShellUnmountNotifier = class extends MessageTray.Source {
     }
 };
 
-var ShellMountQuestionDialog = GObject.registerClass({
+var ShellMountQuestionDialog = class extends ModalDialog.ModalDialog {
-    Signals: { 'response': { param_types: [GObject.TYPE_INT] } }
+    constructor(icon) {
-}, class ShellMountQuestionDialog extends ModalDialog.ModalDialog {
+        super({ styleClass: 'mount-dialog' });
-    _init(icon) {
-        super._init({ styleClass: 'mount-dialog' });
 
         this._content = new Dialog.MessageDialogContent({ icon });
         this.contentLayout.add(this._content, { x_fill: true, y_fill: false });
@@ -283,107 +276,34 @@ var ShellMountQuestionDialog = GObject.registerClass({
         _setLabelsForMessage(this._content, message);
         _setButtonsForChoices(this, choices);
     }
-});
+};
+Signals.addSignalMethods(ShellMountQuestionDialog.prototype);
 
-var ShellMountPasswordDialog = GObject.registerClass({
+var ShellMountPasswordDialog = class extends ModalDialog.ModalDialog {
-    Signals: { 'response': { param_types: [GObject.TYPE_INT,
+    constructor(message, icon, flags) {
-                                           GObject.TYPE_STRING,
-                                           GObject.TYPE_BOOLEAN,
-                                           GObject.TYPE_BOOLEAN,
-                                           GObject.TYPE_BOOLEAN,
-                                           GObject.TYPE_UINT] } }
-}, class ShellMountPasswordDialog extends ModalDialog.ModalDialog {
-    _init(message, icon, flags) {
         let strings = message.split('\n');
         let title = strings.shift() || null;
         let body = strings.shift() || null;
-        super._init({ styleClass: 'prompt-dialog' });
+        super({ styleClass: 'prompt-dialog' });
-
-        let disksApp = Shell.AppSystem.get_default().lookup_app('org.gnome.DiskUtility.desktop');
 
         let content = new Dialog.MessageDialogContent({ icon, title, body });
         this.contentLayout.add_actor(content);
-        content._body.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
 
-        let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
+        this._passwordBox = new St.BoxLayout({ vertical: false, style_class: 'prompt-dialog-password-box' });
-        let grid = new St.Widget({ style_class: 'prompt-dialog-grid',
+        content.messageBox.add(this._passwordBox);
-                                   layout_manager: layout });
-        layout.hookup_style(grid);
-        let rtl = grid.get_text_direction() === Clutter.TextDirection.RTL;
 
-        if (flags & Gio.AskPasswordFlags.TCRYPT) {
+        this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label',
-            this._keyfilesLabel = new St.Label(({ style_class: 'prompt-dialog-keyfiles-label',
+                                              text: _("Password") }));
-                                                  visible: false }));
+        this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE });
 
-            this._hiddenVolume = new CheckBox.CheckBox(_("Hidden Volume"));
-            content.messageBox.add(this._hiddenVolume.actor);
-
-            this._systemVolume = new CheckBox.CheckBox(_("Windows System Volume"));
-            content.messageBox.add(this._systemVolume.actor);
-
-            this._keyfilesCheckbox = new CheckBox.CheckBox(_("Uses Keyfiles"));
-            this._keyfilesCheckbox.actor.connect("clicked", this._onKeyfilesCheckboxClicked.bind(this));
-            content.messageBox.add(this._keyfilesCheckbox.actor);
-
-            this._keyfilesLabel.clutter_text.set_markup(
-                /* Translators: %s is the Disks application */
-                _("To unlock a volume that uses keyfiles, use the <i>%s</i> utility instead.").format(disksApp.get_name())
-            );
-            this._keyfilesLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            this._keyfilesLabel.clutter_text.line_wrap = true;
-            content.messageBox.add(this._keyfilesLabel, { y_fill: false, y_align: St.Align.MIDDLE, expand: true });
-
-            this._pimLabel = new St.Label({ style_class: 'prompt-dialog-password-label',
-                                            text: _("PIM Number"),
-                                            y_align: Clutter.ActorAlign.CENTER });
-            this._pimEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
-                                            can_focus: true,
-                                            x_expand: true });
-            this._pimEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
-            this._pimEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
-            ShellEntry.addContextMenu(this._pimEntry, { isPassword: true });
-
-            if (rtl) {
-                layout.attach(this._pimEntry, 0, 0, 1, 1);
-                layout.attach(this._pimLabel, 1, 0, 1, 1);
-            } else {
-                layout.attach(this._pimLabel, 0, 0, 1, 1);
-                layout.attach(this._pimEntry, 1, 0, 1, 1);
-            }
-
-            this._pimErrorMessageLabel = new St.Label({ style_class: 'prompt-dialog-password-entry',
-                                                        text: _("The PIM must be a number or empty."),
-                                                        visible: false });
-            layout.attach(this._pimErrorMessageLabel, 0, 2, 2, 1);
-        } else {
-            this._hiddenVolume = null;
-            this._systemVolume = null;
-            this._pimEntry = null;
-            this._pimErrorMessageLabel = null;
-        }
-
-        this._passwordLabel = new St.Label({ style_class: 'prompt-dialog-password-label',
-                                             text: _("Password"),
-                                             y_align: Clutter.ActorAlign.CENTER });
         this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
-                                             can_focus: true,
+                                             text: "",
-                                             x_expand: true });
+                                             can_focus: true});
+        ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
         this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
         this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
-        ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
+        this._passwordBox.add(this._passwordEntry, {expand: true });
         this.setInitialKeyFocus(this._passwordEntry);
-        this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
-        this._passwordEntry.secondary_icon = this._workSpinner.actor;
-
-        if (rtl) {
-            layout.attach(this._passwordEntry, 0, 1, 1, 1);
-            layout.attach(this._passwordLabel, 1, 1, 1, 1);
-        } else {
-            layout.attach(this._passwordLabel, 0, 1, 1, 1);
-            layout.attach(this._passwordEntry, 1, 1, 1, 1);
-        }
-
-        content.messageBox.add(grid);
 
         this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label',
                                                  text: _("Sorry, that didn’t work. Please try again.") });
@@ -393,7 +313,8 @@ var ShellMountPasswordDialog = GObject.registerClass({
         content.messageBox.add(this._errorMessageLabel);
 
         if (flags & Gio.AskPasswordFlags.SAVING_SUPPORTED) {
-            this._rememberChoice = new CheckBox.CheckBox(_("Remember Password"));
+            this._rememberChoice = new CheckBox.CheckBox();
+            this._rememberChoice.getLabelActor().text = _("Remember Password");
             this._rememberChoice.actor.checked =
                 global.settings.get_boolean(REMEMBER_MOUNT_PASSWORD_KEY);
             content.messageBox.add(this._rememberChoice.actor);
@@ -401,36 +322,25 @@ var ShellMountPasswordDialog = GObject.registerClass({
             this._rememberChoice = null;
         }
 
-        this._defaultButtons = [{ label: _("Cancel"),
+        let buttons = [{ label: _("Cancel"),
-                                  action: this._onCancelButton.bind(this),
+                         action: this._onCancelButton.bind(this),
-                                  key:    Clutter.Escape
+                         key:    Clutter.Escape
-                                },
+                       },
-                                { label: _("Unlock"),
+                       { label: _("Unlock"),
-                                  action: this._onUnlockButton.bind(this),
+                         action: this._onUnlockButton.bind(this),
-                                  default: true
+                         default: true
-                                }];
+                       }];
 
-        this._usesKeyfilesButtons = [{ label: _("Cancel"),
+        this.setButtons(buttons);
-                                       action: this._onCancelButton.bind(this),
-                                       key:    Clutter.Escape
-                                     },
-                                     { /* Translators: %s is the Disks application */
-                                       label: _("Open %s").format(disksApp.get_name()),
-                                       action: this._onOpenDisksButton.bind(this),
-                                       default: true
-                                     }];
-
-        this.setButtons(this._defaultButtons);
     }
 
     reaskPassword() {
         this._passwordEntry.set_text('');
         this._errorMessageLabel.show();
-        this._workSpinner.stop();
     }
 
     _onCancelButton() {
-        this.emit('response', -1, '', false, false, false, 0);
+        this.emit('response', -1, '', false);
     }
 
     _onUnlockButton() {
@@ -438,68 +348,18 @@ var ShellMountPasswordDialog = GObject.registerClass({
     }
 
     _onEntryActivate() {
-        let pim = 0;
-        if (this._pimEntry !== null)
-            pim = this._pimEntry.get_text();
-        if (isNaN(pim)) {
-            this._pimEntry.set_text('');
-            this._pimErrorMessageLabel.show();
-            return;
-        } else if (this._pimErrorMessageLabel !== null) {
-            this._pimErrorMessageLabel.hide();
-        }
-
         global.settings.set_boolean(REMEMBER_MOUNT_PASSWORD_KEY,
             this._rememberChoice && this._rememberChoice.actor.checked);
-
-        this._workSpinner.play();
         this.emit('response', 1,
             this._passwordEntry.get_text(),
             this._rememberChoice &&
-            this._rememberChoice.actor.checked,
+            this._rememberChoice.actor.checked);
-            this._hiddenVolume &&
-            this._hiddenVolume.actor.checked,
-            this._systemVolume &&
-            this._systemVolume.actor.checked,
-            parseInt(pim));
     }
+};
 
-    _onKeyfilesCheckboxClicked() {
+var ShellProcessesDialog = class extends ModalDialog.ModalDialog {
-        let useKeyfiles = this._keyfilesCheckbox.actor.checked;
+    constructor(icon) {
-        this._passwordEntry.reactive = !useKeyfiles;
+        super({ styleClass: 'mount-dialog' });
-        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.actor.reactive = !useKeyfiles;
-        this._rememberChoice.actor.can_focus = !useKeyfiles;
-        this._keyfilesLabel.visible = useKeyfiles;
-        this.setButtons(useKeyfiles ? this._usesKeyfilesButtons : this._defaultButtons);
-    }
-
-    _onOpenDisksButton() {
-        let app = Shell.AppSystem.get_default().lookup_app('org.gnome.DiskUtility.desktop');
-        if (app)
-            app.activate();
-        else
-            Main.notifyError(
-                /* Translators: %s is the Disks application */
-                _("Unable to start %s").format(app.get_name()),
-                /* Translators: %s is the Disks application */
-                _("Couldn’t find the %s application").format(app.get_name())
-            );
-        this._onCancelButton();
-    }
-});
-
-var ShellProcessesDialog = GObject.registerClass({
-    Signals: { 'response': { param_types: [GObject.TYPE_INT] } }
-}, class ShellProcessesDialog extends ModalDialog.ModalDialog {
-    _init(icon) {
-        super._init({ styleClass: 'mount-dialog' });
 
         this._content = new Dialog.MessageDialogContent({ icon });
         this.contentLayout.add(this._content, { x_fill: true, y_fill: false });
@@ -552,7 +412,8 @@ var ShellProcessesDialog = GObject.registerClass({
         _setLabelsForMessage(this._content, message);
         _setButtonsForChoices(this, choices);
     }
-});
+};
+Signals.addSignalMethods(ShellProcessesDialog.prototype);
 
 const GnomeShellMountOpIface = loadInterfaceXML('org.Gtk.MountOperationHandler');
 
@@ -654,7 +515,7 @@ var GnomeShellMountOpHandler = class {
 
         this._dialog = new ShellMountPasswordDialog(message, this._createGIcon(iconName), flags);
         this._dialog.connect('response',
-            (object, choice, password, remember, hiddenVolume, systemVolume, pim) => {
+            (object, choice, password, remember) => {
                 let details = {};
                 let response;
 
@@ -666,9 +527,6 @@ var GnomeShellMountOpHandler = class {
                     let passSave = remember ? Gio.PasswordSave.PERMANENTLY : Gio.PasswordSave.NEVER;
                     details['password_save'] = GLib.Variant.new('u', passSave);
                     details['password'] = GLib.Variant.new('s', password);
-                    details['hidden_volume'] = GLib.Variant.new('b', hiddenVolume);
-                    details['system_volume'] = GLib.Variant.new('b', systemVolume);
-                    details['pim'] = GLib.Variant.new('u', pim);
                 }
 
                 this._clearCurrentRequest(response, details);

js/ui/status/accessibility.js

@@ -32,14 +32,14 @@ const HIGH_CONTRAST_THEME           = 'HighContrast';
 var ATIndicator = GObject.registerClass(
 class ATIndicator extends PanelMenu.Button {
     _init() {
-        super._init(0.5, _("Accessibility"));
+        super._init(0.0, _("Accessibility"));
 
         this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         this._hbox.add_child(new St.Icon({ style_class: 'system-status-icon',
                                            icon_name: 'preferences-desktop-accessibility-symbolic' }));
         this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
-        this.add_child(this._hbox);
+        this.actor.add_child(this._hbox);
 
         this._a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
         this._a11ySettings.connect('changed::' + KEY_ALWAYS_SHOW, this._queueSyncMenuVisibility.bind(this));
@@ -86,7 +86,7 @@ class ATIndicator extends PanelMenu.Button {
         let alwaysShow = this._a11ySettings.get_boolean(KEY_ALWAYS_SHOW);
         let items = this.menu._getMenuItems();
 
-        this.visible = alwaysShow || items.some(f => !!f.state);
+        this.actor.visible = alwaysShow || items.some(f => !!f.state);
 
         return GLib.SOURCE_REMOVE;
     }
@@ -112,22 +112,38 @@ class ATIndicator extends PanelMenu.Button {
 
     _buildItem(string, schema, key) {
         let settings = new Gio.Settings({ schema_id: schema });
-        let widget = this._buildItemExtended(string,
+        settings.connect('changed::'+key, () => {
-            settings.get_boolean(key),
-            settings.is_writable(key),
-            enabled => settings.set_boolean(key, enabled));
-
-        settings.connect('changed::' + key, () => {
             widget.setToggleState(settings.get_boolean(key));
 
             this._queueSyncMenuVisibility();
         });
 
+        let widget = this._buildItemExtended(string,
+            settings.get_boolean(key),
+            settings.is_writable(key),
+            enabled => settings.set_boolean(key, enabled));
         return widget;
     }
 
     _buildHCItem() {
         let interfaceSettings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
+        interfaceSettings.connect('changed::' + KEY_GTK_THEME, () => {
+            let value = interfaceSettings.get_string(KEY_GTK_THEME);
+            if (value == HIGH_CONTRAST_THEME) {
+                highContrast.setToggleState(true);
+            } else {
+                highContrast.setToggleState(false);
+                gtkTheme = value;
+            }
+
+            this._queueSyncMenuVisibility();
+        });
+        interfaceSettings.connect('changed::' + KEY_ICON_THEME, () => {
+            let value = interfaceSettings.get_string(KEY_ICON_THEME);
+            if (value != HIGH_CONTRAST_THEME)
+                iconTheme = value;
+        });
+
         let gtkTheme = interfaceSettings.get_string(KEY_GTK_THEME);
         let iconTheme = interfaceSettings.get_string(KEY_ICON_THEME);
         let hasHC = (gtkTheme == HIGH_CONTRAST_THEME);
@@ -148,30 +164,19 @@ class ATIndicator extends PanelMenu.Button {
                     interfaceSettings.reset(KEY_ICON_THEME);
                 }
             });
-
-        interfaceSettings.connect('changed::' + KEY_GTK_THEME, () => {
-            let value = interfaceSettings.get_string(KEY_GTK_THEME);
-            if (value == HIGH_CONTRAST_THEME) {
-                highContrast.setToggleState(true);
-            } else {
-                highContrast.setToggleState(false);
-                gtkTheme = value;
-            }
-
-            this._queueSyncMenuVisibility();
-        });
-
-        interfaceSettings.connect('changed::' + KEY_ICON_THEME, () => {
-            let value = interfaceSettings.get_string(KEY_ICON_THEME);
-            if (value != HIGH_CONTRAST_THEME)
-                iconTheme = value;
-        });
-
         return highContrast;
     }
 
     _buildFontItem() {
         let settings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
+        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, () => {
+            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
+            let active = (factor > 1.0);
+            widget.setToggleState(active);
+
+            this._queueSyncMenuVisibility();
+        });
+
         let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
         let initial_setting = (factor > 1.0);
         let widget = this._buildItemExtended(_("Large Text"),
@@ -184,15 +189,6 @@ class ATIndicator extends PanelMenu.Button {
                 else
                     settings.reset(KEY_TEXT_SCALING_FACTOR);
             });
-
-        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, () => {
-            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
-            let active = (factor > 1.0);
-            widget.setToggleState(active);
-
-            this._queueSyncMenuVisibility();
-        });
-
         return widget;
     }
 });

js/ui/status/bluetooth.js

@@ -118,9 +118,9 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         // Remember if there were setup devices and show the menu
         // if we've seen setup devices and we're not hard blocked
         if (nDevices > 0)
-            this._item.visible = !this._proxy.BluetoothHardwareAirplaneMode;
+            this._item.actor.visible = !this._proxy.BluetoothHardwareAirplaneMode;
         else
-            this._item.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
+            this._item.actor.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
 
         if (nConnectedDevices > 0)
             /* Translators: this is the number of connected bluetooth devices */

js/ui/status/brightness.js

@@ -37,12 +37,12 @@ var Indicator = class extends PanelMenu.SystemIndicator {
 
         let icon = new St.Icon({ icon_name: 'display-brightness-symbolic',
                                  style_class: 'popup-menu-icon' });
-        this._item.add(icon);
+        this._item.actor.add(icon);
-        this._item.add(this._slider.actor, { expand: true });
+        this._item.actor.add(this._slider.actor, { expand: true });
-        this._item.connect('button-press-event', (actor, event) => {
+        this._item.actor.connect('button-press-event', (actor, event) => {
             return this._slider.startDragging(event);
         });
-        this._item.connect('key-press-event', (actor, event) => {
+        this._item.actor.connect('key-press-event', (actor, event) => {
             return this._slider.onKeyPressEvent(actor, event);
         });
 
@@ -55,7 +55,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
 
     _sync() {
         let visible = this._proxy.Brightness >= 0;
-        this._item.visible = visible;
+        this._item.actor.visible = visible;
         if (visible)
             this._slider.setValue(this._proxy.Brightness / 100.0);
     }

js/ui/status/dwellClick.js

@@ -1,86 +0,0 @@
-const { Clutter, Gio, GLib, GObject, St } = imports.gi;
-const Mainloop = imports.mainloop;
-
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-
-const MOUSE_A11Y_SCHEMA       = 'org.gnome.desktop.a11y.mouse';
-const KEY_DWELL_CLICK_ENABLED = 'dwell-click-enabled';
-const KEY_DWELL_MODE          = 'dwell-mode';
-const DWELL_MODE_WINDOW       = 'window';
-const DWELL_CLICK_MODES = {
-    primary:   {
-                 name: _("Single Click"),
-                 icon: 'pointer-primary-click-symbolic',
-                 type: Clutter.PointerA11yDwellClickType.PRIMARY
-               },
-    double:    {
-                 name: _("Double Click"),
-                 icon: 'pointer-double-click-symbolic',
-                 type: Clutter.PointerA11yDwellClickType.DOUBLE
-               },
-    drag:      {
-                 name: _("Drag"),
-                 icon: 'pointer-drag-symbolic',
-                 type: Clutter.PointerA11yDwellClickType.DRAG
-               },
-    secondary: {
-                 name: _("Secondary Click"),
-                 icon: 'pointer-secondary-click-symbolic',
-                 type: Clutter.PointerA11yDwellClickType.SECONDARY
-               },
-};
-
-var DwellClickIndicator = GObject.registerClass(
-class DwellClickIndicator extends PanelMenu.Button {
-    _init() {
-        super._init(0.5, _("Dwell Click"));
-
-        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        this._icon = new St.Icon({ style_class: 'system-status-icon',
-                                   icon_name: 'pointer-primary-click-symbolic' });
-        this._hbox.add_child(this._icon);
-        this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-
-        this.add_child(this._hbox);
-
-        this._a11ySettings = new Gio.Settings({ schema_id: MOUSE_A11Y_SCHEMA });
-        this._a11ySettings.connect('changed::' + KEY_DWELL_CLICK_ENABLED, this._syncMenuVisibility.bind(this));
-        this._a11ySettings.connect('changed::' + KEY_DWELL_MODE, this._syncMenuVisibility.bind(this));
-
-        this._deviceManager = Clutter.DeviceManager.get_default();
-        this._deviceManager.connect('ptr-a11y-dwell-click-type-changed', this._updateClickType.bind(this));
-
-        this._addDwellAction(DWELL_CLICK_MODES.primary);
-        this._addDwellAction(DWELL_CLICK_MODES.double);
-        this._addDwellAction(DWELL_CLICK_MODES.drag);
-        this._addDwellAction(DWELL_CLICK_MODES.secondary);
-
-        this._setClickType(DWELL_CLICK_MODES.primary);
-        this._syncMenuVisibility();
-    }
-
-    _syncMenuVisibility() {
-        this.visible =
-          (this._a11ySettings.get_boolean(KEY_DWELL_CLICK_ENABLED) &&
-           this._a11ySettings.get_string(KEY_DWELL_MODE) == DWELL_MODE_WINDOW);
-
-        return GLib.SOURCE_REMOVE;
-    }
-
-    _addDwellAction(mode) {
-        this.menu.addAction(mode.name, this._setClickType.bind(this, mode), mode.icon);
-    }
-
-    _updateClickType(manager, click_type) {
-        for (let mode in DWELL_CLICK_MODES) {
-            if (DWELL_CLICK_MODES[mode].type == click_type)
-                this._icon.icon_name = DWELL_CLICK_MODES[mode].icon;
-        }
-    }
-
-    _setClickType(mode) {
-        this._deviceManager.set_pointer_a11y_dwell_click_type(mode.type);
-        this._icon.icon_name = mode.icon;
-    }
-});

js/ui/status/keyboard.js

@@ -15,18 +15,17 @@ const Util = imports.misc.util;
 const INPUT_SOURCE_TYPE_XKB = 'xkb';
 const INPUT_SOURCE_TYPE_IBUS = 'ibus';
 
-var LayoutMenuItem = GObject.registerClass(
+var LayoutMenuItem = class extends PopupMenu.PopupBaseMenuItem {
-class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem {
+    constructor(displayName, shortName) {
-    _init(displayName, shortName) {
+        super();
-        super._init();
 
         this.label = new St.Label({ text: displayName });
         this.indicator = new St.Label({ text: shortName });
-        this.add(this.label, { expand: true });
+        this.actor.add(this.label, { expand: true });
-        this.add(this.indicator);
+        this.actor.add(this.indicator);
-        this.label_actor = this.label;
+        this.actor.label_actor = this.label;
     }
-});
+};
 
 var InputSource = class {
     constructor(type, id, displayName, shortName, index) {
@@ -126,8 +125,8 @@ class InputSourceSwitcher extends SwitcherPopup.SwitcherList {
 
 var InputSourceSettings = class {
     constructor() {
-        if (this.constructor === InputSourceSettings)
+        if (new.target === InputSourceSettings)
-            throw new TypeError(`Cannot instantiate abstract class ${this.constructor.name}`);
+            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
     }
 
     _emitInputSourcesChanged() {
@@ -810,7 +809,7 @@ class InputSourceIndicatorContainer extends St.Widget {
 var InputSourceIndicator = GObject.registerClass(
 class InputSourceIndicator extends PanelMenu.Button {
     _init() {
-        super._init(0.5, _("Keyboard"));
+        super._init(0.0, _("Keyboard"));
 
         this.connect('destroy', this._onDestroy.bind(this));
 
@@ -823,7 +822,7 @@ class InputSourceIndicator extends PanelMenu.Button {
         this._hbox.add_child(this._container);
         this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
-        this.add_child(this._hbox);
+        this.actor.add_child(this._hbox);
 
         this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(this._propSeparator);
@@ -858,7 +857,7 @@ class InputSourceIndicator extends PanelMenu.Button {
         // but at least for now it is used as "allow popping up windows
         // from shell menus"; we can always add a separate sessionMode
         // option if need arises.
-        this._showLayoutItem.visible = Main.sessionMode.allowSettings;
+        this._showLayoutItem.actor.visible = Main.sessionMode.allowSettings;
     }
 
     _sourcesChanged() {
@@ -909,11 +908,11 @@ class InputSourceIndicator extends PanelMenu.Button {
             // We also hide if we have only one visible source unless
             // it's an IBus source with properties.
             this.menu.close();
-            this.hide();
+            this.actor.hide();
             return;
         }
 
-        this.show();
+        this.actor.show();
 
         this._buildPropSection(newSource.properties);
 

js/ui/status/location.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, Shell } = imports.gi;
+const { Clutter, Gio, GLib, Shell } = imports.gi;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
@@ -101,12 +101,12 @@ var Indicator = class extends PanelMenu.SystemIndicator {
     _syncIndicator() {
         if (this._managerProxy == null) {
             this._indicator.visible = false;
-            this._item.visible = false;
+            this._item.actor.visible = false;
             return;
         }
 
         this._indicator.visible = this._managerProxy.InUse;
-        this._item.visible = this._indicator.visible;
+        this._item.actor.visible = this._indicator.visible;
         this._updateMenuLabels();
     }
 
@@ -342,11 +342,9 @@ var AppAuthorizer = class {
     }
 };
 
-var GeolocationDialog = GObject.registerClass({
+var GeolocationDialog = class extends ModalDialog.ModalDialog {
-    Signals: { 'response': { param_types: [GObject.TYPE_UINT] } }
+    constructor(name, subtitle, reqAccuracyLevel) {
-}, class GeolocationDialog extends ModalDialog.ModalDialog {
+        super({ styleClass: 'geolocation-dialog' });
-    _init(name, subtitle, reqAccuracyLevel) {
-        super._init({ styleClass: 'geolocation-dialog' });
         this.reqAccuracyLevel = reqAccuracyLevel;
 
         let icon = new Gio.ThemedIcon({ name: 'find-location-symbolic' });
@@ -377,4 +375,5 @@ var GeolocationDialog = GObject.registerClass({
         this.emit('response', GeoclueAccuracyLevel.NONE);
         this.close();
     }
-});
+};
+Signals.addSignalMethods(GeolocationDialog.prototype);

js/ui/status/network.js

@@ -69,12 +69,9 @@ function ssidToLabel(ssid) {
 
 function ensureActiveConnectionProps(active, client) {
     if (!active._primaryDevice) {
-        let devices = active.get_devices();
+        // This list is guaranteed to have only one device in it.
-        if (devices.length > 0) {
+        let device = active.get_devices()[0]._delegate;
-            // This list is guaranteed to have at most one device in it.
+        active._primaryDevice = device;
-            let device = devices[0]._delegate;
-            active._primaryDevice = device;
-        }
     }
 }
 
@@ -170,10 +167,10 @@ var NMConnectionItem = class {
 };
 Signals.addSignalMethods(NMConnectionItem.prototype);
 
-var NMConnectionSection = class NMConnectionSection {
+var NMConnectionSection = class {
     constructor(client) {
-        if (this.constructor === NMConnectionSection)
+        if (new.target === NMConnectionSection)
-            throw new TypeError(`Cannot instantiate abstract type ${this.constructor.name}`);
+            throw new TypeError('Cannot instantiate abstract type ' + new.target.name);
 
         this._client = client;
 
@@ -238,14 +235,14 @@ var NMConnectionSection = class NMConnectionSection {
         if (!this._connectionValid(connection))
             return;
 
-        // This function is called every time the connection is added or updated.
+        // This function is called everytime connection is added or updated
         // In the usual case, we already added this connection and UUID
         // didn't change. So we need to check if we already have an item,
         // and update it for properties in the connection that changed
         // (the only one we care about is the name)
         // But it's also possible we didn't know about this connection
         // (eg, during coldplug, or because it was updated and suddenly
-        // it's valid for this device), in which case we add a new item.
+        // it's valid for this device), in which case we add a new item
 
         let item = this._connectionItems.get(connection.get_uuid());
         if (item)
@@ -300,13 +297,12 @@ var NMConnectionSection = class NMConnectionSection {
 };
 Signals.addSignalMethods(NMConnectionSection.prototype);
 
-var NMConnectionDevice = class NMConnectionDevice extends NMConnectionSection {
+var NMConnectionDevice = class extends NMConnectionSection {
     constructor(client, device) {
+        if (new.target === NMConnectionDevice)
+            throw new TypeError('Cannot instantiate abstract type ' + new.target.name);
+
         super(client);
-
-        if (this.constructor === NMConnectionDevice)
-            throw new TypeError(`Cannot instantiate abstract type ${this.constructor.name}`);
-
         this._device = device;
         this._description = '';
 
@@ -392,8 +388,8 @@ var NMConnectionDevice = class NMConnectionDevice extends NMConnectionSection {
 
     _sync() {
         let nItems = this._connectionItems.size;
-        this._autoConnectItem.visible = (nItems == 0);
+        this._autoConnectItem.actor.visible = (nItems == 0);
-        this._deactivateItem.visible = this._device.state > NM.DeviceState.DISCONNECTED;
+        this._deactivateItem.actor.visible = this._device.state > NM.DeviceState.DISCONNECTED;
 
         if (this._activeConnection == null) {
             let activeConnection = this._device.active_connection;
@@ -480,7 +476,7 @@ var NMDeviceWired = class extends NMConnectionDevice {
     }
 
     _sync() {
-        this.item.visible = this._hasCarrier();
+        this.item.actor.visible = this._hasCarrier();
         super._sync();
     }
 
@@ -616,36 +612,31 @@ var NMDeviceBluetooth = class extends NMConnectionDevice {
     }
 };
 
-var NMWirelessDialogItem = GObject.registerClass({
+var NMWirelessDialogItem = class {
-    Signals: {
+    constructor(network) {
-        'selected': {},
-    }
-}, class NMWirelessDialogItem extends St.BoxLayout {
-    _init(network) {
         this._network = network;
         this._ap = network.accessPoints[0];
 
-        super._init({ style_class: 'nm-dialog-item',
+        this.actor = new St.BoxLayout({ style_class: 'nm-dialog-item',
-                      can_focus: true,
+                                        can_focus: true,
-                      reactive: true });
+                                        reactive: true });
-
+        this.actor.connect('key-focus-in', () => { this.emit('selected'); });
-        this.connect('key-focus-in', () => { this.emit('selected'); });
         let action = new Clutter.ClickAction();
-        action.connect('clicked', () => { this.grab_key_focus(); });
+        action.connect('clicked', () => { this.actor.grab_key_focus(); });
-        this.add_action(action);
+        this.actor.add_action(action);
 
         let title = ssidToLabel(this._ap.get_ssid());
         this._label = new St.Label({ text: title });
 
-        this.label_actor = this._label;
+        this.actor.label_actor = this._label;
-        this.add(this._label, { x_align: St.Align.START });
+        this.actor.add(this._label, { x_align: St.Align.START });
 
         this._selectedIcon = new St.Icon({ style_class: 'nm-dialog-icon',
                                            icon_name: 'object-select-symbolic' });
-        this.add(this._selectedIcon);
+        this.actor.add(this._selectedIcon);
 
         this._icons = new St.BoxLayout({ style_class: 'nm-dialog-icons' });
-        this.add(this._icons, { expand: true, x_fill: false, x_align: St.Align.END });
+        this.actor.add(this._icons, { expand: true, x_fill: false, x_align: St.Align.END });
 
         this._secureIcon = new St.Icon({ style_class: 'nm-dialog-icon' });
         if (this._ap._secType != NMAccessPointSecurity.NONE)
@@ -677,12 +668,12 @@ var NMWirelessDialogItem = GObject.registerClass({
         else
             return 'network-wireless-signal-' + signalToIcon(this._ap.strength) + '-symbolic';
     }
-});
+};
+Signals.addSignalMethods(NMWirelessDialogItem.prototype);
 
-var NMWirelessDialog = GObject.registerClass(
+var NMWirelessDialog = class extends ModalDialog.ModalDialog {
-class NMWirelessDialog extends ModalDialog.ModalDialog {
+    constructor(client, device) {
-    _init(client, device) {
+        super({ styleClass: 'nm-dialog' });
-        super._init({ styleClass: 'nm-dialog' });
 
         this._client = client;
         this._device = device;
@@ -728,11 +719,9 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
             Main.sessionMode.disconnect(id);
             this.close();
         });
-
-        this.connect('destroy', this._onDestroy.bind(this));
     }
 
-    _onDestroy() {
+    destroy() {
         if (this._apAddedId) {
             GObject.Object.prototype.disconnect.call(this._device, this._apAddedId);
             this._apAddedId = 0;
@@ -758,6 +747,8 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
             Mainloop.source_remove(this._scanTimeoutId);
             this._scanTimeoutId = 0;
         }
+
+        super.destroy();
     }
 
     _onScanTimeout() {
@@ -1084,7 +1075,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
 
             let newPos = Util.insertSorted(this._networks, network, this._networkSortFunction);
             this._createNetworkItem(network);
-            this._itemBox.insert_child_at_index(network.item, newPos);
+            this._itemBox.insert_child_at_index(network.item.actor, newPos);
         }
 
         this._syncView();
@@ -1102,7 +1093,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
         network.accessPoints.splice(res.ap, 1);
 
         if (network.accessPoints.length == 0) {
-            network.item.destroy();
+            network.item.actor.destroy();
             this._networks.splice(res.network, 1);
         } else {
             network.item.updateBestAP(network.accessPoints[0]);
@@ -1118,7 +1109,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
 
         this._itemBox.remove_all_children();
         this._networks.forEach(network => {
-            this._itemBox.add_child(network.item);
+            this._itemBox.add_child(network.item.actor);
         });
 
         adjustment.value = scrollValue;
@@ -1126,29 +1117,29 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
 
     _selectNetwork(network) {
         if (this._selectedNetwork)
-            this._selectedNetwork.item.remove_style_pseudo_class('selected');
+            this._selectedNetwork.item.actor.remove_style_pseudo_class('selected');
 
         this._selectedNetwork = network;
         this._updateSensitivity();
 
         if (this._selectedNetwork)
-            this._selectedNetwork.item.add_style_pseudo_class('selected');
+            this._selectedNetwork.item.actor.add_style_pseudo_class('selected');
     }
 
     _createNetworkItem(network) {
         network.item = new NMWirelessDialogItem(network);
         network.item.setActive(network == this._selectedNetwork);
         network.item.connect('selected', () => {
-            Util.ensureActorVisibleInScrollView(this._scrollView, network.item);
+            Util.ensureActorVisibleInScrollView(this._scrollView, network.item.actor);
             this._selectNetwork(network);
         });
-        network.item.connect('destroy', () => {
+        network.item.actor.connect('destroy', () => {
             let keyFocus = global.stage.key_focus;
-            if (keyFocus && keyFocus.contains(network.item))
+            if (keyFocus && keyFocus.contains(network.item.actor))
                 this._itemBox.grab_key_focus();
         });
     }
-});
+};
 
 var NMDeviceWireless = class {
     constructor(client, device) {
@@ -1270,7 +1261,7 @@ var NMDeviceWireless = class {
 
     _sync() {
         this._toggleItem.label.text = this._client.wireless_enabled ? _("Turn Off") : _("Turn On");
-        this._toggleItem.visible = this._client.wireless_hardware_enabled;
+        this._toggleItem.actor.visible = this._client.wireless_hardware_enabled;
 
         this.item.icon.icon_name = this._getMenuIcon();
         this.item.label.text = this._getStatus();
@@ -1460,7 +1451,7 @@ var NMVpnSection = class extends NMConnectionSection {
 
     _sync() {
         let nItems = this._connectionItems.size;
-        this.item.visible = (nItems > 0);
+        this.item.actor.visible = (nItems > 0);
 
         super._sync();
     }
@@ -1543,7 +1534,7 @@ var DeviceCategory = class extends PopupMenu.PopupMenuSection {
 
         this._summaryItem.menu.addSettingsAction(_('Network Settings'),
                                                  'gnome-network-panel.desktop');
-        this._summaryItem.hide();
+        this._summaryItem.actor.hide();
 
     }
 
@@ -1552,7 +1543,7 @@ var DeviceCategory = class extends PopupMenu.PopupMenuSection {
             (prev, child) => prev + (child.visible ? 1 : 0), 0);
         this._summaryItem.label.text = this._getSummaryLabel(nDevices);
         let shouldSummarize = nDevices > MAX_DEVICE_ITEMS;
-        this._summaryItem.visible = shouldSummarize;
+        this._summaryItem.actor.visible = shouldSummarize;
         this.section.actor.visible = !shouldSummarize;
     }
 

js/ui/status/nightLight.js

@@ -61,6 +61,6 @@ var Indicator = class extends PanelMenu.SystemIndicator {
                                          : _("Night Light On");
         this._disableItem.label.text = disabled ? _("Resume")
                                                 : _("Disable Until Tomorrow");
-        this._item.visible = this._indicator.visible = visible;
+        this._item.actor.visible = this._indicator.visible = visible;
     }
 };

js/ui/status/power.js

@@ -96,11 +96,11 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         // Do we have batteries or a UPS?
         let visible = this._proxy.IsPresent;
         if (visible) {
-            this._item.show();
+            this._item.actor.show();
             this._percentageLabel.visible = this._desktopSettings.get_boolean(SHOW_BATTERY_PERCENTAGE);
         } else {
             // If there's no battery, then we use the power icon.
-            this._item.hide();
+            this._item.actor.hide();
             this._indicator.icon_name = 'system-shutdown-symbolic';
             this._percentageLabel.hide();
             return;

js/ui/status/remoteAccess.js

@@ -53,10 +53,10 @@ var RemoteAccessApplet = class extends PanelMenu.SystemIndicator {
     _sync() {
         if (this._handles.size == 0) {
             this._indicator.visible = false;
-            this._item.visible = false;
+            this._item.actor.visible = false;
         } else {
             this._indicator.visible = true;
-            this._item.visible = true;
+            this._item.actor.visible = true;
         }
     }
 

js/ui/status/rfkill.js

@@ -97,7 +97,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         let showAirplaneMode = this._manager.shouldShowAirplaneMode;
 
         this._indicator.visible = (airplaneMode && showAirplaneMode);
-        this._item.visible = (airplaneMode && showAirplaneMode);
+        this._item.actor.visible = (airplaneMode && showAirplaneMode);
         this._offItem.setSensitive(!hwAirplaneMode);
 
         if (hwAirplaneMode)

js/ui/status/system.js

@@ -116,10 +116,10 @@ var Indicator = class extends PanelMenu.SystemIndicator {
 
         this._createSubMenu();
 
-        this._loginScreenItem.connect('notify::visible',
+        this._loginScreenItem.actor.connect('notify::visible',
-                                      () => { this._updateMultiUser(); });
+                                            () => { this._updateMultiUser(); });
-        this._logoutItem.connect('notify::visible',
+        this._logoutItem.actor.connect('notify::visible',
-                                 () => { this._updateMultiUser(); });
+                                       () => { this._updateMultiUser(); });
         // Whether shutdown is available or not depends on both lockdown
         // settings (disable-log-out) and Polkit policy - the latter doesn't
         // notify, so we update the menu item each time the menu opens or
@@ -142,7 +142,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
                        this._lockScreenAction.visible ||
                        this._altSwitcher.actor.visible);
 
-        this.buttonGroup.visible = visible;
+        this._actionsItem.actor.visible = visible;
     }
 
     _sessionUpdated() {
@@ -150,10 +150,10 @@ var Indicator = class extends PanelMenu.SystemIndicator {
     }
 
     _updateMultiUser() {
-        let hasSwitchUser = this._loginScreenItem.visible;
+        let hasSwitchUser = this._loginScreenItem.actor.visible;
-        let hasLogout = this._logoutItem.visible;
+        let hasLogout = this._logoutItem.actor.visible;
 
-        this._switchUserSubMenu.visible = hasSwitchUser || hasLogout;
+        this._switchUserSubMenu.actor.visible = hasSwitchUser || hasLogout;
     }
 
     _updateSwitchUserSubMenu() {
@@ -208,7 +208,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         this._switchUserSubMenu.menu.addMenuItem(item);
         this._loginScreenItem = item;
         this._systemActions.bind_property('can-switch-user',
-                                          this._loginScreenItem,
+                                          this._loginScreenItem.actor,
                                           'visible',
                                           bindFlags);
 
@@ -220,7 +220,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         this._switchUserSubMenu.menu.addMenuItem(item);
         this._logoutItem = item;
         this._systemActions.bind_property('can-logout',
-                                          this._logoutItem,
+                                          this._logoutItem.actor,
                                           'visible',
                                           bindFlags);
 
@@ -236,7 +236,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
 
         item = new PopupMenu.PopupBaseMenuItem({ reactive: false,
                                                  can_focus: false });
-        this.buttonGroup = item;
+        this.buttonGroup = item.actor;
 
         let app = this._settingsApp = Shell.AppSystem.get_default().lookup_app(
             'gnome-control-center.desktop'
@@ -251,14 +251,14 @@ var Indicator = class extends PanelMenu.SystemIndicator {
             log('Missing required core component Settings, expect trouble…');
             this._settingsAction = new St.Widget();
         }
-        item.add(this._settingsAction, { expand: true, x_fill: false });
+        item.actor.add(this._settingsAction, { expand: true, x_fill: false });
 
         this._orientationLockAction = this._createActionButton('', _("Orientation Lock"));
         this._orientationLockAction.connect('clicked', () => {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE),
             this._systemActions.activateLockOrientation();
         });
-        item.add(this._orientationLockAction, { expand: true, x_fill: false });
+        item.actor.add(this._orientationLockAction, { expand: true, x_fill: false });
         this._systemActions.bind_property('can-lock-orientation',
                                           this._orientationLockAction,
                                           'visible',
@@ -273,7 +273,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
             this._systemActions.activateLockScreen();
         });
-        item.add(this._lockScreenAction, { expand: true, x_fill: false });
+        item.actor.add(this._lockScreenAction, { expand: true, x_fill: false });
         this._systemActions.bind_property('can-lock-screen',
                                           this._lockScreenAction,
                                           'visible',
@@ -300,8 +300,9 @@ var Indicator = class extends PanelMenu.SystemIndicator {
                                           bindFlags);
 
         this._altSwitcher = new AltSwitcher(this._powerOffAction, this._suspendAction);
-        item.add(this._altSwitcher.actor, { expand: true, x_fill: false });
+        item.actor.add(this._altSwitcher.actor, { expand: true, x_fill: false });
 
+        this._actionsItem = item;
         this.menu.addMenuItem(item);
 
 

js/ui/status/volume.js

@@ -41,12 +41,12 @@ var StreamSlider = class {
         this._slider.connect('drag-end', this._notifyVolumeChange.bind(this));
 
         this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
-        this.item.add(this._icon);
+        this.item.actor.add(this._icon);
-        this.item.add(this._slider.actor, { expand: true });
+        this.item.actor.add(this._slider.actor, { expand: true });
-        this.item.connect('button-press-event', (actor, event) => {
+        this.item.actor.connect('button-press-event', (actor, event) => {
             return this._slider.startDragging(event);
         });
-        this.item.connect('key-press-event', (actor, event) => {
+        this.item.actor.connect('key-press-event', (actor, event) => {
             return this._slider.onKeyPressEvent(actor, event);
         });
 
@@ -93,7 +93,7 @@ var StreamSlider = class {
 
     _updateVisibility() {
         let visible = this._shouldBeVisible();
-        this.item.visible = visible;
+        this.item.actor.visible = visible;
     }
 
     scroll(event) {

js/ui/switcherPopup.js

@@ -30,10 +30,12 @@ function primaryModifier(mask) {
     return primary;
 }
 
-var SwitcherPopup = GObject.registerClass({
+var SwitcherPopup = GObject.registerClass(
-    GTypeFlags: GObject.TypeFlags.ABSTRACT
+class SwitcherPopup extends St.Widget {
-}, class SwitcherPopup extends St.Widget {
     _init(items) {
+        if (new.target === SwitcherPopup)
+            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
+
         super._init({ style_class: 'switcher-popup',
                       reactive: true,
                       visible: false });
@@ -162,7 +164,7 @@ var SwitcherPopup = GObject.registerClass({
     }
 
     _keyPressHandler(keysym, action) {
-        throw new GObject.NotImplementedError(`_keyPressHandler in ${this.constructor.name}`);
+        throw new Error('Not implemented');
     }
 
     _keyPressEvent(actor, event) {

js/ui/tweener.js

@@ -152,7 +152,7 @@ function registerSpecialPropertySplitter(name, splitFunction, parameters) {
 // Tweener to a Clutter.TimeLine. Now, Clutter.Timeline itself isn't a
 // whole lot more sophisticated than a simple timeout at a fixed frame
 // rate, but at least it knows how to drop frames. (See
-// HippoAnimationManager for a more sophisticated view of continuous
+// HippoAnimationManager for a more sophisticated view of continous
 // time updates; even better is to pay attention to the vertical
 // vblank and sync to that when possible.)
 //

js/ui/windowManager.js

@@ -40,10 +40,9 @@ const GSD_WACOM_OBJECT_PATH = '/org/gnome/SettingsDaemon/Wacom';
 const GsdWacomIface = loadInterfaceXML('org.gnome.SettingsDaemon.Wacom');
 const GsdWacomProxy = Gio.DBusProxy.makeProxyWrapper(GsdWacomIface);
 
-var DisplayChangeDialog = GObject.registerClass(
+var DisplayChangeDialog = class extends ModalDialog.ModalDialog {
-class DisplayChangeDialog extends ModalDialog.ModalDialog {
+    constructor(wm) {
-    _init(wm) {
+        super({ styleClass: 'prompt-dialog' });
-        super._init({ styleClass: 'prompt-dialog' });
 
         this._wm = wm;
 
@@ -60,7 +59,7 @@ class DisplayChangeDialog extends ModalDialog.ModalDialog {
                                { x_fill: true,
                                  y_fill: true });
 
-        /* Translators: this and the following message should be limited in length,
+        /* Translators: this and the following message should be limited in lenght,
            to avoid ellipsizing the labels.
         */
         this._cancelButton = this.addButton({ label: _("Revert Settings"),
@@ -112,7 +111,7 @@ class DisplayChangeDialog extends ModalDialog.ModalDialog {
         this._wm.complete_display_change(true);
         this.close();
     }
-});
+};
 
 var WindowDimmer = class {
     constructor(actor) {
@@ -1871,25 +1870,17 @@ var WindowManager = class {
         }
     }
 
-    _getPositionForDirection(direction, fromWs, toWs) {
+    _getPositionForDirection(direction) {
         let xDest = 0, yDest = 0;
 
-        let oldWsIsFullscreen = fromWs.list_windows().some(w => w.is_fullscreen());
-        let newWsIsFullscreen = toWs.list_windows().some(w => w.is_fullscreen());
-
-        // We have to shift windows up or down by the height of the panel to prevent having a
-        // visible gap between the windows while switching workspaces. Since fullscreen windows
-        // hide the panel, they don't need to be shifted up or down.
-        let shiftHeight = Main.panel.height;
-
         if (direction == Meta.MotionDirection.UP ||
             direction == Meta.MotionDirection.UP_LEFT ||
             direction == Meta.MotionDirection.UP_RIGHT)
-            yDest = -global.screen_height + (oldWsIsFullscreen ? 0 : shiftHeight);
+            yDest = -global.screen_height + Main.panel.height;
         else if (direction == Meta.MotionDirection.DOWN ||
             direction == Meta.MotionDirection.DOWN_LEFT ||
             direction == Meta.MotionDirection.DOWN_RIGHT)
-            yDest = global.screen_height - (newWsIsFullscreen ? 0 : shiftHeight);
+            yDest = global.screen_height - Main.panel.height;
 
         if (direction == Meta.MotionDirection.LEFT ||
             direction == Meta.MotionDirection.UP_LEFT ||
@@ -1947,7 +1938,7 @@ var WindowManager = class {
             switchData.container.add_actor(info.actor);
             info.actor.raise_top();
 
-            let [x, y] = this._getPositionForDirection(dir, curWs, ws);
+            let [x, y] = this._getPositionForDirection(dir);
             info.actor.set_position(x, y);
         }
 
@@ -2033,11 +2024,7 @@ var WindowManager = class {
 
         this._switchData.inProgress = true;
 
-        let workspaceManager = global.workspace_manager;
+        let [xDest, yDest] = this._getPositionForDirection(direction);
-        let fromWs = workspaceManager.get_workspace_by_index(from);
-        let toWs = workspaceManager.get_workspace_by_index(to);
-
-        let [xDest, yDest] = this._getPositionForDirection(direction, fromWs, toWs);
 
         /* @direction is the direction that the "camera" moves, so the
          * screen contents have to move one screen's worth in the
@@ -2121,14 +2108,7 @@ var WindowManager = class {
         Main.ctrlAltTabManager.popup(binding.is_reversed(), binding.get_name(), binding.get_mask());
     }
 
-    _allowFavoriteShortcuts() {
-        return Main.sessionMode.hasOverview;
-    }
-
     _switchToApplication(display, window, binding) {
-        if (!this._allowFavoriteShortcuts())
-            return;
-
         let [,,,target] = binding.get_name().split('-');
         let apps = AppFavorites.getAppFavorites().getFavorites();
         let app = apps[target - 1];

js/ui/windowMenu.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*
 
-const { GLib, Meta, St } = imports.gi;
+const { Meta, St } = imports.gi;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
@@ -42,13 +42,13 @@ var WindowMenu = class extends PopupMenu.PopupMenu {
             item.setSensitive(false);
 
         item = this.addAction(_("Move"), event => {
-            this._grabAction(window, Meta.GrabOp.KEYBOARD_MOVING, event.get_time());
+            window.begin_grab_op(Meta.GrabOp.KEYBOARD_MOVING, true, event.get_time());
         });
         if (!window.allows_move())
             item.setSensitive(false);
 
         item = this.addAction(_("Resize"), event => {
-            this._grabAction(window, Meta.GrabOp.KEYBOARD_RESIZING_UNKNOWN, event.get_time());
+            window.begin_grab_op(Meta.GrabOp.KEYBOARD_RESIZING_UNKNOWN, true, event.get_time());
         });
         if (!window.allows_resize())
             item.setSensitive(false);
@@ -169,31 +169,11 @@ var WindowMenu = class extends PopupMenu.PopupMenu {
         if (!window.can_close())
             item.setSensitive(false);
     }
-
-    _grabAction(window, grabOp, time) {
-        if (global.display.get_grab_op() == Meta.GrabOp.NONE) {
-            window.begin_grab_op(grabOp, true, time);
-            return;
-        }
-
-        let waitId = 0;
-        let id = global.display.connect('grab-op-end', (display) => {
-            display.disconnect(id);
-            GLib.source_remove(waitId);
-
-            window.begin_grab_op(grabOp, true, time);
-        });
-
-        waitId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 100, () => {
-            global.display.disconnect(id);
-            return GLib.SOURCE_REMOVE;
-        });
-    }
 };
 
 var WindowMenuManager = class {
     constructor() {
-        this._manager = new PopupMenu.PopupMenuManager(Main.layoutManager.dummyCursor);
+        this._manager = new PopupMenu.PopupMenuManager({ actor: Main.layoutManager.dummyCursor });
 
         this._sourceActor = new St.Widget({ reactive: true, visible: false });
         this._sourceActor.connect('button-press-event', () => {
@@ -203,9 +183,6 @@ var WindowMenuManager = class {
     }
 
     showWindowMenuForWindow(window, type, rect) {
-        if (!Main.sessionMode.hasWmMenus)
-            return;
-
         if (type != Meta.WindowMenuType.WM)
             throw new Error('Unsupported window menu type');
         let menu = new WindowMenu(window, this._sourceActor);

js/ui/workspace.js

@@ -786,8 +786,8 @@ var WindowPositionFlags = {
 
 var LayoutStrategy = class {
     constructor(monitor, rowSpacing, columnSpacing) {
-        if (this.constructor === LayoutStrategy)
+        if (new.target === LayoutStrategy)
-            throw new TypeError(`Cannot instantiate abstract type ${this.constructor.name}`);
+            throw new TypeError('Cannot instantiate abstract type ' + new.target.name);
 
         this._monitor = monitor;
         this._rowSpacing = rowSpacing;
@@ -813,7 +813,7 @@ var LayoutStrategy = class {
     }
 
     // Computes and returns an individual scaling factor for @window,
-    // to be applied in addition to the overall layout scale.
+    // to be applied in addition to the overal layout scale.
     _computeWindowScale(window) {
         // Since we align windows next to each other, the height of the
         // thumbnails is much more important to preserve than the width of
@@ -835,7 +835,7 @@ var LayoutStrategy = class {
     // (optionally) for each row in @layout.rows. This method is
     // intended to be called by subclasses.
     _computeRowSizes(layout) {
-        throw new GObject.NotImplementedError(`_computeRowSizes in ${this.constructor.name}`);
+        throw new Error('_computeRowSizes not implemented');
     }
 
     // Compute strategy-specific window slots for each window in
@@ -848,7 +848,7 @@ var LayoutStrategy = class {
     //  * gridHeight - The totial height used by the grid, unscaled, unspaced.
     //  * rows - A list of rows, which should be instantiated by _newRow.
     computeLayout(windows, layout) {
-        throw new GObject.NotImplementedError(`computeLayout in ${this.constructor.name}`);
+        throw new Error('computeLayout not implemented');
     }
 
     // Given @layout, compute the overall scale and space of the layout.
@@ -1266,7 +1266,7 @@ var Workspace = class {
         }
 
         // We will reposition windows anyway when enter again overview or when ending the windows
-        // animations with fade animation.
+        // animations whith fade animation.
         // In this way we avoid unwanted animations of windows repositioning while
         // animating overview.
         if (this.leavingOverview || this._animatingWindowsFade)
@@ -1886,10 +1886,10 @@ var Workspace = class {
             // Win win -- better scale and better space
             return true;
         } else if (newLayout.scale > oldLayout.scale && newLayout.space <= oldLayout.space) {
-            // Keep new layout only if scale gain outweighs aspect space loss
+            // Keep new layout only if scale gain outweights aspect space loss
             return scalePower > spacePower;
         } else if (newLayout.scale <= oldLayout.scale && newLayout.space > oldLayout.space) {
-            // Keep new layout only if aspect space gain outweighs scale loss
+            // Keep new layout only if aspect space gain outweights scale loss
             return spacePower > scalePower;
         } else {
             // Lose -- worse scale and space

js/ui/workspaceSwitcherPopup.js

@@ -85,6 +85,8 @@ class WorkspaceSwitcherPopup extends St.Widget {
                       height: global.screen_height,
                       style_class: 'workspace-switcher-group' });
 
+        this.actor = this;
+
         Main.uiGroup.add_actor(this);
 
         this._timeoutId = 0;
@@ -140,7 +142,7 @@ class WorkspaceSwitcherPopup extends St.Widget {
                                             time: ANIMATION_TIME,
                                             transition: 'easeOutQuad'
                                            });
-        this.show();
+        this.actor.show();
     }
 
     display(direction, activeWorkspaceIndex) {

js/ui/workspaceThumbnail.js

@@ -601,7 +601,8 @@ class ThumbnailsBox extends St.Widget {
                       style_class: 'workspace-thumbnails',
                       request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT });
 
-        this._delegate = this;
+        this.actor = this;
+        this.actor._delegate = this;
 
         let indicator = new St.Bin({ style_class: 'workspace-thumbnail-indicator' });
 

js/ui/workspacesView.js

@@ -84,7 +84,7 @@ var WorkspacesView = class extends WorkspacesViewBase {
         this._animating = false; // tweening
         this._scrolling = false; // swipe-scrolling
         this._gestureActive = false; // touch(pad) gestures
-        this._animatingScroll = false; // programmatically updating the adjustment
+        this._animatingScroll = false; // programatically updating the adjustment
 
         let activeWorkspaceIndex = workspaceManager.get_active_workspace_index();
         this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
@@ -483,6 +483,7 @@ var WorkspacesDisplay = class {
         this._primaryIndex = Main.layoutManager.primaryIndex;
 
         this._workspacesViews = [];
+        this._primaryScrollAdjustment = null;
         switchGesture.enabled = this.actor.mapped;
 
         this._settings = new Gio.Settings({ schema_id: MUTTER_SCHEMA });
@@ -490,6 +491,8 @@ var WorkspacesDisplay = class {
                                this._workspacesOnlyOnPrimaryChanged.bind(this));
         this._workspacesOnlyOnPrimaryChanged();
 
+        this._switchWorkspaceNotifyId = 0;
+
         this._notifyOpacityId = 0;
         this._restackedNotifyId = 0;
         this._scrollEventId = 0;

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.33.3',
+  version: '3.32.2',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )
@@ -14,16 +14,16 @@ cogl_pango_pc = 'mutter-cogl-pango-' + mutter_api_version
 libmutter_pc = 'libmutter-' + mutter_api_version
 
 croco_req = '>= 0.6.8'
-ecal_req = '>= 3.33.1'
+ecal_req = '>= 3.5.3'
 eds_req = '>= 3.17.2'
 gcr_req = '>= 3.7.5'
 gdesktop_req = '>= 3.7.90'
 gio_req = '>= 2.56.0'
 gi_req = '>= 1.49.1'
-gjs_req = '>= 1.57.3'
+gjs_req = '>= 1.54.0'
 gtk_req = '>= 3.15.0'
 json_glib_req = '>= 0.13.2'
-mutter_req = '>= 3.33.3'
+mutter_req = '>= 3.32.0'
 polkit_req = '>= 0.100'
 schemas_req = '>= 3.27.90'
 startup_req = '>= 0.11'
@@ -73,7 +73,7 @@ else
 endif
 
 atk_bridge_dep = dependency('atk-bridge-2.0')
-ecal_dep = dependency('libecal-2.0', version: ecal_req)
+ecal_dep = dependency('libecal-1.2', version: ecal_req)
 eds_dep = dependency('libedataserver-1.2', version: eds_req)
 gcr_dep = dependency('gcr-base-3', version: gcr_req)
 gdk_x11_dep = dependency('gdk-x11-3.0')
@@ -167,58 +167,6 @@ cdata.set('HAVE_FDWALK',
           cc.has_function('fdwalk')
 )
 
-buildtype = get_option('buildtype')
-if buildtype != 'plain'
-  all_warnings = [
-    '-fno-strict-aliasing',
-    '-Wpointer-arith',
-    '-Wmissing-declarations',
-    '-Wimplicit-function-declaration',
-    '-Wformat=2',
-    '-Wformat-nonliteral',
-    '-Wformat-security',
-    '-Wstrict-prototypes',
-    '-Wmissing-prototypes',
-    '-Wnested-externs',
-    '-Wold-style-definition',
-    '-Wundef',
-    '-Wunused',
-    '-Wcast-align',
-    '-Wmissing-noreturn',
-    '-Wmissing-format-attribute',
-    '-Wmissing-include-dirs',
-    '-Wlogical-op',
-    '-Wignored-qualifiers',
-    '-Werror=redundant-decls',
-    '-Werror=implicit',
-    '-Werror=nonnull',
-    '-Werror=init-self',
-    '-Werror=main',
-    '-Werror=missing-braces',
-    '-Werror=sequence-point',
-    '-Werror=return-type',
-    '-Werror=trigraphs',
-    '-Werror=array-bounds',
-    '-Werror=write-strings',
-    '-Werror=address',
-    '-Werror=int-to-pointer-cast',
-    '-Werror=pointer-to-int-cast',
-    '-Werror=empty-body',
-    '-Werror=write-strings',
-  ]
-  supported_warnings = cc.get_supported_arguments(all_warnings)
-  add_project_arguments(supported_warnings, language: 'c')
-endif
-
-if get_option('debug')
-  debug_c_args = [
-    '-DG_ENABLE_DEBUG',
-    '-fno-omit-frame-pointer'
-  ]
-  supported_debug_c_args = cc.get_supported_arguments(debug_c_args)
-  add_project_arguments(supported_debug_c_args, language: 'c')
-endif
-
 config_h = configure_file(
   input: 'config.h.meson',
   output: 'config.h',

po/POTFILES.in

@@ -54,7 +54,6 @@ js/ui/shellMountOperation.js
 js/ui/status/accessibility.js
 js/ui/status/bluetooth.js
 js/ui/status/brightness.js
-js/ui/status/dwellClick.js
 js/ui/status/keyboard.js
 js/ui/status/location.js
 js/ui/status/network.js

po/eo.po

@@ -6,22 +6,22 @@
 # Daniel PUENTES <blatberk@openmailbox.org>, 2015.
 # Nicolas MAIA < >, 2015.
 # Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011, 2012, 2015, 2016, 2018.
-# Carmen Bianca BAKKER <carmen@carmenbianca.eu>, 2018-2019.
+# Carmen Bianca BAKKER <carmen@carmenbianca.eu>, 2018, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2019-05-08 17:45+0000\n"
+"POT-Creation-Date: 2019-03-24 17:37+0000\n"
-"PO-Revision-Date: 2019-05-09 20:12+0200\n"
+"PO-Revision-Date: 2019-03-31 00:14+0100\n"
-"Last-Translator: Carmen Bianca BAKKER <carmen@carmenbianca.eu>\n"
+"Last-Translator: Carmen Bianca Bakker <carmen@carmenbianca.eu>\n"
 "Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.32.0\n"
+"X-Generator: Poedit 2.2.1\n"
 "X-DamnedLies-Scope: partial\n"
 "X-Project-Style: gnome\n"
 
@@ -383,7 +383,7 @@ msgstr "Foliumi en Programaro"
 #: js/gdm/authPrompt.js:140 js/ui/audioDeviceSelection.js:55
 #: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:136
 #: js/ui/endSessionDialog.js:430 js/ui/extensionDownloader.js:188
-#: js/ui/shellMountOperation.js:325 js/ui/status/network.js:889
+#: js/ui/shellMountOperation.js:325 js/ui/status/network.js:888
 msgid "Cancel"
 msgstr "Nuligi"
 
@@ -681,37 +681,32 @@ msgstr "Oftaj"
 msgid "All"
 msgstr "Ĉiuj"
 
-#. Translators: This is the heading of a list of open windows
+#: js/ui/appDisplay.js:1737 js/ui/panel.js:83
-#: js/ui/appDisplay.js:1713 js/ui/panel.js:79
-msgid "Open Windows"
-msgstr "Malfermaj fenestroj"
-
-#: js/ui/appDisplay.js:1732 js/ui/panel.js:86
 msgid "New Window"
 msgstr "Nova fenestro"
 
-#: js/ui/appDisplay.js:1746
+#: js/ui/appDisplay.js:1751
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Lanĉi uzante dediĉitan vidkarton"
 
-#: js/ui/appDisplay.js:1773 js/ui/dash.js:239
+#: js/ui/appDisplay.js:1778 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Forigi el preferataj"
 
-#: js/ui/appDisplay.js:1779
+#: js/ui/appDisplay.js:1784
 msgid "Add to Favorites"
 msgstr "Aldoni al preferataj"
 
-#: js/ui/appDisplay.js:1789 js/ui/panel.js:97
+#: js/ui/appDisplay.js:1794 js/ui/panel.js:94
 msgid "Show Details"
 msgstr "Montri detalojn"
 
-#: js/ui/appFavorites.js:149
+#: js/ui/appFavorites.js:141
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s estas aldonita de via preferataj aplikaĵoj."
 
-#: js/ui/appFavorites.js:183
+#: js/ui/appFavorites.js:175
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s estas forigita de via preferataj aplikaĵoj."
@@ -919,7 +914,7 @@ msgstr ""
 "Alternative vi povas konekti per premi la “WPS”-butonon de via enkursigilo."
 
 #: js/ui/components/networkAgent.js:112 js/ui/status/network.js:219
-#: js/ui/status/network.js:310 js/ui/status/network.js:892
+#: js/ui/status/network.js:309 js/ui/status/network.js:891
 msgid "Connect"
 msgstr "Konekti"
 
@@ -949,7 +944,7 @@ msgstr "Servo: "
 
 #: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:685
 msgid "Authentication required by wireless network"
-msgstr "Sendrata reto bezonas aŭtentigon"
+msgstr "Aŭtentigo estas bezonata de sendrata reto"
 
 #: js/ui/components/networkAgent.js:313 js/ui/components/networkAgent.js:686
 #, javascript-format
@@ -977,7 +972,7 @@ msgstr "PIN-kodo bezonata"
 
 #: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:700
 msgid "PIN code is needed for the mobile broadband device"
-msgstr "PIN-kodo necesas por la portebla larĝkapacita aparato"
+msgstr "PIN-kodo estas bezonata por la portebla larĝkapacita aparato"
 
 #: js/ui/components/networkAgent.js:333
 msgid "PIN: "
@@ -991,9 +986,9 @@ msgstr "Portebla larĝkapacita retopasvorto"
 #: js/ui/components/networkAgent.js:694 js/ui/components/networkAgent.js:707
 #, javascript-format
 msgid "A password is required to connect to “%s”."
-msgstr "Pasvorto necesas por konekti al “%s”."
+msgstr "Pasvorto estas bezonata por konekti al “%s”."
 
-#: js/ui/components/networkAgent.js:674 js/ui/status/network.js:1665
+#: js/ui/components/networkAgent.js:674 js/ui/status/network.js:1664
 msgid "Network Manager"
 msgstr "Retadministrilo"
 
@@ -1065,23 +1060,23 @@ msgstr "Aldoni mondajn horloĝojn…"
 msgid "World Clocks"
 msgstr "Mondaj horloĝoj"
 
-#: js/ui/dateMenu.js:228
+#: js/ui/dateMenu.js:222
 msgid "Weather"
 msgstr "Vetero"
 
-#: js/ui/dateMenu.js:311
+#: js/ui/dateMenu.js:305
 msgid "Select a location…"
 msgstr "Elekti lokon…"
 
-#: js/ui/dateMenu.js:319
+#: js/ui/dateMenu.js:313
 msgid "Loading…"
 msgstr "Ŝargante…"
 
-#: js/ui/dateMenu.js:329
+#: js/ui/dateMenu.js:323
 msgid "Go online for weather information"
 msgstr "Enretigi por veterinformoj"
 
-#: js/ui/dateMenu.js:331
+#: js/ui/dateMenu.js:325
 msgid "Weather information is currently unavailable"
 msgstr "Veterinformoj ĉimomente nehaveblas"
 
@@ -1310,13 +1305,13 @@ msgid "Leave On"
 msgstr "Lasi ŝaltita"
 
 #: js/ui/kbdA11yDialog.js:57 js/ui/status/bluetooth.js:133
-#: js/ui/status/network.js:1264
+#: js/ui/status/network.js:1263
 msgid "Turn On"
 msgstr "Ŝalti"
 
 #: js/ui/kbdA11yDialog.js:65 js/ui/status/bluetooth.js:133
-#: js/ui/status/network.js:128 js/ui/status/network.js:311
+#: js/ui/status/network.js:128 js/ui/status/network.js:310
-#: js/ui/status/network.js:1264 js/ui/status/network.js:1376
+#: js/ui/status/network.js:1263 js/ui/status/network.js:1375
 #: js/ui/status/nightLight.js:39 js/ui/status/rfkill.js:79
 #: js/ui/status/rfkill.js:106
 msgid "Turn Off"
@@ -1378,7 +1373,7 @@ msgstr "Montri fonton"
 msgid "Web Page"
 msgstr "Retpaĝo"
 
-#: js/ui/messageTray.js:1479
+#: js/ui/messageTray.js:1480
 msgid "System Information"
 msgstr "Sisteminformoj"
 
@@ -1457,25 +1452,34 @@ msgstr "Premu Esk-klavon por ĉesi"
 msgid "Press any key to exit"
 msgstr "Premu iun ajn klavon por ĉesi"
 
-#: js/ui/panel.js:113
+#: js/ui/panel.js:108
 msgid "Quit"
 msgstr "Ĉesi"
 
 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: js/ui/panel.js:468
+#: js/ui/panel.js:471
 msgid "Activities"
 msgstr "Aktivecoj"
 
-#: js/ui/panel.js:743
+#: js/ui/panel.js:746
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "Sistemo"
 
-#: js/ui/panel.js:861
+#: js/ui/panel.js:867
 msgid "Top Bar"
 msgstr "Supra breto"
 
+#. Translators: this MUST be either "toggle-switch-us"
+#. (for toggle switches containing the English words
+#. "ON" and "OFF") or "toggle-switch-intl" (for toggle
+#. switches containing "◯" and "|"). Other values will
+#. simply result in invisible toggle switches.
+#: js/ui/popupMenu.js:285
+msgid "toggle-switch-us"
+msgstr "toggle-switch-intl"
+
 #: js/ui/runDialog.js:64
 msgid "Enter a Command"
 msgstr "Enigu komandon"
@@ -1610,11 +1614,11 @@ msgstr "Saltaj klavoj"
 msgid "Mouse Keys"
 msgstr "Musklavoj"
 
-#: js/ui/status/accessibility.js:135
+#: js/ui/status/accessibility.js:151
 msgid "High Contrast"
 msgstr "Alta kontrasto"
 
-#: js/ui/status/accessibility.js:177
+#: js/ui/status/accessibility.js:182
 msgid "Large Text"
 msgstr "Granda teksto"
 
@@ -1622,7 +1626,7 @@ msgstr "Granda teksto"
 msgid "Bluetooth"
 msgstr "Bludento"
 
-#: js/ui/status/bluetooth.js:47 js/ui/status/network.js:586
+#: js/ui/status/bluetooth.js:47 js/ui/status/network.js:585
 msgid "Bluetooth Settings"
 msgstr "Bludento-agordoj"
 
@@ -1693,13 +1697,13 @@ msgid "<unknown>"
 msgstr "<nekonata>"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:417 js/ui/status/network.js:1293
+#: js/ui/status/network.js:416 js/ui/status/network.js:1292
 #, javascript-format
 msgid "%s Off"
 msgstr "%s malŝaltita"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:420
+#: js/ui/status/network.js:419
 #, javascript-format
 msgid "%s Connected"
 msgstr "%s konektita"
@@ -1707,189 +1711,189 @@ msgstr "%s konektita"
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu);
 #. %s is a network identifier
-#: js/ui/status/network.js:425
+#: js/ui/status/network.js:424
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "%s nemastrumita"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:428
+#: js/ui/status/network.js:427
 #, javascript-format
 msgid "%s Disconnecting"
 msgstr "%s malkonektante"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:435 js/ui/status/network.js:1285
+#: js/ui/status/network.js:434 js/ui/status/network.js:1284
 #, javascript-format
 msgid "%s Connecting"
 msgstr "%s konektante"
 
 #. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
-#: js/ui/status/network.js:438
+#: js/ui/status/network.js:437
 #, javascript-format
 msgid "%s Requires Authentication"
 msgstr "%s postulas aŭtentigon"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing; %s is a network identifier
-#: js/ui/status/network.js:446
+#: js/ui/status/network.js:445
 #, javascript-format
 msgid "Firmware Missing For %s"
 msgstr "Mikroprogramo mankas por %s"
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage; %s is a network identifier
-#: js/ui/status/network.js:450
+#: js/ui/status/network.js:449
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "%s nedisponebla"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:453
+#: js/ui/status/network.js:452
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "%s konekto malsukcesis"
 
-#: js/ui/status/network.js:465
+#: js/ui/status/network.js:464
 msgid "Wired Settings"
 msgstr "Drataj agordoj"
 
-#: js/ui/status/network.js:507
+#: js/ui/status/network.js:506
 msgid "Mobile Broadband Settings"
 msgstr "Porteblaj larĝkapacitaj agordoj"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:554 js/ui/status/network.js:1290
+#: js/ui/status/network.js:553 js/ui/status/network.js:1289
 #, javascript-format
 msgid "%s Hardware Disabled"
 msgstr "%s aparataro malŝaltita"
 
 #. Translators: this is for a network device that cannot be activated
 #. because it's disabled by rfkill (airplane mode); %s is a network identifier
-#: js/ui/status/network.js:558
+#: js/ui/status/network.js:557
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s malŝaltita"
 
-#: js/ui/status/network.js:598
+#: js/ui/status/network.js:597
 msgid "Connect to Internet"
 msgstr "Konekti al interreto"
 
-#: js/ui/status/network.js:787
+#: js/ui/status/network.js:786
 msgid "Airplane Mode is On"
 msgstr "Aviadila reĝimo ŝaltita"
 
-#: js/ui/status/network.js:788
+#: js/ui/status/network.js:787
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Vifio malebliĝas se aviadila reĝimo estas ŝaltita."
 
-#: js/ui/status/network.js:789
+#: js/ui/status/network.js:788
 msgid "Turn Off Airplane Mode"
 msgstr "Malŝalti aviadilan reĝimon"
 
-#: js/ui/status/network.js:798
+#: js/ui/status/network.js:797
 msgid "Wi-Fi is Off"
 msgstr "Vifio malŝaltita"
 
-#: js/ui/status/network.js:799
+#: js/ui/status/network.js:798
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Necesas ŝalti vifion por konekti al reto."
 
-#: js/ui/status/network.js:800
+#: js/ui/status/network.js:799
 msgid "Turn On Wi-Fi"
 msgstr "Ŝalti vifion"
 
-#: js/ui/status/network.js:825
+#: js/ui/status/network.js:824
 msgid "Wi-Fi Networks"
 msgstr "Vifiaj retoj"
 
-#: js/ui/status/network.js:827
+#: js/ui/status/network.js:826
 msgid "Select a network"
 msgstr "Elekti reton"
 
-#: js/ui/status/network.js:856
+#: js/ui/status/network.js:855
 msgid "No Networks"
 msgstr "Neniu reto"
 
-#: js/ui/status/network.js:877 js/ui/status/rfkill.js:104
+#: js/ui/status/network.js:876 js/ui/status/rfkill.js:104
 msgid "Use hardware switch to turn off"
 msgstr "Uzi aparataran ŝaltilon por malŝalti"
 
-#: js/ui/status/network.js:1153
+#: js/ui/status/network.js:1152
 msgid "Select Network"
 msgstr "Elekti reton"
 
-#: js/ui/status/network.js:1159
+#: js/ui/status/network.js:1158
 msgid "Wi-Fi Settings"
 msgstr "Vifio-agordoj"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1281
+#: js/ui/status/network.js:1280
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "%s retkaptejo aktiva"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1296
+#: js/ui/status/network.js:1295
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "%s ne konektita"
 
-#: js/ui/status/network.js:1393
+#: js/ui/status/network.js:1392
 msgid "connecting…"
 msgstr "konektante…"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: js/ui/status/network.js:1396
+#: js/ui/status/network.js:1395
 msgid "authentication required"
 msgstr "aŭtentigo necesas"
 
-#: js/ui/status/network.js:1398
+#: js/ui/status/network.js:1397
 msgid "connection failed"
 msgstr "konekto malsukcesis"
 
-#: js/ui/status/network.js:1448
+#: js/ui/status/network.js:1447
 msgid "VPN Settings"
 msgstr "VPR-agordoj"
 
-#: js/ui/status/network.js:1465
+#: js/ui/status/network.js:1464
 msgid "VPN"
 msgstr "VPR"
 
-#: js/ui/status/network.js:1475
+#: js/ui/status/network.js:1474
 msgid "VPN Off"
 msgstr "VPR malŝaltita"
 
-#: js/ui/status/network.js:1536 js/ui/status/rfkill.js:82
+#: js/ui/status/network.js:1535 js/ui/status/rfkill.js:82
 msgid "Network Settings"
 msgstr "Ret-agordoj"
 
-#: js/ui/status/network.js:1565
+#: js/ui/status/network.js:1564
 #, javascript-format
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
 msgstr[0] "%s drata konekto"
 msgstr[1] "%s drataj konektoj"
 
-#: js/ui/status/network.js:1569
+#: js/ui/status/network.js:1568
 #, javascript-format
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
 msgstr[0] "%s vifia konekto"
 msgstr[1] "%s vifiaj konektoj"
 
-#: js/ui/status/network.js:1573
+#: js/ui/status/network.js:1572
 #, javascript-format
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
 msgstr[0] "%s modema konekto"
 msgstr[1] "%s modemaj konektoj"
 
-#: js/ui/status/network.js:1706
+#: js/ui/status/network.js:1701
 msgid "Connection failed"
 msgstr "Konekto malsukcesis"
 
-#: js/ui/status/network.js:1707
+#: js/ui/status/network.js:1702
 msgid "Activation of network connection failed"
 msgstr "Aktivigo de reto-konekto malsukcesis"
 
@@ -2094,7 +2098,7 @@ msgstr[1] "Agordaj ŝanĝoj malfaritos post %d sekundoj"
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height.
-#: js/ui/windowManager.js:677
+#: js/ui/windowManager.js:662
 #, javascript-format
 msgid "%d × %d"
 msgstr "%d × %d"
@@ -2227,9 +2231,6 @@ msgstr[1] "%u enigoj"
 msgid "System Sounds"
 msgstr "Sistemsonoj"
 
-#~ msgid "toggle-switch-us"
-#~ msgstr "toggle-switch-intl"
-
 #~ msgid "network-workgroup"
 #~ msgstr "network-workgroup"
 

po/es.po

@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2019-06-06 11:42+0000\n"
+"POT-Creation-Date: 2019-07-17 14:17+0000\n"
-"PO-Revision-Date: 2019-06-10 12:04+0200\n"
+"PO-Revision-Date: 2019-07-24 09:53+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: es <gnome-es-list@gnome.org>\n"
+"Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
-"Language: es\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.32.0\n"
+"X-Generator: Gtranslator 3.32.1\n"
 
 #: data/50-gnome-shell-system.xml:6
 msgid "System"
@@ -428,11 +428,10 @@ msgstr ""
 msgid "Browse in Software"
 msgstr "Buscar en Software"
 
-#: js/gdm/authPrompt.js:140 js/ui/audioDeviceSelection.js:52
+#: js/gdm/authPrompt.js:140 js/ui/audioDeviceSelection.js:55
-#: js/ui/components/networkAgent.js:118 js/ui/components/polkitAgent.js:138
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:136
-#: js/ui/endSessionDialog.js:431 js/ui/extensionDownloader.js:188
+#: js/ui/endSessionDialog.js:430 js/ui/extensionDownloader.js:188
-#: js/ui/shellMountOperation.js:404 js/ui/shellMountOperation.js:413
+#: js/ui/shellMountOperation.js:325 js/ui/status/network.js:888
-#: js/ui/status/network.js:894
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -440,7 +439,7 @@ msgstr "Cancelar"
 msgid "Next"
 msgstr "Siguiente"
 
-#: js/gdm/authPrompt.js:198 js/ui/shellMountOperation.js:408
+#: js/gdm/authPrompt.js:198 js/ui/shellMountOperation.js:329
 #: js/ui/unlockDialog.js:41
 msgid "Unlock"
 msgstr "Desbloquear"
@@ -471,8 +470,8 @@ msgstr "(ej., usuario 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:889 js/ui/components/networkAgent.js:244
+#: js/gdm/loginDialog.js:889 js/ui/components/networkAgent.js:243
-#: js/ui/components/networkAgent.js:264 js/ui/components/networkAgent.js:282
+#: js/ui/components/networkAgent.js:263 js/ui/components/networkAgent.js:281
 msgid "Username: "
 msgstr "Nombre de usuario:"
 
@@ -523,7 +522,7 @@ msgstr "Cerrar la sesión"
 
 #. Translators: A list of keywords that match the logout action, separated by semicolons
 #: js/misc/systemActions.js:105
-msgid "logout;log out;sign off"
+msgid "logout;sign off"
 msgstr "cerrar;sesión;salir"
 
 #. Translators: The name of the suspend action in search
@@ -709,11 +708,11 @@ msgstr ""
 
 #. No support for non-modal system dialogs, so ignore the option
 #. let modal = options['modal'] || true;
-#: js/ui/accessDialog.js:38 js/ui/status/location.js:362
+#: js/ui/accessDialog.js:37 js/ui/status/location.js:360
 msgid "Deny Access"
 msgstr "Denegar acceso"
 
-#: js/ui/accessDialog.js:39 js/ui/status/location.js:365
+#: js/ui/accessDialog.js:38 js/ui/status/location.js:363
 msgid "Grant Access"
 msgstr "Conceder acceso"
 
@@ -729,28 +728,23 @@ msgstr "Frecuentes"
 msgid "All"
 msgstr "Todas"
 
-#. Translators: This is the heading of a list of open windows
+#: js/ui/appDisplay.js:1737 js/ui/panel.js:83
-#: js/ui/appDisplay.js:1713 js/ui/panel.js:79
-msgid "Open Windows"
-msgstr "Ventanas abiertas"
-
-#: js/ui/appDisplay.js:1732 js/ui/panel.js:86
 msgid "New Window"
 msgstr "Ventana nueva"
 
-#: js/ui/appDisplay.js:1746
+#: js/ui/appDisplay.js:1751
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Lanzar usando la tarjeta gráfica dedicada"
 
-#: js/ui/appDisplay.js:1773 js/ui/dash.js:239
+#: js/ui/appDisplay.js:1778 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Quitar de los favoritos"
 
-#: js/ui/appDisplay.js:1779
+#: js/ui/appDisplay.js:1784
 msgid "Add to Favorites"
 msgstr "Añadir a los favoritos"
 
-#: js/ui/appDisplay.js:1789 js/ui/panel.js:97
+#: js/ui/appDisplay.js:1794 js/ui/panel.js:94
 msgid "Show Details"
 msgstr "Mostrar detalles"
 
@@ -764,23 +758,23 @@ msgstr "Se ha añadido %s a sus favoritos."
 msgid "%s has been removed from your favorites."
 msgstr "Se ha quitado %s de sus favoritos."
 
-#: js/ui/audioDeviceSelection.js:39
+#: js/ui/audioDeviceSelection.js:42
 msgid "Select Audio Device"
 msgstr "Seleccionar dispositivo de sonido"
 
-#: js/ui/audioDeviceSelection.js:50
+#: js/ui/audioDeviceSelection.js:53
 msgid "Sound Settings"
 msgstr "Configuración de sonido"
 
-#: js/ui/audioDeviceSelection.js:59
+#: js/ui/audioDeviceSelection.js:62
 msgid "Headphones"
 msgstr "Auriculares"
 
-#: js/ui/audioDeviceSelection.js:61
+#: js/ui/audioDeviceSelection.js:64
 msgid "Headset"
 msgstr "Manos libres"
 
-#: js/ui/audioDeviceSelection.js:63 js/ui/status/volume.js:247
+#: js/ui/audioDeviceSelection.js:66 js/ui/status/volume.js:247
 msgid "Microphone"
 msgstr "Micrófono"
 
@@ -941,75 +935,67 @@ msgstr "Forzar la salida"
 msgid "Wait"
 msgstr "Esperar"
 
-#: js/ui/components/automountManager.js:87
+#: js/ui/components/automountManager.js:86
 msgid "External drive connected"
 msgstr "Dispositivo externo conectado"
 
-#: js/ui/components/automountManager.js:99
+#: js/ui/components/automountManager.js:98
 msgid "External drive disconnected"
 msgstr "Dispositivo externo desconectado"
 
-#: js/ui/components/automountManager.js:211
-msgid "Unable to unlock volume"
-msgstr "No se puede desbloquear el volumen"
-
-#: js/ui/components/automountManager.js:212
-msgid "The installed udisks version does not support the PIM setting"
-msgstr "La versión de udisks instalada no soporta la configuración PIM"
-
 #: js/ui/components/autorunManager.js:334
 #, javascript-format
 msgid "Open with %s"
 msgstr "Abrir con %s"
 
-#: js/ui/components/keyring.js:66 js/ui/components/polkitAgent.js:257
+#: js/ui/components/keyring.js:77 js/ui/components/polkitAgent.js:255
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: js/ui/components/keyring.js:97
+#: js/ui/components/keyring.js:108
 msgid "Type again:"
 msgstr "Escriba de nuevo:"
 
-#: js/ui/components/networkAgent.js:103
+#: js/ui/components/networkAgent.js:102
 msgid ""
 "Alternatively you can connect by pushing the “WPS” button on your router."
 msgstr ""
 "Alternativamente puede conectarse pulsando el botón «WPS» de su router."
 
-#: js/ui/components/networkAgent.js:113 js/ui/status/network.js:219
+#: js/ui/components/networkAgent.js:112 js/ui/status/network.js:219
-#: js/ui/status/network.js:310 js/ui/status/network.js:897
+#: js/ui/status/network.js:309 js/ui/status/network.js:891
 msgid "Connect"
 msgstr "Conectar"
 
 #. Cisco LEAP
-#: js/ui/components/networkAgent.js:212 js/ui/components/networkAgent.js:224
+#: js/ui/components/networkAgent.js:211 js/ui/components/networkAgent.js:223
-#: js/ui/components/networkAgent.js:247 js/ui/components/networkAgent.js:266
+#: js/ui/components/networkAgent.js:246 js/ui/components/networkAgent.js:265
-#: js/ui/components/networkAgent.js:286 js/ui/components/networkAgent.js:296
+#: js/ui/components/networkAgent.js:285 js/ui/components/networkAgent.js:295
 msgid "Password: "
 msgstr "Contraseña: "
 
 #. static WEP
-#: js/ui/components/networkAgent.js:217
+#: js/ui/components/networkAgent.js:216
 msgid "Key: "
 msgstr "Clave:"
 
-#: js/ui/components/networkAgent.js:250 js/ui/components/networkAgent.js:272
+#: js/ui/components/networkAgent.js:249 js/ui/components/networkAgent.js:271
 msgid "Private key password: "
 msgstr "Contraseña de la clave privada:"
 
-#: js/ui/components/networkAgent.js:270
+#: js/ui/components/networkAgent.js:269
 msgid "Identity: "
 msgstr "Identidad:"
 
-#: js/ui/components/networkAgent.js:284
+#: js/ui/components/networkAgent.js:283
 msgid "Service: "
 msgstr "Servicio:"
 
-#: js/ui/components/networkAgent.js:313 js/ui/components/networkAgent.js:686
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:685
 msgid "Authentication required by wireless network"
 msgstr "La red inalámbrica requiere autenticación"
 
-#: js/ui/components/networkAgent.js:314 js/ui/components/networkAgent.js:687
+#: js/ui/components/networkAgent.js:313 js/ui/components/networkAgent.js:686
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -1018,53 +1004,53 @@ msgstr ""
 "Se necesitan contraseñas o claves de cifrado para acceder a la red "
 "inalámbrica «%s»."
 
-#: js/ui/components/networkAgent.js:318 js/ui/components/networkAgent.js:690
+#: js/ui/components/networkAgent.js:317 js/ui/components/networkAgent.js:689
 msgid "Wired 802.1X authentication"
 msgstr "Autenticación 802.1X cableada"
 
-#: js/ui/components/networkAgent.js:320
+#: js/ui/components/networkAgent.js:319
 msgid "Network name: "
 msgstr "Nombre de la red: "
 
-#: js/ui/components/networkAgent.js:325 js/ui/components/networkAgent.js:694
+#: js/ui/components/networkAgent.js:324 js/ui/components/networkAgent.js:693
 msgid "DSL authentication"
 msgstr "Autenticación DSL"
 
-#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:700
+#: js/ui/components/networkAgent.js:331 js/ui/components/networkAgent.js:699
 msgid "PIN code required"
 msgstr "Código PIN requerido"
 
-#: js/ui/components/networkAgent.js:333 js/ui/components/networkAgent.js:701
+#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:700
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Se necesita un código PIN para el dispositivo de banda ancha móvil"
 
-#: js/ui/components/networkAgent.js:334
+#: js/ui/components/networkAgent.js:333
 msgid "PIN: "
 msgstr "PIN: "
 
-#: js/ui/components/networkAgent.js:341 js/ui/components/networkAgent.js:707
+#: js/ui/components/networkAgent.js:340 js/ui/components/networkAgent.js:706
 msgid "Mobile broadband network password"
 msgstr "Contraseña de la red de banda ancha móvil"
 
-#: js/ui/components/networkAgent.js:342 js/ui/components/networkAgent.js:691
+#: js/ui/components/networkAgent.js:341 js/ui/components/networkAgent.js:690
-#: js/ui/components/networkAgent.js:695 js/ui/components/networkAgent.js:708
+#: js/ui/components/networkAgent.js:694 js/ui/components/networkAgent.js:707
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Se requiere una contraseña para conectarse a «%s»."
 
-#: js/ui/components/networkAgent.js:675 js/ui/status/network.js:1670
+#: js/ui/components/networkAgent.js:674 js/ui/status/network.js:1664
 msgid "Network Manager"
 msgstr "Gestor de la red"
 
-#: js/ui/components/polkitAgent.js:36
+#: js/ui/components/polkitAgent.js:34
 msgid "Authentication Required"
 msgstr "Se necesita autenticación"
 
-#: js/ui/components/polkitAgent.js:64
+#: js/ui/components/polkitAgent.js:62
 msgid "Administrator"
 msgstr "Administrador"
 
-#: js/ui/components/polkitAgent.js:141
+#: js/ui/components/polkitAgent.js:139
 msgid "Authenticate"
 msgstr "Autenticar"
 
@@ -1072,7 +1058,7 @@ msgstr "Autenticar"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:243 js/ui/shellMountOperation.js:389
+#: js/ui/components/polkitAgent.js:241 js/ui/shellMountOperation.js:309
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Eso no ha funcionado. Inténtelo de nuevo."
 
@@ -1266,27 +1252,27 @@ msgstr ""
 "puede tardar mucho tiempo: asegúrese de que tiene una copia de respaldo y de "
 "que el equipo está enchufado."
 
-#: js/ui/endSessionDialog.js:310
+#: js/ui/endSessionDialog.js:309
 msgid "Running on battery power: please plug in before installing updates."
 msgstr ""
 "Funcionando con batería: conéctese antes de instalar las actualizaciones."
 
-#: js/ui/endSessionDialog.js:327
+#: js/ui/endSessionDialog.js:326
 msgid "Some applications are busy or have unsaved work."
 msgstr "Algunas aplicaciones están ocupadas o tienen trabajo sin guardar."
 
-#: js/ui/endSessionDialog.js:334
+#: js/ui/endSessionDialog.js:333
 msgid "Other users are logged in."
 msgstr "Hay otros usuarios con la sesión iniciada."
 
 #. Translators: Remote here refers to a remote session, like a ssh login
-#: js/ui/endSessionDialog.js:615
+#: js/ui/endSessionDialog.js:614
 #, javascript-format
 msgid "%s (remote)"
 msgstr "%s (remoto)"
 
 #. Translators: Console here refers to a tty like a VT console
-#: js/ui/endSessionDialog.js:618
+#: js/ui/endSessionDialog.js:617
 #, javascript-format
 msgid "%s (console)"
 msgstr "%s (consola)"
@@ -1373,13 +1359,13 @@ msgid "Leave On"
 msgstr "Dejar activada"
 
 #: js/ui/kbdA11yDialog.js:57 js/ui/status/bluetooth.js:133
-#: js/ui/status/network.js:1269
+#: js/ui/status/network.js:1263
 msgid "Turn On"
-msgstr "Encender"
+msgstr "Encendido"
 
 #: js/ui/kbdA11yDialog.js:65 js/ui/status/bluetooth.js:133
-#: js/ui/status/network.js:128 js/ui/status/network.js:311
+#: js/ui/status/network.js:128 js/ui/status/network.js:310
-#: js/ui/status/network.js:1269 js/ui/status/network.js:1381
+#: js/ui/status/network.js:1263 js/ui/status/network.js:1375
 #: js/ui/status/nightLight.js:39 js/ui/status/rfkill.js:79
 #: js/ui/status/rfkill.js:106
 msgid "Turn Off"
@@ -1387,7 +1373,7 @@ msgstr "Apagar"
 
 #: js/ui/kbdA11yDialog.js:65
 msgid "Leave Off"
-msgstr "Dejar desactivada"
+msgstr "Dejar desactivado"
 
 #: js/ui/keyboard.js:200
 msgid "Region & Language Settings"
@@ -1441,7 +1427,7 @@ msgstr "Ver fuente"
 msgid "Web Page"
 msgstr "Página web"
 
-#: js/ui/messageTray.js:1479
+#: js/ui/messageTray.js:1480
 msgid "System Information"
 msgstr "Información del sistema"
 
@@ -1519,38 +1505,38 @@ msgstr "Pulse Esc para salir"
 msgid "Press any key to exit"
 msgstr "Pulse cualquier tecla para salir"
 
-#: js/ui/panel.js:113
+#: js/ui/panel.js:108
 msgid "Quit"
 msgstr "Salir"
 
 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: js/ui/panel.js:468
+#: js/ui/panel.js:470
 msgid "Activities"
 msgstr "Actividades"
 
-#: js/ui/panel.js:743
+#: js/ui/panel.js:745
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "Sistema"
 
-#: js/ui/panel.js:862
+#: js/ui/panel.js:866
 msgid "Top Bar"
 msgstr "Barra superior"
 
-#: js/ui/runDialog.js:65
+#: js/ui/runDialog.js:64
 msgid "Enter a Command"
 msgstr "Introducir un comando"
 
-#: js/ui/runDialog.js:105 js/ui/windowMenu.js:166
+#: js/ui/runDialog.js:104 js/ui/windowMenu.js:166
 msgid "Close"
 msgstr "Cerrar"
 
-#: js/ui/runDialog.js:267
+#: js/ui/runDialog.js:266
 msgid "Restart is not available on Wayland"
 msgstr "Reiniciar no está disponible en Wayland"
 
-#: js/ui/runDialog.js:272
+#: js/ui/runDialog.js:271
 msgid "Restarting…"
 msgstr "Reiniciando…"
 
@@ -1597,15 +1583,15 @@ msgstr "No se pudo bloquear"
 msgid "Lock was blocked by an application"
 msgstr "Una aplicación impidió el bloqueo"
 
-#: js/ui/search.js:638
+#: js/ui/search.js:635
 msgid "Searching…"
 msgstr "Buscando…"
 
-#: js/ui/search.js:640
+#: js/ui/search.js:637
 msgid "No results."
 msgstr "No se encontraron resultados."
 
-#: js/ui/search.js:764
+#: js/ui/search.js:761
 #, javascript-format
 msgid "%d more"
 msgid_plural "%d more"
@@ -1628,61 +1614,14 @@ msgstr "Mostrar texto"
 msgid "Hide Text"
 msgstr "Ocultar texto"
 
-#: js/ui/shellMountOperation.js:318
+#: js/ui/shellMountOperation.js:296
-msgid "Hidden Volume"
-msgstr "Ocultar volumen"
-
-#: js/ui/shellMountOperation.js:321
-msgid "Windows System Volume"
-msgstr "Volumen de sistema Windows"
-
-#: js/ui/shellMountOperation.js:324
-msgid "Uses Keyfiles"
-msgstr "Usa archivos de claves"
-
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:330
-#, javascript-format
-msgid ""
-"To unlock a volume that uses keyfiles, use the <i>%s</i> utility instead."
-msgstr ""
-"Para desbloquear un volumen que usa archivos de claves use la herramienta <i>"
-"%s</i> en su lugar."
-
-#: js/ui/shellMountOperation.js:337
-msgid "PIM Number"
-msgstr "Número PIM"
-
-#: js/ui/shellMountOperation.js:355
-msgid "The PIM must be a number or empty."
-msgstr "El PIM debe ser un número o estar vacío."
-
-#: js/ui/shellMountOperation.js:366
 msgid "Password"
 msgstr "Contraseña"
 
-#: js/ui/shellMountOperation.js:396
+#: js/ui/shellMountOperation.js:317
 msgid "Remember Password"
 msgstr "Recordar contraseña"
 
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:418
-#, javascript-format
-msgid "Open %s"
-msgstr "Abrir %s"
-
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:490
-#, javascript-format
-msgid "Unable to start %s"
-msgstr "No se puede iniciar %s"
-
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:492
-#, javascript-format
-msgid "Couldn’t find the %s application"
-msgstr "No se pudo encontrar la aplicación %s"
-
 #: js/ui/status/accessibility.js:35
 msgid "Accessibility"
 msgstr "Accesibilidad"
@@ -1719,11 +1658,11 @@ msgstr "Rechazo de teclas"
 msgid "Mouse Keys"
 msgstr "Teclas del ratón"
 
-#: js/ui/status/accessibility.js:135
+#: js/ui/status/accessibility.js:151
 msgid "High Contrast"
 msgstr "Contraste alto"
 
-#: js/ui/status/accessibility.js:177
+#: js/ui/status/accessibility.js:182
 msgid "Large Text"
 msgstr "Texto grande"
 
@@ -1731,7 +1670,7 @@ msgstr "Texto grande"
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: js/ui/status/bluetooth.js:47 js/ui/status/network.js:586
+#: js/ui/status/bluetooth.js:47 js/ui/status/network.js:585
 msgid "Bluetooth Settings"
 msgstr "Configuración de Bluetooth"
 
@@ -1755,31 +1694,11 @@ msgstr "Encendido"
 msgid "Brightness"
 msgstr "Brillo"
 
-#: js/ui/status/dwellClick.js:13
+#: js/ui/status/keyboard.js:812
-msgid "Single Click"
-msgstr "Una sola pulsación"
-
-#: js/ui/status/dwellClick.js:18
-msgid "Double Click"
-msgstr "Doble pulsación"
-
-#: js/ui/status/dwellClick.js:23
-msgid "Drag"
-msgstr "Arrastrar"
-
-#: js/ui/status/dwellClick.js:28
-msgid "Secondary Click"
-msgstr "Pulsación secundaria"
-
-#: js/ui/status/dwellClick.js:37
-msgid "Dwell Click"
-msgstr "Pulsación al posarse"
-
-#: js/ui/status/keyboard.js:813
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: js/ui/status/keyboard.js:835
+#: js/ui/status/keyboard.js:834
 msgid "Show Keyboard Layout"
 msgstr "Mostrar la distribución del teclado"
 
@@ -1808,12 +1727,12 @@ msgid "Enable"
 msgstr "Activar"
 
 #. Translators: %s is an application name
-#: js/ui/status/location.js:355
+#: js/ui/status/location.js:353
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "¿Conceder acceso a %s a su ubicación?"
 
-#: js/ui/status/location.js:356
+#: js/ui/status/location.js:354
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr ""
 "Los servicios de ubicación se pueden cambiar en cualquier momento desde la "
@@ -1824,13 +1743,13 @@ msgid "<unknown>"
 msgstr "<desconocido>"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:417 js/ui/status/network.js:1298
+#: js/ui/status/network.js:416 js/ui/status/network.js:1292
 #, javascript-format
 msgid "%s Off"
 msgstr "%s apagada"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:420
+#: js/ui/status/network.js:419
 #, javascript-format
 msgid "%s Connected"
 msgstr "%s conectada"
@@ -1838,189 +1757,189 @@ msgstr "%s conectada"
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu);
 #. %s is a network identifier
-#: js/ui/status/network.js:425
+#: js/ui/status/network.js:424
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "%s sin gestionar"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:428
+#: js/ui/status/network.js:427
 #, javascript-format
 msgid "%s Disconnecting"
 msgstr "Desconectando %s"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:435 js/ui/status/network.js:1290
+#: js/ui/status/network.js:434 js/ui/status/network.js:1284
 #, javascript-format
 msgid "%s Connecting"
 msgstr "Conectando %s"
 
 #. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
-#: js/ui/status/network.js:438
+#: js/ui/status/network.js:437
 #, javascript-format
 msgid "%s Requires Authentication"
 msgstr "%s requiere autenticación"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing; %s is a network identifier
-#: js/ui/status/network.js:446
+#: js/ui/status/network.js:445
 #, javascript-format
 msgid "Firmware Missing For %s"
 msgstr "Falta el «firmware» para %s"
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage; %s is a network identifier
-#: js/ui/status/network.js:450
+#: js/ui/status/network.js:449
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "%s no disponible"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:453
+#: js/ui/status/network.js:452
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "Falló la conexión %s"
 
-#: js/ui/status/network.js:465
+#: js/ui/status/network.js:464
 msgid "Wired Settings"
 msgstr "Configuración de red cableada"
 
-#: js/ui/status/network.js:507
+#: js/ui/status/network.js:506
 msgid "Mobile Broadband Settings"
 msgstr "Configuración de banda ancha móvil"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:554 js/ui/status/network.js:1295
+#: js/ui/status/network.js:553 js/ui/status/network.js:1289
 #, javascript-format
 msgid "%s Hardware Disabled"
 msgstr "Hardware %s desactivado"
 
 #. Translators: this is for a network device that cannot be activated
 #. because it's disabled by rfkill (airplane mode); %s is a network identifier
-#: js/ui/status/network.js:558
+#: js/ui/status/network.js:557
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s desactivado"
 
-#: js/ui/status/network.js:598
+#: js/ui/status/network.js:597
 msgid "Connect to Internet"
 msgstr "Conectar a Internet"
 
-#: js/ui/status/network.js:792
+#: js/ui/status/network.js:786
 msgid "Airplane Mode is On"
 msgstr "El modo avión está activado"
 
-#: js/ui/status/network.js:793
+#: js/ui/status/network.js:787
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "La Wi-Fi se desactiva cuando se activa el modo avión."
 
-#: js/ui/status/network.js:794
+#: js/ui/status/network.js:788
 msgid "Turn Off Airplane Mode"
 msgstr "Apagar el modo avión"
 
-#: js/ui/status/network.js:803
+#: js/ui/status/network.js:797
 msgid "Wi-Fi is Off"
 msgstr "La Wi-Fi está desactivada"
 
-#: js/ui/status/network.js:804
+#: js/ui/status/network.js:798
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Se debe activar la Wi-Fi para poder conectarse a la red."
 
-#: js/ui/status/network.js:805
+#: js/ui/status/network.js:799
 msgid "Turn On Wi-Fi"
 msgstr "Activar la Wi-Fi"
 
-#: js/ui/status/network.js:830
+#: js/ui/status/network.js:824
 msgid "Wi-Fi Networks"
 msgstr "Redes Wi-Fi"
 
-#: js/ui/status/network.js:832
+#: js/ui/status/network.js:826
 msgid "Select a network"
 msgstr "Seleccionar una red"
 
-#: js/ui/status/network.js:861
+#: js/ui/status/network.js:855
 msgid "No Networks"
 msgstr "No hay redes"
 
-#: js/ui/status/network.js:882 js/ui/status/rfkill.js:104
+#: js/ui/status/network.js:876 js/ui/status/rfkill.js:104
 msgid "Use hardware switch to turn off"
 msgstr "Usar el interruptor hardware para apagar"
 
-#: js/ui/status/network.js:1158
+#: js/ui/status/network.js:1152
 msgid "Select Network"
 msgstr "Seleccionar red"
 
-#: js/ui/status/network.js:1164
+#: js/ui/status/network.js:1158
 msgid "Wi-Fi Settings"
 msgstr "Configuración de Wi-Fi"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1286
+#: js/ui/status/network.js:1280
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "Punto de acceso %s activo"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1301
+#: js/ui/status/network.js:1295
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "%s no conectado"
 
-#: js/ui/status/network.js:1398
+#: js/ui/status/network.js:1392
 msgid "connecting…"
 msgstr "conectando…"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: js/ui/status/network.js:1401
+#: js/ui/status/network.js:1395
 msgid "authentication required"
 msgstr "se necesita autenticación"
 
-#: js/ui/status/network.js:1403
+#: js/ui/status/network.js:1397
 msgid "connection failed"
 msgstr "falló la conexión"
 
-#: js/ui/status/network.js:1453
+#: js/ui/status/network.js:1447
 msgid "VPN Settings"
 msgstr "Configuración de VPN"
 
-#: js/ui/status/network.js:1470
+#: js/ui/status/network.js:1464
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1480
+#: js/ui/status/network.js:1474
 msgid "VPN Off"
 msgstr "VPN apagada"
 
-#: js/ui/status/network.js:1541 js/ui/status/rfkill.js:82
+#: js/ui/status/network.js:1535 js/ui/status/rfkill.js:82
 msgid "Network Settings"
 msgstr "Configuración de la red"
 
-#: js/ui/status/network.js:1570
+#: js/ui/status/network.js:1564
 #, javascript-format
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
 msgstr[0] "%s conexión cableada"
 msgstr[1] "%s conexiones cableadas"
 
-#: js/ui/status/network.js:1574
+#: js/ui/status/network.js:1568
 #, javascript-format
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
 msgstr[0] "%s conexión inalámbrica"
 msgstr[1] "%s conexiones inalámbricas"
 
-#: js/ui/status/network.js:1578
+#: js/ui/status/network.js:1572
 #, javascript-format
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
 msgstr[0] "%s conexión por módem"
 msgstr[1] "%s conexiones por módem"
 
-#: js/ui/status/network.js:1711
+#: js/ui/status/network.js:1705
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: js/ui/status/network.js:1712
+#: js/ui/status/network.js:1706
 msgid "Activation of network connection failed"
 msgstr "Falló la activación de la conexión de red"
 
@@ -2202,22 +2121,22 @@ msgstr "Buscar"
 msgid "“%s” is ready"
 msgstr "«%s» está preparado"
 
-#: js/ui/windowManager.js:54
+#: js/ui/windowManager.js:53
 msgid "Do you want to keep these display settings?"
 msgstr "¿Quiere mantener esta configuración de la pantalla?"
 
-#. Translators: this and the following message should be limited in length,
+#. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #.
-#: js/ui/windowManager.js:66
+#: js/ui/windowManager.js:65
 msgid "Revert Settings"
 msgstr "Revertir configuración"
 
-#: js/ui/windowManager.js:69
+#: js/ui/windowManager.js:68
 msgid "Keep Changes"
 msgstr "Mantener cambios"
 
-#: js/ui/windowManager.js:87
+#: js/ui/windowManager.js:86
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -2226,7 +2145,7 @@ msgstr[1] "La configuración se revertirá en %d segundos"
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height.
-#: js/ui/windowManager.js:678
+#: js/ui/windowManager.js:677
 #, javascript-format
 msgid "%d × %d"
 msgstr "%d × %d"
@@ -2587,6 +2506,9 @@ msgstr "Sonidos del sistema"
 #~ msgid "Internal error"
 #~ msgstr "Error interno"
 
+#~ msgid "Unable to connect to %s"
+#~ msgstr "No se pudo conectar a %s"
+
 #~ msgid "View account"
 #~ msgstr "Ver cuenta"
 

po/hr.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2019-06-15 10:38+0000\n"
+"POT-Creation-Date: 2019-03-24 17:37+0000\n"
-"PO-Revision-Date: 2019-06-22 01:55+0200\n"
+"PO-Revision-Date: 2019-03-26 12:33+0100\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "Language: hr\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: data/50-gnome-shell-system.xml:6
 msgid "System"
@@ -418,11 +418,10 @@ msgstr ""
 msgid "Browse in Software"
 msgstr "Pregledaj u Softveru"
 
-#: js/gdm/authPrompt.js:140 js/ui/audioDeviceSelection.js:52
+#: js/gdm/authPrompt.js:140 js/ui/audioDeviceSelection.js:55
-#: js/ui/components/networkAgent.js:118 js/ui/components/polkitAgent.js:138
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:136
-#: js/ui/endSessionDialog.js:431 js/ui/extensionDownloader.js:188
+#: js/ui/endSessionDialog.js:430 js/ui/extensionDownloader.js:188
-#: js/ui/shellMountOperation.js:404 js/ui/shellMountOperation.js:413
+#: js/ui/shellMountOperation.js:325 js/ui/status/network.js:888
-#: js/ui/status/network.js:894
 msgid "Cancel"
 msgstr "Odustani"
 
@@ -430,7 +429,7 @@ msgstr "Odustani"
 msgid "Next"
 msgstr "Sljedeće"
 
-#: js/gdm/authPrompt.js:198 js/ui/shellMountOperation.js:408
+#: js/gdm/authPrompt.js:198 js/ui/shellMountOperation.js:329
 #: js/ui/unlockDialog.js:41
 msgid "Unlock"
 msgstr "Otključaj"
@@ -461,8 +460,8 @@ msgstr "(npr., korisnik ili %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:889 js/ui/components/networkAgent.js:244
+#: js/gdm/loginDialog.js:889 js/ui/components/networkAgent.js:243
-#: js/ui/components/networkAgent.js:264 js/ui/components/networkAgent.js:282
+#: js/ui/components/networkAgent.js:263 js/ui/components/networkAgent.js:281
 msgid "Username: "
 msgstr "Korisničko ime: "
 
@@ -513,8 +512,8 @@ msgstr "Odjava"
 
 #. Translators: A list of keywords that match the logout action, separated by semicolons
 #: js/misc/systemActions.js:105
-msgid "logout;log out;sign off"
+msgid "logout;sign off"
-msgstr "odjava;odjavljivanje"
+msgstr "odjava:odjavljivanje"
 
 #. Translators: The name of the suspend action in search
 #: js/misc/systemActions.js:109
@@ -706,11 +705,11 @@ msgstr ""
 
 #. No support for non-modal system dialogs, so ignore the option
 #. let modal = options['modal'] || true;
-#: js/ui/accessDialog.js:38 js/ui/status/location.js:362
+#: js/ui/accessDialog.js:37 js/ui/status/location.js:360
 msgid "Deny Access"
 msgstr "Zabrani pristup"
 
-#: js/ui/accessDialog.js:39 js/ui/status/location.js:365
+#: js/ui/accessDialog.js:38 js/ui/status/location.js:363
 msgid "Grant Access"
 msgstr "Dopusti pristup"
 
@@ -726,58 +725,53 @@ msgstr "Najčešće"
 msgid "All"
 msgstr "Sve"
 
-#. Translators: This is the heading of a list of open windows
+#: js/ui/appDisplay.js:1737 js/ui/panel.js:83
-#: js/ui/appDisplay.js:1713 js/ui/panel.js:79
-msgid "Open Windows"
-msgstr "Otvaranje prozora"
-
-#: js/ui/appDisplay.js:1732 js/ui/panel.js:86
 msgid "New Window"
 msgstr "Novi prozor"
 
-#: js/ui/appDisplay.js:1746
+#: js/ui/appDisplay.js:1751
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Pokreni pomoću namjenske grafičke kartice"
 
-#: js/ui/appDisplay.js:1773 js/ui/dash.js:239
+#: js/ui/appDisplay.js:1778 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Ukloni iz omiljenih"
 
-#: js/ui/appDisplay.js:1779
+#: js/ui/appDisplay.js:1784
 msgid "Add to Favorites"
 msgstr "Dodaj u omiljene"
 
-#: js/ui/appDisplay.js:1789 js/ui/panel.js:97
+#: js/ui/appDisplay.js:1794 js/ui/panel.js:94
 msgid "Show Details"
 msgstr "Prikaži pojedinosti"
 
-#: js/ui/appFavorites.js:149
+#: js/ui/appFavorites.js:141
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s je dodan u omiljene."
 
-#: js/ui/appFavorites.js:183
+#: js/ui/appFavorites.js:175
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s je uklonjen iz omiljenih."
 
-#: js/ui/audioDeviceSelection.js:39
+#: js/ui/audioDeviceSelection.js:42
 msgid "Select Audio Device"
 msgstr "Odaberi zvučni uređaj"
 
-#: js/ui/audioDeviceSelection.js:50
+#: js/ui/audioDeviceSelection.js:53
 msgid "Sound Settings"
 msgstr "Postavke zvuka"
 
-#: js/ui/audioDeviceSelection.js:59
+#: js/ui/audioDeviceSelection.js:62
 msgid "Headphones"
 msgstr "Slušalice"
 
-#: js/ui/audioDeviceSelection.js:61
+#: js/ui/audioDeviceSelection.js:64
 msgid "Headset"
 msgstr "Slušalice s mikrofonom"
 
-#: js/ui/audioDeviceSelection.js:63 js/ui/status/volume.js:247
+#: js/ui/audioDeviceSelection.js:66 js/ui/status/volume.js:247
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -938,75 +932,67 @@ msgstr "Prisilno zatvori"
 msgid "Wait"
 msgstr "Čekaj"
 
-#: js/ui/components/automountManager.js:87
+#: js/ui/components/automountManager.js:86
 msgid "External drive connected"
 msgstr "Vanjski uređaj povezan"
 
-#: js/ui/components/automountManager.js:99
+#: js/ui/components/automountManager.js:98
 msgid "External drive disconnected"
 msgstr "Vanjski uređaj odspojen"
 
-#: js/ui/components/automountManager.js:211
-msgid "Unable to unlock volume"
-msgstr "Nemoguće otključavanje uređaja"
-
-#: js/ui/components/automountManager.js:212
-msgid "The installed udisks version does not support the PIM setting"
-msgstr "Instalirana udisks inačica ne podržava PIM postavku"
-
 #: js/ui/components/autorunManager.js:334
 #, javascript-format
 msgid "Open with %s"
 msgstr "Otvori s(a) %s"
 
-#: js/ui/components/keyring.js:66 js/ui/components/polkitAgent.js:257
+#: js/ui/components/keyring.js:77 js/ui/components/polkitAgent.js:255
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: js/ui/components/keyring.js:97
+#: js/ui/components/keyring.js:108
 msgid "Type again:"
 msgstr "Pokušaj ponovno:"
 
-#: js/ui/components/networkAgent.js:103
+#: js/ui/components/networkAgent.js:102
 msgid ""
 "Alternatively you can connect by pushing the “WPS” button on your router."
 msgstr ""
 "Alternativno se možete povezati pritiskom na “WPS” tipku vašeg usmjernika."
 
-#: js/ui/components/networkAgent.js:113 js/ui/status/network.js:219
+#: js/ui/components/networkAgent.js:112 js/ui/status/network.js:219
-#: js/ui/status/network.js:310 js/ui/status/network.js:897
+#: js/ui/status/network.js:309 js/ui/status/network.js:891
 msgid "Connect"
 msgstr "Povezivanje"
 
 #. Cisco LEAP
-#: js/ui/components/networkAgent.js:212 js/ui/components/networkAgent.js:224
+#: js/ui/components/networkAgent.js:211 js/ui/components/networkAgent.js:223
-#: js/ui/components/networkAgent.js:247 js/ui/components/networkAgent.js:266
+#: js/ui/components/networkAgent.js:246 js/ui/components/networkAgent.js:265
-#: js/ui/components/networkAgent.js:286 js/ui/components/networkAgent.js:296
+#: js/ui/components/networkAgent.js:285 js/ui/components/networkAgent.js:295
 msgid "Password: "
 msgstr "Lozinka: "
 
 #. static WEP
-#: js/ui/components/networkAgent.js:217
+#: js/ui/components/networkAgent.js:216
 msgid "Key: "
 msgstr "Ključ: "
 
-#: js/ui/components/networkAgent.js:250 js/ui/components/networkAgent.js:272
+#: js/ui/components/networkAgent.js:249 js/ui/components/networkAgent.js:271
 msgid "Private key password: "
 msgstr "Lozinka privatnog ključa: "
 
-#: js/ui/components/networkAgent.js:270
+#: js/ui/components/networkAgent.js:269
 msgid "Identity: "
 msgstr "Identitet: "
 
-#: js/ui/components/networkAgent.js:284
+#: js/ui/components/networkAgent.js:283
 msgid "Service: "
 msgstr "Usluga: "
 
-#: js/ui/components/networkAgent.js:313 js/ui/components/networkAgent.js:686
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:685
 msgid "Authentication required by wireless network"
 msgstr "Potrebna je ovjera za bežičnu mrežu"
 
-#: js/ui/components/networkAgent.js:314 js/ui/components/networkAgent.js:687
+#: js/ui/components/networkAgent.js:313 js/ui/components/networkAgent.js:686
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -1014,53 +1000,53 @@ msgid ""
 msgstr ""
 "Lozinka ili ključevi šifriranja su potrebni za pristup bežičnoj mreži “%s”."
 
-#: js/ui/components/networkAgent.js:318 js/ui/components/networkAgent.js:690
+#: js/ui/components/networkAgent.js:317 js/ui/components/networkAgent.js:689
 msgid "Wired 802.1X authentication"
 msgstr "Wired 802.1X ovjera"
 
-#: js/ui/components/networkAgent.js:320
+#: js/ui/components/networkAgent.js:319
 msgid "Network name: "
 msgstr "Naziv mreže: "
 
-#: js/ui/components/networkAgent.js:325 js/ui/components/networkAgent.js:694
+#: js/ui/components/networkAgent.js:324 js/ui/components/networkAgent.js:693
 msgid "DSL authentication"
 msgstr "DSL ovjera"
 
-#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:700
+#: js/ui/components/networkAgent.js:331 js/ui/components/networkAgent.js:699
 msgid "PIN code required"
 msgstr "PIN kôd je potreban"
 
-#: js/ui/components/networkAgent.js:333 js/ui/components/networkAgent.js:701
+#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:700
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN kôd je potreban za uređaj mobilnog interneta"
 
-#: js/ui/components/networkAgent.js:334
+#: js/ui/components/networkAgent.js:333
 msgid "PIN: "
 msgstr "PIN: "
 
-#: js/ui/components/networkAgent.js:341 js/ui/components/networkAgent.js:707
+#: js/ui/components/networkAgent.js:340 js/ui/components/networkAgent.js:706
 msgid "Mobile broadband network password"
 msgstr "Lozinka mreže mobilnog interneta"
 
-#: js/ui/components/networkAgent.js:342 js/ui/components/networkAgent.js:691
+#: js/ui/components/networkAgent.js:341 js/ui/components/networkAgent.js:690
-#: js/ui/components/networkAgent.js:695 js/ui/components/networkAgent.js:708
+#: js/ui/components/networkAgent.js:694 js/ui/components/networkAgent.js:707
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Potrebna je lozinka za povezivanje s “%s”."
 
-#: js/ui/components/networkAgent.js:675 js/ui/status/network.js:1670
+#: js/ui/components/networkAgent.js:674 js/ui/status/network.js:1664
 msgid "Network Manager"
 msgstr "Mrežni upravitelj"
 
-#: js/ui/components/polkitAgent.js:36
+#: js/ui/components/polkitAgent.js:34
 msgid "Authentication Required"
 msgstr "Potrebna je ovjera"
 
-#: js/ui/components/polkitAgent.js:64
+#: js/ui/components/polkitAgent.js:62
 msgid "Administrator"
 msgstr "Administrator"
 
-#: js/ui/components/polkitAgent.js:141
+#: js/ui/components/polkitAgent.js:139
 msgid "Authenticate"
 msgstr "Ovjeri"
 
@@ -1068,7 +1054,7 @@ msgstr "Ovjeri"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:243 js/ui/shellMountOperation.js:389
+#: js/ui/components/polkitAgent.js:241 js/ui/shellMountOperation.js:309
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Nažalost, to ne radi. Pokušajte ponovno."
 
@@ -1118,23 +1104,23 @@ msgstr "Dodaj satove iz svijeta…"
 msgid "World Clocks"
 msgstr "Svjetski satovi"
 
-#: js/ui/dateMenu.js:228
+#: js/ui/dateMenu.js:222
 msgid "Weather"
 msgstr "Vrijeme"
 
-#: js/ui/dateMenu.js:311
+#: js/ui/dateMenu.js:305
 msgid "Select a location…"
 msgstr "Odaberi lokaciju…"
 
-#: js/ui/dateMenu.js:319
+#: js/ui/dateMenu.js:313
 msgid "Loading…"
 msgstr "Pretraživanje…"
 
-#: js/ui/dateMenu.js:329
+#: js/ui/dateMenu.js:323
 msgid "Go online for weather information"
 msgstr "Posjetite za opširnije vremenske informacije"
 
-#: js/ui/dateMenu.js:331
+#: js/ui/dateMenu.js:325
 msgid "Weather information is currently unavailable"
 msgstr "Vremenske informacije su trenutno nedostupne"
 
@@ -1269,28 +1255,28 @@ msgstr ""
 "može potrajati duže vrijeme: pobrinite se da ste spremili svoj rad i "
 "računalo je priključeno na izvor napajanja."
 
-#: js/ui/endSessionDialog.js:310
+#: js/ui/endSessionDialog.js:309
 msgid "Running on battery power: please plug in before installing updates."
 msgstr ""
 "Koristi se energija baterije: računalo priključite na izvor napajanja prije "
 "instalacije nadopuna."
 
-#: js/ui/endSessionDialog.js:327
+#: js/ui/endSessionDialog.js:326
 msgid "Some applications are busy or have unsaved work."
 msgstr "Neke aplikacije su zauzete ili imaju nespremljeni rad."
 
-#: js/ui/endSessionDialog.js:334
+#: js/ui/endSessionDialog.js:333
 msgid "Other users are logged in."
 msgstr "Drugi korisnici su prijavljeni."
 
 #. Translators: Remote here refers to a remote session, like a ssh login
-#: js/ui/endSessionDialog.js:615
+#: js/ui/endSessionDialog.js:614
 #, javascript-format
 msgid "%s (remote)"
 msgstr "%s (udaljeno)"
 
 #. Translators: Console here refers to a tty like a VT console
-#: js/ui/endSessionDialog.js:618
+#: js/ui/endSessionDialog.js:617
 #, javascript-format
 msgid "%s (console)"
 msgstr "%s (konzola)"
@@ -1375,13 +1361,13 @@ msgid "Leave On"
 msgstr "Ostavi"
 
 #: js/ui/kbdA11yDialog.js:57 js/ui/status/bluetooth.js:133
-#: js/ui/status/network.js:1269
+#: js/ui/status/network.js:1263
 msgid "Turn On"
 msgstr "Uključi"
 
 #: js/ui/kbdA11yDialog.js:65 js/ui/status/bluetooth.js:133
-#: js/ui/status/network.js:128 js/ui/status/network.js:311
+#: js/ui/status/network.js:128 js/ui/status/network.js:310
-#: js/ui/status/network.js:1269 js/ui/status/network.js:1381
+#: js/ui/status/network.js:1263 js/ui/status/network.js:1375
 #: js/ui/status/nightLight.js:39 js/ui/status/rfkill.js:79
 #: js/ui/status/rfkill.js:106
 msgid "Turn Off"
@@ -1443,7 +1429,7 @@ msgstr "Pogledaj izvor"
 msgid "Web Page"
 msgstr "Web stranica"
 
-#: js/ui/messageTray.js:1479
+#: js/ui/messageTray.js:1480
 msgid "System Information"
 msgstr "Informacije sustava"
 
@@ -1521,38 +1507,47 @@ msgstr "Pritisni Esc za prekidanje"
 msgid "Press any key to exit"
 msgstr "Pritisni bilo koju tipku za prekidanje"
 
-#: js/ui/panel.js:113
+#: js/ui/panel.js:108
 msgid "Quit"
 msgstr "Zatvori"
 
 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: js/ui/panel.js:468
+#: js/ui/panel.js:471
 msgid "Activities"
 msgstr "Aktivnosti"
 
-#: js/ui/panel.js:743
+#: js/ui/panel.js:746
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "Sustav"
 
-#: js/ui/panel.js:862
+#: js/ui/panel.js:867
 msgid "Top Bar"
 msgstr "Gornja traka"
 
-#: js/ui/runDialog.js:65
+#. Translators: this MUST be either "toggle-switch-us"
+#. (for toggle switches containing the English words
+#. "ON" and "OFF") or "toggle-switch-intl" (for toggle
+#. switches containing "◯" and "|"). Other values will
+#. simply result in invisible toggle switches.
+#: js/ui/popupMenu.js:285
+msgid "toggle-switch-us"
+msgstr "toggle-switch-us"
+
+#: js/ui/runDialog.js:64
 msgid "Enter a Command"
 msgstr "Upiši naredbu"
 
-#: js/ui/runDialog.js:105 js/ui/windowMenu.js:166
+#: js/ui/runDialog.js:104 js/ui/windowMenu.js:166
 msgid "Close"
 msgstr "Zatvori"
 
-#: js/ui/runDialog.js:267
+#: js/ui/runDialog.js:266
 msgid "Restart is not available on Wayland"
 msgstr "Ponovno pokretanje nije dostupno na Waylandu"
 
-#: js/ui/runDialog.js:272
+#: js/ui/runDialog.js:271
 msgid "Restarting…"
 msgstr "Ponovno pokretanje…"
 
@@ -1599,17 +1594,17 @@ msgstr "Nemoguće zaključavanje"
 
 #: js/ui/screenShield.js:827 js/ui/screenShield.js:1300
 msgid "Lock was blocked by an application"
-msgstr "Zaključavanje je blokirala aplikacija"
+msgstr "Zaključavanje je blokirala apliakcija"
 
-#: js/ui/search.js:638
+#: js/ui/search.js:635
 msgid "Searching…"
 msgstr "Pretraživanje…"
 
-#: js/ui/search.js:640
+#: js/ui/search.js:637
 msgid "No results."
 msgstr "Nema rezultata."
 
-#: js/ui/search.js:764
+#: js/ui/search.js:761
 #, javascript-format
 msgid "%d more"
 msgid_plural "%d more"
@@ -1633,61 +1628,14 @@ msgstr "Prikaži tekst"
 msgid "Hide Text"
 msgstr "Sakrij tekst"
 
-#: js/ui/shellMountOperation.js:318
+#: js/ui/shellMountOperation.js:296
-msgid "Hidden Volume"
-msgstr "Skriveni uređaj"
-
-#: js/ui/shellMountOperation.js:321
-msgid "Windows System Volume"
-msgstr "Uređaj Windows sustava"
-
-#: js/ui/shellMountOperation.js:324
-msgid "Uses Keyfiles"
-msgstr "Koristi datoteke ključa"
-
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:330
-#, javascript-format
-msgid ""
-"To unlock a volume that uses keyfiles, use the <i>%s</i> utility instead."
-msgstr ""
-"Za otključavanje uređaja koji koristi datoteke ključa, koristite <i>%s</i> "
-"pomagalo."
-
-#: js/ui/shellMountOperation.js:337
-msgid "PIM Number"
-msgstr "PIM broj"
-
-#: js/ui/shellMountOperation.js:355
-msgid "The PIM must be a number or empty."
-msgstr "PIM mora biti broj ili prazan."
-
-#: js/ui/shellMountOperation.js:366
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/ui/shellMountOperation.js:396
+#: js/ui/shellMountOperation.js:317
 msgid "Remember Password"
 msgstr "Zapamti lozinku"
 
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:418
-#, javascript-format
-msgid "Open %s"
-msgstr "Otvori %s"
-
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:490
-#, javascript-format
-msgid "Unable to start %s"
-msgstr "Nemoguće pokretanje %s"
-
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:492
-#, javascript-format
-msgid "Couldn’t find the %s application"
-msgstr "Nemoguć pronalazak %s aplikacije"
-
 #: js/ui/status/accessibility.js:35
 msgid "Accessibility"
 msgstr "Pristupačnost"
@@ -1724,11 +1672,11 @@ msgstr "Odbijanje tipki"
 msgid "Mouse Keys"
 msgstr "Tipke miša"
 
-#: js/ui/status/accessibility.js:135
+#: js/ui/status/accessibility.js:151
 msgid "High Contrast"
 msgstr "Visok kontrast"
 
-#: js/ui/status/accessibility.js:177
+#: js/ui/status/accessibility.js:182
 msgid "Large Text"
 msgstr "Velik tekst"
 
@@ -1736,7 +1684,7 @@ msgstr "Velik tekst"
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: js/ui/status/bluetooth.js:47 js/ui/status/network.js:586
+#: js/ui/status/bluetooth.js:47 js/ui/status/network.js:585
 msgid "Bluetooth Settings"
 msgstr "Bluetooth postavke"
 
@@ -1761,31 +1709,11 @@ msgstr "Uključeno"
 msgid "Brightness"
 msgstr "Svjetlina"
 
-#: js/ui/status/dwellClick.js:13
+#: js/ui/status/keyboard.js:812
-msgid "Single Click"
-msgstr "Jednostruki klik"
-
-#: js/ui/status/dwellClick.js:18
-msgid "Double Click"
-msgstr "Dvostruki klik"
-
-#: js/ui/status/dwellClick.js:23
-msgid "Drag"
-msgstr "Povlačenje"
-
-#: js/ui/status/dwellClick.js:28
-msgid "Secondary Click"
-msgstr "Pomoćni klik"
-
-#: js/ui/status/dwellClick.js:37
-msgid "Dwell Click"
-msgstr "Zadržani klik"
-
-#: js/ui/status/keyboard.js:813
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
-#: js/ui/status/keyboard.js:835
+#: js/ui/status/keyboard.js:834
 msgid "Show Keyboard Layout"
 msgstr "Prikaži raspored tipkovnice"
 
@@ -1814,12 +1742,12 @@ msgid "Enable"
 msgstr "Omogući"
 
 #. Translators: %s is an application name
-#: js/ui/status/location.js:355
+#: js/ui/status/location.js:353
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "Dopustite %s pristup vašoj lokaciji?"
 
-#: js/ui/status/location.js:356
+#: js/ui/status/location.js:354
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr ""
 "Pristup lokaciji može se promijeniti u svako vrijeme iz postavka privatnosti."
@@ -1829,13 +1757,13 @@ msgid "<unknown>"
 msgstr "<nepoznato>"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:417 js/ui/status/network.js:1298
+#: js/ui/status/network.js:416 js/ui/status/network.js:1292
 #, javascript-format
 msgid "%s Off"
 msgstr "%s isključena"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:420
+#: js/ui/status/network.js:419
 #, javascript-format
 msgid "%s Connected"
 msgstr "%s povezana"
@@ -1843,164 +1771,164 @@ msgstr "%s povezana"
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu);
 #. %s is a network identifier
-#: js/ui/status/network.js:425
+#: js/ui/status/network.js:424
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "%s neupravljana"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:428
+#: js/ui/status/network.js:427
 #, javascript-format
 msgid "%s Disconnecting"
 msgstr "%s prekidanje povezivanja"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:435 js/ui/status/network.js:1290
+#: js/ui/status/network.js:434 js/ui/status/network.js:1284
 #, javascript-format
 msgid "%s Connecting"
 msgstr "%s povezivanje"
 
 #. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
-#: js/ui/status/network.js:438
+#: js/ui/status/network.js:437
 #, javascript-format
 msgid "%s Requires Authentication"
 msgstr "%s zahtijeva ovjeru"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing; %s is a network identifier
-#: js/ui/status/network.js:446
+#: js/ui/status/network.js:445
 #, javascript-format
 msgid "Firmware Missing For %s"
 msgstr "Nedostaje firmver za %s"
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage; %s is a network identifier
-#: js/ui/status/network.js:450
+#: js/ui/status/network.js:449
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "%s nedostupna"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:453
+#: js/ui/status/network.js:452
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "%s neuspješno povezivanje"
 
-#: js/ui/status/network.js:465
+#: js/ui/status/network.js:464
 msgid "Wired Settings"
 msgstr "Postavke žične mreže"
 
-#: js/ui/status/network.js:507
+#: js/ui/status/network.js:506
 msgid "Mobile Broadband Settings"
 msgstr "Mobilni internet"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:554 js/ui/status/network.js:1295
+#: js/ui/status/network.js:553 js/ui/status/network.js:1289
 #, javascript-format
 msgid "%s Hardware Disabled"
 msgstr "%s hardverski onemogućena"
 
 #. Translators: this is for a network device that cannot be activated
 #. because it's disabled by rfkill (airplane mode); %s is a network identifier
-#: js/ui/status/network.js:558
+#: js/ui/status/network.js:557
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s onemogućeno"
 
-#: js/ui/status/network.js:598
+#: js/ui/status/network.js:597
 msgid "Connect to Internet"
 msgstr "Povežite se na internet"
 
-#: js/ui/status/network.js:792
+#: js/ui/status/network.js:786
 msgid "Airplane Mode is On"
 msgstr "Zrakoplovni način rada je omogućen"
 
-#: js/ui/status/network.js:793
+#: js/ui/status/network.js:787
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Bežična mreža je onemogućena u zrakoplovnom načinu rada."
 
-#: js/ui/status/network.js:794
+#: js/ui/status/network.js:788
 msgid "Turn Off Airplane Mode"
 msgstr "Isključi zrakoplovni način rada"
 
-#: js/ui/status/network.js:803
+#: js/ui/status/network.js:797
 msgid "Wi-Fi is Off"
 msgstr "Bežična mreža isključena"
 
-#: js/ui/status/network.js:804
+#: js/ui/status/network.js:798
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Bežična mreža se mora uključiti kako bi se povezala s internetom."
 
-#: js/ui/status/network.js:805
+#: js/ui/status/network.js:799
 msgid "Turn On Wi-Fi"
 msgstr "Uključi bežičnu mrežu"
 
-#: js/ui/status/network.js:830
+#: js/ui/status/network.js:824
 msgid "Wi-Fi Networks"
 msgstr "Bežične mreže"
 
-#: js/ui/status/network.js:832
+#: js/ui/status/network.js:826
 msgid "Select a network"
 msgstr "Odaberi mrežu"
 
-#: js/ui/status/network.js:861
+#: js/ui/status/network.js:855
 msgid "No Networks"
 msgstr "Nema mreža"
 
-#: js/ui/status/network.js:882 js/ui/status/rfkill.js:104
+#: js/ui/status/network.js:876 js/ui/status/rfkill.js:104
 msgid "Use hardware switch to turn off"
 msgstr "Koristi hardverski prekidač za isključivanje"
 
-#: js/ui/status/network.js:1158
+#: js/ui/status/network.js:1152
 msgid "Select Network"
 msgstr "Odaberi mrežu"
 
-#: js/ui/status/network.js:1164
+#: js/ui/status/network.js:1158
 msgid "Wi-Fi Settings"
 msgstr "Postavke bežične mreže"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1286
+#: js/ui/status/network.js:1280
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "%s pristupna točka aktivna"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1301
+#: js/ui/status/network.js:1295
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "%s nije povezana"
 
-#: js/ui/status/network.js:1398
+#: js/ui/status/network.js:1392
 msgid "connecting…"
 msgstr "povezivanje…"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: js/ui/status/network.js:1401
+#: js/ui/status/network.js:1395
 msgid "authentication required"
 msgstr "potrebna je ovjera"
 
-#: js/ui/status/network.js:1403
+#: js/ui/status/network.js:1397
 msgid "connection failed"
 msgstr "neuspješno povezivanje"
 
-#: js/ui/status/network.js:1453
+#: js/ui/status/network.js:1447
 msgid "VPN Settings"
 msgstr "VPN postavke"
 
-#: js/ui/status/network.js:1470
+#: js/ui/status/network.js:1464
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1480
+#: js/ui/status/network.js:1474
 msgid "VPN Off"
 msgstr "VPN isključen"
 
-#: js/ui/status/network.js:1541 js/ui/status/rfkill.js:82
+#: js/ui/status/network.js:1535 js/ui/status/rfkill.js:82
 msgid "Network Settings"
 msgstr "Mrežne postavke"
 
-#: js/ui/status/network.js:1570
+#: js/ui/status/network.js:1564
 #, javascript-format
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
@@ -2008,7 +1936,7 @@ msgstr[0] "%s žično povezivanje"
 msgstr[1] "%s žična povezivanja"
 msgstr[2] "%s žičnih povezivanja"
 
-#: js/ui/status/network.js:1574
+#: js/ui/status/network.js:1568
 #, javascript-format
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
@@ -2016,7 +1944,7 @@ msgstr[0] "%s bežično povezivanje"
 msgstr[1] "%s bežična povezivanja"
 msgstr[2] "%s bežičnih povezivanja"
 
-#: js/ui/status/network.js:1578
+#: js/ui/status/network.js:1572
 #, javascript-format
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
@@ -2024,11 +1952,11 @@ msgstr[0] "%s modemsko povezivanje"
 msgstr[1] "%s modemska povezivanja"
 msgstr[2] "%s modemskih povezivanja"
 
-#: js/ui/status/network.js:1711
+#: js/ui/status/network.js:1701
 msgid "Connection failed"
 msgstr "Neuspješno povezivanje"
 
-#: js/ui/status/network.js:1712
+#: js/ui/status/network.js:1702
 msgid "Activation of network connection failed"
 msgstr "Aktiviranje mrežnog povezivanja je neuspjelo"
 
@@ -2209,22 +2137,22 @@ msgstr "Pretraži"
 msgid "“%s” is ready"
 msgstr "“%s” je spreman"
 
-#: js/ui/windowManager.js:54
+#: js/ui/windowManager.js:53
 msgid "Do you want to keep these display settings?"
 msgstr "Želite li zadržati ove postavke zaslona?"
 
-#. Translators: this and the following message should be limited in length,
+#. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #.
-#: js/ui/windowManager.js:66
+#: js/ui/windowManager.js:65
 msgid "Revert Settings"
 msgstr "Vrati postavke"
 
-#: js/ui/windowManager.js:69
+#: js/ui/windowManager.js:68
 msgid "Keep Changes"
 msgstr "Zadrži promjene"
 
-#: js/ui/windowManager.js:87
+#: js/ui/windowManager.js:86
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -2234,7 +2162,7 @@ msgstr[2] "Promjene postavka će se vratiti za %d sekundi"
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height.
-#: js/ui/windowManager.js:678
+#: js/ui/windowManager.js:662
 #, javascript-format
 msgid "%d × %d"
 msgstr "%d × %d"
@@ -2333,11 +2261,11 @@ msgstr "Nepoznat"
 msgid "Failed to launch “%s”"
 msgstr "Neuspješno pokretanje “%s”"
 
-#: src/shell-keyring-prompt.c:731
+#: src/shell-keyring-prompt.c:730
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
-#: src/shell-keyring-prompt.c:739
+#: src/shell-keyring-prompt.c:738
 msgid "Password cannot be blank"
 msgstr "Lozinka ne može biti prazna"
 
@@ -2369,9 +2297,6 @@ msgstr[2] "%u ulaza"
 msgid "System Sounds"
 msgstr "Zvukovi sustava"
 
-#~ msgid "toggle-switch-us"
-#~ msgstr "toggle-switch-us"
-
 #~ msgid "network-workgroup"
 #~ msgstr "network-workgroup"
 

po/hu.po

@@ -4,22 +4,22 @@
 #
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016.
 # Lukács Bence <lukacs.bence1 at gmail dot com>, 2012.
-# Balázs Meskó <meskobalazs at gmail dot com>, 2014, 2019.
+# Balázs Meskó <meskobalazs at gmail dot com>, 2014.
-# Balázs Úr <ur.balazs at fsf dot hu>, 2012, 2014, 2015, 2016, 2017, 2018, 2019.
+# Balázs Úr <urbalazs at gmail dot com>, 2012, 2014, 2015, 2016, 2017, 2018, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2019-05-28 17:15+0000\n"
+"POT-Creation-Date: 2019-03-03 10:16+0000\n"
-"PO-Revision-Date: 2019-06-01 13:15+0200\n"
+"PO-Revision-Date: 2019-02-05 21:05+0100\n"
-"Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 1.2\n"
 
 #: data/50-gnome-shell-system.xml:6
 msgid "System"
@@ -373,6 +373,11 @@ msgstr ""
 msgid "Network Login"
 msgstr "Hálózati bejelentkezés"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/org.gnome.Shell.PortalHelper.desktop.in.in:9
+msgid "network-workgroup"
+msgstr "network-workgroup"
+
 #: js/extensionPrefs/main.js:116
 msgid "Something’s gone wrong"
 msgstr "Valami elromlott"
@@ -418,11 +423,10 @@ msgstr ""
 msgid "Browse in Software"
 msgstr "Tallózás a Szoftverekben"
 
-#: js/gdm/authPrompt.js:140 js/ui/audioDeviceSelection.js:52
+#: js/gdm/authPrompt.js:140 js/ui/audioDeviceSelection.js:55
-#: js/ui/components/networkAgent.js:118 js/ui/components/polkitAgent.js:138
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:136
-#: js/ui/endSessionDialog.js:431 js/ui/extensionDownloader.js:188
+#: js/ui/endSessionDialog.js:430 js/ui/extensionDownloader.js:188
-#: js/ui/shellMountOperation.js:404 js/ui/shellMountOperation.js:413
+#: js/ui/shellMountOperation.js:325 js/ui/status/network.js:888
-#: js/ui/status/network.js:894
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -430,7 +434,7 @@ msgstr "Mégse"
 msgid "Next"
 msgstr "Következő"
 
-#: js/gdm/authPrompt.js:198 js/ui/shellMountOperation.js:408
+#: js/gdm/authPrompt.js:198 js/ui/shellMountOperation.js:329
 #: js/ui/unlockDialog.js:41
 msgid "Unlock"
 msgstr "Feloldás"
@@ -461,8 +465,8 @@ msgstr "(például: felhasználó vagy %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:889 js/ui/components/networkAgent.js:244
+#: js/gdm/loginDialog.js:889 js/ui/components/networkAgent.js:243
-#: js/ui/components/networkAgent.js:264 js/ui/components/networkAgent.js:282
+#: js/ui/components/networkAgent.js:263 js/ui/components/networkAgent.js:281
 msgid "Username: "
 msgstr "Felhasználónév: "
 
@@ -513,7 +517,7 @@ msgstr "Kijelentkezés"
 
 #. Translators: A list of keywords that match the logout action, separated by semicolons
 #: js/misc/systemActions.js:105
-msgid "logout;log out;sign off"
+msgid "logout;sign off"
 msgstr "kijelentkezés;kilépés"
 
 #. Translators: The name of the suspend action in search
@@ -700,11 +704,11 @@ msgstr ""
 
 #. No support for non-modal system dialogs, so ignore the option
 #. let modal = options['modal'] || true;
-#: js/ui/accessDialog.js:38 js/ui/status/location.js:362
+#: js/ui/accessDialog.js:37 js/ui/status/location.js:360
 msgid "Deny Access"
 msgstr "Hozzáférés tiltása"
 
-#: js/ui/accessDialog.js:39 js/ui/status/location.js:365
+#: js/ui/accessDialog.js:38 js/ui/status/location.js:363
 msgid "Grant Access"
 msgstr "Hozzáférés megadása"
 
@@ -720,58 +724,53 @@ msgstr "Gyakori"
 msgid "All"
 msgstr "Összes"
 
-#. Translators: This is the heading of a list of open windows
+#: js/ui/appDisplay.js:1737 js/ui/panel.js:83
-#: js/ui/appDisplay.js:1713 js/ui/panel.js:79
-msgid "Open Windows"
-msgstr "Ablakok megnyitása"
-
-#: js/ui/appDisplay.js:1732 js/ui/panel.js:86
 msgid "New Window"
 msgstr "Új ablak"
 
-#: js/ui/appDisplay.js:1746
+#: js/ui/appDisplay.js:1751
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Futtatás a dedikált videokártyával"
 
-#: js/ui/appDisplay.js:1773 js/ui/dash.js:239
+#: js/ui/appDisplay.js:1778 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Eltávolítás a Kedvencek közül"
 
-#: js/ui/appDisplay.js:1779
+#: js/ui/appDisplay.js:1784
 msgid "Add to Favorites"
 msgstr "Hozzáadás a Kedvencekhez"
 
-#: js/ui/appDisplay.js:1789 js/ui/panel.js:97
+#: js/ui/appDisplay.js:1794 js/ui/panel.js:94
 msgid "Show Details"
 msgstr "Részletek megjelenítése"
 
-#: js/ui/appFavorites.js:149
+#: js/ui/appFavorites.js:141
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s felvéve a Kedvencek közé."
 
-#: js/ui/appFavorites.js:183
+#: js/ui/appFavorites.js:175
 #, javascript-format
 msgid "%s has been removed from your favorites."
-msgstr "%s eltávolítva a Kedvencek közül."
+msgstr "%s eltávolítva a Kedvencek közül"
 
-#: js/ui/audioDeviceSelection.js:39
+#: js/ui/audioDeviceSelection.js:42
 msgid "Select Audio Device"
 msgstr "Válasszon hangeszközt"
 
-#: js/ui/audioDeviceSelection.js:50
+#: js/ui/audioDeviceSelection.js:53
 msgid "Sound Settings"
 msgstr "Hangbeállítások"
 
-#: js/ui/audioDeviceSelection.js:59
+#: js/ui/audioDeviceSelection.js:62
 msgid "Headphones"
 msgstr "Fülhallgatók"
 
-#: js/ui/audioDeviceSelection.js:61
+#: js/ui/audioDeviceSelection.js:64
 msgid "Headset"
 msgstr "Fejhallgató"
 
-#: js/ui/audioDeviceSelection.js:63 js/ui/status/volume.js:247
+#: js/ui/audioDeviceSelection.js:66 js/ui/status/volume.js:247
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -932,74 +931,66 @@ msgstr "Erőltetett kilépés"
 msgid "Wait"
 msgstr "Várakozás"
 
-#: js/ui/components/automountManager.js:87
+#: js/ui/components/automountManager.js:86
 msgid "External drive connected"
 msgstr "Külső meghajtó csatlakoztatva"
 
-#: js/ui/components/automountManager.js:99
+#: js/ui/components/automountManager.js:98
 msgid "External drive disconnected"
 msgstr "Külső meghajtó leválasztva"
 
-#: js/ui/components/automountManager.js:211
-msgid "Unable to unlock volume"
-msgstr "Nem lehet feloldani a kötetet"
-
-#: js/ui/components/automountManager.js:212
-msgid "The installed udisks version does not support the PIM setting"
-msgstr "A telepített udisks verzió nem támogatja a PIM beállítást"
-
 #: js/ui/components/autorunManager.js:334
 #, javascript-format
 msgid "Open with %s"
 msgstr "Megnyitás ezzel: %s"
 
-#: js/ui/components/keyring.js:66 js/ui/components/polkitAgent.js:257
+#: js/ui/components/keyring.js:77 js/ui/components/polkitAgent.js:255
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: js/ui/components/keyring.js:97
+#: js/ui/components/keyring.js:108
 msgid "Type again:"
 msgstr "Írja be újra:"
 
-#: js/ui/components/networkAgent.js:103
+#: js/ui/components/networkAgent.js:102
 msgid ""
 "Alternatively you can connect by pushing the “WPS” button on your router."
 msgstr "Alternatívaként kapcsolódhat a „WPS” gomb megnyomásával az eszközön."
 
-#: js/ui/components/networkAgent.js:113 js/ui/status/network.js:219
+#: js/ui/components/networkAgent.js:112 js/ui/status/network.js:219
-#: js/ui/status/network.js:310 js/ui/status/network.js:897
+#: js/ui/status/network.js:309 js/ui/status/network.js:891
 msgid "Connect"
 msgstr "Kapcsolódás"
 
 #. Cisco LEAP
-#: js/ui/components/networkAgent.js:212 js/ui/components/networkAgent.js:224
+#: js/ui/components/networkAgent.js:211 js/ui/components/networkAgent.js:223
-#: js/ui/components/networkAgent.js:247 js/ui/components/networkAgent.js:266
+#: js/ui/components/networkAgent.js:246 js/ui/components/networkAgent.js:265
-#: js/ui/components/networkAgent.js:286 js/ui/components/networkAgent.js:296
+#: js/ui/components/networkAgent.js:285 js/ui/components/networkAgent.js:295
 msgid "Password: "
 msgstr "Jelszó: "
 
 #. static WEP
-#: js/ui/components/networkAgent.js:217
+#: js/ui/components/networkAgent.js:216
 msgid "Key: "
 msgstr "Kulcs: "
 
-#: js/ui/components/networkAgent.js:250 js/ui/components/networkAgent.js:272
+#: js/ui/components/networkAgent.js:249 js/ui/components/networkAgent.js:271
 msgid "Private key password: "
 msgstr "Személyes kulcs jelszava: "
 
-#: js/ui/components/networkAgent.js:270
+#: js/ui/components/networkAgent.js:269
 msgid "Identity: "
 msgstr "Személyazonosság: "
 
-#: js/ui/components/networkAgent.js:284
+#: js/ui/components/networkAgent.js:283
 msgid "Service: "
 msgstr "Szolgáltatás: "
 
-#: js/ui/components/networkAgent.js:313 js/ui/components/networkAgent.js:686
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:685
 msgid "Authentication required by wireless network"
 msgstr "A vezeték nélküli hálózat hitelesítést igényel"
 
-#: js/ui/components/networkAgent.js:314 js/ui/components/networkAgent.js:687
+#: js/ui/components/networkAgent.js:313 js/ui/components/networkAgent.js:686
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -1008,53 +999,53 @@ msgstr ""
 "Jelszavak vagy titkosítási kulcsok szükségesek a(z) „%s” vezeték nélküli "
 "hálózat eléréséhez."
 
-#: js/ui/components/networkAgent.js:318 js/ui/components/networkAgent.js:690
+#: js/ui/components/networkAgent.js:317 js/ui/components/networkAgent.js:689
 msgid "Wired 802.1X authentication"
 msgstr "Vezetékes 802.1X hitelesítés"
 
-#: js/ui/components/networkAgent.js:320
+#: js/ui/components/networkAgent.js:319
 msgid "Network name: "
 msgstr "Hálózat neve: "
 
-#: js/ui/components/networkAgent.js:325 js/ui/components/networkAgent.js:694
+#: js/ui/components/networkAgent.js:324 js/ui/components/networkAgent.js:693
 msgid "DSL authentication"
 msgstr "DSL hitelesítés"
 
-#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:700
+#: js/ui/components/networkAgent.js:331 js/ui/components/networkAgent.js:699
 msgid "PIN code required"
 msgstr "PIN kód szükséges"
 
-#: js/ui/components/networkAgent.js:333 js/ui/components/networkAgent.js:701
+#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:700
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN kód szükséges a mobil széles sávú eszközhöz"
 
-#: js/ui/components/networkAgent.js:334
+#: js/ui/components/networkAgent.js:333
 msgid "PIN: "
 msgstr "PIN: "
 
-#: js/ui/components/networkAgent.js:341 js/ui/components/networkAgent.js:707
+#: js/ui/components/networkAgent.js:340 js/ui/components/networkAgent.js:706
 msgid "Mobile broadband network password"
 msgstr "Mobil széles sávú hálózat jelszava"
 
-#: js/ui/components/networkAgent.js:342 js/ui/components/networkAgent.js:691
+#: js/ui/components/networkAgent.js:341 js/ui/components/networkAgent.js:690
-#: js/ui/components/networkAgent.js:695 js/ui/components/networkAgent.js:708
+#: js/ui/components/networkAgent.js:694 js/ui/components/networkAgent.js:707
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Jelszó szükséges a kapcsolódáshoz a következőhöz: „%s”."
 
-#: js/ui/components/networkAgent.js:675 js/ui/status/network.js:1670
+#: js/ui/components/networkAgent.js:674 js/ui/status/network.js:1664
 msgid "Network Manager"
 msgstr "Hálózatkezelő"
 
-#: js/ui/components/polkitAgent.js:36
+#: js/ui/components/polkitAgent.js:34
 msgid "Authentication Required"
 msgstr "Hitelesítés szükséges"
 
-#: js/ui/components/polkitAgent.js:64
+#: js/ui/components/polkitAgent.js:62
 msgid "Administrator"
 msgstr "Rendszergazda"
 
-#: js/ui/components/polkitAgent.js:141
+#: js/ui/components/polkitAgent.js:139
 msgid "Authenticate"
 msgstr "Hitelesítés"
 
@@ -1062,7 +1053,7 @@ msgstr "Hitelesítés"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:243 js/ui/shellMountOperation.js:389
+#: js/ui/components/polkitAgent.js:241 js/ui/shellMountOperation.js:309
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Elnézést, ez nem sikerült. Próbálja újra."
 
@@ -1113,23 +1104,23 @@ msgstr "Világórák hozzáadása…"
 msgid "World Clocks"
 msgstr "Világórák"
 
-#: js/ui/dateMenu.js:228
+#: js/ui/dateMenu.js:222
 msgid "Weather"
 msgstr "Időjárás"
 
-#: js/ui/dateMenu.js:311
+#: js/ui/dateMenu.js:305
 msgid "Select a location…"
 msgstr "Válasszon egy helyet…"
 
-#: js/ui/dateMenu.js:319
+#: js/ui/dateMenu.js:313
 msgid "Loading…"
 msgstr "Betöltés…"
 
-#: js/ui/dateMenu.js:329
+#: js/ui/dateMenu.js:323
 msgid "Go online for weather information"
 msgstr "Időjárás-információkért kapcsolódjon az internetre"
 
-#: js/ui/dateMenu.js:331
+#: js/ui/dateMenu.js:325
 msgid "Weather information is currently unavailable"
 msgstr "Az időjárás-információk jelenleg nem érhetőek el"
 
@@ -1257,28 +1248,28 @@ msgstr ""
 "eltarthat egy ideig: győződjön meg arról, hogy készített-e biztonsági "
 "mentést, valamint a számítógép be van-e dugva."
 
-#: js/ui/endSessionDialog.js:310
+#: js/ui/endSessionDialog.js:309
 msgid "Running on battery power: please plug in before installing updates."
 msgstr ""
 "Akkumulátoros működés: a frissítések telepítése előtt dugja be eszközét a "
 "konnektorba."
 
-#: js/ui/endSessionDialog.js:327
+#: js/ui/endSessionDialog.js:326
 msgid "Some applications are busy or have unsaved work."
 msgstr "Egyes alkalmazások elfoglaltak, vagy mentetlen munkát tartalmaznak."
 
-#: js/ui/endSessionDialog.js:334
+#: js/ui/endSessionDialog.js:333
 msgid "Other users are logged in."
 msgstr "Más felhasználók vannak bejelentkezve."
 
 #. Translators: Remote here refers to a remote session, like a ssh login
-#: js/ui/endSessionDialog.js:615
+#: js/ui/endSessionDialog.js:614
 #, javascript-format
 msgid "%s (remote)"
 msgstr "%s (távoli)"
 
 #. Translators: Console here refers to a tty like a VT console
-#: js/ui/endSessionDialog.js:618
+#: js/ui/endSessionDialog.js:617
 #, javascript-format
 msgid "%s (console)"
 msgstr "%s (konzol)"
@@ -1294,26 +1285,26 @@ msgstr ""
 "Letölti és telepíti a következőt az extensions.gnome.org webhelyről: „%s”?"
 
 #. Translators: %s is an application name like "Settings"
-#: js/ui/inhibitShortcutsDialog.js:78
+#: js/ui/inhibitShortcutsDialog.js:50
 #, javascript-format
 msgid "%s wants to inhibit shortcuts"
 msgstr "A(z) %s meg akarja gátolni a gyorsbillentyűk használatát"
 
-#: js/ui/inhibitShortcutsDialog.js:79
+#: js/ui/inhibitShortcutsDialog.js:51
 msgid "Application wants to inhibit shortcuts"
 msgstr "Az alkalmazás meg akarja gátolni a gyorsbillentyűk használatát"
 
 #. Translators: %s is a keyboard shortcut like "Super+x"
-#: js/ui/inhibitShortcutsDialog.js:88
+#: js/ui/inhibitShortcutsDialog.js:60
 #, javascript-format
 msgid "You can restore shortcuts by pressing %s."
 msgstr "A(z) %s megnyomásával visszaállíthatja a gyorsbillentyűket."
 
-#: js/ui/inhibitShortcutsDialog.js:93
+#: js/ui/inhibitShortcutsDialog.js:65
 msgid "Deny"
 msgstr "Tiltás"
 
-#: js/ui/inhibitShortcutsDialog.js:100
+#: js/ui/inhibitShortcutsDialog.js:71
 msgid "Allow"
 msgstr "Engedélyezés"
 
@@ -1364,13 +1355,13 @@ msgid "Leave On"
 msgstr "Bekapcsolva hagyás"
 
 #: js/ui/kbdA11yDialog.js:57 js/ui/status/bluetooth.js:133
-#: js/ui/status/network.js:1269
+#: js/ui/status/network.js:1263
 msgid "Turn On"
 msgstr "Bekapcsolás"
 
 #: js/ui/kbdA11yDialog.js:65 js/ui/status/bluetooth.js:133
-#: js/ui/status/network.js:128 js/ui/status/network.js:311
+#: js/ui/status/network.js:128 js/ui/status/network.js:310
-#: js/ui/status/network.js:1269 js/ui/status/network.js:1381
+#: js/ui/status/network.js:1263 js/ui/status/network.js:1375
 #: js/ui/status/nightLight.js:39 js/ui/status/rfkill.js:79
 #: js/ui/status/rfkill.js:106
 msgid "Turn Off"
@@ -1380,7 +1371,7 @@ msgstr "Kikapcsolás"
 msgid "Leave Off"
 msgstr "Kikapcsolva hagyás"
 
-#: js/ui/keyboard.js:200
+#: js/ui/keyboard.js:203
 msgid "Region & Language Settings"
 msgstr "Területi és nyelvi beállítások"
 
@@ -1432,7 +1423,7 @@ msgstr "Forrás megtekintése"
 msgid "Web Page"
 msgstr "Weblap"
 
-#: js/ui/messageTray.js:1479
+#: js/ui/messageTray.js:1480
 msgid "System Information"
 msgstr "Rendszerinformációk"
 
@@ -1510,38 +1501,47 @@ msgstr "Nyomja meg az Esc gombot a kilépéshez"
 msgid "Press any key to exit"
 msgstr "Nyomjon meg egy gombot a kilépéshez"
 
-#: js/ui/panel.js:113
+#: js/ui/panel.js:108
 msgid "Quit"
 msgstr "Kilépés"
 
 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: js/ui/panel.js:468
+#: js/ui/panel.js:471
 msgid "Activities"
 msgstr "Tevékenységek"
 
-#: js/ui/panel.js:743
+#: js/ui/panel.js:746
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "Rendszer"
 
-#: js/ui/panel.js:861
+#: js/ui/panel.js:866
 msgid "Top Bar"
 msgstr "Felső sáv"
 
-#: js/ui/runDialog.js:65
+#. Translators: this MUST be either "toggle-switch-us"
+#. (for toggle switches containing the English words
+#. "ON" and "OFF") or "toggle-switch-intl" (for toggle
+#. switches containing "◯" and "|"). Other values will
+#. simply result in invisible toggle switches.
+#: js/ui/popupMenu.js:285
+msgid "toggle-switch-us"
+msgstr "toggle-switch-intl"
+
+#: js/ui/runDialog.js:64
 msgid "Enter a Command"
 msgstr "Adjon meg egy parancsot"
 
-#: js/ui/runDialog.js:105 js/ui/windowMenu.js:166
+#: js/ui/runDialog.js:104 js/ui/windowMenu.js:166
 msgid "Close"
 msgstr "Bezárás"
 
-#: js/ui/runDialog.js:267
+#: js/ui/runDialog.js:266
 msgid "Restart is not available on Wayland"
 msgstr "Az újraindítás nem érhető el Wayland alatt"
 
-#: js/ui/runDialog.js:272
+#: js/ui/runDialog.js:271
 msgid "Restarting…"
 msgstr "Újraindítás…"
 
@@ -1565,7 +1565,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d új értesítés"
 msgstr[1] "%d új értesítés"
 
-#: js/ui/screenShield.js:449 js/ui/status/system.js:271
+#: js/ui/screenShield.js:449 js/ui/status/system.js:270
 msgid "Lock"
 msgstr "Zárolás"
 
@@ -1580,11 +1580,11 @@ msgstr "A GNOME-nak zárolnia kell a képernyőt"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: js/ui/screenShield.js:826 js/ui/screenShield.js:1299
+#: js/ui/screenShield.js:834 js/ui/screenShield.js:1307
 msgid "Unable to lock"
 msgstr "Nem lehet zárolni"
 
-#: js/ui/screenShield.js:827 js/ui/screenShield.js:1300
+#: js/ui/screenShield.js:835 js/ui/screenShield.js:1308
 msgid "Lock was blocked by an application"
 msgstr "A zárolást egy alkalmazás blokkolta"
 
@@ -1619,61 +1619,14 @@ msgstr "Szöveg megjelenítése"
 msgid "Hide Text"
 msgstr "Szöveg elrejtése"
 
-#: js/ui/shellMountOperation.js:318
+#: js/ui/shellMountOperation.js:296
-msgid "Hidden Volume"
-msgstr "Rejtett kötet"
-
-#: js/ui/shellMountOperation.js:321
-msgid "Windows System Volume"
-msgstr "Windows rendszerkötet"
-
-#: js/ui/shellMountOperation.js:324
-msgid "Uses Keyfiles"
-msgstr "Kulcsfájlokat használ"
-
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:330
-#, javascript-format
-msgid ""
-"To unlock a volume that uses keyfiles, use the <i>%s</i> utility instead."
-msgstr ""
-"A kulcsfájlokat használó kötetek feloldásához használja inkább a(z) <i>%s</i> "
-"segédprogramot."
-
-#: js/ui/shellMountOperation.js:337
-msgid "PIM Number"
-msgstr "PIM-szám"
-
-#: js/ui/shellMountOperation.js:355
-msgid "The PIM must be a number or empty."
-msgstr "A PIM-nek számnak vagy üresnek kell lennie."
-
-#: js/ui/shellMountOperation.js:366
 msgid "Password"
 msgstr "Jelszó"
 
-#: js/ui/shellMountOperation.js:396
+#: js/ui/shellMountOperation.js:317
 msgid "Remember Password"
 msgstr "Jelszó megjegyzése"
 
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:418
-#, javascript-format
-msgid "Open %s"
-msgstr "%s megnyitása"
-
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:490
-#, javascript-format
-msgid "Unable to start %s"
-msgstr "A(z) %s nem indítható el"
-
-#. Translators: %s is the Disks application
-#: js/ui/shellMountOperation.js:492
-#, javascript-format
-msgid "Couldn’t find the %s application"
-msgstr "Nem sikerült megtalálni a(z) %s alkalmazást"
-
 #: js/ui/status/accessibility.js:35
 msgid "Accessibility"
 msgstr "Akadálymentesítés"
@@ -1710,11 +1663,11 @@ msgstr "Billentyűszűrés"
 msgid "Mouse Keys"
 msgstr "Egérbillentyűk"
 
-#: js/ui/status/accessibility.js:135
+#: js/ui/status/accessibility.js:151
 msgid "High Contrast"
 msgstr "Nagy kontraszt"
 
-#: js/ui/status/accessibility.js:177
+#: js/ui/status/accessibility.js:182
 msgid "Large Text"
 msgstr "Nagy szöveg"
 
@@ -1722,7 +1675,7 @@ msgstr "Nagy szöveg"
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: js/ui/status/bluetooth.js:47 js/ui/status/network.js:586
+#: js/ui/status/bluetooth.js:47 js/ui/status/network.js:585
 msgid "Bluetooth Settings"
 msgstr "Bluetooth-beállítások"
 
@@ -1746,11 +1699,11 @@ msgstr "Be"
 msgid "Brightness"
 msgstr "Fényerő"
 
-#: js/ui/status/keyboard.js:813
+#: js/ui/status/keyboard.js:812
 msgid "Keyboard"
 msgstr "Billentyűzet"
 
-#: js/ui/status/keyboard.js:835
+#: js/ui/status/keyboard.js:834
 msgid "Show Keyboard Layout"
 msgstr "Billentyűzetkiosztás megjelenítése"
 
@@ -1779,12 +1732,12 @@ msgid "Enable"
 msgstr "Engedélyezés"
 
 #. Translators: %s is an application name
-#: js/ui/status/location.js:355
+#: js/ui/status/location.js:353
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "Elérheti a(z) %s a földrajzi hely adatait?"
 
-#: js/ui/status/location.js:356
+#: js/ui/status/location.js:354
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr ""
 "A hely hozzáférése bármikor megváltoztatható az adatvédelmi beállításokban."
@@ -1794,13 +1747,13 @@ msgid "<unknown>"
 msgstr "<ismeretlen>"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:417 js/ui/status/network.js:1298
+#: js/ui/status/network.js:416 js/ui/status/network.js:1292
 #, javascript-format
 msgid "%s Off"
 msgstr "%s ki"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:420
+#: js/ui/status/network.js:419
 #, javascript-format
 msgid "%s Connected"
 msgstr "%s kapcsolódva"
@@ -1808,189 +1761,189 @@ msgstr "%s kapcsolódva"
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu);
 #. %s is a network identifier
-#: js/ui/status/network.js:425
+#: js/ui/status/network.js:424
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "%s felügyeletlen"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:428
+#: js/ui/status/network.js:427
 #, javascript-format
 msgid "%s Disconnecting"
 msgstr "%s leválasztása"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:435 js/ui/status/network.js:1290
+#: js/ui/status/network.js:434 js/ui/status/network.js:1284
 #, javascript-format
 msgid "%s Connecting"
 msgstr "%s kapcsolódás"
 
 #. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
-#: js/ui/status/network.js:438
+#: js/ui/status/network.js:437
 #, javascript-format
 msgid "%s Requires Authentication"
 msgstr "%s hitelesítést igényel"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing; %s is a network identifier
-#: js/ui/status/network.js:446
+#: js/ui/status/network.js:445
 #, javascript-format
 msgid "Firmware Missing For %s"
 msgstr "Hiányzó firmware ennél: %s"
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage; %s is a network identifier
-#: js/ui/status/network.js:450
+#: js/ui/status/network.js:449
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "%s nem érhető el"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:453
+#: js/ui/status/network.js:452
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "%s kapcsolódás meghiúsult"
 
-#: js/ui/status/network.js:465
+#: js/ui/status/network.js:464
 msgid "Wired Settings"
 msgstr "Vezetékes beállítások"
 
-#: js/ui/status/network.js:507
+#: js/ui/status/network.js:506
 msgid "Mobile Broadband Settings"
 msgstr "Mobil széles sáv beállításai"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:554 js/ui/status/network.js:1295
+#: js/ui/status/network.js:553 js/ui/status/network.js:1289
 #, javascript-format
 msgid "%s Hardware Disabled"
 msgstr "%s hardver letiltva"
 
 #. Translators: this is for a network device that cannot be activated
 #. because it's disabled by rfkill (airplane mode); %s is a network identifier
-#: js/ui/status/network.js:558
+#: js/ui/status/network.js:557
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s letiltva"
 
-#: js/ui/status/network.js:598
+#: js/ui/status/network.js:597
 msgid "Connect to Internet"
 msgstr "Kapcsolódás az internetre"
 
-#: js/ui/status/network.js:792
+#: js/ui/status/network.js:786
 msgid "Airplane Mode is On"
 msgstr "Repülőgép mód be"
 
-#: js/ui/status/network.js:793
+#: js/ui/status/network.js:787
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "A Wi-Fi ki van kapcsolva repülőgép üzemmódban."
 
-#: js/ui/status/network.js:794
+#: js/ui/status/network.js:788
 msgid "Turn Off Airplane Mode"
 msgstr "Repülőgép mód ki"
 
-#: js/ui/status/network.js:803
+#: js/ui/status/network.js:797
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi ki"
 
-#: js/ui/status/network.js:804
+#: js/ui/status/network.js:798
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "A Wi-Fi-t be kell kapcsolni a hálózatra kapcsolódáshoz."
 
-#: js/ui/status/network.js:805
+#: js/ui/status/network.js:799
 msgid "Turn On Wi-Fi"
 msgstr "Wi-Fi bekapcsolása"
 
-#: js/ui/status/network.js:830
+#: js/ui/status/network.js:824
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi hálózatok"
 
-#: js/ui/status/network.js:832
+#: js/ui/status/network.js:826
 msgid "Select a network"
 msgstr "Válasszon egy hálózatot"
 
-#: js/ui/status/network.js:861
+#: js/ui/status/network.js:855
 msgid "No Networks"
 msgstr "Nincs hálózat"
 
-#: js/ui/status/network.js:882 js/ui/status/rfkill.js:104
+#: js/ui/status/network.js:876 js/ui/status/rfkill.js:104
 msgid "Use hardware switch to turn off"
 msgstr "A hardveres kapcsolóval kapcsolja ki"
 
-#: js/ui/status/network.js:1158
+#: js/ui/status/network.js:1152
 msgid "Select Network"
 msgstr "Válasszon hálózatot"
 
-#: js/ui/status/network.js:1164
+#: js/ui/status/network.js:1158
 msgid "Wi-Fi Settings"
 msgstr "Wi-Fi beállítások"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1286
+#: js/ui/status/network.js:1280
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "%s hotspot aktív"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1301
+#: js/ui/status/network.js:1295
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "%s nincs kapcsolódva"
 
-#: js/ui/status/network.js:1398
+#: js/ui/status/network.js:1392
 msgid "connecting…"
 msgstr "kapcsolódás…"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: js/ui/status/network.js:1401
+#: js/ui/status/network.js:1395
 msgid "authentication required"
 msgstr "hitelesítés szükséges"
 
-#: js/ui/status/network.js:1403
+#: js/ui/status/network.js:1397
 msgid "connection failed"
 msgstr "a kapcsolódás meghiúsult"
 
-#: js/ui/status/network.js:1453
+#: js/ui/status/network.js:1447
 msgid "VPN Settings"
 msgstr "VPN beállítások"
 
-#: js/ui/status/network.js:1470
+#: js/ui/status/network.js:1464
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1480
+#: js/ui/status/network.js:1474
 msgid "VPN Off"
 msgstr "VPN ki"
 
-#: js/ui/status/network.js:1541 js/ui/status/rfkill.js:82
+#: js/ui/status/network.js:1535 js/ui/status/rfkill.js:82
 msgid "Network Settings"
 msgstr "Hálózati beállítások"
 
-#: js/ui/status/network.js:1570
+#: js/ui/status/network.js:1564
 #, javascript-format
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
 msgstr[0] "%s vezetékes kapcsolat"
 msgstr[1] "%s vezetékes kapcsolat"
 
-#: js/ui/status/network.js:1574
+#: js/ui/status/network.js:1568
 #, javascript-format
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
 msgstr[0] "%s Wi-Fi kapcsolat"
 msgstr[1] "%s Wi-Fi kapcsolat"
 
-#: js/ui/status/network.js:1578
+#: js/ui/status/network.js:1572
 #, javascript-format
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
 msgstr[0] "%s modemes kapcsolat"
 msgstr[1] "%s modemes kapcsolat"
 
-#: js/ui/status/network.js:1711
+#: js/ui/status/network.js:1701
 msgid "Connection failed"
 msgstr "Kapcsolódás meghiúsult"
 
-#: js/ui/status/network.js:1712
+#: js/ui/status/network.js:1702
 msgid "Activation of network connection failed"
 msgstr "A hálózati kapcsolat aktiválása meghiúsult"
 
@@ -2037,7 +1990,7 @@ msgstr "%d∶%02d van hátra (%d%%)"
 #. Translators: this is <hours>:<minutes> Until Full (<percentage>)
 #: js/ui/status/power.js:89
 #, javascript-format
-msgid "%d∶%02d Until Full (%d %%)"
+msgid  "%d∶%02d Until Full (%d %%)"
 msgstr "Töltésidő: %d∶%02d (%d%%)"
 
 #: js/ui/status/power.js:117 js/ui/status/power.js:119
@@ -2072,15 +2025,15 @@ msgstr "Kijelentkezés"
 msgid "Account Settings"
 msgstr "Fiókbeállítások"
 
-#: js/ui/status/system.js:256
+#: js/ui/status/system.js:255
 msgid "Orientation Lock"
 msgstr "Tájolás zárolása"
 
-#: js/ui/status/system.js:282
+#: js/ui/status/system.js:281
 msgid "Suspend"
 msgstr "Felfüggesztés"
 
-#: js/ui/status/system.js:292
+#: js/ui/status/system.js:291
 msgid "Power Off"
 msgstr "Kikapcsolás"
 
@@ -2172,22 +2125,22 @@ msgstr "Oldalsáv"
 msgid "“%s” is ready"
 msgstr "„%s” kész"
 
-#: js/ui/windowManager.js:54
+#: js/ui/windowManager.js:53
 msgid "Do you want to keep these display settings?"
 msgstr "Meg szeretné tartani ezeket a kijelzőbeállításokat?"
 
-#. Translators: this and the following message should be limited in length,
+#. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #.
-#: js/ui/windowManager.js:66
+#: js/ui/windowManager.js:65
 msgid "Revert Settings"
 msgstr "Beállítások visszavonása"
 
-#: js/ui/windowManager.js:69
+#: js/ui/windowManager.js:68
 msgid "Keep Changes"
 msgstr "Módosítások megtartása"
 
-#: js/ui/windowManager.js:87
+#: js/ui/windowManager.js:86
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -2196,7 +2149,7 @@ msgstr[1] "A beállítások módosításai %d másodperc múlva visszavonásra k
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height.
-#: js/ui/windowManager.js:678
+#: js/ui/windowManager.js:662
 #, javascript-format
 msgid "%d × %d"
 msgstr "%d × %d"
@@ -2269,6 +2222,11 @@ msgstr "Áthelyezés a jobb oldali kijelzőre"
 msgid "Evolution Calendar"
 msgstr "Evolution naptár"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: src/calendar-server/evolution-calendar.desktop.in:6
+msgid "evolution"
+msgstr "evolution"
+
 #: src/main.c:408
 msgid "Print version"
 msgstr "Verzió kiírása"
@@ -2286,21 +2244,21 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Lehetséges módok listázása"
 
-#: src/shell-app.c:264
+#: src/shell-app.c:260
 msgctxt "program"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/shell-app.c:515
+#: src/shell-app.c:511
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "„%s” indítása meghiúsult"
 
-#: src/shell-keyring-prompt.c:731
+#: src/shell-keyring-prompt.c:730
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
-#: src/shell-keyring-prompt.c:739
+#: src/shell-keyring-prompt.c:738
 msgid "Password cannot be blank"
 msgstr "A jelszó nem lehet üres"
 

src/calendar-server/calendar-sources.c

@@ -295,13 +295,13 @@ create_client_for_source (ESource              *source,
 		          CalendarSourceData   *source_data)
 {
   ClientData *data;
-  EClient *client;
+  ECalClient *client;
   GError *error = NULL;
 
   client = g_hash_table_lookup (source_data->clients, source);
   g_return_if_fail (client == NULL);
 
-  client = e_cal_client_connect_sync (source, source_type, -1, NULL, &error);
+  client = e_cal_client_new (source, source_type, &error);
   if (!client)
     {
       g_warning ("Could not load source '%s': %s",
@@ -312,7 +312,7 @@ create_client_for_source (ESource              *source,
     }
 
   data = g_slice_new0 (ClientData);
-  data->client = E_CAL_CLIENT (client);  /* takes ownership */
+  data->client = client;  /* takes ownership */
   data->backend_died_id = g_signal_connect (client,
                                             "backend-died",
                                             G_CALLBACK (backend_died_cb),