shell-global: import environment from $XDG_RUNTIME_DIR/gnome/environment

environment variables are normally propagated from parent to child, but they're used to convey information that's typically scoped to the session. gnome-shell needs to know about environment variables that are set in the session after it's already been started. gnome-session now exports its environment to $XDG_RUNTIME_DIR/gnome/environment so that programs in the session can pick up on the latest environment variables. This commit changes gnome-shell to propagate the gnome-session's latest environment when launching new children.
2015-09-16 21:14:48 -04:00
265 changed files with 34670 additions and 47974 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,8 +16,11 @@ config.log
 config.status
 config
 configure
-data/org.gnome.Shell.desktop
+data/50-gnome-shell-*.xml
-data/org.gnome.Shell.desktop.in
+data/gnome-shell.desktop
 data/gnome-shell.desktop.in
 data/gnome-shell-wayland.desktop
 data/gnome-shell-wayland.desktop.in
 data/gnome-shell-extension-prefs.desktop
 data/gnome-shell-extension-prefs.desktop.in
 data/gnome-shell-theme.gresource
@ -25,6 +28,8 @@ data/gschemas.compiled
 data/perf-background.xml
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
 data/org.gnome.shell.evolution.calendar.gschema.xml
 data/org.gnome.shell.evolution.calendar.gschema.valid
 data/org.gnome.Shell.PortalHelper.desktop
 data/org.gnome.Shell.PortalHelper.service
 data/theme/.sass-cache
@ -71,6 +76,7 @@ src/*-marshal.[ch]
 src/Makefile
 src/Makefile.in
 src/calendar-server/evolution-calendar.desktop
 src/calendar-server/evolution-calendar.desktop.in
 src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
 src/gnome-shell-calendar-server
--- a/357
+++ b/357
@ -1,360 +1,3 @@
 3.23.2
 ======
 * Implement Pad configuration OSD [Carlos; #771067]
 * Show overview on three-finger touchpad pinch [Carlos; #765937]
 * Summarize network sections with too many devices [Florian; #773892]
 * Always show primary network icon when connected [Florian; #773890]
 * Fix fullscreen transitions on wayland [Rui; #770345]
 * Work around portal failures by using a URL without HTPPS redirect [Debarshi; #769940]
 * Fix app view hiding when no usage data is available [Florian, Xiaoguang; #774381]
 * Misc. bug fixes [Florian, Ray; #773875, #740043, #773893, #774643, #774805]
 Contributors:
  Carlos Garnacho, Rui Matos, Florian Müllner, Debarshi Ray, Ray Strode,
  Xiaoguang Wang
 Translations:
  Balázs Meskó [hu], Fabio Tomat [fur], Marek Cernocky [cs], Stas Solovey [ru],
  Daniel Mustieles [es], Marek Černocký [cs], Piotr Drąg [pl],
  Rafael Fontenelle [pt_BR], Baurzhan Muftakhidinov [kk], Jiri Grönroos [fi],
  Kjartan Maraas [nb]
 3.23.1
 ======
 * Request periodic scans while WiFi list is open [Dan; #767918]
 * Include extension UUID in structured log metadata [Jonh; #770717]
 * Line-wrap PAM messages on login screen [Tao; #764445]
 * Add a way to launch an app on the discrete GPU [Bastien; #773117]
 * Only allow graphs to lift screen shield when locked [Florian; #773328]
 * Add reload option to gnome-shell-extension-tool [Jonh; #772593]
 * Update background animations when resuming from suspend [Florian; #773265]
 * Misc. bug fixes [Cosimo, Bastien, Florian, Philip, Carlos; #772723, #772287,
  #756432, #772386, #772386, #773085, #773634]
 Contributors:
  Cosimo Cecchi, Philip Chimento, Carlos Garcia Campos, Florian Müllner,
  Bastien Nocera, Jonh Wendell, Dan Williams, Tao Yang
 Translations:
  Fabio Tomat [fur], Philip Chimento [zh_CN], YunQiang Su [zh_CN],
  Jordi Mas [ca], Piotr Drąg [pl], Muhammet Kara [tr], Marek Černocký [cs],
  Daniel Korostil [uk], Dušan Kazik [sk]
 3.22.1
 ======
 * Fix hidden network indicator on startup [Florian; #772249]
 * Fix order of windows with modal dialogs in window switcher [Florian; #747153]
 * Fix feedback loop between StClipboard and X11 bridge [Carlos; #760745]
 * Reliably match windows from Flatpak apps [Florian; #772615]
 * Misc. bug fixes [Philip; #742249]
 Contributors:
  Philip Chimento, Carlos Garnacho, Florian Müllner
 Translations:
  Inaki Larranaga Murgoitio [eu], Khaled Hosny [ar], BM [uz@cyrillic],
  Milo Casagrande [it], Cheng-Chia Tseng [zh_TW], gogo [hr]
 3.22.0
 ======
 * Misc. bug fixes [Florian, Rui; #771391, #771536] #771656]
 Contributors:
  Rui Matos, Florian Müllner
 Translations:
  Ask Hjorth Larsen [da], GNOME Translation Robot [gd], Alexandre Franke [fr],
  Daniel Korostil [uk], Jordi Mas [ca], Khaled Hosny [ar], David King [en_GB]
 3.21.92
 =======
 * Adjust screen capture to work with multiple stage views [Jonas; #770128]
 * Improve handling of cycle shortcuts [Florian; #771063]
 * Fix windows not getting undimmed in some cases [Rui; #770163, #752524]
 * Disable extension version check by default [Florian; #770887]
 * Misc. bug fixes [Rui, Florian, Michael; #770382, #770888, #770328]
 Contributors:
  Jonas Ådahl, Michael Catanzaro, Fran Dieguez, Olivier Fourdan, Rui Matos,
  Florian Müllner
 Translations:
  Changwoo Ryu [ko], Baurzhan Muftakhidinov [kk], Aurimas Černius [lt],
  Muhammet Kara [tr], Trần Ngọc Quân [vi], A S Alam [pa], Yosef Or Boczko [he],
  Anders Jonsson [sv], Tiago Santos [pt], Hannie Dumoleyn [nl],
  Rūdolfs Mazurs [lv], Claude Paroz [fr], Arash Mousavi [fa],
  Fran Dieguez [gl], Stas Solovey [ru], Tom Tryfonidis [el]
 3.21.91
 =======
 Translations:
  Mario Blättermann [de], Jiri Grönroos [fi], Dušan Kazik [sk],
  Andika Triwidada [id], Daniel Mustieles [es], Fabio Tomat [fur],
  Enrico Nicoletto [pt_BR], Matej Urbančič [sl], Мирослав Николић [sr, sr@latin]
 3.21.90.1
 =========
 Contributors:
  Piotr Drąg
 Translations:
  Marek Černocký [cs], Balázs Úr [hu]
 3.21.90
 =======
 * Improve on-screen keyboard on wayland [Carlos; #765009]
 * Misc. bug fixes [Florian; #769156, #769216, #769074]
 Contributors:
  Carlos Garnacho, Florian Müllner
 Translations:
  Fabio Tomat [fur], Tiago Santos [pt], Daniel Mustieles [es],
  Bernd Homuth [de], Aurimas Černius [lt], Balázs Úr [hu],
  Yosef Or Boczko [he], Jiri Grönroos [fi], Marek Cernocky [cs],
  Muhammet Kara [tr], Enrico Nicoletto [pt_BR], Andika Triwidada [id]
 3.21.4
 ======
 * overview: Fix switching workspaces when scrolling on non-primary monitors
  [Florian; #766883, #768316]
 * Fix crash when using screen recorder under wayland [Rui; #767001]
 * Update theme on video memory purge errors [Rui; #739178]
 * Free old backgrounds immediately [Hyungwon; #766353]
 * Add support for system upgrades to end session dialog [Kalev; #763611]
 * Fix maximized windows flickering to the wrong size on restart [Owen; #761566]
 * Hide ignored events in calendar as well [Florian; #768538]
 * calendar: Only hide dismissed occurrence of recurring event [Florian; #748226]
 * Provide org.freedesktop.impl.portal.access implementation [Florian; #768669]
 * Misc. bug fixes and cleanups [Rui, Florian, Marinus, Jonas; #767954, #768317,
  #746867, #762206, #768956, #768979]
 Contributors:
  Jonas Ådahl, Piotr Drąg, Hyungwon Hwang, Kalev Lember, Rui Matos,
  Florian Müllner, Marinus Schraal, Owen W. Taylor
 Translations:
  Andika Triwidada [id], Daniel Mustieles [es], Bruce Cowan [en_GB],
  Dušan Kazik [sk], Piotr Drąg [pl], Chao-Hsiung Liao [zh_HK]
 3.21.3
 ======
 * Do not disable suspend action when locked [Florian; #725960]
 * Remember input sources MRU list [Cosimo; #766826]
 * networkAgent: Handle VPN service aliases [David; #658484]
 * Plug a memory leak [Hans; #710230]
 Contributors:
  Cosimo Cecchi, Florian Müllner, Hans Petter Jansson, David Woodhouse
 Translations:
  Tiago Santos [pt], Cédric Valmary [oc], Muhammet Kara [tr],
  Daniel Mustieles [es], Rafael Fontenelle [pt_BR]
 3.21.2
 ======
 * Fix sorting of hidden apps in app switcher [Florian; #766238]
 * Set logind's LockedHint property when locked [Victor; #764773]
 * Allocate framebuffers early to fix a crash on NVIDIA [Martin; #764898]
 * Fix cycle-windows/cycle-group keybindings [Florian; #730739]
 * Switch to shared desktop schema for calendar settings [Iain; #766318]
 * Misc. bug fixes [Florian, Cosimo, Michele; #766325, #758471, #757556,
  #757019, #766598]
 Contributors:
  Cosimo Cecchi, Michele Gaio, Iain Lane, Florian Müllner, Martin Szulecki,
  Victor Toso
 Translations:
  Tiago Santos [pt], Kjartan Maraas [nb], Jiro Matsuzawa [ja],
  Cédric Valmary [oc], Sveinn í Felli [is]
 3.21.1
 ======
 * Save screencasts in HOME if XDG_VIDEO_DIR doesn't exist [Florian; #765015]
 * Don't show orientation lock when g-s-d won't rotate [Florian; #765267]
 * Misc. bug fixes [Heiher, Florian, Marek, Rui; #722752, #765061, #763068,
  #765607, #757676, #760439]
 Contributors:
  Heiher, Marek Chalupa, Rui Matos, Florian Müllner
 Translations:
  Arash Mousavi [fa], Kristjan SCHMIDT [eo], GNOME Translation Robot [gd]
 3.20.1
 ======
 * Plug a memory leak [Aaron; #735705]
 Contributors:
  Aaron Plattner
 Translations:
  Daniel Korostil [uk], Matej Urbančič [sl], Inaki Larranaga Murgoitio [eu],
  Cheng-Chia Tseng [zh_TW], Fabio Tomat [fur], Trần Ngọc Quân [vi],
  YunQiang Su [zh_CN], Marek Černocký [cs], Arash Mousavi [fa],
  Alexander Shopov [bg], Khaled Hosny [ar]
 3.20.0
 ======
 Translations:
  Changwoo Ryu [ko], Baurzhan Muftakhidinov [kk], Milo Casagrande [it],
  Anders Jonsson [sv], Muhammet Kara [tr], Alexandre Franke [fr],
  Rūdolfs Mazurs [lv], Ask Hjorth Larsen [da], Jiro Matsuzawa [ja]
 3.19.92
 =======
 * Update location dialog according to latest mockups [Zeeshan; #762480]
 * Fix deleting chat notifications in calendar [Florian; #747991]
 Contributors:
  Zeeshan Ali (Khattak), Florian Müllner
 Translations:
  Rūdolfs Mazurs [lv], Changwoo Ryu [ko], Matej Urbančič [sl],
  Justin van Steijn [nl], Fabio Tomat [fur], Kris Thomsen [da],
  Marek Černocký [cs], Piotr Drąg [pl], Dušan Kazik [sk],
  Мирослав Николић [sr, sr@latin], Balázs Úr [hu], Yosef Or Boczko [he],
  Daniel Mustieles [es], Fran Dieguez [gl], Bernd Homuth [de],
  Tom Tryfonidis [el], Jiri Grönroos [fi], Gil Forcada [ca],
  Artur Morais [pt_BR], Aurimas Černius [lt], Stas Solovey [ru]
 3.19.91
 =======
 * location: Ask user only once [Zeeshan; #762559]
 * Fix jiggling when auto-hiding legacy tray [Florian; #747957]
 * Misc. bug fixes [Florian, Michael, Ting-Wei; #762475, #762507, #755659]
 Contributors:
  Zeeshan Ali (Khattak), Michael Catanzaro, Ting-Wei Lan, Florian Müllner
 Translations:
  Мирослав Николић [sr, sr@latin], Piotr Drąg [pl], A S Alam [pa],
  Artur de Aquino Morais [pt_BR], Daniel Mustieles [es],
  Chao-Hsiung Liao [zh_TW], Daniel Korostil [uk], Fran Dieguez [gl],
  Tom Tryfonidis [el], Bernd Homuth [de], Sebastian Rasmussen [sv],
  Jordi Mas [ca], Piotr Drąg [ga], Cédric Valmary [oc], Gábor Kelemen [hu],
  Baurzhan Muftakhidinov [kk], Friedel Wolff [af], Marek Černocký [cs],
  Mingye Wang (Arthur2e5) [zh_CN], Aron Xu [zh_CN], Khaled Hosny [ar],
  Aurimas Černius [lt], Stas Solovey [ru], Yosef Or Boczko [he]
 3.19.90
 =======
 * Correctly identify VPN secret requests [Lubomir; #760999]
 * Improve week number presentation [Jakub; #683245]
 * Add audio device selection dialog [Florian; #760284]
 * Add media controls to the time and date drop down [Florian; #756491]
 * Fix IBus candidate popup position under wayland [Rui; #753476]
 * Ask user to grant applications access to location [Zeeshan; #762119]
 * Misc. bug fixes [Mario, Jakub, Florian; #761208, #761772, #762270]
 Contributors:
  Zeeshan Ali (Khattak), Michael Catanzaro, Rui Matos, Florian Müllner,
  Lubomir Rintel, Mario Sanchez Prada, Jakub Steiner
 Translations:
  Alexander Shopov [bg], Balázs Meskó [hu], Fabio Tomat [fur],
  Dušan Kazik [sk], Piotr Drąg [pl], Alexandre Franke [fr],
  Mario Blättermann [de], Milo Casagrande [it], Jordi Mas [ca]
 3.19.4
 ======
 * gdm: Do not allow bypassing disabled Sign In button [Michael; #746180]
 * Style week numbers in calendar [Jakub; #683245]
 * Misc. bug fixes [Christophe, Jakub, Rui; #759708, #760577, #760945]
 Contributors:
  Michael Catanzaro, Marek Černocký, Christophe Fergeau, Rui Matos,
  Jakub Steiner
 Translations:
  Aurimas Černius [lt], Enrico Nicoletto [pt_BR], Andika Triwidada [id],
  Mario Blättermann [de], Marek Černocký [cs], Kjartan Maraas [nb],
  Muhammet Kara [tr], Stas Solovey [ru]
 3.19.3
 ======
 * Fix thumbnail scaling in window switcher on HiDPI [Florian; #758676]
 * Update animated backgrounds on timezone changes [Florian; #758939]
 * loginDialog: Update user list on user changes [Michael; #758568]
 * Fix touch interaction on wayland [Carlos; #756748]
 Contributors:
  Michael Catanzaro, Carlos Garnacho, Kalev Lember, Florian Müllner
 Translations:
  Daniel Korostil [uk], Muhammet Kara [tr], Dušan Kazik [sk],
  Baurzhan Muftakhidinov [kk], Marek Černocký [cs]
 3.19.2
 ======
 * Make gnome-shell DBus activatable [Ray; #741666]
 * Fix browser plugin crash in Firefox [Carlos; #737932, #757940]
 * Optionally show battery percentage in system status area [Bastien; #735771]
 * Misc. bug fixes [Kalev, Florian, Bastien; #757418, #757668, #757779, #757816,
  #745626, #758220]
 Contributors:
  Michael Biebl, Michael Catanzaro, Piotr Drąg, Carlos Garcia Campos,
  Kalev Lember, Florian Müllner, Bastien Nocera, Ray Strode
 Translations:
  Pedro Albuquerque [pt], liushuyu [zh_CN], Yosef Or Boczko [he],
  Jiri Grönroos [fi], Kjartan Maraas [nb], GNOME Translation Robot [gd],
  Daniel Mustieles [es], Marek Černocký [cs], Kristjan SCHMIDT [eo],
  Stas Solovey [ru]
 3.19.1
 ======
 * Respect text-scaling factor under wayland [Owen; #756447]
 * Show the Bluetooth submenu when there were setup devices [Bastien; #723848]
 * Misc. bug fixes [Florian, Cosimo, Rui, Ray, Owen, Jakub, Bastien;
  #756697, #756714, #756605, #754814, #738942, #756983, #756925,
  #757011, #673235, #757150]
 Contributors:
  Cosimo Cecchi, Rui Matos, Florian Müllner, Bastien Nocera, Jakub Steiner,
  Ray Strode, Owen W. Taylor
 Translations:
  Kjartan Maraas [nb], Khaled Hosny [ar], Balázs Meskó [hu],
  Daniel Șerbănescu [ro], Marek Černocký [cs]
 3.18.1
 ======
 * Fix screen freezes when a notification is pushed [Carlos; #755425]
 * Fix overzealous ellipsization in system status menu [Adel, Florian; #708472]
 * Hide app menu when disabled by setting [Florian; #745919]
 * Fix lightbox effect when animations are disabled [Rui; #755827]
 * Do not mark hotplug notifications as critical [Florian; #657923]
 * Fix icons getting cut off in dash [Florian; #745649]
 * Animate fullscreen/unfullscreen operations [Cosimo; #707248]
 * Misc. bug fixes [Florian, Owen; #748919, #674799, #754581]
 Contributors:
  Emmanuele Bassi, Michael Catanzaro, Cosimo Cecchi, Matthias Clasen,
  Adel Gadllah, Carlos Garnacho, Ekaterina Gerasimova, Rui Matos,
  Florian Müllner, Owen W. Taylor
 Translations:
  Марко Костић [sr], Милош Поповић [sr@latin], Khaled Hosny [ar],
  Trần Ngọc Quân [vi], Petr Kovar [cs], Alexandre Franke [fr],
  Fran Dieguez [gl], Anders Jonsson [sv], Piotr Drąg [pl], Dušan Kazik [sk],
  Milo Casagrande [it], Changwoo Ryu [ko], Stas Solovey [ru],
  Rafael Fontenelle [pt_BR], Tom Tryfonidis [el], Aurimas Černius [lt],
  Seán de Búrca [ga], Christian Kirbach [de], Jiri Grönroos [fi],
  Pedro Albuquerque [pt], Baurzhan Muftakhidinov [kk], Daniel Mustieles [es],
  Marek Černocký [cs], Ask Hjorth Larsen [da], Inaki Larranaga Murgoitio [eu]
 3.18.0
 ======
 Translations:
  Sendy Aditya Suryana [id], Kris Thomsen [da], Seán de Búrca [ga],
  Andika Triwidada [id], Enrico Nicoletto [pt_BR], Anders Jonsson [sv],
  Rūdolfs Mazurs [lv]
 3.17.92
 =======
 * Fix race when loading multiple background animations [Josselin; #741453]
--- a/autogen.sh
+++ b/autogen.sh
@ -11,8 +11,6 @@ test -z "$srcdir" && srcdir=.
    exit 1
 }
 pushd $srcdir
 # Fetch submodules if needed
 if test ! -f src/gvc/Makefile.am || test ! -f data/theme/gnome-shell-sass/COPYING;
 then
@ -21,8 +19,6 @@ then
 fi
 git submodule update
 popd
 which gnome-autogen.sh || {
    echo "You need to install gnome-common from GNOME Git (or from"
    echo "your OS vendor's package manager)."
--- a/browser-plugin/Makefile.am
+++ b/browser-plugin/Makefile.am
@ -3,10 +3,7 @@ mozillalibdir = $(BROWSER_PLUGIN_DIR)
 mozillalib_LTLIBRARIES = libgnome-shell-browser-plugin.la
-# Browsers can unload and reload the module while browsing, which is not supported by GObject.
+libgnome_shell_browser_plugin_la_LDFLAGS = -module -avoid-version -no-undefined
 # We pass -Wl,-z,nodelete to the linker to ensure the module is never unloaded.
 # https://bugzilla.gnome.org/show_bug.cgi?id=737932
 libgnome_shell_browser_plugin_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,-z,nodelete
 libgnome_shell_browser_plugin_la_LIBADD = 	\
 	$(BROWSER_PLUGIN_LIBS)
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@ -33,16 +33,20 @@
 #include <json-glib/json-glib.h>
 #define ORIGIN "extensions.gnome.org"
-#define PLUGIN_NAME "GNOME Shell Integration"
+#define PLUGIN_NAME "Gnome Shell Integration"
-#define PLUGIN_DESCRIPTION "This plugin provides integration with GNOME Shell " \
+#define PLUGIN_DESCRIPTION "This plugin provides integration with Gnome Shell " \
      "for live extension enabling and disabling. " \
      "It can be used only by extensions.gnome.org"
-#define PLUGIN_MIME_STRING "application/x-gnome-shell-integration::GNOME Shell Integration Dummy Content-Type";
+#define PLUGIN_MIME_STRING "application/x-gnome-shell-integration::Gnome Shell Integration Dummy Content-Type";
 #define PLUGIN_API_VERSION 5
 #define EXTENSION_DISABLE_VERSION_CHECK_KEY "disable-extension-version-validation"
 typedef struct {
  GDBusProxy *proxy;
 } PluginData;
 static NPNetscapeFuncs funcs;
 static inline gchar *
@ -141,6 +145,121 @@ check_origin_and_protocol (NPP instance)
  return ret;
 }
 /* =============== public entry points =================== */
 NPError
 NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
 {
  /* global initialization routine, called once when plugin
     is loaded */
  g_debug ("plugin loaded");
  memcpy (&funcs, pfuncs, sizeof (funcs));
  plugin->size = sizeof(NPPluginFuncs);
  plugin->newp = NPP_New;
  plugin->destroy = NPP_Destroy;
  plugin->getvalue = NPP_GetValue;
  plugin->setwindow = NPP_SetWindow;
  return NPERR_NO_ERROR;
 }
 NPError
 NP_Shutdown(void)
 {
  return NPERR_NO_ERROR;
 }
 const char*
 NP_GetMIMEDescription(void)
 {
  return PLUGIN_MIME_STRING;
 }
 NPError
 NP_GetValue(void         *instance,
            NPPVariable   variable,
            void         *value)
 {
  switch (variable) {
  case NPPVpluginNameString:
    *(char**)value = PLUGIN_NAME;
    break;
  case NPPVpluginDescriptionString:
    *(char**)value = PLUGIN_DESCRIPTION;
    break;
  default:
    ;
  }
  return NPERR_NO_ERROR;
 }
 NPError
 NPP_New(NPMIMEType    mimetype,
        NPP           instance,
        uint16_t      mode,
        int16_t       argc,
        char        **argn,
        char        **argv,
        NPSavedData  *saved)
 {
  /* instance initialization function */
  PluginData *data;
  GError *error = NULL;
  g_debug ("plugin created");
  if (!check_origin_and_protocol (instance))
    return NPERR_GENERIC_ERROR;
  data = g_slice_new (PluginData);
  instance->pdata = data;
  data->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                               G_DBUS_PROXY_FLAGS_NONE,
                                               NULL, /* interface info */
                                               "org.gnome.Shell",
                                               "/org/gnome/Shell",
                                               "org.gnome.Shell.Extensions",
                                               NULL, /* GCancellable */
                                               &error);
  if (!data->proxy)
    {
      /* ignore error if the shell is not running, otherwise warn */
      if (error->domain != G_DBUS_ERROR ||
          error->code != G_DBUS_ERROR_NAME_HAS_NO_OWNER)
        {
          g_warning ("Failed to set up Shell proxy: %s", error->message);
        }
      g_clear_error (&error);
      return NPERR_GENERIC_ERROR;
    }
  g_debug ("plugin created successfully");
  return NPERR_NO_ERROR;
 }
 NPError
 NPP_Destroy(NPP           instance,
 	    NPSavedData **saved)
 {
  /* instance finalization function */
  PluginData *data = instance->pdata;
  g_debug ("plugin destroyed");
  g_object_unref (data->proxy);
  g_slice_free (PluginData, data);
  return NPERR_NO_ERROR;
 }
 /* =================== scripting interface =================== */
 typedef struct {
@ -211,18 +330,45 @@ static NPObject *
 plugin_object_allocate (NPP      instance,
                        NPClass *klass)
 {
-  PluginObject *obj = (PluginObject *) funcs.memalloc (sizeof (PluginObject));
+  PluginData *data = instance->pdata;
  PluginObject *obj = g_slice_new0 (PluginObject);
  memset (obj, 0, sizeof (PluginObject));
  obj->instance = instance;
  obj->proxy = g_object_ref (data->proxy);
  obj->settings = g_settings_new (SHELL_SCHEMA);
  obj->signal_id = g_signal_connect (obj->proxy, "g-signal",
                                     G_CALLBACK (on_shell_signal), obj);
-  return (NPObject*) obj;
+  obj->watch_name_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
                                         "org.gnome.Shell",
                                         G_BUS_NAME_WATCHER_FLAGS_NONE,
                                         on_shell_appeared,
                                         NULL,
                                         obj,
                                         NULL);
  g_debug ("plugin object created");
  return (NPObject*)obj;
 }
 static void
 plugin_object_deallocate (NPObject *npobj)
 {
-  funcs.memfree (npobj);
+  PluginObject *obj = (PluginObject*)npobj;
  g_signal_handler_disconnect (obj->proxy, obj->signal_id);
  g_object_unref (obj->proxy);
  if (obj->listener)
    funcs.releaseobject (obj->listener);
  if (obj->watch_name_id)
    g_bus_unwatch_name (obj->watch_name_id);
  g_debug ("plugin object destroyed");
  g_slice_free (PluginObject, obj);
 }
 static inline gboolean
@ -873,149 +1019,6 @@ init_methods_and_properties (void)
  onextension_changed_id = funcs.getstringidentifier ("onchange");
 }
 /* =============== public entry points =================== */
 NPError
 NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
 {
  /* global initialization routine, called once when plugin
     is loaded */
  g_debug ("plugin loaded");
  memcpy (&funcs, pfuncs, sizeof (funcs));
  plugin->size = sizeof(NPPluginFuncs);
  plugin->newp = NPP_New;
  plugin->destroy = NPP_Destroy;
  plugin->getvalue = NPP_GetValue;
  plugin->setwindow = NPP_SetWindow;
  plugin->event = NPP_HandleEvent;
  return NPERR_NO_ERROR;
 }
 NPError
 NP_Shutdown(void)
 {
  return NPERR_NO_ERROR;
 }
 const char*
 NP_GetMIMEDescription(void)
 {
  return PLUGIN_MIME_STRING;
 }
 NPError
 NP_GetValue(void         *instance,
            NPPVariable   variable,
            void         *value)
 {
  switch (variable) {
  case NPPVpluginNameString:
    *(char**)value = PLUGIN_NAME;
    break;
  case NPPVpluginDescriptionString:
    *(char**)value = PLUGIN_DESCRIPTION;
    break;
  default:
    ;
  }
  return NPERR_NO_ERROR;
 }
 NPError
 NPP_New(NPMIMEType    mimetype,
        NPP           instance,
        uint16_t      mode,
        int16_t       argc,
        char        **argn,
        char        **argv,
        NPSavedData  *saved)
 {
  /* instance initialization function */
  PluginObject *obj;
  GError *error = NULL;
  g_debug ("plugin created");
  if (!check_origin_and_protocol (instance))
    return NPERR_GENERIC_ERROR;
  /* set windowless mode */
  funcs.setvalue(instance, NPPVpluginWindowBool, NULL);
  g_debug ("creating scriptable object");
  init_methods_and_properties ();
  obj = (PluginObject *) funcs.createobject (instance, &plugin_class);
  instance->pdata = obj;
  obj->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                              G_DBUS_PROXY_FLAGS_NONE,
                                              NULL, /* interface info */
                                              "org.gnome.Shell",
                                              "/org/gnome/Shell",
                                              "org.gnome.Shell.Extensions",
                                              NULL, /* GCancellable */
                                              &error);
  if (!obj->proxy)
    {
      /* ignore error if the shell is not running, otherwise warn */
      if (!g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_NAME_HAS_NO_OWNER))
        {
          g_warning ("Failed to set up Shell proxy: %s", error->message);
        }
      g_clear_error (&error);
      return NPERR_GENERIC_ERROR;
    }
  obj->settings = g_settings_new (SHELL_SCHEMA);
  obj->signal_id = g_signal_connect (obj->proxy, "g-signal",
                                     G_CALLBACK (on_shell_signal), obj);
  obj->watch_name_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
                                         "org.gnome.Shell",
                                         G_BUS_NAME_WATCHER_FLAGS_NONE,
                                         on_shell_appeared,
                                         NULL,
                                         obj,
                                         NULL);
  g_debug ("plugin created successfully");
  return NPERR_NO_ERROR;
 }
 NPError
 NPP_Destroy(NPP           instance,
 	    NPSavedData **saved)
 {
  /* instance finalization function */
  PluginObject *obj = (PluginObject *) instance->pdata;
  if (!obj)
    return NPERR_INVALID_INSTANCE_ERROR;
  g_debug ("plugin destroyed");
  g_signal_handler_disconnect (obj->proxy, obj->signal_id);
  g_object_unref (obj->proxy);
  if (obj->listener)
    funcs.releaseobject (obj->listener);
  if (obj->restart_listener)
    funcs.releaseobject (obj->restart_listener);
  if (obj->watch_name_id)
    g_bus_unwatch_name (obj->watch_name_id);
  funcs.releaseobject((NPObject *)obj);
  return NPERR_NO_ERROR;
 }
 NPError
 NPP_GetValue(NPP          instance,
 	     NPPVariable  variable,
@ -1026,11 +1029,13 @@ NPP_GetValue(NPP          instance,
  switch (variable) {
  case NPPVpluginScriptableNPObject:
    g_debug ("creating scriptable object");
-    if (!instance->pdata)
+    init_methods_and_properties ();
      return NPERR_INVALID_INSTANCE_ERROR;
-    funcs.retainobject (instance->pdata);
+    *(NPObject**)value = funcs.createobject (instance, &plugin_class);
-    *(NPObject**)value = instance->pdata;
+    break;
  case NPPVpluginNeedsXEmbed:
    *(bool *)value = TRUE;
    break;
  default:
@ -1048,11 +1053,3 @@ NPP_SetWindow(NPP          instance,
 {
  return NPERR_NO_ERROR;
 }
 int16_t
 NPP_HandleEvent(NPP   instance,
                void *event)
 {
  /* Ignore the event */
  return FALSE;
 }
--- a/configure.ac
+++ b/configure.ac
@ -1,6 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.23.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.17.92],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 AX_IS_RELEASE([git-directory])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -24,14 +23,13 @@ LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 # i18n
 IT_PROG_INTLTOOL([0.40])
 GETTEXT_PACKAGE=gnome-shell
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                   [The prefix for our gettext translation domains.])
 AM_GNU_GETTEXT_VERSION([0.19.6])
 AM_GNU_GETTEXT([external])
 PKG_PROG_PKG_CONFIG([0.22])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
@ -53,7 +51,7 @@ if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
   AC_MSG_RESULT(yes)
   build_recorder=true
   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11 gtk+-3.0"
-   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules mutter-clutter-1.0)
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0)
 else
   AC_MSG_RESULT(no)
 fi
@ -76,9 +74,9 @@ AS_IF([test x$enable_systemd != xno], [
 AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.21.5
-GOBJECT_INTROSPECTION_MIN_VERSION=1.49.1
+GOBJECT_INTROSPECTION_MIN_VERSION=1.45.4
-GJS_MIN_VERSION=1.47.0
+GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.23.2
+MUTTER_MIN_VERSION=3.17.92
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3
@ -96,11 +94,11 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
            libxml-2.0
            gtk+-3.0 >= $GTK_MIN_VERSION
            atk-bridge-2.0
-            gjs-1.0 >= $GJS_MIN_VERSION
+            gjs-internals-1.0 >= $GJS_MIN_VERSION
            $recorder_modules
            gdk-x11-3.0 libsoup-2.4
-            mutter-clutter-1.0 >= $CLUTTER_MIN_VERSION
+            clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
-            mutter-cogl-pango-1.0
+            clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
            libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
            gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
            libcanberra libcanberra-gtk3
@ -114,13 +112,13 @@ fi
 PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
 PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION)
-PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-1.0 >= $GJS_MIN_VERSION)
+PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
-PKG_CHECK_MODULES(ST, mutter-clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
 PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
 PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
-PKG_CHECK_MODULES(TRAY, mutter-clutter-1.0 gtk+-3.0)
+PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.21.3)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.13.1)
 AC_ARG_ENABLE(browser-plugin,
              [AS_HELP_STRING([--enable-browser-plugin],
@ -222,7 +220,7 @@ if test "$enable_man" != no; then
 fi
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
-AX_COMPILER_FLAGS()
+GNOME_COMPILE_WARNINGS([error])
 case "$WARN_CFLAGS" in
    *-Werror*)
        WARN_CFLAGS="$WARN_CFLAGS -Wno-error=deprecated-declarations"
@ -255,6 +253,7 @@ AC_CONFIG_FILES([
  docs/reference/st/Makefile
  docs/reference/st/st-docs.sgml
  js/Makefile
  src/calendar-server/evolution-calendar.desktop.in
  src/Makefile
  src/gvc/Makefile
  browser-plugin/Makefile
@ -270,7 +269,7 @@ Build configuration:
       Prefix:                                 ${prefix}
       Source code location:                   ${srcdir}
       Compiler:                               ${CC}
-       Compiler Warnings:                      $ax_enable_compile_warnings
+       Compiler Warnings:                      $enable_compile_warnings
       Support for NetworkManager:             $have_networkmanager
       Support for GStreamer recording:        $build_recorder
--- a/data/50-gnome-shell-system.xml.in
+++ b/data/50-gnome-shell-system.xml.in
@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <KeyListEntries schema="org.gnome.shell.keybindings"
                group="system"
-                name="System"
+                _name="System"
                wm_name="GNOME Shell"
                package="gnome-shell">
 	<KeyListEntry name="toggle-message-tray"
-                      description="Show the notification list"/>
+                      _description="Show the notification list"/>
 	<KeyListEntry name="focus-active-notification"
-                      description="Focus the active notification"/>
+                      _description="Focus the active notification"/>
 	<KeyListEntry name="toggle-overview"
-                      description="Show the overview"/>
+                      _description="Show the overview"/>
 	<KeyListEntry name="toggle-application-view"
-                      description="Show all applications"/>
+                      _description="Show all applications"/>
 	<KeyListEntry name="open-application-menu"
-                      description="Open the application menu"/>
+                      _description="Open the application menu"/>
 </KeyListEntries>
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -2,21 +2,17 @@ CLEANFILES =
 NULL =
 desktopdir=$(datadir)/applications
-desktop_DATA = org.gnome.Shell.desktop gnome-shell-extension-prefs.desktop
+desktop_DATA = gnome-shell.desktop gnome-shell-wayland.desktop  gnome-shell-extension-prefs.desktop
 if HAVE_NETWORKMANAGER
 desktop_DATA += org.gnome.Shell.PortalHelper.desktop
 portaldir = $(datadir)/xdg-desktop-portal/portals
 portal_DATA = gnome-shell.portal
 servicedir = $(datadir)/dbus-1/services
 service_DATA = org.gnome.Shell.PortalHelper.service
 CLEANFILES += \
-	org.gnome.Shell.PortalHelper.service 	\
+	org.gnome.Shell.PortalHelper.service \
-	org.gnome.Shell.PortalHelper.desktop 	\
+	org.gnome.Shell.PortalHelper.desktop \
 	org.gnome.Shell.PortalHelper.desktop.in \
 	$(NULL)
 endif
@ -32,13 +28,10 @@ endif
 	    -e "s|@VERSION[@]|$(VERSION)|" \
 	    $< > $@ || rm $@
-%.desktop:%.desktop.in
+@INTLTOOL_DESKTOP_RULE@
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $(builddir)/$< \
 	                      -d $(top_srcdir)/po -o $@
 introspectiondir = $(datadir)/dbus-1/interfaces
 introspection_DATA =				\
 	org.gnome.Shell.PadOsd.xml		\
 	org.gnome.Shell.Screencast.xml		\
 	org.gnome.Shell.Screenshot.xml		\
 	org.gnome.ShellSearchProvider.xml	\
@ -64,7 +57,6 @@ dist_theme_files =						\
 	theme/gnome-shell-sass/NEWS				\
 	theme/gnome-shell-sass/README				\
 	theme/gnome-shell-sass/gnome-shell-sass.doap		\
 	theme/pad-osd.css						\
 	theme/parse-sass.sh					\
 	$(NULL)
@ -88,11 +80,14 @@ perf-background.xml: perf-background.xml.in
 	    $< > $@ || rm $@
 keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
-keys_DATA = 50-gnome-shell-system.xml
+keys_in_files = 50-gnome-shell-system.xml.in
 keys_DATA = $(keys_in_files:.xml.in=.xml)
 gsettings_SCHEMAS = org.gnome.shell.gschema.xml
-%.gschema.xml: %.gschema.xml.in Makefile
+@INTLTOOL_XML_NOMERGE_RULE@
 %.gschema.xml.in: %.gschema.xml.in.in Makefile
 	$(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[@]|$(GETTEXT_PACKAGE)|g' \
 	$< > $@ || rm $@
@ -109,29 +104,32 @@ convertdir = $(datadir)/GConf/gsettings
 convert_DATA = gnome-shell-overrides.convert
 EXTRA_DIST =						\
-	org.gnome.Shell.desktop.in.in			\
+	gnome-shell.desktop.in.in			\
 	gnome-shell-wayland.desktop.in.in		\
 	gnome-shell-extension-prefs.desktop.in.in	\
 	$(portal_DATA)					\
 	$(introspection_DATA)				\
 	$(menu_DATA)					\
 	$(convert_DATA)					\
-	$(keys_DATA)					\
+	$(keys_in_files)				\
 	$(dist_theme_files)				\
 	perf-background.xml.in				\
-	org.gnome.Shell.PortalHelper.desktop.in.in	\
+	org.gnome.Shell.PortalHelper.desktop.in		\
 	org.gnome.Shell.PortalHelper.service.in		\
-	org.gnome.shell.gschema.xml.in			\
+	org.gnome.shell.gschema.xml.in.in		\
 	gnome-shell-theme.gresource.xml 		\
 	$(resource_files)				\
 	$(NULL)
 CLEANFILES +=						\
-	org.gnome.Shell.desktop.in			\
+	gnome-shell.desktop.in				\
 	gnome-shell-wayland.desktop.in			\
 	gnome-shell-extension-prefs.in			\
 	$(desktop_DATA)					\
 	$(keys_DATA)					\
 	$(gsettings_SCHEMAS)				\
 	perf-background.xml				\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\
 	org.gnome.shell.gschema.xml.in			\
 	gnome-shell-theme.gresource			\
 	$(NULL)
--- a/data/gnome-shell-extension-prefs.desktop.in.in
+++ b/data/gnome-shell-extension-prefs.desktop.in.in
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=GNOME Shell Extension Preferences
+_Name=GNOME Shell Extension Preferences
-Comment=Configure GNOME Shell Extensions
+_Comment=Configure GNOME Shell Extensions
 Exec=@bindir@/gnome-shell-extension-prefs %u
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@ -22,7 +22,6 @@
    <file>no-events.svg</file>
    <file>no-notifications.svg</file>
    <file>noise-texture.png</file>
    <file>pad-osd.css</file>
    <file>page-indicator-active.svg</file>
    <file>page-indicator-inactive.svg</file>
    <file>page-indicator-checked.svg</file>
--- a/data/gnome-shell-wayland.desktop.in.in
+++ b/data/gnome-shell-wayland.desktop.in.in
@ -0,0 +1,15 @@
 [Desktop Entry]
 Type=Application
 _Name=GNOME Shell (wayland compositor)
 _Comment=Window management and application launching
 Exec=@bindir@/gnome-shell --wayland --display-server
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
 Categories=GNOME;GTK;Core;
 OnlyShowIn=GNOME;
 NoDisplay=true
 X-GNOME-Autostart-Phase=DisplayServer
 X-GNOME-Autostart-Notify=true
 X-GNOME-AutoRestart=false
--- a/data/org.gnome.Shell.desktop.in.in
+++ b/data/org.gnome.Shell.desktop.in.in
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=GNOME Shell
+_Name=GNOME Shell
-Comment=Window management and application launching
+_Comment=Window management and application launching
 Exec=@bindir@/gnome-shell
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
@ -10,7 +10,7 @@ X-GNOME-Bugzilla-Version=@VERSION@
 Categories=GNOME;GTK;Core;
 OnlyShowIn=GNOME;
 NoDisplay=true
-X-GNOME-Autostart-Phase=DisplayServer
+X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=panel;windowmanager;
 X-GNOME-Autostart-Notify=true
 X-GNOME-AutoRestart=false
--- a/data/gnome-shell.portal
+++ b/data/gnome-shell.portal
@ -1,4 +0,0 @@
 [portal]
 DBusName=org.freedesktop.impl.portal.desktop.gnome
 Interfaces=org.freedesktop.impl.portal.Access
 UseIn=gnome
--- a/data/org.gnome.Shell.PadOsd.xml
+++ b/data/org.gnome.Shell.PadOsd.xml
@ -1,28 +0,0 @@
 <!DOCTYPE node PUBLIC
 '-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
 'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
 <node>
  <!--
      org.gnome.Shell.PadOSD:
      @short_description: Pad OSD interface
      The interface used to show button map OSD on pad devices.
  -->
  <interface name='org.gnome.Shell.Wacom.PadOsd'>
    <!--
        Show:
        @device_node: device node file, usually in /dev/input/...
        @edition_mode: whether toggling edition mode on when showing
        Shows the pad button map OSD for the requested device, the OSD
 	will be shown according the current device settings (output
 	mapping, left handed mode, ...)
    -->
    <method name='Show'>
      <arg name='device_node' direction='in' type='o'/>
      <arg name='edition_mode' direction='in' type='b'/>
    </method>
  </interface>
 </node>
--- a/data/org.gnome.Shell.PortalHelper.desktop.in.in
+++ b/data/org.gnome.Shell.PortalHelper.desktop.in.in
@ -1,10 +1,9 @@
 [Desktop Entry]
-Name=Network Login
+_Name=Network Login
 Type=Application
 Exec=gapplication launch org.gnome.Shell.PortalHelper
 DBusActivatable=true
 NoDisplay=true
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=network-workgroup
 StartupNotify=true
 OnlyShowIn=GNOME;
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@ -3,131 +3,133 @@
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="development-tools" type="b">
      <default>true</default>
-      <summary>
+      <_summary>
        Enable internal tools useful for developers and testers from Alt-F2
-      </summary>
+      </_summary>
-      <description>
+      <_description>
        Allows access to internal debugging and monitoring tools
        using the Alt-F2 dialog.
-      </description>
+      </_description>
    </key>
    <key name="enabled-extensions" type="as">
      <default>[]</default>
-      <summary>UUIDs of extensions to enable</summary>
+      <_summary>UUIDs of extensions to enable</_summary>
-      <description>
+      <_description>
        GNOME Shell extensions have a UUID property; this key lists extensions
        which should be loaded. Any extension that wants to be loaded needs
        to be in this list. You can also manipulate this list with the
        EnableExtension and DisableExtension D-Bus methods on org.gnome.Shell.
-      </description>
+      </_description>
    </key>
    <key name="disable-extension-version-validation" type="b">
-      <default>true</default>
+      <default>false</default>
-      <summary>Disables the validation of extension version compatibility</summary>
+      <_summary>Disables the validation of extension version compatibility</_summary>
-      <description>
+      <_description>
        GNOME Shell will only load extensions that claim to support the current
        running version. Enabling this option will disable this check and try to
        load all extensions regardless of the versions they claim to support.
-      </description>
+      </_description>
    </key>
    <key name="favorite-apps" type="as">
      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-      <summary>List of desktop file IDs for favorite applications</summary>
+      <_summary>List of desktop file IDs for favorite applications</_summary>
-      <description>
+      <_description>
        The applications corresponding to these identifiers
        will be displayed in the favorites area.
-      </description>
+      </_description>
    </key>
    <key name="app-picker-view" type="u">
      <default>0</default>
-      <summary>App Picker View</summary>
+      <_summary>App Picker View</_summary>
-      <description>
+      <_description>
        Index of the currently selected view in the application picker.
-      </description>
+      </_description>
    </key>
    <key name="command-history" type="as">
      <default>[]</default>
-      <summary>History for command (Alt-F2) dialog</summary>
+      <_summary>History for command (Alt-F2) dialog</_summary>
    </key>
    <key name="looking-glass-history" type="as">
      <default>[]</default>
-      <!-- Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass -->
+      <!-- Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass -->
-      <summary>History for the looking glass dialog</summary>
+      <_summary>History for the looking glass dialog</_summary>
    </key>
    <key name="always-show-log-out" type="b">
      <default>false</default>
-      <summary>Always show the 'Log out' menu item in the user menu.</summary>
+      <_summary>Always show the 'Log out' menu item in the user menu.</_summary>
-      <description>
+      <_description>
        This key overrides the automatic hiding of the 'Log out'
        menu item in single-user, single-session situations.
-      </description>
+      </_description>
    </key>
    <key name="remember-mount-password" type="b">
      <default>false</default>
-      <summary>Whether to remember password for mounting encrypted or remote filesystems</summary>
+      <_summary>Whether to remember password for mounting encrypted or remote filesystems</_summary>
-      <description>
+      <_description>
        The shell will request a password when an encrypted device or a
        remote filesystem is mounted.  If the password can be saved for
        future use a 'Remember Password' checkbox will be present.
        This key sets the default state of the checkbox.
-      </description>
+      </_description>
    </key>
    <key name="had-bluetooth-devices-setup" type="b">
      <default>false</default>
      <summary>Whether the default Bluetooth adapter had set up devices associated to it</summary>
      <description>
        The shell will only show a Bluetooth menu item if a Bluetooth
        adapter is powered, or if there were devices set up associated
        with the default adapter. This will be reset if the default
        adapter is ever seen not to have devices associated to it.
      </description>
    </key>
    <child name="calendar" schema="org.gnome.shell.calendar"/>
    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
  </schema>
  <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="show-weekdate" type="b">
      <default>false</default>
      <_summary>Show the week date in the calendar</_summary>
      <_description>
        If true, display the ISO week date in the calendar.
      </_description>
      </key>
  </schema>
  <schema id="org.gnome.shell.keybindings" path="/org/gnome/shell/keybindings/"
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="open-application-menu" type="as">
      <default>["&lt;Super&gt;F10"]</default>
-      <summary>Keybinding to open the application menu</summary>
+      <_summary>Keybinding to open the application menu</_summary>
-      <description>
+      <_description>
        Keybinding to open the application menu.
-      </description>
+      </_description>
    </key>
    <key name="toggle-application-view" type="as">
      <default>["&lt;Super&gt;a"]</default>
-      <summary>Keybinding to open the "Show Applications" view</summary>
+      <_summary>Keybinding to open the "Show Applications" view</_summary>
-      <description>
+      <_description>
        Keybinding to open the "Show Applications" view of the Activities
        Overview.
-      </description>
+      </_description>
    </key>
    <key name="toggle-overview" type="as">
      <default>["&lt;Super&gt;s"]</default>
-      <summary>Keybinding to open the overview</summary>
+      <_summary>Keybinding to open the overview</_summary>
-      <description>
+      <_description>
        Keybinding to open the Activities Overview.
-      </description>
+      </_description>
    </key>
    <key name="toggle-message-tray" type="as">
      <default>["&lt;Super&gt;v","&lt;Super&gt;m"]</default>
-      <summary>Keybinding to toggle the visibility of the notification list</summary>
+      <_summary>Keybinding to toggle the visibility of the notification list</_summary>
-      <description>
+      <_description>
        Keybinding to toggle the visibility of the notification list.
-      </description>
+      </_description>
    </key>
    <key name="focus-active-notification" type="as">
      <default>["&lt;Super&gt;n"]</default>
-      <summary>Keybinding to focus the active notification</summary>
+      <_summary>Keybinding to focus the active notification</_summary>
-      <description>
+      <_description>
        Keybinding to focus the active notification.
-      </description>
+      </_description>
    </key>
    <key name="pause-resume-tweens" type="as">
      <default>[]</default>
-      <summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</summary>
+      <_summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</_summary>
-      <description></description>
+      <_description></_description>
    </key>
  </schema>
@ -135,10 +137,10 @@
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="keyboard-type" type="s">
      <default>'touch'</default>
-      <summary>Which keyboard to use</summary>
+      <_summary>Which keyboard to use</_summary>
-      <description>
+      <_description>
        The type of keyboard to use.
-      </description>
+      </_description>
    </key>
  </schema>
@ -147,11 +149,11 @@
          gettext-domain="@GETTEXT_PACKAGE@">
    <key type="b" name="current-workspace-only">
      <default>false</default>
-      <summary>Limit switcher to current workspace.</summary>
+      <_summary>Limit switcher to current workspace.</_summary>
-      <description>
+      <_description>
 	If true, only applications that have windows on the current workspace are shown in the switcher.
 	Otherwise, all applications are included.
-      </description>
+      </_description>
    </key>
  </schema>
@ -165,20 +167,20 @@
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="app-icon-mode" enum="org.gnome.shell.window-switcher.AppIconMode">
      <default>'both'</default>
-      <summary>The application icon mode.</summary>
+      <_summary>The application icon mode.</_summary>
-      <description>
+      <_description>
 	Configures how the windows are shown in the switcher. Valid possibilities
 	are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only'
 	(shows only the application icon) or 'both'.
-      </description>
+      </_description>
    </key>
    <key type="b" name="current-workspace-only">
      <default>true</default>
-      <summary>Limit switcher to current workspace.</summary>
+      <_summary>Limit switcher to current workspace.</_summary>
-      <description>
+      <_description>
 	If true, only windows from the current workspace are shown in the switcher.
 	Otherwise, all windows are included.
-      </description>
+      </_description>
    </key>
  </schema>
@ -186,43 +188,43 @@
 	  gettext-domain="@GETTEXT_PACKAGE@">
    <key name="attach-modal-dialogs" type="b">
      <default>true</default>
-      <summary>Attach modal dialog to the parent window</summary>
+      <_summary>Attach modal dialog to the parent window</_summary>
-      <description>
+      <_description>
        This key overrides the key in org.gnome.mutter when running
        GNOME Shell.
-      </description>
+      </_description>
    </key>
    <key name="edge-tiling" type="b">
      <default>true</default>
-      <summary>Enable edge tiling when dropping windows on screen edges</summary>
+      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
-      <description>
+      <_description>
        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
+      </_description>
    </key>
    <key name="dynamic-workspaces" type="b">
      <default>true</default>
-      <summary>Workspaces are managed dynamically</summary>
+      <_summary>Workspaces are managed dynamically</_summary>
-      <description>
+      <_description>
        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
+      </_description>
    </key>
    <key name="workspaces-only-on-primary" type="b">
      <default>true</default>
-      <summary>Workspaces only on primary monitor</summary>
+      <_summary>Workspaces only on primary monitor</_summary>
-      <description>
+      <_description>
        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
+      </_description>
    </key>
    <key name="focus-change-on-pointer-rest" type="b">
      <default>true</default>
-      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
+      <_summary>Delay focus changes in mouse mode until the pointer stops moving</_summary>
-      <description>
+      <_description>
        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
+      </_description>
    </key>
  </schema>
 </schemalist>
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@ -199,7 +199,7 @@ StScrollBar {
  border-radius: 9px;
  color: #eeeeec;
  background-color: rgba(23, 25, 26, 0.95);
-  border: 1px solid rgba(238, 238, 236, 0.2); }
+  border: 3px solid rgba(238, 238, 236, 0.5); }
  .modal-dialog .modal-dialog-content-box {
    padding: 24px; }
  .modal-dialog .run-dialog-entry {
@ -224,7 +224,7 @@ StScrollBar {
 /* End Session Dialog */
 .end-session-dialog {
  spacing: 42px;
-  border: 1px solid rgba(238, 238, 236, 0.2); }
+  border: 3px solid rgba(238, 238, 236, 0.2); }
 .end-session-dialog-list {
  padding-top: 20px; }
@ -399,77 +399,6 @@ StScrollBar {
  width: 48px;
  height: 48px; }
 /* Audio selection dialog */
 .audio-device-selection-dialog {
  spacing: 30px; }
 .audio-selection-content {
  spacing: 20px;
  padding: 24px; }
 .audio-selection-title {
  font-weight: bold;
  text-align: center; }
 .audio-selection-box {
  spacing: 20px; }
 .audio-selection-device {
  border: 1px solid rgba(238, 238, 236, 0.2);
  border-radius: 12px; }
  .audio-selection-device:active, .audio-selection-device:hover, .audio-selection-device:focus {
    background-color: #215d9c; }
 .audio-selection-device-box {
  padding: 20px;
  spacing: 20px; }
 .audio-selection-device-icon {
  icon-size: 64px; }
 /* Access Dialog */
 .access-dialog {
  spacing: 30px; }
 .access-dialog-main-layout {
  padding: 12px 20px 0;
  spacing: 12px; }
 .access-dialog-content {
  max-width: 28em;
  spacing: 20px; }
 .access-dialog-icon {
  min-width: 48px;
  icon-size: 48px; }
 .access-dialog-title {
  font-weight: bold; }
 .access-dialog-subtitle {
  color: #999999;
  font-weight: bold; }
 /* Geolocation Dialog */
 .geolocation-dialog {
  spacing: 30px; }
 .geolocation-dialog-main-layout {
  spacing: 12px; }
 .geolocation-dialog-content {
  spacing: 20px; }
 .geolocation-dialog-icon {
  icon-size: 48px; }
 .geolocation-dialog-title {
  font-weight: bold; }
 .geolocation-dialog-reason {
  color: #999999;
  font-weight: bold; }
 /* Network Agent Dialog */
 .network-dialog-secret-table {
  spacing-rows: 15px;
@ -479,9 +408,9 @@ StScrollBar {
  spacing-rows: 15px;
  spacing-columns: 1em; }
-/* Popovers/Menus */
+/* Popvers/Menus */
 .popup-menu {
-  min-width: 15em; }
+  min-width: 200px; }
  .popup-menu .popup-sub-menu {
    background-color: black;
    box-shadow: inset 0 -1px 0px #0d0d0d; }
@ -558,17 +487,6 @@ StScrollBar {
    border-radius: 0.3em;
    background-color: rgba(11, 12, 13, 0.5);
    color: #eeeeec; }
  .osd-window .level-bar {
    background-color: #eeeeec;
    border-radius: 0.3em; }
 /* Pad OSD */
 .pad-osd-window {
  padding: 32px;
  background-color: rgba(0, 0, 0, 0.8); }
 .combo-box-label {
  width: 15em; }
 /* App Switcher */
 .switcher-popup {
@ -612,10 +530,6 @@ StScrollBar {
  width: 96px;
  height: 96px; }
 /* Window Cycler */
 .cycler-highlight {
  border: 5px solid #215d9c; }
 /* Workspace Switcher */
 .workspace-switcher-group {
  padding: 12px; }
@ -711,8 +625,6 @@ StScrollBar {
  #panel .panel-status-indicators-box,
  #panel .panel-status-menu-box {
    spacing: 2px; }
  #panel .power-status.panel-status-indicators-box {
    spacing: 0; }
  #panel .screencast-indicator {
    color: #f57900; }
@ -804,7 +716,7 @@ StScrollBar {
  border-radius: 1.4em; }
  .calendar-day-base:hover, .calendar-day-base:focus {
    background-color: #0d0d0d; }
-  .calendar-day-base:active, .calendar-day-base:selected {
+  .calendar-day-base:active {
    color: white;
    background-color: #215d9c;
    border-color: transparent; }
@ -838,20 +750,9 @@ StScrollBar {
  color: rgba(255, 255, 255, 0.15);
  opacity: 0.5; }
 .calendar-week-number {
  font-size: 70%;
  font-weight: bold;
  width: 2.3em;
  height: 1.8em;
  border-radius: 2px;
  padding: 0.5em 0 0;
  margin: 6px;
  background-color: rgba(255, 255, 255, 0.3);
  color: #000; }
 /* Message list */
 .message-list {
-  width: 31.5em; }
+  width: 420px; }
 .message-list-sections {
  spacing: 1.5em; }
@ -907,23 +808,6 @@ StScrollBar {
  padding: 8px;
  font-size: .9em; }
 .message-media-control {
  padding: 6px; }
  .message-media-control:last-child:ltr {
    padding-right: 18px; }
  .message-media-control:last-child:rtl {
    padding-left: 18px; }
 .media-message-cover-icon {
  icon-size: 32px; }
  .media-message-cover-icon.fallback {
    color: #1a1a1a;
    background-color: #000;
    border: 2px solid #000;
    border-radius: 2px;
    icon-size: 16px;
    padding: 8px; }
 .system-switch-user-submenu-icon.user-icon {
  icon-size: 20px;
  padding: 0 2px; }
@ -939,7 +823,7 @@ StScrollBar {
    color: transparent; }
 .aggregate-menu {
-  min-width: 21em; }
+  width: 360px; }
  .aggregate-menu .popup-menu-icon {
    padding: 0 4px; }
@ -1076,14 +960,10 @@ StScrollBar {
 .search-entry {
  width: 320px;
  padding: 7px 9px;
-  border-radius: 6px;
+  border-radius: 6px; }
  border-color: #747467;
  color: #eeeeec;
  background-color: #2e3436; }
  .search-entry:focus {
    padding: 6px 8px;
-    border-width: 2px;
+    border-width: 2px; }
    border-color: #215d9c; }
  .search-entry .search-entry-icon {
    icon-size: 1em;
    padding: 0 4px;
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -199,7 +199,7 @@ StScrollBar {
  border-radius: 9px;
  color: #eeeeec;
  background-color: rgba(23, 25, 26, 0.95);
-  border: 1px solid rgba(238, 238, 236, 0.2); }
+  border: 3px solid rgba(238, 238, 236, 0.5); }
  .modal-dialog .modal-dialog-content-box {
    padding: 24px; }
  .modal-dialog .run-dialog-entry {
@ -224,7 +224,7 @@ StScrollBar {
 /* End Session Dialog */
 .end-session-dialog {
  spacing: 42px;
-  border: 1px solid rgba(238, 238, 236, 0.2); }
+  border: 3px solid rgba(238, 238, 236, 0.2); }
 .end-session-dialog-list {
  padding-top: 20px; }
@ -399,77 +399,6 @@ StScrollBar {
  width: 48px;
  height: 48px; }
 /* Audio selection dialog */
 .audio-device-selection-dialog {
  spacing: 30px; }
 .audio-selection-content {
  spacing: 20px;
  padding: 24px; }
 .audio-selection-title {
  font-weight: bold;
  text-align: center; }
 .audio-selection-box {
  spacing: 20px; }
 .audio-selection-device {
  border: 1px solid rgba(238, 238, 236, 0.2);
  border-radius: 12px; }
  .audio-selection-device:active, .audio-selection-device:hover, .audio-selection-device:focus {
    background-color: #215d9c; }
 .audio-selection-device-box {
  padding: 20px;
  spacing: 20px; }
 .audio-selection-device-icon {
  icon-size: 64px; }
 /* Access Dialog */
 .access-dialog {
  spacing: 30px; }
 .access-dialog-main-layout {
  padding: 12px 20px 0;
  spacing: 12px; }
 .access-dialog-content {
  max-width: 28em;
  spacing: 20px; }
 .access-dialog-icon {
  min-width: 48px;
  icon-size: 48px; }
 .access-dialog-title {
  font-weight: bold; }
 .access-dialog-subtitle {
  color: #8e8e80;
  font-weight: bold; }
 /* Geolocation Dialog */
 .geolocation-dialog {
  spacing: 30px; }
 .geolocation-dialog-main-layout {
  spacing: 12px; }
 .geolocation-dialog-content {
  spacing: 20px; }
 .geolocation-dialog-icon {
  icon-size: 48px; }
 .geolocation-dialog-title {
  font-weight: bold; }
 .geolocation-dialog-reason {
  color: #8e8e80;
  font-weight: bold; }
 /* Network Agent Dialog */
 .network-dialog-secret-table {
  spacing-rows: 15px;
@ -479,9 +408,9 @@ StScrollBar {
  spacing-rows: 15px;
  spacing-columns: 1em; }
-/* Popovers/Menus */
+/* Popvers/Menus */
 .popup-menu {
-  min-width: 15em; }
+  min-width: 200px; }
  .popup-menu .popup-sub-menu {
    background-color: #343a3a;
    box-shadow: inset 0 -1px 0px #282c2c; }
@ -558,17 +487,6 @@ StScrollBar {
    border-radius: 0.3em;
    background-color: rgba(11, 12, 13, 0.5);
    color: #eeeeec; }
  .osd-window .level-bar {
    background-color: #eeeeec;
    border-radius: 0.3em; }
 /* Pad OSD */
 .pad-osd-window {
  padding: 32px;
  background-color: rgba(0, 0, 0, 0.8); }
 .combo-box-label {
  width: 15em; }
 /* App Switcher */
 .switcher-popup {
@ -612,10 +530,6 @@ StScrollBar {
  width: 96px;
  height: 96px; }
 /* Window Cycler */
 .cycler-highlight {
  border: 5px solid #215d9c; }
 /* Workspace Switcher */
 .workspace-switcher-group {
  padding: 12px; }
@ -711,8 +625,6 @@ StScrollBar {
  #panel .panel-status-indicators-box,
  #panel .panel-status-menu-box {
    spacing: 2px; }
  #panel .power-status.panel-status-indicators-box {
    spacing: 0; }
  #panel .screencast-indicator {
    color: #f57900; }
@ -804,7 +716,7 @@ StScrollBar {
  border-radius: 1.4em; }
  .calendar-day-base:hover, .calendar-day-base:focus {
    background-color: #454c4c; }
-  .calendar-day-base:active, .calendar-day-base:selected {
+  .calendar-day-base:active {
    color: white;
    background-color: #215d9c;
    border-color: transparent; }
@ -838,20 +750,9 @@ StScrollBar {
  color: rgba(238, 238, 236, 0.15);
  opacity: 0.5; }
 .calendar-week-number {
  font-size: 70%;
  font-weight: bold;
  width: 2.3em;
  height: 1.8em;
  border-radius: 2px;
  padding: 0.5em 0 0;
  margin: 6px;
  background-color: rgba(238, 238, 236, 0.3);
  color: #393f3f; }
 /* Message list */
 .message-list {
-  width: 31.5em; }
+  width: 420px; }
 .message-list-sections {
  spacing: 1.5em; }
@ -907,23 +808,6 @@ StScrollBar {
  padding: 8px;
  font-size: .9em; }
 .message-media-control {
  padding: 6px; }
  .message-media-control:last-child:ltr {
    padding-right: 18px; }
  .message-media-control:last-child:rtl {
    padding-left: 18px; }
 .media-message-cover-icon {
  icon-size: 32px; }
  .media-message-cover-icon.fallback {
    color: #515a5a;
    background-color: #393f3f;
    border: 2px solid #393f3f;
    border-radius: 2px;
    icon-size: 16px;
    padding: 8px; }
 .system-switch-user-submenu-icon.user-icon {
  icon-size: 20px;
  padding: 0 2px; }
@ -939,7 +823,7 @@ StScrollBar {
    color: transparent; }
 .aggregate-menu {
-  min-width: 21em; }
+  width: 280px; }
  .aggregate-menu .popup-menu-icon {
    padding: 0 4px; }
@ -1076,14 +960,10 @@ StScrollBar {
 .search-entry {
  width: 320px;
  padding: 7px 9px;
-  border-radius: 6px;
+  border-radius: 6px; }
  border-color: #747467;
  color: #eeeeec;
  background-color: #2e3436; }
  .search-entry:focus {
    padding: 6px 8px;
-    border-width: 2px;
+    border-width: 2px; }
    border-color: #215d9c; }
  .search-entry .search-entry-icon {
    icon-size: 1em;
    padding: 0 4px;
--- a/data/theme/pad-osd.css
+++ b/data/theme/pad-osd.css
@ -1,30 +0,0 @@
 .Leader {
    stroke-width: .5 !important;
    stroke: #535353;
    fill: none !important;
 }
 .Button {
    stroke-width: .25;
    stroke: #ededed;
    fill: #ededed;
 }
 .Ring {
    stroke-width: .5 !important;
    stroke: #535353 !important;
    fill: none !important;
 }
 .Label {
    stroke: none !important;
    stroke-width: .1 !important;
    font-size: .1 !important;
    fill: transparent !important;
 }
 .TouchStrip, .TouchRing {
    stroke-width: .1 !important;
    stroke: #ededed !important;
    fill: #535353 !important;
 }
--- a/docs/reference/shell/Makefile.am
+++ b/docs/reference/shell/Makefile.am
@ -113,7 +113,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS)
-GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la -rpath $(MUTTER_TYPELIB_DIR)
+GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
--- a/docs/reference/st/Makefile.am
+++ b/docs/reference/st/Makefile.am
@ -78,7 +78,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=
-GTKDOC_LIBS=$(top_builddir)/src/libst-1.0.la -rpath $(MUTTER_TYPELIB_DIR)
+GTKDOC_LIBS=$(top_builddir)/src/libst-1.0.la
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@ -23,6 +23,11 @@ const GnomeShellIface = '<node> \
 </interface> \
 </node>';
 const customCss = '.prefs-button { \
                       padding: 8px; \
                       border-radius: 20px; \
                   }';
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
 function stripPrefix(string, prefix) {
@ -152,7 +157,6 @@ const Application = new Lang.Class({
        let scroll = new Gtk.ScrolledWindow({ hscrollbar_policy: Gtk.PolicyType.NEVER,
                                              shadow_type: Gtk.ShadowType.IN,
                                              halign: Gtk.Align.CENTER,
                                              propagate_natural_width: true,
                                              margin: 18 });
        this._window.add(scroll);
@ -172,6 +176,21 @@ const Application = new Lang.Class({
        this._window.show_all();
    },
    _addCustomStyle: function() {
        let provider = new Gtk.CssProvider();
        try {
            provider.load_from_data(customCss, -1);
        } catch(e) {
            log('Failed to add application style');
            return;
        }
        let screen = this._window.window.get_screen();
        let priority = Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION;
        Gtk.StyleContext.add_provider_for_screen(screen, provider, priority);
    },
    _sortList: function(row1, row2) {
        let name1 = ExtensionUtils.extensions[row1.uuid].metadata.name;
        let name2 = ExtensionUtils.extensions[row2.uuid].metadata.name;
@ -220,6 +239,7 @@ const Application = new Lang.Class({
    _onStartup: function(app) {
        this._buildUI(app);
        this._addCustomStyle();
        this._scanExtensions();
    },
@ -296,7 +316,7 @@ const ExtensionRow = new Lang.Class({
        button.add(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
                                   icon_size: Gtk.IconSize.BUTTON,
                                   visible: true }));
-        button.get_style_context().add_class('circular');
+        button.get_style_context().add_class('prefs-button');
        hbox.add(button);
        this.prefsButton = button;
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@ -13,7 +13,6 @@ const Params = imports.misc.params;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;
 const Pango = imports.gi.Pango;
 const DEFAULT_BUTTON_WELL_ICON_SIZE = 16;
 const DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0;
@ -114,7 +113,6 @@ const AuthPrompt = new Lang.Class({
        this._message = new St.Label({ opacity: 0,
                                       styleClass: 'login-dialog-message' });
        this._message.clutter_text.line_wrap = true;
        this._message.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        this.actor.add(this._message, { x_fill: false, x_align: St.Align.START, y_align: St.Align.START });
        this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
@ -191,8 +189,7 @@ const AuthPrompt = new Lang.Class({
                                             this._updateNextButtonSensitivity(this._entry.text.length > 0);
                                         }));
        this._entry.clutter_text.connect('activate', Lang.bind(this, function() {
-            if (this.nextButton.reactive)
+            this.emit('next');
                this.emit('next');
        }));
    },
--- a/js/gdm/batch.js
+++ b/js/gdm/batch.js
@ -16,34 +16,6 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 /*
 * In order for transformation animations to look good, they need to be
 * incremental and have some order to them (e.g., fade out hidden items,
 * then shrink to close the void left over). Chaining animations in this way can
 * be error-prone and wordy using just Tweener callbacks.
 *
 * The classes in this file help with this:
 *
 * - Task.  encapsulates schedulable work to be run in a specific scope.
 *
 * - ConsecutiveBatch.  runs a series of tasks in order and completes
 *                      when the last in the series finishes.
 *
 * - ConcurrentBatch.  runs a set of tasks at the same time and completes
 *                     when the last to finish completes.
 *
 * - Hold.  prevents a batch from completing the pending task until
 *          the hold is released.
 *
 * The tasks associated with a batch are specified in a list at batch
 * construction time as either task objects or plain functions.
 * Batches are task objects, themselves, so they can be nested.
 *
 * These classes aren't specific to GDM, but were found to be unintuitive and so
 * are not used elsewhere. These APIs may ultimately get dropped entirely and
 * replaced by something else.
 */
 const Lang = imports.lang;
 const Signals = imports.signals;
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -96,7 +96,7 @@ const UserListItem = new Lang.Class({
    },
    _onDestroy: function() {
-        this.user.disconnect(this._userChangedId);
+        this._user.disconnect(this._userChangedId);
    },
    _onClicked: function() {
@ -212,10 +212,6 @@ const UserList = new Lang.Class({
        return item;
    },
    containsUser: function(user) {
        return this._items[user.get_user_name()] != null;
    },
    addUser: function(user) {
        if (!user.is_loaded)
            return;
@ -804,11 +800,6 @@ const LoginDialog = new Lang.Class({
        this._user = null;
        if (this._nextSignalId) {
            this._authPrompt.disconnect(this._nextSignalId);
            this._nextSignalId = 0;
        }
        if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) {
            if (!this._disableUserList)
                this._showUserList();
@ -933,7 +924,11 @@ const LoginDialog = new Lang.Class({
                           },
                           onUpdateScope: this,
                           onComplete: function() {
-                               this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
+                               let id = Mainloop.idle_add(Lang.bind(this, function() {
                                   this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
                                   return GLib.SOURCE_REMOVE;
                               }));
                               GLib.Source.set_name_by_id(id, '[gnome-shell] this._greeter.call_start_session_when_ready_sync');
                           },
                           onCompleteScope: this });
    },
@ -1135,10 +1130,6 @@ const LoginDialog = new Lang.Class({
            this._userManager.disconnect(this._userRemovedId);
            this._userRemovedId = 0;
        }
        if (this._userChangedId) {
            this._userManager.disconnect(this._userChangedId);
            this._userChangedId = 0;
        }
        this._textureCache.disconnect(this._updateLogoTextureId);
        Main.layoutManager.disconnect(this._startupCompleteId);
        if (this._settings) {
@ -1185,14 +1176,6 @@ const LoginDialog = new Lang.Class({
                                                            this._userList.removeUser(user);
                                                        }));
        this._userChangedId = this._userManager.connect('user-changed',
                                                        Lang.bind(this, function(userManager, user) {
                                                            if (this._userList.containsUser(user) && user.locked)
                                                                this._userList.removeUser(user);
                                                            else if (!this._userList.containsUser(user) && !user.locked)
                                                                this._userList.addUser(user);
                                                        }));
        return GLib.SOURCE_REMOVE;
    },
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@ -31,12 +31,10 @@
    <file>portalHelper/main.js</file>
    <file>ui/accessDialog.js</file>
    <file>ui/altTab.js</file>
    <file>ui/animation.js</file>
    <file>ui/appDisplay.js</file>
    <file>ui/appFavorites.js</file>
    <file>ui/audioDeviceSelection.js</file>
    <file>ui/backgroundMenu.js</file>
    <file>ui/background.js</file>
    <file>ui/boxpointer.js</file>
@ -64,15 +62,12 @@
    <file>ui/magnifierDBus.js</file>
    <file>ui/main.js</file>
    <file>ui/messageTray.js</file>
    <file>ui/messageList.js</file>
    <file>ui/modalDialog.js</file>
    <file>ui/mpris.js</file>
    <file>ui/notificationDaemon.js</file>
    <file>ui/osdWindow.js</file>
    <file>ui/osdMonitorLabeler.js</file>
    <file>ui/overview.js</file>
    <file>ui/overviewControls.js</file>
    <file>ui/padOsd.js</file>
    <file>ui/panel.js</file>
    <file>ui/panelMenu.js</file>
    <file>ui/pointerWatcher.js</file>
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@ -6,7 +6,9 @@
 const Lang = imports.lang;
 const Signals = imports.signals;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const ShellJS = imports.gi.ShellJS;
 const Config = imports.misc.config;
 const FileUtils = imports.misc.fileUtils;
@ -19,25 +21,14 @@ const ExtensionType = {
 // Maps uuid -> metadata object
 const extensions = {};
 /**
 * getCurrentExtension:
 *
 * Returns the current extension, or null if not called from an extension.
 */
 function getCurrentExtension() {
-    let stack = (new Error()).stack.split('\n');
+    let stack = (new Error()).stack;
    let extensionStackLine;
-    // Search for an occurrence of an extension stack frame
+    // Assuming we're importing this directly from an extension (and we shouldn't
-    // Start at 1 because 0 is the stack frame of this function
+    // ever not be), its UUID should be directly in the path here.
-    for (let i = 1; i < stack.length; i++) {
+    let extensionStackLine = stack.split('\n')[1];
        if (stack[i].indexOf('/gnome-shell/extensions/') > -1) {
            extensionStackLine = stack[i];
            break;
        }
    }
    if (!extensionStackLine)
-        return null;
+        throw new Error('Could not find current extension');
    // The stack line is like:
    //   init([object Object])@/home/user/data/gnome-shell/extensions/u@u.id/prefs.js:8
@ -47,7 +38,7 @@ function getCurrentExtension() {
    //   @/home/user/data/gnome-shell/extensions/u@u.id/prefs.js:8
    let match = new RegExp('@(.+):\\d+').exec(extensionStackLine);
    if (!match)
-        return null;
+        throw new Error('Could not find current extension');
    let path = match[1];
    let file = Gio.File.new_for_path(path);
@ -61,7 +52,7 @@ function getCurrentExtension() {
        file = file.get_parent();
    }
-    return null;
+    throw new Error('Could not find current extension');
 }
 /**
@ -149,13 +140,12 @@ function createExtensionObject(uuid, dir, type) {
    return extension;
 }
 var _extension = null;
 function installImporter(extension) {
-    let oldSearchPath = imports.searchPath.slice();  // make a copy
+    _extension = extension;
-    imports.searchPath = [extension.dir.get_parent().get_path()];
+    ShellJS.add_extension_importer('imports.misc.extensionUtils._extension', 'imports', extension.path);
-    // importing a "subdir" creates a new importer object that doesn't affect
+    _extension = null;
    // the global one
    extension.imports = imports[extension.uuid];
    imports.searchPath = oldSearchPath;
 }
 const ExtensionFinder = new Lang.Class({
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@ -40,9 +40,6 @@ const SystemdLoginSessionIface = '<node> \
 <signal name="Lock" /> \
 <signal name="Unlock" /> \
 <property name="Active" type="b" access="read" /> \
 <method name="SetLockedHint"> \
    <arg type="b" direction="in"/> \
 </method> \
 </interface> \
 </node>';
@ -134,13 +131,10 @@ const LoginManagerSystemd = new Lang.Class({
    canSuspend: function(asyncCallback) {
        this._proxy.CanSuspendRemote(function(result, error) {
-            if (error) {
+            if (error)
-                asyncCallback(false, false);
+                asyncCallback(false);
-            } else {
+            else
-                let needsAuth = result[0] == 'challenge';
+                asyncCallback(result[0] != 'no' && result[0] != 'na');
                let canSuspend = needsAuth || result[0] == 'yes';
                asyncCallback(canSuspend, needsAuth);
            }
        });
    },
@ -193,7 +187,7 @@ const LoginManagerDummy = new Lang.Class({
    },
    canSuspend: function(asyncCallback) {
-        asyncCallback(false, false);
+        asyncCallback(false);
    },
    listSessions: function(asyncCallback) {
--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -94,7 +94,7 @@ function spawnApp(argv) {
                                                      Gio.AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION);
        let context = global.create_app_launch_context(0, -1);
-        app.launch([], context, false);
+        app.launch([], context);
    } catch(err) {
        _handleSpawnError(argv[0], err);
    }
--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@ -20,8 +20,6 @@ const PortalHelperResult = {
 };
 const INACTIVITY_TIMEOUT = 30000; //ms
 const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
 const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST;
 const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
 const HelperDBusInterface = '<node> \
@ -52,7 +50,7 @@ const PortalWindow = new Lang.Class({
        this.parent({ application: application });
        if (!url) {
-            url = CONNECTIVITY_CHECK_URI;
+            url = 'http://www.gnome.org';
            this._originalUrlWasGnome = true;
        } else {
            this._originalUrlWasGnome = false;
@ -114,12 +112,12 @@ const PortalWindow = new Lang.Class({
        let uri = new Soup.URI(request.get_uri());
        if (!uri.host_equal(this._uri) && this._originalUrlWasGnome) {
-            if (uri.get_host() == CONNECTIVITY_CHECK_HOST && this._everSeenRedirect) {
+            if (uri.get_host() == 'www.gnome.org' && this._everSeenRedirect) {
                // Yay, we got to gnome!
                decision.ignore();
                this._doneCallback(PortalHelperResult.COMPLETED);
                return true;
-            } else if (uri.get_host() != CONNECTIVITY_CHECK_HOST) {
+            } else if (uri.get_host() != 'www.gnome.org') {
                this._everSeenRedirect = true;
            }
        }
--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@ -1,202 +0,0 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const CheckBox = imports.ui.checkBox;
 const ModalDialog = imports.ui.modalDialog;
 const RequestIface = '<node> \
 <interface name="org.freedesktop.impl.portal.Request"> \
 <method name="Close"/> \
 </interface> \
 </node>';
 const AccessIface = '<node> \
 <interface name="org.freedesktop.impl.portal.Access"> \
 <method name="AccessDialog"> \
  <arg type="o" name="handle" direction="in"/> \
  <arg type="s" name="app_id" direction="in"/> \
  <arg type="s" name="parent_window" direction="in"/> \
  <arg type="s" name="title" direction="in"/> \
  <arg type="s" name="subtitle" direction="in"/> \
  <arg type="s" name="body" direction="in"/> \
  <arg type="a{sv}" name="options" direction="in"/> \
  <arg type="u" name="response" direction="out"/> \
  <arg type="a{sv}" name="results" direction="out"/> \
 </method> \
 </interface> \
 </node>';
 const DialogResponse = {
    OK: 0,
    CANCEL: 1,
    CLOSED: 2
 };
 const AccessDialog = new Lang.Class({
    Name: 'AccessDialog',
    Extends: ModalDialog.ModalDialog,
    _init: function(invocation, handle, title, subtitle, body, options) {
        this.parent({ styleClass: 'access-dialog' });
        this._invocation = invocation;
        this._handle = handle;
        this._requestExported = false;
        this._request = Gio.DBusExportedObject.wrapJSObject(RequestIface, this);
        for (let option in options)
            options[option] = options[option].deep_unpack();
        this._buildLayout(title, subtitle, body, options);
    },
    _buildLayout: function(title, subtitle, body, options) {
        // No support for non-modal system dialogs, so ignore the option
        //let modal = options['modal'] || true;
        let denyLabel = options['deny_label'] || _("Deny Access");
        let grantLabel = options['grant_label'] || _("Grant Access");
        let iconName = options['icon'] || null;
        let choices = options['choices'] || [];
        let mainContentBox = new St.BoxLayout();
        mainContentBox.style_class = 'access-dialog-main-layout';
        this.contentLayout.add_actor(mainContentBox);
        let icon = new St.Icon({ style_class: 'access-dialog-icon',
                                 icon_name: iconName,
                                 y_align: Clutter.ActorAlign.START });
        mainContentBox.add_actor(icon);
        let messageBox = new St.BoxLayout({ vertical: true });
        messageBox.style_class = 'access-dialog-content',
        mainContentBox.add_actor(messageBox);
        let label;
        label = new St.Label({ style_class: 'access-dialog-title headline',
                               text: title });
        messageBox.add_actor(label);
        label = new St.Label({ style_class: 'access-dialog-subtitle',
                               text: subtitle });
        label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        label.clutter_text.line_wrap = true;
        messageBox.add_actor(label);
        this._choices = new Map();
        for (let i = 0; i < choices.length; i++) {
            let [id, name, opts, selected] = choices[i];
            if (opts.length > 0)
                continue; // radio buttons, not implemented
            let check = new CheckBox.CheckBox();
            check.getLabelActor().text = name;
            check.actor.checked = selected == "true";
            messageBox.add_actor(check.actor);
            this._choices.set(id, check);
        }
        label = new St.Label({ text: body });
        label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        label.clutter_text.line_wrap = true;
        messageBox.add_actor(label);
        this.addButton({ label: denyLabel,
                         action: () => {
                             this._sendResponse(DialogResponse.CANCEL);
                         },
                         key: Clutter.KEY_Escape });
        this.addButton({ label: grantLabel,
                         action: () => {
                             this._sendResponse(DialogResponse.OK);
                         }});
    },
    open: function() {
        this.parent();
        let connection = this._invocation.get_connection();
        this._requestExported = this._request.export(connection, this._handle);
    },
    CloseAsync: function(invocation, params) {
        if (this._invocation.get_sender() != invocation.get_sender()) {
            invocation.return_error_literal(Gio.DBusError,
                                            Gio.DBusError.ACCESS_DENIED,
                                            '');
            return;
        }
        this._sendResponse(DialogResponse.CLOSED);
    },
    _sendResponse: function(response) {
        if (this._requestExported)
            this._request.unexport();
        this._requestExported = false;
        let results = {};
        if (response == DialogResponse.OK) {
            for (let [id, check] of this._choices) {
                let checked = check.actor.checked ? 'true' : 'false';
                results[id] = new GLib.Variant('s', checked);
            }
        }
        // Delay actual response until the end of the close animation (if any)
        this.connect('closed', () => {
            this._invocation.return_value(new GLib.Variant('(ua{sv})',
                                                           [response, results]));
        });
        this.close();
    }
 });
 const AccessDialogDBus = new Lang.Class({
    Name: 'AccessDialogDBus',
    _init: function() {
        this._accessDialog = null;
        this._windowTracker = Shell.WindowTracker.get_default();
        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(AccessIface, this);
        this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/portal/desktop');
        Gio.DBus.session.own_name('org.freedesktop.impl.portal.desktop.gnome', Gio.BusNameOwnerFlags.REPLACE, null, null);
    },
    AccessDialogAsync: function(params, invocation) {
        if (this._accessDialog) {
            invocation.return_error_literal(Gio.DBusError,
                                            Gio.DBusError.LIMITS_EXCEEDED,
                                            'Already showing a system access dialog');
            return;
        }
        let [handle, appId, parentWindow, title, subtitle, body, options] = params;
        // We probably want to use parentWindow and global.display.focus_window
        // for this check in the future
        if (appId && appId + '.desktop' != this._windowTracker.focus_app.id) {
            invocation.return_error_literal(Gio.DBusError,
                                            Gio.DBusError.ACCESS_DENIED,
                                            'Only the focused app is allowed to show a system access dialog');
            return;
        }
        let dialog = new AccessDialog(invocation, handle, title,
                                      subtitle, body, options);
        dialog.open();
        dialog.connect('closed', () => { this._accessDialog = null; });
        this._accessDialog = dialog;
    }
 });
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -46,19 +46,6 @@ function _createWindowClone(window, size) {
                               y_expand: true });
 };
 function getWindows(workspace) {
    // We ignore skip-taskbar windows in switchers, but if they are attached
    // to their parent, their position in the MRU list may be more appropriate
    // than the parent; so start with the complete list ...
    let windows = global.display.get_tab_list(Meta.TabList.NORMAL_ALL,
                                              workspace);
    // ... map windows to their parent where appropriate ...
    return windows.map(w => {
        return w.is_attached_dialog() ? w.get_transient_for() : w;
    // ... and filter out skip-taskbar windows and duplicates
    }).filter((w, i, a) => !w.skip_taskbar && a.indexOf(w) == i);
 }
 const AppSwitcherPopup = new Lang.Class({
    Name: 'AppSwitcherPopup',
    Extends: SwitcherPopup.SwitcherPopup,
@ -367,149 +354,6 @@ const AppSwitcherPopup = new Lang.Class({
    }
 });
 const CyclerHighlight = new Lang.Class({
    Name: 'CyclerHighlight',
    _init: function() {
        this._window = null;
        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout() });
        this._clone = new Clutter.Clone();
        this.actor.add_actor(this._clone);
        this._highlight = new St.Widget({ style_class: 'cycler-highlight' });
        this.actor.add_actor(this._highlight);
        let coordinate = Clutter.BindCoordinate.ALL;
        let constraint = new Clutter.BindConstraint({ coordinate: coordinate });
        this._clone.bind_property('source', constraint, 'source', 0);
        this.actor.add_constraint(constraint);
        this.actor.connect('notify::allocation',
                           Lang.bind(this, this._onAllocationChanged));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
    },
    set window(w) {
        if (this._window == w)
            return;
        this._window = w;
        if (this._clone.source)
            this._clone.source.sync_visibility();
        let windowActor = this._window ? this._window.get_compositor_private()
                                       : null;
        if (windowActor)
            windowActor.hide();
        this._clone.source = windowActor;
    },
    _onAllocationChanged: function() {
        if (!this._window) {
            this._highlight.set_size(0, 0);
            this._highlight.hide();
        } else {
            let [x, y] = this.actor.allocation.get_origin();
            let rect = this._window.get_frame_rect();
            this._highlight.set_size(rect.width, rect.height);
            this._highlight.set_position(rect.x - x, rect.y - y);
            this._highlight.show();
        }
    },
    _onDestroy: function() {
        this.window = null;
    }
 });
 const CyclerPopup = new Lang.Class({
    Name: 'CyclerPopup',
    Extends: SwitcherPopup.SwitcherPopup,
    Abstract: true,
    _init : function() {
        this.parent();
        this._items = this._getWindows();
        if (this._items.length == 0)
            return;
        this._highlight = new CyclerHighlight();
        global.window_group.add_actor(this._highlight.actor);
        // We don't show an actual popup, so just provide what SwitcherPopup
        // expects instead of inheriting from SwitcherList
        this._switcherList = { actor: new St.Widget(),
                               highlight: Lang.bind(this, this._highlightItem),
                               connect: function() {} };
    },
    _highlightItem: function(index, justOutline) {
        this._highlight.window = this._items[index];
        global.window_group.set_child_above_sibling(this._highlight.actor, null);
    },
    _finish: function() {
        let window = this._items[this._selectedIndex];
        let ws = window.get_workspace();
        let activeWs = global.screen.get_active_workspace();
        if (window.minimized) {
            Main.wm.skipNextEffect(window.get_compositor_private());
            window.unminimize();
        }
        if (activeWs == ws) {
            Main.activateWindow(window);
        } else {
            // If the selected window is on a different workspace, we don't
            // want it to disappear, then slide in with the workspace; instead,
            // always activate it on the active workspace ...
            activeWs.activate_with_focus(window, global.get_current_time());
            // ... then slide it over to the original workspace if necessary
            Main.wm.actionMoveWindow(window, ws);
        }
        this.parent();
    },
    _onDestroy: function() {
        this._highlight.actor.destroy();
        this.parent();
    }
 });
 const GroupCyclerPopup = new Lang.Class({
    Name: 'GroupCyclerPopup',
    Extends: CyclerPopup,
    _getWindows: function() {
        let app = Shell.WindowTracker.get_default().focus_app;
        return app ? app.get_windows() : [];
    },
    _keyPressHandler: function(keysym, action) {
        if (action == Meta.KeyBindingAction.CYCLE_GROUP)
            this._select(this._next());
        else if (action == Meta.KeyBindingAction.CYCLE_GROUP_BACKWARD)
            this._select(this._previous());
        else
            return Clutter.EVENT_PROPAGATE;
        return Clutter.EVENT_STOP;
    }
 });
 const WindowSwitcherPopup = new Lang.Class({
    Name: 'WindowSwitcherPopup',
    Extends: SwitcherPopup.SwitcherPopup,
@ -530,7 +374,7 @@ const WindowSwitcherPopup = new Lang.Class({
    _getWindowList: function() {
        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
-        return getWindows(workspace);
+        return global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
    },
    _keyPressHandler: function(keysym, action) {
@ -557,32 +401,6 @@ const WindowSwitcherPopup = new Lang.Class({
    }
 });
 const WindowCyclerPopup = new Lang.Class({
    Name: 'WindowCyclerPopup',
    Extends: CyclerPopup,
    _init: function() {
        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
        this.parent();
    },
    _getWindows: function() {
        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
        return getWindows(workspace);
    },
    _keyPressHandler: function(keysym, action) {
        if (action == Meta.KeyBindingAction.CYCLE_WINDOWS)
            this._select(this._next());
        else if (action == Meta.KeyBindingAction.CYCLE_WINDOWS_BACKWARD)
            this._select(this._previous());
        else
            return Clutter.EVENT_PROPAGATE;
        return Clutter.EVENT_STOP;
    }
 });
 const AppIcon = new Lang.Class({
    Name: 'AppIcon',
@ -630,6 +448,8 @@ const AppSwitcher = new Lang.Class({
            });
            if (appIcon.cachedWindows.length > 0)
                this._addIcon(appIcon);
            else if (workspace == null)
                throw new Error('%s appears to be running, but doesn\'t have any windows'.format(appIcon.app.get_name()));
        }
        this._curApp = -1;
@ -867,17 +687,15 @@ const WindowIcon = new Lang.Class({
        this._icon.destroy_all_children();
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        switch (mode) {
            case AppIconMode.THUMBNAIL_ONLY:
                size = WINDOW_PREVIEW_SIZE;
-                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+                this._icon.add_actor(_createWindowClone(mutterWindow, WINDOW_PREVIEW_SIZE));
                break;
            case AppIconMode.BOTH:
                size = WINDOW_PREVIEW_SIZE;
-                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+                this._icon.add_actor(_createWindowClone(mutterWindow, WINDOW_PREVIEW_SIZE));
                if (this.app)
                    this._icon.add_actor(this._createAppIcon(this.app,
@ -889,7 +707,7 @@ const WindowIcon = new Lang.Class({
                this._icon.add_actor(this._createAppIcon(this.app, size));
        }
-        this._icon.set_size(size * scaleFactor, size * scaleFactor);
+        this._icon.set_size(size, size);
    },
    _createAppIcon: function(app, size) {
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@ -7,7 +7,7 @@ const St = imports.gi.St;
 const Signals = imports.signals;
 const Atk = imports.gi.Atk;
-const ANIMATED_ICON_UPDATE_TIMEOUT = 16;
+const ANIMATED_ICON_UPDATE_TIMEOUT = 14;
 const Animation = new Lang.Class({
    Name: 'Animation',
@ -33,7 +33,7 @@ const Animation = new Lang.Class({
            if (this._frame == 0)
                this._showFrame(0);
-            this._timeoutId = GLib.timeout_add(GLib.PRIORITY_LOW, this._speed, Lang.bind(this, this._update));
+            this._timeoutId = Mainloop.timeout_add(this._speed, Lang.bind(this, this._update));
            GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._update');
        }
@ -67,7 +67,7 @@ const Animation = new Lang.Class({
    },
    _animationsLoaded: function() {
-        this._isLoaded = this._animations.get_n_children() > 0;
+        this._isLoaded = true;
        if (this._isPlaying)
            this.play();
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -60,18 +60,6 @@ const PAGE_SWITCH_TIME = 0.3;
 const VIEWS_SWITCH_TIME = 0.4;
 const VIEWS_SWITCH_ANIMATION_DELAY = 0.1;
 const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl';
 const SWITCHEROO_OBJECT_PATH = '/net/hadess/SwitcherooControl';
 const SwitcherooProxyInterface = '<node> \
 <interface name="net.hadess.SwitcherooControl"> \
  <property name="HasDualGpu" type="b" access="read"/> \
 </interface> \
 </node>';
 const SwitcherooProxy = Gio.DBusProxy.makeProxyWrapper(SwitcherooProxyInterface);
 let discreteGpuAvailable = false;
 function _getCategories(info) {
    let categoriesStr = info.get_categories();
    if (!categoriesStr)
@ -210,14 +198,6 @@ const BaseAppView = new Lang.Class({
    },
    animate: function(animationDirection, onComplete) {
        if (onComplete) {
            let animationDoneId = this._grid.connect('animation-done', Lang.bind(this,
                function () {
                    this._grid.disconnect(animationDoneId);
                    onComplete();
            }));
        }
        if (animationDirection == IconGrid.AnimationDirection.IN) {
            let toAnimate = this._grid.actor.connect('notify::allocation', Lang.bind(this,
                function() {
@ -233,6 +213,14 @@ const BaseAppView = new Lang.Class({
        } else {
            this._doSpringAnimation(animationDirection);
        }
        if (onComplete) {
            let animationDoneId = this._grid.connect('animation-done', Lang.bind(this,
                function () {
                    this._grid.disconnect(animationDoneId);
                    onComplete();
            }));
        }
    },
    animateSwitch: function(animationDirection) {
@ -981,36 +969,10 @@ const AppDisplay = new Lang.Class({
            initialView = Views.ALL;
        this._showView(initialView);
        this._updateFrequentVisibility();
        Gio.DBus.system.watch_name(SWITCHEROO_BUS_NAME,
                                   Gio.BusNameWatcherFlags.NONE,
                                   Lang.bind(this, this._switcherooProxyAppeared),
                                   Lang.bind(this, function() {
                                       this._switcherooProxy = null;
                                       this._updateDiscreteGpuAvailable();
                                   }));
    },
    _updateDiscreteGpuAvailable: function() {
        if (!this._switcherooProxy)
            discreteGpuAvailable = false;
        else
            discreteGpuAvailable = this._switcherooProxy.HasDualGpu;
    },
    _switcherooProxyAppeared: function() {
        this._switcherooProxy = new SwitcherooProxy(Gio.DBus.system, SWITCHEROO_BUS_NAME, SWITCHEROO_OBJECT_PATH,
            Lang.bind(this, function(proxy, error) {
                if (error) {
                    log(error.message);
                    return;
                }
                this._updateDiscreteGpuAvailable();
            }));
    },
    animate: function(animationDirection, onComplete) {
-        let currentView = this._views.filter(v => v.control.has_style_pseudo_class('checked')).pop().view;
+        let currentView = this._views[global.settings.get_uint('app-picker-view')].view;
        // Animate controls opacity using iconGrid animation time, since
        // it will be the time the AllView or FrequentView takes to show
@ -1852,7 +1814,7 @@ const AppIconMenu = new Lang.Class({
            if (!source.actor.mapped)
                this.close();
        }));
-        source.actor.connect('destroy', Lang.bind(this, this.destroy));
+        source.actor.connect('destroy', Lang.bind(this, function () { this.actor.destroy(); }));
        Main.uiGroup.add_actor(this.actor);
    },
@ -1899,19 +1861,6 @@ const AppIconMenu = new Lang.Class({
                this._appendSeparator();
            }
            if (discreteGpuAvailable &&
                this._source.app.state == Shell.AppState.STOPPED &&
                actions.indexOf('activate-discrete-gpu') == -1) {
                this._onDiscreteGpuMenuItem = this._appendMenuItem(_("Launch using Dedicated Graphics Card"));
                this._onDiscreteGpuMenuItem.connect('activate', Lang.bind(this, function() {
                    if (this._source.app.state == Shell.AppState.STOPPED)
                        this._source.animateLaunch();
                    this._source.app.launch(0, -1, true);
                    this.emit('activate-window', null);
                }));
            }
            for (let i = 0; i < actions.length; i++) {
                let action = actions[i];
                let item = this._appendMenuItem(appInfo.get_action_name(action));
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@ -16,18 +16,16 @@ const RENAMED_DESKTOP_IDS = {
    'glchess.desktop': 'gnome-chess.desktop',
    'glines.desktop': 'five-or-more.desktop',
    'gnect.desktop': 'four-in-a-row.desktop',
-    'gnibbles.desktop': 'org.gnome.Nibbles.desktop',
+    'gnibbles.desktop': 'gnome-nibbles.desktop',
    'gnobots2.desktop': 'gnome-robots.desktop',
    'gnome-boxes.desktop': 'org.gnome.Boxes.desktop',
    'gnome-clocks.desktop': 'org.gnome.clocks.desktop',
    'gnome-contacts.desktop': 'org.gnome.Contacts.desktop',
    'gnome-documents.desktop': 'org.gnome.Documents.desktop',
    'gnome-font-viewer.desktop': 'org.gnome.font-viewer.desktop',
    'gnome-nibbles.desktop': 'org.gnome.Nibbles.desktop',
    'gnome-photos.desktop': 'org.gnome.Photos.desktop',
    'gnome-screenshot.desktop': 'org.gnome.Screenshot.desktop',
    'gnome-software.desktop': 'org.gnome.Software.desktop',
    'gnome-terminal.desktop': 'org.gnome.Terminal.desktop',
    'gnome-weather.desktop': 'org.gnome.Weather.Application.desktop',
    'gnomine.desktop': 'gnome-mines.desktop',
    'gnotravex.desktop': 'gnome-tetravex.desktop',
--- a/js/ui/audioDeviceSelection.js
+++ b/js/ui/audioDeviceSelection.js
@ -1,216 +0,0 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const AudioDevice = {
    HEADPHONES: 1 << 0,
    HEADSET:    1 << 1,
    MICROPHONE: 1 << 2
 };
 const AudioDeviceSelectionIface = '<node> \
 <interface name="org.gnome.Shell.AudioDeviceSelection"> \
 <method name="Open"> \
    <arg name="devices" direction="in" type="as" /> \
 </method> \
 <method name="Close"> \
 </method> \
 <signal name="DeviceSelected"> \
    <arg name="device" type="s" /> \
 </signal> \
 </interface> \
 </node>';
 const AudioDeviceSelectionDialog = new Lang.Class({
    Name: 'AudioDeviceSelectionDialog',
    Extends: ModalDialog.ModalDialog,
    _init: function(devices) {
        this.parent({ styleClass: 'audio-device-selection-dialog' });
        this._deviceItems = {};
        this._buildLayout();
        if (devices & AudioDevice.HEADPHONES)
            this._addDevice(AudioDevice.HEADPHONES);
        if (devices & AudioDevice.HEADSET)
            this._addDevice(AudioDevice.HEADSET);
        if (devices & AudioDevice.MICROPHONE)
            this._addDevice(AudioDevice.MICROPHONE);
        if (this._selectionBox.get_n_children() < 2)
            throw new Error('Too few devices for a selection');
    },
    destroy: function() {
        this.parent();
    },
    _buildLayout: function(devices) {
        let title = new St.Label({ style_class: 'audio-selection-title',
                                   text: _("Select Audio Device"),
                                   x_align: Clutter.ActorAlign.CENTER });
        this.contentLayout.style_class = 'audio-selection-content';
        this.contentLayout.add(title);
        this._selectionBox = new St.BoxLayout({ style_class: 'audio-selection-box' });
        this.contentLayout.add(this._selectionBox, { expand: true });
        this.addButton({ action: Lang.bind(this, this._openSettings),
                         label: _("Sound Settings") });
        this.addButton({ action: Lang.bind(this, this.close),
                         label: _("Cancel"),
                         key: Clutter.Escape });
    },
    _getDeviceLabel: function(device) {
        switch(device) {
            case AudioDevice.HEADPHONES:
                return _("Headphones");
            case AudioDevice.HEADSET:
                return _("Headset");
            case AudioDevice.MICROPHONE:
                return _("Microphone");
            default:
                return null;
        }
    },
    _getDeviceIcon: function(device) {
        switch(device) {
            case AudioDevice.HEADPHONES:
                return 'audio-headphones-symbolic';
            case AudioDevice.HEADSET:
                return 'audio-headset-symbolic';
            case AudioDevice.MICROPHONE:
                return 'audio-input-microphone-symbolic';
            default:
                return null;
        }
    },
    _addDevice: function(device) {
        let box = new St.BoxLayout({ style_class: 'audio-selection-device-box',
                                     vertical: true });
        box.connect('notify::height',
            function() {
                Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
                    function() {
                        box.width = box.height;
                    });
            });
        let icon = new St.Icon({ style_class: 'audio-selection-device-icon',
                                 icon_name: this._getDeviceIcon(device) });
        box.add(icon);
        let label = new St.Label({ style_class: 'audio-selection-device-label',
                                   text: this._getDeviceLabel(device),
                                   x_align: Clutter.ActorAlign.CENTER });
        box.add(label);
        let button = new St.Button({ style_class: 'audio-selection-device',
                                     can_focus: true,
                                     child: box });
        this._selectionBox.add(button);
        button.connect('clicked', Lang.bind(this,
            function() {
                this.emit('device-selected', device);
                this.close();
                Main.overview.hide();
            }));
    },
    _openSettings: function() {
        let desktopFile = 'gnome-sound-panel.desktop'
        let app = Shell.AppSystem.get_default().lookup_app(desktopFile);
        if (!app) {
            log('Settings panel for desktop file ' + desktopFile + ' could not be loaded!');
            return;
        }
        this.close();
        Main.overview.hide();
        app.activate();
    }
 });
 const AudioDeviceSelectionDBus = new Lang.Class({
    Name: 'AudioDeviceSelectionDBus',
    _init: function() {
        this._audioSelectionDialog = null;
        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(AudioDeviceSelectionIface, this);
        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/AudioDeviceSelection');
        Gio.DBus.session.own_name('org.gnome.Shell.AudioDeviceSelection', Gio.BusNameOwnerFlags.REPLACE, null, null);
    },
    _onDialogClosed: function() {
        this._audioSelectionDialog = null;
    },
    _onDeviceSelected: function(dialog, device) {
        let connection = this._dbusImpl.get_connection();
        let info = this._dbusImpl.get_info();
        let deviceName = Object.keys(AudioDevice).filter(
            function(dev) {
                return AudioDevice[dev] == device;
            })[0].toLowerCase();
        connection.emit_signal(this._audioSelectionDialog._sender,
                               this._dbusImpl.get_object_path(),
                               info ? info.name : null,
                               'DeviceSelected',
                               GLib.Variant.new('(s)', [deviceName]));
    },
    OpenAsync: function(params, invocation) {
        if (this._audioSelectionDialog) {
            invocation.return_value(null);
            return;
        }
        let [deviceNames] = params;
        let devices = 0;
        deviceNames.forEach(function(n) {
            devices |= AudioDevice[n.toUpperCase()];
        });
        let dialog;
        try {
            dialog = new AudioDeviceSelectionDialog(devices);
        } catch(e) {
            invocation.return_value(null);
            return;
        }
        dialog._sender = invocation.get_sender();
        dialog.connect('closed', Lang.bind(this, this._onDialogClosed));
        dialog.connect('device-selected',
                       Lang.bind(this, this._onDeviceSelected));
        dialog.open();
        this._audioSelectionDialog = dialog;
        invocation.return_value(null);
    },
    CloseAsync: function(params, invocation) {
        if (this._audioSelectionDialog &&
            this._audioSelectionDialog._sender == invocation.get_sender())
            this._audioSelectionDialog.close();
        invocation.return_value(null);
    }
 });
--- a/js/ui/background.js
+++ b/js/ui/background.js
@ -102,7 +102,6 @@ const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
@ -248,20 +247,6 @@ const Background = new Lang.Class({
        this._cancellable = new Gio.Cancellable();
        this.isLoaded = false;
        this._clock = new GnomeDesktop.WallClock();
        this._timezoneChangedId = this._clock.connect('notify::timezone',
            Lang.bind(this, function() {
                if (this._animation)
                    this._loadAnimation(this._animation.file);
            }));
        LoginManager.getLoginManager().connect('prepare-for-sleep',
            (lm, aboutToSuspend) => {
                if (aboutToSuspend)
                    return;
                this._refreshAnimation();
            });
        this._settingsChangedSignalId = this._settings.connect('changed', Lang.bind(this, function() {
                                            this.emit('changed');
                                        }));
@ -280,26 +265,16 @@ const Background = new Lang.Class({
        }
        this._fileWatches = null;
        if (this._timezoneChangedId != 0)
            this._clock.disconnect(this._timezoneChangedId);
        this._timezoneChangedId = 0;
        if (this._settingsChangedSignalId != 0)
            this._settings.disconnect(this._settingsChangedSignalId);
        this._settingsChangedSignalId = 0;
    },
    updateResolution: function() {
-        if (this._animation)
+        if (this._animation) {
-            this._refreshAnimation();
+            this._removeAnimationTimeout();
-    },
+            this._updateAnimation();
-
+        }
    _refreshAnimation: function() {
        if (!this._animation)
            return;
        this._removeAnimationTimeout();
        this._updateAnimation();
    },
    _setLoaded: function() {
@ -710,7 +685,6 @@ const BackgroundManager = new Lang.Class({
                           time: FADE_ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: function() {
                               oldBackgroundActor.background.run_dispose();
                               oldBackgroundActor.destroy();
                           }
                         });
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@ -64,8 +64,7 @@ function startAppForMount(app, mount) {
    try {
        retval = app.launch(files, 
-                            global.create_app_launch_context(0, -1),
+                            global.create_app_launch_context(0, -1))
                            false)
    } catch (e) {
        log('Unable to launch the application ' + app.get_name()
            + ': ' + e.toString());
@ -314,10 +313,6 @@ const AutorunSource = new Lang.Class({
    getIcon: function() {
        return this.mount.get_icon();
    },
    _createPolicy: function() {
        return new MessageTray.NotificationApplicationPolicy('org.gnome.Nautilus');
    }
 });
@ -330,6 +325,9 @@ const AutorunNotification = new Lang.Class({
        this._manager = manager;
        this._mount = source.mount;
        // set the notification to urgent, so that it expands out
        this.setUrgency(MessageTray.Urgency.CRITICAL);
    },
    createBanner: function() {
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@ -615,14 +615,6 @@ const NetworkAgent = new Lang.Class({
        this._vpnRequests = { };
        this._notifications = { };
        this._pluginDir = Gio.file_new_for_path(GLib.build_filenamev([Config.SYSCONFDIR, 'NetworkManager/VPN']));
        try {
            let monitor = this._pluginDir.monitor(Gio.FileMonitorFlags.NONE, null);
            monitor.connect('changed', () => { this._vpnCacheBuilt = false; });
        } catch(e) {
            log('Failed to create monitor for VPN plugin dir: ' + e.message);
        }
        this._native.connect('new-request', Lang.bind(this, this._newRequest));
        this._native.connect('cancel-request', Lang.bind(this, this._cancelRequest));
@ -773,8 +765,9 @@ const NetworkAgent = new Lang.Class({
        this._vpnCacheBuilt = true;
        this._vpnBinaries = { };
        let dir = Gio.file_new_for_path(GLib.build_filenamev([Config.SYSCONFDIR, 'NetworkManager/VPN']));
        try {
-            let fileEnum = this._pluginDir.enumerate_children('standard::name', Gio.FileQueryInfoFlags.NONE, null);
+            let fileEnum = dir.enumerate_children('standard::name', Gio.FileQueryInfoFlags.NONE, null);
            let info;
            while ((info = fileEnum.next_file(null))) {
@ -784,7 +777,7 @@ const NetworkAgent = new Lang.Class({
                try {
                    let keyfile = new GLib.KeyFile();
-                    keyfile.load_from_file(this._pluginDir.get_child(name).get_path(), GLib.KeyFileFlags.NONE);
+                    keyfile.load_from_file(dir.get_child(name).get_path(), GLib.KeyFileFlags.NONE);
                    let service = keyfile.get_string('VPN Connection', 'service');
                    let binary = keyfile.get_string('GNOME', 'auth-dialog');
                    let externalUIMode = false;
@ -803,21 +796,13 @@ const NetworkAgent = new Lang.Class({
                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
                    }
-                    if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE)) {
+                    if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
                        this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode, supportsHints: hints };
-                        try {
+                    else
                            let aliases = keyfile.get_string_list('VPN Connection', 'aliases');
                            for (let alias of aliases) {
                                this._vpnBinaries[alias] = { fileName: path, externalUIMode: externalUIMode, supportsHints: hints };
                            }
                        } catch(e) { } // ignore errors if key does not exist
                    } else {
                        throw new Error('VPN plugin at %s is not executable'.format(path));
                    }
                } catch(e) {
                    log('Error \'%s\' while processing VPN keyfile \'%s\''.
-                        format(e.message, this._pluginDir.get_child(name).get_path()));
+                        format(e.message, dir.get_child(name).get_path()));
                    continue;
                }
            }
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@ -12,9 +12,9 @@ const St = imports.gi.St;
 const Tpl = imports.gi.TelepathyLogger;
 const Tp = imports.gi.TelepathyGLib;
 const Calendar = imports.ui.calendar;
 const History = imports.misc.history;
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;
 const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;
@ -469,17 +469,11 @@ const ChatSource = new Lang.Class({
    destroy: function(reason) {
        if (this._client.is_handling_channel(this._channel)) {
            this._ackMessages();
            // The chat box has been destroyed so it can't
            // handle the channel any more.
            this._channel.close_async(function(channel, result) {
                channel.close_finish(result);
            });
        } else {
            // Don't indicate any unread messages when the notification
            // that represents them has been destroyed.
            this._pendingMessages = [];
            this.countUpdated();
        }
        // Keep source alive while the channel is open
@ -872,7 +866,7 @@ const ChatNotificationBanner = new Lang.Class({
    },
    _addMessage: function(message) {
-        let highlighter = new MessageList.URLHighlighter(message.body, true, true);
+        let highlighter = new Calendar.URLHighlighter(message.body, true, true);
        let body = highlighter.actor;
        let styles = message.styles;
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -259,7 +259,7 @@ const ShowAppsIcon = new Lang.Class({
    },
    _createIcon: function(size) {
-        this._iconActor = new St.Icon({ icon_name: 'view-app-grid-symbolic',
+        this._iconActor = new St.Icon({ icon_name: 'view-grid-symbolic',
                                        icon_size: size,
                                        style_class: 'show-apps-icon',
                                        track_hover: true });
@ -644,14 +644,15 @@ const Dash = new Lang.Class({
        let firstIcon = firstButton._delegate.icon;
        let minHeight, natHeight;
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        // Enforce the current icon size during the size request
-        firstIcon.icon.ensure_style();
+        firstIcon.setIconSize(this.iconSize);
        let [currentWidth, currentHeight] = firstIcon.icon.get_size();
        firstIcon.icon.set_size(this.iconSize * scaleFactor, this.iconSize * scaleFactor);
        [minHeight, natHeight] = firstButton.get_preferred_height(-1);
-        firstIcon.icon.set_size(currentWidth, currentHeight);
+
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        let iconSizes = baseIconSizes.map(function(s) {
            return s * scaleFactor;
        });
        // Subtract icon padding and box spacing from the available height
        availHeight -= iconChildren.length * (natHeight - this.iconSize * scaleFactor) +
@ -659,10 +660,6 @@ const Dash = new Lang.Class({
        let availSize = availHeight / iconChildren.length;
        let iconSizes = baseIconSizes.map(function(s) {
            return s * scaleFactor;
        });
        let newIconSize = baseIconSizes[0];
        for (let i = 0; i < iconSizes.length; i++) {
            if (iconSizes[i] < availSize)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -360,7 +360,7 @@ const DateMenuButton = new Lang.Class({
        }));
        // Fill up the first column
-        this._messageList = new Calendar.CalendarMessageList();
+        this._messageList = new Calendar.MessageList();
        hbox.add(this._messageList.actor, { expand: true, y_fill: false, y_align: St.Align.START });
        // Fill up the second column
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -79,12 +79,9 @@ const _Draggable = new Lang.Class({
                                        dragActorOpacity: undefined });
        this.actor = actor;
-        if (!params.manualMode) {
+        if (!params.manualMode)
            this.actor.connect('button-press-event',
                               Lang.bind(this, this._onButtonPress));
            this.actor.connect('touch-event',
                               Lang.bind(this, this._onTouchEvent));
        }
        this.actor.connect('destroy', Lang.bind(this, function() {
            this._actorDestroyed = true;
@ -124,50 +121,8 @@ const _Draggable = new Lang.Class({
        return Clutter.EVENT_PROPAGATE;
    },
    _onTouchEvent: function (actor, event) {
        if (event.type() != Clutter.EventType.TOUCH_BEGIN ||
            !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
            return Clutter.EVENT_PROPAGATE;
        if (Tweener.getTweenCount(actor))
            return Clutter.EVENT_PROPAGATE;
        this._touchSequence = event.get_event_sequence();
        this._buttonDown = true;
        this._grabActor();
        let [stageX, stageY] = event.get_coords();
        this._dragStartX = stageX;
        this._dragStartY = stageY;
        return Clutter.EVENT_PROPAGATE;
    },
    _grabDevice: function(actor) {
        let manager = Clutter.DeviceManager.get_default();
        let pointer = manager.get_core_device(Clutter.InputDeviceType.POINTER_DEVICE);
        if (pointer && this._touchSequence)
            pointer.sequence_grab(this._touchSequence, actor);
        else if (pointer)
            pointer.grab (actor);
        this._grabbedDevice = pointer;
    },
    _ungrabDevice: function() {
        if (this._touchSequence)
            this._grabbedDevice.sequence_ungrab (this._touchSequence);
        else
            this._grabbedDevice.ungrab();
        this._touchSequence = null;
        this._grabbedDevice = null;
    },
    _grabActor: function() {
-        this._grabDevice(this.actor);
+        Clutter.grab_pointer(this.actor);
        this._onEventId = this.actor.connect('event',
                                             Lang.bind(this, this._onEvent));
    },
@ -176,7 +131,7 @@ const _Draggable = new Lang.Class({
        if (!this._onEventId)
            return;
-        this._ungrabDevice();
+        Clutter.ungrab_pointer();
        this.actor.disconnect(this._onEventId);
        this._onEventId = null;
    },
@ -185,13 +140,13 @@ const _Draggable = new Lang.Class({
        if (!this._eventsGrabbed) {
            this._eventsGrabbed = Main.pushModal(_getEventHandlerActor());
            if (this._eventsGrabbed)
-                this._grabDevice(_getEventHandlerActor());
+                Clutter.grab_pointer(_getEventHandlerActor());
        }
    },
    _ungrabEvents: function() {
        if (this._eventsGrabbed) {
-            this._ungrabDevice();
+            Clutter.ungrab_pointer();
            Main.popModal(_getEventHandlerActor());
            this._eventsGrabbed = false;
        }
@ -202,9 +157,7 @@ const _Draggable = new Lang.Class({
        // didn't start the drag, to drop the draggable in case the drag was in progress, and
        // to complete the drag and ensure that whatever happens to be under the pointer does
        // not get triggered if the drag was cancelled with Esc.
-        if (event.type() == Clutter.EventType.BUTTON_RELEASE ||
+        if (event.type() == Clutter.EventType.BUTTON_RELEASE) {
            (event.type() == Clutter.EventType.TOUCH_END &&
             global.display.is_pointer_emulating_sequence(event.get_event_sequence()))) {
            this._buttonDown = false;
            if (this._dragInProgress) {
                return this._dragActorDropped(event);
@ -219,9 +172,7 @@ const _Draggable = new Lang.Class({
            }
        // We intercept MOTION event to figure out if the drag has started and to draw
        // this._dragActor under the pointer when dragging is in progress
-        } else if (event.type() == Clutter.EventType.MOTION ||
+        } else if (event.type() == Clutter.EventType.MOTION) {
                   (event.type() == Clutter.EventType.TOUCH_UPDATE &&
                    global.display.is_pointer_emulating_sequence(event.get_event_sequence()))) {
            if (this._dragInProgress) {
                return this._updateDragPosition(event);
            } else if (this._dragActor == null) {
@ -263,7 +214,7 @@ const _Draggable = new Lang.Class({
     * This function is useful to call if you've specified manualMode
     * for the draggable.
     */
-    startDrag: function (stageX, stageY, time, sequence) {
+    startDrag: function (stageX, stageY, time) {
        currentDraggable = this;
        this._dragInProgress = true;
@ -277,8 +228,6 @@ const _Draggable = new Lang.Class({
        this.emit('drag-begin', time);
        if (this._onEventId)
            this._ungrabActor();
        this._touchSequence = sequence;
        this._grabEvents();
        global.screen.set_cursor(Meta.Cursor.DND_IN_DRAG);
@ -389,8 +338,8 @@ const _Draggable = new Lang.Class({
        let threshold = Gtk.Settings.get_default().gtk_dnd_drag_threshold;
        if ((Math.abs(stageX - this._dragStartX) > threshold ||
             Math.abs(stageY - this._dragStartY) > threshold)) {
-            this.startDrag(stageX, stageY, event.get_time(), this._touchSequence);
+                this.startDrag(stageX, stageY, event.get_time());
-            this._updateDragPosition(event);
+                this._updateDragPosition(event);
        }
        return true;
@ -571,13 +520,20 @@ const _Draggable = new Lang.Class({
            return;
        }
-        this._animateDragEnd(eventTime,
+        this._animationInProgress = true;
-                             { x: snapBackX,
+        // No target, so snap back
-                               y: snapBackY,
+        Tweener.addTween(this._dragActor,
-                               scale_x: snapBackScale,
+                         { x: snapBackX,
-                               scale_y: snapBackScale,
+                           y: snapBackY,
-                               time: SNAP_BACK_ANIMATION_TIME,
+                           scale_x: snapBackScale,
-                             });
+                           scale_y: snapBackScale,
                           opacity: this._dragOrigOpacity,
                           time: SNAP_BACK_ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: this._onAnimationComplete,
                           onCompleteScope: this,
                           onCompleteParams: [this._dragActor, eventTime]
                         });
    },
    _restoreDragActor: function(eventTime) {
@ -589,44 +545,18 @@ const _Draggable = new Lang.Class({
        this._dragActor.set_scale(restoreScale, restoreScale);
        this._dragActor.opacity = 0;
        this._animateDragEnd(eventTime,
                             { time: REVERT_ANIMATION_TIME });
    },
    _animateDragEnd: function (eventTime, params) {
        this._animationInProgress = true;
-
+        Tweener.addTween(this._dragActor,
-        // finish animation if the actor gets destroyed
+                         { opacity: this._dragOrigOpacity,
-        // during it
+                           time: REVERT_ANIMATION_TIME,
-        this._dragActorDestroyId =
+                           transition: 'easeOutQuad',
-            this._dragActor.connect('destroy',
+                           onComplete: this._onAnimationComplete,
-                                    Lang.bind(this, this._finishAnimation));
+                           onCompleteScope: this,
-
+                           onCompleteParams: [this._dragActor, eventTime]
-        params['opacity']          = this._dragOrigOpacity;
+                         });
        params['transition']       = 'easeOutQuad';
        params['onComplete']       = this._onAnimationComplete;
        params['onCompleteScope']  = this;
        params['onCompleteParams'] = [this._dragActor, eventTime];
        // start the animation
        Tweener.addTween(this._dragActor, params)
    },
    _finishAnimation : function () {
        if (!this._animationInProgress)
            return
        this._animationInProgress = false;
        if (!this._buttonDown)
            this._dragComplete();
        global.screen.set_cursor(Meta.Cursor.DEFAULT);
    },
    _onAnimationComplete : function (dragActor, eventTime) {
        dragActor.disconnect(this._dragActorDestroyId);
        this._dragActorDestroyId = 0;
        if (this._dragOrigParent) {
            Main.uiGroup.remove_child(this._dragActor);
            this._dragOrigParent.add_actor(this._dragActor);
@ -635,9 +565,12 @@ const _Draggable = new Lang.Class({
        } else {
            dragActor.destroy();
        }
-
+        global.screen.set_cursor(Meta.Cursor.DEFAULT);
        this.emit('drag-end', eventTime, false);
-        this._finishAnimation();
+
        this._animationInProgress = false;
        if (!this._buttonDown)
            this._dragComplete();
    },
    _dragComplete: function() {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /*
- * Copyright 2010-2016 Red Hat, Inc
+ * Copyright 2010 Red Hat, Inc
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -114,7 +114,7 @@ const restartDialogContent = {
    showOtherSessions: true,
 };
-const restartUpdateDialogContent = {
+const restartInstallDialogContent = {
    subject: C_("title", "Restart & Install Updates"),
    description: function(seconds) {
@ -132,38 +132,18 @@ const restartUpdateDialogContent = {
    showOtherSessions: true,
 };
 const restartUpgradeDialogContent = {
    subject: C_("title", "Restart & Install Upgrade"),
    upgradeDescription: function(distroName, distroVersion) {
        /* Translators: This is the text displayed for system upgrades in the
           shut down dialog. First %s gets replaced with the distro name and
           second %s with the distro version to upgrade to */
        return _("%s %s will be installed after restart. Upgrade installation can take a long time: ensure that you have backed up and that the computer is plugged in.").format(distroName, distroVersion);
    },
    disableTimer: true,
    showBatteryWarning: false,
    confirmButtons: [{ signal: 'ConfirmedReboot',
                       label:  C_("button", "Restart &amp; Install") }],
    iconName: 'view-refresh-symbolic',
    iconStyleClass: 'end-session-dialog-shutdown-icon',
    showOtherSessions: true,
 };
 const DialogType = {
  LOGOUT: 0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */,
  SHUTDOWN: 1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */,
  RESTART: 2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */,
-  UPDATE_RESTART: 3,
+  UPDATE_RESTART: 3
  UPGRADE_RESTART: 4
 };
 const DialogContent = {
    0 /* DialogType.LOGOUT */: logoutDialogContent,
    1 /* DialogType.SHUTDOWN */: shutdownDialogContent,
    2 /* DialogType.RESTART */: restartDialogContent,
-    3 /* DialogType.UPDATE_RESTART */: restartUpdateDialogContent,
+    3 /* DialogType.UPDATE_RESTART */: restartInstallDialogContent
    4 /* DialogType.UPGRADE_RESTART */: restartUpgradeDialogContent
 };
 const MAX_USERS_IN_SESSION_DIALOG = 5;
@ -183,10 +163,7 @@ const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface);
 const PkOfflineIface = '<node> \
 <interface name="org.freedesktop.PackageKit.Offline"> \
    <property name="UpdatePrepared" type="b" access="read"/> \
-    <property name="UpdateTriggered" type="b" access="read"/> \
+    <property name="TriggerAction" type="s" access="read"/> \
    <property name="UpgradePrepared" type="b" access="read"/> \
    <property name="UpgradeTriggered" type="b" access="read"/> \
    <property name="PreparedUpgrade" type="a{sv}" access="read"/> \
    <method name="Trigger"> \
        <arg type="s" name="action" direction="in"/> \
    </method> \
@ -438,19 +415,11 @@ const EndSessionDialog = new Lang.Class({
                if (dialogContent.descriptionWithUser)
                    description = dialogContent.descriptionWithUser(realName, displayTime);
                else
                    description = dialogContent.description(displayTime);
            }
        }
        // Use a different description when we are installing a system upgrade
        if (dialogContent.upgradeDescription) {
            let name = this._pkOfflineProxy.PreparedUpgrade['name'].deep_unpack();
            let version = this._pkOfflineProxy.PreparedUpgrade['version'].deep_unpack();
            if (name != null && version != null)
                description = dialogContent.upgradeDescription(name, version);
        }
        // Fall back to regular description
        if (!description)
            description = dialogContent.description(displayTime);
@ -729,12 +698,9 @@ const EndSessionDialog = new Lang.Class({
        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
        this._type = type;
-        if (this._type == DialogType.RESTART) {
+        if (this._type == DialogType.RESTART &&
-            if (this._pkOfflineProxy.UpdateTriggered)
+            this._pkOfflineProxy.TriggerAction == 'reboot')
-                this._type = DialogType.UPDATE_RESTART;
+            this._type = DialogType.UPDATE_RESTART;
            else if (this._pkOfflineProxy.UpgradeTriggered)
                this._type = DialogType.UPGRADE_RESTART;
        }
        this._applications = [];
        this._applicationList.destroy_all_children();
@ -761,19 +727,19 @@ const EndSessionDialog = new Lang.Class({
        if (dialogContent.showOtherSessions)
            this._loadSessions();
-        let updateTriggered = this._pkOfflineProxy.UpdateTriggered;
+        let updateAlreadyTriggered = this._pkOfflineProxy.TriggerAction == 'power-off' || this._pkOfflineProxy.TriggerAction == 'reboot';
        let updatePrepared = this._pkOfflineProxy.UpdatePrepared;
        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText);
        this._checkBox.actor.visible = (dialogContent.checkBoxText && updatePrepared && updatesAllowed);
-        this._checkBox.actor.checked = (updatePrepared && updateTriggered);
+        this._checkBox.actor.checked = (updatePrepared && updateAlreadyTriggered);
        // We show the warning either together with the checkbox, or when
        // updates have already been triggered, but the user doesn't have
        // enough permissions to cancel them.
        this._batteryWarning.visible = (dialogContent.showBatteryWarning &&
-                                        (this._checkBox.actor.visible || updatePrepared && updateTriggered && !updatesAllowed));
+                                        (this._checkBox.actor.visible || updatePrepared && updateAlreadyTriggered && !updatesAllowed));
        this._updateButtons();
@ -783,9 +749,7 @@ const EndSessionDialog = new Lang.Class({
            return;
        }
-        if (!dialogContent.disableTimer)
+        this._startTimer();
            this._startTimer();
        this._sync();
        let signalId = this.connect('opened',
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@ -61,19 +61,10 @@ function _patchLayoutClass(layoutClass, styleProps) {
    };
 }
-function _loggingFunc() {
+function _makeLoggingFunc(func) {
-    let fields = {'MESSAGE': [].join.call(arguments, ', ')};
+    return function() {
-    let domain = "GNOME Shell";
+        return func([].join.call(arguments, ', '));
-
+    };
    // If the caller is an extension, add it as metadata
    let extension = imports.misc.extensionUtils.getCurrentExtension();
    if (extension != null) {
        domain = extension.metadata.name;
        fields['GNOME_SHELL_EXTENSION_UUID'] = extension.uuid;
        fields['GNOME_SHELL_EXTENSION_NAME'] = extension.metadata.name;
    }
    GLib.log_structured(domain, GLib.LogLevelFlags.LEVEL_MESSAGE, fields);
 }
 function init() {
@ -81,7 +72,7 @@ function init() {
    // browser convention of having that namespace be called 'window'.)
    window.global = Shell.Global.get();
-    window.log = _loggingFunc;
+    window.log = _makeLoggingFunc(window.log);
    window._ = Gettext.gettext;
    window.C_ = Gettext.pgettext;
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -334,7 +334,7 @@ function _sessionUpdated() {
    // from allowExtensions in the future
    if (Main.sessionMode.allowExtensions) {
        if (initted)
-            enabledExtensions = getEnabledExtensions();
+            onEnabledExtensionsChanged();
        enableAllExtensions();
    } else {
        disableAllExtensions();
--- a/js/ui/ibusCandidatePopup.js
+++ b/js/ui/ibusCandidatePopup.js
@ -158,22 +158,10 @@ const CandidatePopup = new Lang.Class({
        panelService.connect('set-cursor-location',
                             Lang.bind(this, function(ps, x, y, w, h) {
-                                 this._setDummyCursorGeometry(x, y, w, h);
+                                 Main.layoutManager.setDummyCursorGeometry(x, y, w, h);
                                 if (this._boxPointer.actor.visible)
                                     this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
                             }));
        try {
            panelService.connect('set-cursor-location-relative',
                                 Lang.bind(this, function(ps, x, y, w, h) {
                                     if (!global.display.focus_window)
                                         return;
                                     let window = global.display.focus_window.get_compositor_private();
                                     this._setDummyCursorGeometry(window.x + x, window.y + y, w, h);
                                 }));
        } catch(e) {
            // Only recent IBus versions have support for this signal
            // which is used for wayland clients. In order to work
            // with older IBus versions we can silently ignore the
            // signal's absence.
        }
        panelService.connect('update-preedit-text',
                             Lang.bind(this, function(ps, text, cursorPosition, visible) {
                                 this._preeditText.visible = visible;
@ -258,12 +246,6 @@ const CandidatePopup = new Lang.Class({
                             }));
    },
    _setDummyCursorGeometry: function(x, y, w, h) {
        Main.layoutManager.setDummyCursorGeometry(x, y, w, h);
        if (this._boxPointer.actor.visible)
            this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
    },
    _updateVisibility: function() {
        let isVisible = (this._preeditText.visible ||
                         this._auxText.visible ||
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@ -10,7 +10,6 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
 const InputSourceManager = imports.ui.status.keyboard;
 const BoxPointer = imports.ui.boxpointer;
 const Layout = imports.ui.layout;
@ -758,48 +757,19 @@ const ShellWaylandAdapter = new Lang.Class({
    Name: 'ShellWaylandAdapter',
    Extends: Caribou.XAdapter,
    _init: function () {
        this.parent();
        let deviceManager = Clutter.DeviceManager.get_default();
        this._virtualDevice = deviceManager.create_virtual_device(Clutter.InputDeviceType.KEYBOARD_DEVICE);
        this._inputSourceManager = InputSourceManager.getInputSourceManager();
        this._sourceChangedId = this._inputSourceManager.connect('current-source-changed',
                                                                 Lang.bind(this, this._onSourceChanged));
        this._sourcesModifiedId = this._inputSourceManager.connect ('sources-changed',
                                                                    Lang.bind(this, this._onSourcesModified));
    },
    _onSourcesModified: function () {
        this.emit('config-changed');
    },
    _onSourceChanged: function (inputSourceManager, oldSource) {
        let source = inputSourceManager.currentSource;
        this.emit('group-changed', source.index, source.id, '');
    },
    vfunc_get_groups: function () {
        let inputSources = this._inputSourceManager.inputSources;
        let groups = []
        let variants = [];
        for (let i in inputSources) {
            let is = inputSources[i];
            groups[is.index] = is.id;
            variants[is.index] = '';
        }
        return [groups, groups.length, variants, variants.length];
    },
    vfunc_keyval_press: function(keyval) {
-        this._virtualDevice.notify_keyval(Clutter.get_current_event_time(),
+        let focus = global.stage.get_key_focus();
-                                          keyval, Clutter.KeyState.PRESSED);
+        if (focus instanceof Clutter.Text)
            Shell.util_text_insert_keyval(focus, keyval);
        else
            this.parent(keyval);
    },
    vfunc_keyval_release: function(keyval) {
-        this._virtualDevice.notify_keyval(Clutter.get_current_event_time(),
+        let focus = global.stage.get_key_focus();
-                                          keyval, Clutter.KeyState.RELEASED);
+        if (focus instanceof Clutter.Text)
            return;             // do nothing
        else
            this.parent(keyval);
    },
 });
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -220,8 +220,7 @@ const LayoutManager = new Lang.Class({
        global.stage.add_child(this.uiGroup);
        this.overviewGroup = new St.Widget({ name: 'overviewGroup',
-                                             visible: false,
+                                             visible: false });
                                             reactive: true });
        this.addChrome(this.overviewGroup);
        this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
@ -592,10 +591,7 @@ const LayoutManager = new Lang.Class({
        this.addChrome(this._coverPane);
        if (Meta.is_restart()) {
-            // On restart, we don't do an animation. Force an update of the
+            // On restart, we don't do an animation
            // regions immediately so that maximized windows restore to the
            // right size taking struts into account.
            this._updateRegions();
        } else if (Main.sessionMode.isGreeter) {
            this.panelBox.translation_y = -this.panelBox.height;
        } else {
@ -942,11 +938,6 @@ const LayoutManager = new Lang.Class({
        if (Main.modalCount > 0)
            return GLib.SOURCE_REMOVE;
        // Bug workaround - get_transformed_position()/get_transformed_size() don't work after
        // a change in stage size until the first pick or paint.
        // https://bugzilla.gnome.org/show_bug.cgi?id=761565
        global.stage.get_actor_at_pos(Clutter.PickMode.ALL, 0, 0);
        let rects = [], struts = [], i;
        let isPopupMenuVisible = global.top_window_group.get_children().some(isPopupMetaWindow);
        let wantsInputRegion = !isPopupMenuVisible;
--- a/js/ui/legacyTray.js
+++ b/js/ui/legacyTray.js
@ -50,14 +50,15 @@ const LegacyTray = new Lang.Class({
        this._slideLayout.translationX = 0;
        this._slideLayout.slideDirection = OverviewControls.SlideDirection.LEFT;
-        this._slider = new St.Widget({ x_expand: true, y_expand: true,
+        this._slider = new St.Widget({ style_class: 'legacy-tray',
                                       x_expand: true, y_expand: true,
                                       x_align: Clutter.ActorAlign.START,
                                       y_align: Clutter.ActorAlign.END,
                                       layout_manager: this._slideLayout });
        this.actor.add_actor(this._slider);
        this._slider.connect('notify::allocation', Lang.bind(this, this._syncBarrier));
-        this._box = new St.BoxLayout({ style_class: 'legacy-tray' });
+        this._box = new St.BoxLayout();
        this._slider.add_actor(this._box);
        this._concealHandle = new St.Button({ style_class: 'legacy-tray-handle',
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -11,8 +11,6 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const AccessDialog = imports.ui.accessDialog;
 const AudioDeviceSelection = imports.ui.audioDeviceSelection;
 const Components = imports.ui.components;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const EndSessionDialog = imports.ui.endSessionDialog;
@ -26,7 +24,6 @@ const ModalDialog = imports.ui.modalDialog;
 const OsdWindow = imports.ui.osdWindow;
 const OsdMonitorLabeler = imports.ui.osdMonitorLabeler;
 const Overview = imports.ui.overview;
 const PadOsd = imports.ui.padOsd;
 const Panel = imports.ui.panel;
 const Params = imports.misc.params;
 const RunDialog = imports.ui.runDialog;
@ -62,12 +59,9 @@ let screenShield = null;
 let notificationDaemon = null;
 let windowAttentionHandler = null;
 let ctrlAltTabManager = null;
 let padOsdService = null;
 let osdWindowManager = null;
 let osdMonitorLabeler = null;
 let sessionMode = null;
 let shellAccessDialogDBusService = null;
 let shellAudioSelectionDBusService = null;
 let shellDBusService = null;
 let shellMountOpDBusService = null;
 let screenSaverDBus = null;
@ -84,7 +78,6 @@ let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
 let _a11ySettings = null;
 let _themeResource = null;
 function _sessionUpdated() {
    if (sessionMode.isPrimary)
@ -126,8 +119,6 @@ function start() {
                                       _loadDefaultStylesheet);
    _initializeUI();
    shellAccessDialogDBusService = new AccessDialog.AccessDialogDBus();
    shellAudioSelectionDBusService = new AudioDeviceSelection.AudioDeviceSelectionDBus();
    shellDBusService = new ShellDBus.GnomeShell();
    shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();
@ -146,7 +137,9 @@ function _initializeUI() {
    Shell.WindowTracker.get_default();
    Shell.AppUsage.get_default();
-    reloadThemeResource();
+    let resource = Gio.Resource.load(global.datadir + '/gnome-shell-theme.gresource');
    resource._register();
    _loadDefaultStylesheet();
    // Setup the stage hierarchy early
@ -157,7 +150,6 @@ function _initializeUI() {
    // working until it's updated.
    uiGroup = layoutManager.uiGroup;
    padOsdService = new PadOsd.PadOsdService();
    screencastService = new Screencast.ScreencastService();
    xdndHandler = new XdndHandler.XdndHandler();
    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
@ -197,8 +189,6 @@ function _initializeUI() {
        return true;
    });
    global.display.connect('gl-video-memory-purged', loadTheme);
    // Provide the bus object for gnome-session to
    // initiate logouts.
    EndSessionDialog.init();
@ -300,14 +290,6 @@ function setThemeStylesheet(cssStylesheet) {
    _cssStylesheet = cssStylesheet ? Gio.File.new_for_path(cssStylesheet) : null;
 }
 function reloadThemeResource() {
    if (_themeResource)
        _themeResource._unregister();
    _themeResource = Gio.Resource.load(global.datadir + '/gnome-shell-theme.gresource');
    _themeResource._register();
 }
 /**
 * loadTheme:
 *
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@ -1,726 +0,0 @@
 const Atk = imports.gi.Atk;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const Meta = imports.gi.Meta;
 const Pango = imports.gi.Pango;
 const Signals = imports.signals;
 const St = imports.gi.St;
 const Calendar = imports.ui.calendar;
 const Tweener = imports.ui.tweener;
 const Util = imports.misc.util;
 const MESSAGE_ANIMATION_TIME = 0.1;
 const DEFAULT_EXPAND_LINES = 6;
 function _fixMarkup(text, allowMarkup) {
    if (allowMarkup) {
        // Support &amp;, &quot;, &apos;, &lt; and &gt;, escape all other
        // occurrences of '&'.
        let _text = text.replace(/&(?!amp;|quot;|apos;|lt;|gt;)/g, '&amp;');
        // Support <b>, <i>, and <u>, escape anything else
        // so it displays as raw markup.
        _text = _text.replace(/<(?!\/?[biu]>)/g, '&lt;');
        try {
            Pango.parse_markup(_text, -1, '');
            return _text;
        } catch (e) {}
    }
    // !allowMarkup, or invalid markup
    return GLib.markup_escape_text(text, -1);
 }
 const URLHighlighter = new Lang.Class({
    Name: 'URLHighlighter',
    _init: function(text, lineWrap, allowMarkup) {
        if (!text)
            text = '';
        this.actor = new St.Label({ reactive: true, style_class: 'url-highlighter',
                                    x_expand: true, x_align: Clutter.ActorAlign.START });
        this._linkColor = '#ccccff';
        this.actor.connect('style-changed', Lang.bind(this, function() {
            let [hasColor, color] = this.actor.get_theme_node().lookup_color('link-color', false);
            if (hasColor) {
                let linkColor = color.to_string().substr(0, 7);
                if (linkColor != this._linkColor) {
                    this._linkColor = linkColor;
                    this._highlightUrls();
                }
            }
        }));
        this.actor.clutter_text.line_wrap = lineWrap;
        this.actor.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
        this.setMarkup(text, allowMarkup);
        this.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
            // Don't try to URL highlight when invisible.
            // The MessageTray doesn't actually hide us, so
            // we need to check for paint opacities as well.
            if (!actor.visible || actor.get_paint_opacity() == 0)
                return Clutter.EVENT_PROPAGATE;
            // Keep Notification.actor from seeing this and taking
            // a pointer grab, which would block our button-release-event
            // handler, if an URL is clicked
            return this._findUrlAtPos(event) != -1;
        }));
        this.actor.connect('button-release-event', Lang.bind(this, function (actor, event) {
            if (!actor.visible || actor.get_paint_opacity() == 0)
                return Clutter.EVENT_PROPAGATE;
            let urlId = this._findUrlAtPos(event);
            if (urlId != -1) {
                let url = this._urls[urlId].url;
                if (url.indexOf(':') == -1)
                    url = 'http://' + url;
                Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context(0, -1));
                return Clutter.EVENT_STOP;
            }
            return Clutter.EVENT_PROPAGATE;
        }));
        this.actor.connect('motion-event', Lang.bind(this, function(actor, event) {
            if (!actor.visible || actor.get_paint_opacity() == 0)
                return Clutter.EVENT_PROPAGATE;
            let urlId = this._findUrlAtPos(event);
            if (urlId != -1 && !this._cursorChanged) {
                global.screen.set_cursor(Meta.Cursor.POINTING_HAND);
                this._cursorChanged = true;
            } else if (urlId == -1) {
                global.screen.set_cursor(Meta.Cursor.DEFAULT);
                this._cursorChanged = false;
            }
            return Clutter.EVENT_PROPAGATE;
        }));
        this.actor.connect('leave-event', Lang.bind(this, function() {
            if (!this.actor.visible || this.actor.get_paint_opacity() == 0)
                return Clutter.EVENT_PROPAGATE;
            if (this._cursorChanged) {
                this._cursorChanged = false;
                global.screen.set_cursor(Meta.Cursor.DEFAULT);
            }
            return Clutter.EVENT_PROPAGATE;
        }));
    },
    setMarkup: function(text, allowMarkup) {
        text = text ? _fixMarkup(text, allowMarkup) : '';
        this._text = text;
        this.actor.clutter_text.set_markup(text);
        /* clutter_text.text contain text without markup */
        this._urls = Util.findUrls(this.actor.clutter_text.text);
        this._highlightUrls();
    },
    _highlightUrls: function() {
        // text here contain markup
        let urls = Util.findUrls(this._text);
        let markup = '';
        let pos = 0;
        for (let i = 0; i < urls.length; i++) {
            let url = urls[i];
            let str = this._text.substr(pos, url.pos - pos);
            markup += str + '<span foreground="' + this._linkColor + '"><u>' + url.url + '</u></span>';
            pos = url.pos + url.url.length;
        }
        markup += this._text.substr(pos);
        this.actor.clutter_text.set_markup(markup);
    },
    _findUrlAtPos: function(event) {
        let success;
        let [x, y] = event.get_coords();
        [success, x, y] = this.actor.transform_stage_point(x, y);
        let find_pos = -1;
        for (let i = 0; i < this.actor.clutter_text.text.length; i++) {
            let [success, px, py, line_height] = this.actor.clutter_text.position_to_coords(i);
            if (py > y || py + line_height < y || x < px)
                continue;
            find_pos = i;
        }
        if (find_pos != -1) {
            for (let i = 0; i < this._urls.length; i++)
            if (find_pos >= this._urls[i].pos &&
                this._urls[i].pos + this._urls[i].url.length > find_pos)
                return i;
        }
        return -1;
    }
 });
 const ScaleLayout = new Lang.Class({
    Name: 'ScaleLayout',
    Extends: Clutter.BinLayout,
    _connectContainer: function(container) {
        if (this._container == container)
            return;
        if (this._container)
            for (let id of this._signals)
                this._container.disconnect(id);
        this._container = container;
        this._signals = [];
        if (this._container)
            for (let signal of ['notify::scale-x', 'notify::scale-y']) {
                let id = this._container.connect(signal, Lang.bind(this,
                    function() {
                        this.layout_changed();
                    }));
                this._signals.push(id);
            }
    },
    vfunc_get_preferred_width: function(container, forHeight) {
        this._connectContainer(container);
        let [min, nat] = this.parent(container, forHeight);
        return [Math.floor(min * container.scale_x),
                Math.floor(nat * container.scale_x)];
    },
    vfunc_get_preferred_height: function(container, forWidth) {
        this._connectContainer(container);
        let [min, nat] = this.parent(container, forWidth);
        return [Math.floor(min * container.scale_y),
                Math.floor(nat * container.scale_y)];
    }
 });
 const LabelExpanderLayout = new Lang.Class({
    Name: 'LabelExpanderLayout',
    Extends: Clutter.LayoutManager,
    Properties: { 'expansion': GObject.ParamSpec.double('expansion',
                                                        'Expansion',
                                                        'Expansion of the layout, between 0 (collapsed) ' +
                                                        'and 1 (fully expanded',
                                                         GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
                                                         0, 1, 0)},
    _init: function(params) {
        this._expansion = 0;
        this._expandLines = DEFAULT_EXPAND_LINES;
        this.parent(params);
    },
    get expansion() {
        return this._expansion;
    },
    set expansion(v) {
        if (v == this._expansion)
            return;
        this._expansion = v;
        this.notify('expansion');
        let visibleIndex = this._expansion > 0 ? 1 : 0;
        for (let i = 0; this._container && i < this._container.get_n_children(); i++)
            this._container.get_child_at_index(i).visible = (i == visibleIndex);
        this.layout_changed();
    },
    set expandLines(v) {
        if (v == this._expandLines)
            return;
        this._expandLines = v;
        if (this._expansion > 0)
            this.layout_changed();
    },
    vfunc_set_container: function(container) {
        this._container = container;
    },
    vfunc_get_preferred_width: function(container, forHeight) {
        let [min, nat] = [0, 0];
        for (let i = 0; i < container.get_n_children(); i++) {
            if (i > 1)
                break; // we support one unexpanded + one expanded child
            let child = container.get_child_at_index(i);
            let [childMin, childNat] = child.get_preferred_width(forHeight);
            [min, nat] = [Math.max(min, childMin), Math.max(nat, childNat)];
        }
        return [min, nat];
    },
    vfunc_get_preferred_height: function(container, forWidth) {
        let [min, nat] = [0, 0];
        let children = container.get_children();
        if (children[0])
            [min, nat] = children[0].get_preferred_height(forWidth);
        if (children[1]) {
            let [min2, nat2] = children[1].get_preferred_height(forWidth);
            let [expMin, expNat] = [Math.min(min2, min * this._expandLines),
                                    Math.min(nat2, nat * this._expandLines)];
            [min, nat] = [min + this._expansion * (expMin - min),
                          nat + this._expansion * (expNat - nat)];
        }
        return [min, nat];
    },
    vfunc_allocate: function(container, box, flags) {
        for (let i = 0; i < container.get_n_children(); i++) {
            let child = container.get_child_at_index(i);
            if (child.visible)
                child.allocate(box, flags);
        }
    }
 });
 const Message = new Lang.Class({
    Name: 'Message',
    _init: function(title, body) {
        this.expanded = false;
        this.actor = new St.Button({ style_class: 'message',
                                     accessible_role: Atk.Role.NOTIFICATION,
                                     can_focus: true,
                                     x_expand: true, x_fill: true });
        this.actor.connect('key-press-event',
                           Lang.bind(this, this._onKeyPressed));
        let vbox = new St.BoxLayout({ vertical: true });
        this.actor.set_child(vbox);
        let hbox = new St.BoxLayout();
        vbox.add_actor(hbox);
        this._actionBin = new St.Widget({ layout_manager: new ScaleLayout(),
                                          visible: false });
        vbox.add_actor(this._actionBin);
        this._iconBin = new St.Bin({ style_class: 'message-icon-bin',
                                     y_expand: true,
                                     visible: false });
        hbox.add_actor(this._iconBin);
        let contentBox = new St.BoxLayout({ style_class: 'message-content',
                                            vertical: true, x_expand: true });
        hbox.add_actor(contentBox);
        this._mediaControls = new St.BoxLayout();
        hbox.add_actor(this._mediaControls);
        let titleBox = new St.BoxLayout();
        contentBox.add_actor(titleBox);
        this.titleLabel = new St.Label({ style_class: 'message-title',
                                         x_expand: true,
                                         x_align: Clutter.ActorAlign.START });
        this.setTitle(title);
        titleBox.add_actor(this.titleLabel);
        this._secondaryBin = new St.Bin({ style_class: 'message-secondary-bin' });
        titleBox.add_actor(this._secondaryBin);
        let closeIcon = new St.Icon({ icon_name: 'window-close-symbolic',
                                      icon_size: 16 });
        this._closeButton = new St.Button({ child: closeIcon, visible: false });
        titleBox.add_actor(this._closeButton);
        this._bodyStack = new St.Widget({ x_expand: true });
        this._bodyStack.layout_manager = new LabelExpanderLayout();
        contentBox.add_actor(this._bodyStack);
        this.bodyLabel = new URLHighlighter('', false, this._useBodyMarkup);
        this.bodyLabel.actor.add_style_class_name('message-body');
        this._bodyStack.add_actor(this.bodyLabel.actor);
        this.setBody(body);
        this._closeButton.connect('clicked', Lang.bind(this, this.close));
        this.actor.connect('notify::hover', Lang.bind(this, this._sync));
        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
        this._sync();
    },
    close: function() {
        this.emit('close');
    },
    setIcon: function(actor) {
        this._iconBin.child = actor;
        this._iconBin.visible = (actor != null);
    },
    setSecondaryActor: function(actor) {
        this._secondaryBin.child = actor;
    },
    setTitle: function(text) {
        let title = text ? _fixMarkup(text.replace(/\n/g, ' '), false) : '';
        this.titleLabel.clutter_text.set_markup(title);
    },
    setBody: function(text) {
        this._bodyText = text;
        this.bodyLabel.setMarkup(text ? text.replace(/\n/g, ' ') : '',
                                 this._useBodyMarkup);
        if (this._expandedLabel)
            this._expandedLabel.setMarkup(text, this._useBodyMarkup);
    },
    setUseBodyMarkup: function(enable) {
        if (this._useBodyMarkup === enable)
            return;
        this._useBodyMarkup = enable;
        if (this.bodyLabel)
            this.setBody(this._bodyText);
    },
    setActionArea: function(actor) {
        if (actor == null) {
            if (this._actionBin.get_n_children() > 0)
                this._actionBin.get_child_at_index(0).destroy();
            return;
        }
        if (this._actionBin.get_n_children() > 0)
            throw new Error('Message already has an action area');
        this._actionBin.add_actor(actor);
        this._actionBin.visible = this.expanded;
    },
    addMediaControl: function(iconName, callback) {
        let icon = new St.Icon({ icon_name: iconName, icon_size: 16 });
        let button = new St.Button({ style_class: 'message-media-control',
                                     child: icon });
        button.connect('clicked', callback);
        this._mediaControls.add_actor(button);
        return button;
    },
    setExpandedBody: function(actor) {
        if (actor == null) {
            if (this._bodyStack.get_n_children() > 1)
                this._bodyStack.get_child_at_index(1).destroy();
            return;
        }
        if (this._bodyStack.get_n_children() > 1)
            throw new Error('Message already has an expanded body actor');
        this._bodyStack.insert_child_at_index(actor, 1);
    },
    setExpandedLines: function(nLines) {
        this._bodyStack.layout_manager.expandLines = nLines;
    },
    expand: function(animate) {
        this.expanded = true;
        this._actionBin.visible = (this._actionBin.get_n_children() > 0);
        if (this._bodyStack.get_n_children() < 2) {
            this._expandedLabel = new URLHighlighter(this._bodyText,
                                                     true, this._useBodyMarkup);
            this.setExpandedBody(this._expandedLabel.actor);
        }
        if (animate) {
            Tweener.addTween(this._bodyStack.layout_manager,
                             { expansion: 1,
                               time: MessageTray.ANIMATION_TIME,
                               transition: 'easeOutQuad' });
            this._actionBin.scale_y = 0;
            Tweener.addTween(this._actionBin,
                             { scale_y: 1,
                               time: MessageTray.ANIMATION_TIME,
                               transition: 'easeOutQuad' });
        } else {
            this._bodyStack.layout_manager.expansion = 1;
            this._actionBin.scale_y = 1;
        }
        this.emit('expanded');
    },
    unexpand: function(animate) {
        if (animate) {
            Tweener.addTween(this._bodyStack.layout_manager,
                             { expansion: 0,
                               time: MessageTray.ANIMATION_TIME,
                               transition: 'easeOutQuad' });
            Tweener.addTween(this._actionBin,
                             { scale_y: 0,
                               time: MessageTray.ANIMATION_TIME,
                               transition: 'easeOutQuad',
                               onCompleteScope: this,
                               onComplete: function() {
                                   this._actionBin.hide();
                                   this.expanded = false;
                               }});
        } else {
            this._bodyStack.layout_manager.expansion = 0;
            this._actionBin.scale_y = 0;
            this.expanded = false;
        }
        this.emit('unexpanded');
    },
    canClose: function() {
        return this._mediaControls.get_n_children() == 0;
    },
    _sync: function() {
        let hovered = this.actor.hover;
        this._closeButton.visible = hovered && this.canClose();
        this._secondaryBin.visible = !hovered;
    },
    _onClicked: function() {
    },
    _onDestroy: function() {
    },
    _onKeyPressed: function(a, event) {
        let keysym = event.get_key_symbol();
        if (keysym == Clutter.KEY_Delete ||
            keysym == Clutter.KEY_KP_Delete) {
            this.close();
            return Clutter.EVENT_STOP;
        }
        return Clutter.EVENT_PROPAGATE;
    }
 });
 Signals.addSignalMethods(Message.prototype);
 const MessageListSection = new Lang.Class({
    Name: 'MessageListSection',
    _init: function(title) {
        this.actor = new St.BoxLayout({ style_class: 'message-list-section',
                                        clip_to_allocation: true,
                                        x_expand: true, vertical: true });
        let titleBox = new St.BoxLayout({ style_class: 'message-list-section-title-box' });
        this.actor.add_actor(titleBox);
        this._title = new St.Button({ style_class: 'message-list-section-title',
                                      label: title,
                                      can_focus: true,
                                      x_expand: true,
                                      x_align: St.Align.START });
        titleBox.add_actor(this._title);
        this._title.connect('clicked', Lang.bind(this, this._onTitleClicked));
        this._title.connect('key-focus-in', Lang.bind(this, this._onKeyFocusIn));
        let closeIcon = new St.Icon({ icon_name: 'window-close-symbolic' });
        this._closeButton = new St.Button({ style_class: 'message-list-section-close',
                                            child: closeIcon,
                                            accessible_name: _("Clear section"),
                                            can_focus: true });
        this._closeButton.set_x_align(Clutter.ActorAlign.END);
        titleBox.add_actor(this._closeButton);
        this._closeButton.connect('clicked', Lang.bind(this, this.clear));
        this._list = new St.BoxLayout({ style_class: 'message-list-section-list',
                                        vertical: true });
        this.actor.add_actor(this._list);
        this._list.connect('actor-added', Lang.bind(this, this._sync));
        this._list.connect('actor-removed', Lang.bind(this, this._sync));
        let id = Main.sessionMode.connect('updated',
                                          Lang.bind(this, this._sync));
        this.actor.connect('destroy', function() {
            Main.sessionMode.disconnect(id);
        });
        this._messages = new Map();
        this._date = new Date();
        this.empty = true;
        this._sync();
    },
    _onTitleClicked: function() {
        Main.overview.hide();
        Main.panel.closeCalendar();
    },
    _onKeyFocusIn: function(actor) {
        this.emit('key-focus-in', actor);
    },
    get allowed() {
        return true;
    },
    setDate: function(date) {
        if (Calendar.sameDay(date, this._date))
            return;
        this._date = date;
        this._sync();
    },
    addMessage: function(message, animate) {
        this.addMessageAtIndex(message, -1, animate);
    },
    addMessageAtIndex: function(message, index, animate) {
        let obj = {
            container: null,
            destroyId: 0,
            keyFocusId: 0,
            closeId: 0
        };
        let pivot = new Clutter.Point({ x: .5, y: .5 });
        let scale = animate ? 0 : 1;
        obj.container = new St.Widget({ layout_manager: new ScaleLayout(),
                                        pivot_point: pivot,
                                        scale_x: scale, scale_y: scale });
        obj.keyFocusId = message.actor.connect('key-focus-in',
            Lang.bind(this, this._onKeyFocusIn));
        obj.destroyId = message.actor.connect('destroy',
            Lang.bind(this, function() {
                this.removeMessage(message, false);
            }));
        obj.closeId = message.connect('close',
            Lang.bind(this, function() {
                this.removeMessage(message, true);
            }));
        this._messages.set(message, obj);
        obj.container.add_actor(message.actor);
        this._list.insert_child_at_index(obj.container, index);
        if (animate)
            Tweener.addTween(obj.container, { scale_x: 1,
                                              scale_y: 1,
                                              time: MESSAGE_ANIMATION_TIME,
                                              transition: 'easeOutQuad' });
    },
    moveMessage: function(message, index, animate) {
        let obj = this._messages.get(message);
        if (!animate) {
            this._list.set_child_at_index(obj.container, index);
            return;
        }
        let onComplete = Lang.bind(this, function() {
            this._list.set_child_at_index(obj.container, index);
            Tweener.addTween(obj.container, { scale_x: 1,
                                              scale_y: 1,
                                              time: MESSAGE_ANIMATION_TIME,
                                              transition: 'easeOutQuad' });
        });
        Tweener.addTween(obj.container, { scale_x: 0,
                                          scale_y: 0,
                                          time: MESSAGE_ANIMATION_TIME,
                                          transition: 'easeOutQuad',
                                          onComplete: onComplete });
    },
    removeMessage: function(message, animate) {
        let obj = this._messages.get(message);
        message.actor.disconnect(obj.destroyId);
        message.actor.disconnect(obj.keyFocusId);
        message.disconnect(obj.closeId);
        this._messages.delete(message);
        if (animate) {
            Tweener.addTween(obj.container, { scale_x: 0, scale_y: 0,
                                              time: MESSAGE_ANIMATION_TIME,
                                              transition: 'easeOutQuad',
                                              onComplete: function() {
                                                  obj.container.destroy();
                                                  global.sync_pointer();
                                              }});
        } else {
            obj.container.destroy();
            global.sync_pointer();
        }
    },
    clear: function() {
        let messages = [...this._messages.keys()].filter(function(message) {
            return message.canClose();
        });
        // If there are few messages, letting them all zoom out looks OK
        if (messages.length < 2) {
            messages.forEach(function(message) {
                message.close();
            });
        } else {
            // Otherwise we slide them out one by one, and then zoom them
            // out "off-screen" in the end to smoothly shrink the parent
            let delay = MESSAGE_ANIMATION_TIME / Math.max(messages.length, 5);
            for (let i = 0; i < messages.length; i++) {
                let message = messages[i];
                let obj = this._messages.get(message);
                Tweener.addTween(obj.container,
                                 { anchor_x: this._list.width,
                                   opacity: 0,
                                   time: MESSAGE_ANIMATION_TIME,
                                   delay: i * delay,
                                   transition: 'easeOutQuad',
                                   onComplete: function() {
                                       message.close();
                                   }});
            }
        }
    },
    _canClear: function() {
        for (let message of this._messages.keys())
            if (message.canClose())
                return true;
        return false;
    },
    _shouldShow: function() {
        return !this.empty;
    },
    _sync: function() {
        let empty = this._list.get_n_children() == 0;
        let changed = this.empty !== empty;
        this.empty = empty;
        if (changed)
            this.emit('empty-changed');
        this._closeButton.visible = this._canClear();
        this.actor.visible = this.allowed && this._shouldShow();
    }
 });
 Signals.addSignalMethods(MessageListSection.prototype);
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -259,7 +259,7 @@ const ModalDialog = new Lang.Class({
        if (this.state == State.OPENED || this.state == State.OPENING)
            return true;
-        if (!this.pushModal(timestamp))
+        if (!this.pushModal({ timestamp: timestamp }))
            return false;
        this._fadeOpen(onPrimary);
@ -318,11 +318,8 @@ const ModalDialog = new Lang.Class({
    pushModal: function (timestamp) {
        if (this._hasModal)
            return true;
-
+        if (!Main.pushModal(this._group, { timestamp: timestamp,
-        let params = { actionMode: this._actionMode };
+                                           actionMode: this._actionMode }))
        if (timestamp)
            params['timestamp'] = timestamp;
        if (!Main.pushModal(this._group, params))
            return false;
        this._hasModal = true;
--- a/js/ui/mpris.js
+++ b/js/ui/mpris.js
@ -1,270 +0,0 @@
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Calendar = imports.ui.calendar;
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;
 const DBusIface = '<node> \
 <interface name="org.freedesktop.DBus"> \
  <method name="ListNames"> \
    <arg type="as" direction="out" name="names" /> \
  </method> \
  <signal name="NameOwnerChanged"> \
    <arg type="s" direction="out" name="name" /> \
    <arg type="s" direction="out" name="oldOwner" /> \
    <arg type="s" direction="out" name="newOwner" /> \
  </signal> \
 </interface> \
 </node>';
 const DBusProxy = Gio.DBusProxy.makeProxyWrapper(DBusIface);
 const MprisIface = '<node> \
 <interface name="org.mpris.MediaPlayer2"> \
  <method name="Raise" /> \
  <property name="CanRaise" type="b" access="read" /> \
  <property name="DesktopEntry" type="s" access="read" /> \
 </interface> \
 </node>';
 const MprisProxy = Gio.DBusProxy.makeProxyWrapper(MprisIface);
 const MprisPlayerIface = '<node> \
 <interface name="org.mpris.MediaPlayer2.Player"> \
  <method name="PlayPause" /> \
  <method name="Next" /> \
  <method name="Previous" /> \
  <property name="CanPlay" type="b" access="read" /> \
  <property name="Metadata" type="a{sv}" access="read" /> \
  <property name="PlaybackStatus" type="s" access="read" /> \
 </interface> \
 </node>';
 const MprisPlayerProxy = Gio.DBusProxy.makeProxyWrapper(MprisPlayerIface);
 const MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.';
 const MediaMessage = new Lang.Class({
    Name: 'MediaMessage',
    Extends: MessageList.Message,
    _init: function(player) {
        this._player = player;
        this.parent('', '');
        this._icon = new St.Icon({ style_class: 'media-message-cover-icon' });
        this.setIcon(this._icon);
        this.addMediaControl('media-skip-backward-symbolic',
            Lang.bind(this, function() {
                this._player.previous();
            }));
        this._playPauseButton = this.addMediaControl(null,
            Lang.bind(this, function() {
                this._player.playPause();
            }));
        this.addMediaControl('media-skip-forward-symbolic',
            Lang.bind(this, function() {
                this._player.next();
            }));
        this._player.connect('changed', Lang.bind(this, this._update));
        this._player.connect('closed', Lang.bind(this, this.close));
        this._update();
    },
    _onClicked: function() {
        this._player.raise();
        Main.panel.closeCalendar();
    },
    _update: function() {
        this.setTitle(this._player.trackArtists.join(', '));
        this.setBody(this._player.trackTitle);
        if (this._player.trackCoverUrl) {
            let file = Gio.File.new_for_uri(this._player.trackCoverUrl);
            this._icon.gicon = new Gio.FileIcon({ file: file });
            this._icon.remove_style_class_name('fallback');
        } else {
            this._icon.icon_name = 'audio-x-generic-symbolic';
            this._icon.add_style_class_name('fallback');
        }
        let isPlaying = this._player.status == 'Playing';
        let iconName = isPlaying ? 'media-playback-pause-symbolic'
                                 : 'media-playback-start-symbolic';
        this._playPauseButton.child.icon_name = iconName;
    }
 });
 const MprisPlayer = new Lang.Class({
    Name: 'MprisPlayer',
    _init: function(busName) {
        this._mprisProxy = new MprisProxy(Gio.DBus.session, busName,
                                          '/org/mpris/MediaPlayer2',
                                          Lang.bind(this, this._onMprisProxyReady));
        this._playerProxy = new MprisPlayerProxy(Gio.DBus.session, busName,
                                                 '/org/mpris/MediaPlayer2',
                                                 Lang.bind(this, this._onPlayerProxyReady));
        this._visible = false;
        this._trackArtists = [];
        this._trackTitle = '';
        this._trackCoverUrl = '';
    },
    get status() {
        return this._playerProxy.PlaybackStatus;
    },
    get trackArtists() {
        return this._trackArtists;
    },
    get trackTitle() {
        return this._trackTitle;
    },
    get trackCoverUrl() {
        return this._trackCoverUrl;
    },
    playPause: function() {
        this._playerProxy.PlayPauseRemote();
    },
    next: function() {
        this._playerProxy.NextRemote();
    },
    previous: function() {
        this._playerProxy.PreviousRemote();
    },
    raise: function() {
        // The remote Raise() method may run into focus stealing prevention,
        // so prefer activating the app via .desktop file if possible
        let app = null;
        if (this._mprisProxy.DesktopEntry) {
            let desktopId = this._mprisProxy.DesktopEntry + '.desktop';
            app = Shell.AppSystem.get_default().lookup_app(desktopId);
        }
        if (app)
            app.activate();
        else if (this._mprisProxy.CanRaise)
            this._mprisProxy.RaiseRemote();
    },
    _close: function() {
        this._mprisProxy.disconnect(this._ownerNotifyId);
        this._mprisProxy = null;
        this._playerProxy.disconnect(this._propsChangedId);
        this._playerProxy = null;
        this.emit('closed');
    },
    _onMprisProxyReady: function() {
        this._ownerNotifyId = this._mprisProxy.connect('notify::g-name-owner',
            Lang.bind(this, function() {
                if (!this._mprisProxy.g_name_owner)
                    this._close();
            }));
    },
    _onPlayerProxyReady: function() {
        this._propsChangedId = this._playerProxy.connect('g-properties-changed',
                                                         Lang.bind(this, this._updateState));
        this._updateState();
    },
    _updateState: function() {
        let metadata = {};
        for (let prop in this._playerProxy.Metadata)
            metadata[prop] = this._playerProxy.Metadata[prop].deep_unpack();
        this._trackArtists = metadata['xesam:artist'] || [_("Unknown artist")];
        this._trackTitle = metadata['xesam:title'] || _("Unknown title");
        this._trackCoverUrl = metadata['mpris:artUrl'] || '';
        this.emit('changed');
        let visible = this._playerProxy.CanPlay;
        if (this._visible != visible) {
            this._visible = visible;
            if (visible)
                this.emit('show');
            else
                this._close();
        }
    }
 });
 Signals.addSignalMethods(MprisPlayer.prototype);
 const MediaSection = new Lang.Class({
    Name: 'MediaSection',
    Extends: MessageList.MessageListSection,
    _init: function() {
        this.parent(_("Media"));
        this._players = new Map();
        this._proxy = new DBusProxy(Gio.DBus.session,
                                    'org.freedesktop.DBus',
                                    '/org/freedesktop/DBus',
                                    Lang.bind(this, this._onProxyReady));
    },
    _shouldShow: function() {
        return !this.empty && Calendar.isToday(this._date);
    },
    _addPlayer: function(busName) {
        if (this._players.get(busName))
            return;
        let player = new MprisPlayer(busName);
        player.connect('closed', Lang.bind(this,
            function() {
                this._players.delete(busName);
            }));
        player.connect('show', Lang.bind(this,
            function() {
                let message = new MediaMessage(player);
                this.addMessage(message, true);
            }));
        this._players.set(busName, player);
    },
    _onProxyReady: function() {
        this._proxy.ListNamesRemote(Lang.bind(this,
            function([names]) {
                names.forEach(Lang.bind(this,
                    function(name) {
                        if (!name.startsWith(MPRIS_PLAYER_PREFIX))
                            return;
                        this._addPlayer(name);
                    }));
            }));
        this._proxy.connectSignal('NameOwnerChanged',
                                  Lang.bind(this, this._onNameOwnerChanged));
    },
    _onNameOwnerChanged: function(proxy, sender, [name, oldOwner, newOwner]) {
        if (!name.startsWith(MPRIS_PLAYER_PREFIX))
            return;
        if (newOwner && !oldOwner)
            this._addPlayer(name);
    }
 });
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@ -22,13 +22,11 @@ const LevelBar = new Lang.Class({
        this._level = 0;
        this.actor = new St.Bin({ style_class: 'level',
-                                  x_align: St.Align.START,
+                                  x_fill: true, y_fill: true });
-                                  y_fill: true });
+        this._bar = new St.DrawingArea();
-        this._bar = new St.Widget({ style_class: 'level-bar' });
+        this._bar.connect('repaint', Lang.bind(this, this._repaint));
        this.actor.set_child(this._bar);
        this.actor.connect('notify::width', () => { this.level = this.level; });
    },
    get level() {
@ -36,44 +34,39 @@ const LevelBar = new Lang.Class({
    },
    set level(value) {
-        this._level = Math.max(0, Math.min(value, 100));
+        let newValue = Math.max(0, Math.min(value, 100));
-
+        if (newValue == this._level)
-        let alloc = this.actor.get_allocation_box();
+            return;
-        let newWidth = Math.round((alloc.x2 - alloc.x1) * this._level / 100);
+        this._level = newValue;
-        if (newWidth != this._bar.width)
+        this._bar.queue_repaint();
            this._bar.width = newWidth;
    }
 });
 const OsdWindowConstraint = new Lang.Class({
    Name: 'OsdWindowConstraint',
    Extends: Clutter.Constraint,
    _init: function(props) {
        this._minSize = 0;
        this.parent(props);
    },
-    set minSize(v) {
+    _repaint: function() {
-        this._minSize = v;
+        let cr = this._bar.get_context();
        if (this.actor)
            this.actor.queue_relayout();
    },
-    vfunc_update_allocation: function(actor, actorBox) {
+        let node = this.actor.get_theme_node();
-        // Clutter will adjust the allocation for margins,
+        let radius = node.get_border_radius(0); // assume same radius for all corners
-        // so add it to our minimum size
+        Clutter.cairo_set_source_color(cr, node.get_foreground_color());
        let minSize = this._minSize + actor.margin_top + actor.margin_bottom;
        let [width, height] = actorBox.get_size();
-        // Enforce a ratio of 1
+        let [w, h] = this._bar.get_surface_size();
-        let size = Math.ceil(Math.max(minSize, height));
+        w *= (this._level / 100.);
        actorBox.set_size(size, size);
-        // Recenter
+        if (w == 0)
-        let [x, y] = actorBox.get_origin();
+            return;
-        actorBox.set_origin(Math.ceil(x + width / 2 - size / 2),
+
-                            Math.ceil(y + height / 2 - size / 2));
+        cr.moveTo(radius, 0);
        if (w >= radius)
            cr.arc(w - radius, radius, radius, 1.5 * Math.PI, 2. * Math.PI);
        else
            cr.lineTo(w, 0);
        if (w >= radius)
            cr.arc(w - radius, h - radius, radius, 0, 0.5 * Math.PI);
        else
            cr.lineTo(w, h);
        cr.arc(radius, h - radius, radius, 0.5 * Math.PI, Math.PI);
        cr.arc(radius, radius, radius, Math.PI, 1.5 * Math.PI);
        cr.fill();
        cr.$dispose();
    }
 });
@ -81,6 +74,7 @@ const OsdWindow = new Lang.Class({
    Name: 'OsdWindow',
    _init: function(monitorIndex) {
        this._popupSize = 0;
        this.actor = new St.Widget({ x_expand: true,
                                     y_expand: true,
                                     x_align: Clutter.ActorAlign.CENTER,
@ -90,12 +84,19 @@ const OsdWindow = new Lang.Class({
        let constraint = new Layout.MonitorConstraint({ index: monitorIndex });
        this.actor.add_constraint(constraint);
        this._boxConstraint = new OsdWindowConstraint();
        this._box = new St.BoxLayout({ style_class: 'osd-window',
                                       vertical: true });
        this._box.add_constraint(this._boxConstraint);
        this.actor.add_actor(this._box);
        this._box.connect('style-changed', Lang.bind(this, this._onStyleChanged));
        this._box.connect('notify::height', Lang.bind(this,
            function() {
                Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
                    function() {
                        this._box.width = this._box.height;
                    }));
            }));
        this._icon = new St.Icon();
        this._box.add(this._icon, { expand: true });
@ -109,11 +110,8 @@ const OsdWindow = new Lang.Class({
        this._reset();
        Main.layoutManager.connect('monitors-changed',
-                                   Lang.bind(this, this._relayout));
+                                   Lang.bind(this, this._monitorsChanged));
-        let themeContext = St.ThemeContext.get_for_stage(global.stage);
+        this._monitorsChanged();
        themeContext.connect('notify::scale-factor',
                             Lang.bind(this, this._relayout));
        this._relayout();
        Main.uiGroup.add_child(this.actor);
    },
@ -191,7 +189,7 @@ const OsdWindow = new Lang.Class({
        this.setLevel(null);
    },
-    _relayout: function() {
+    _monitorsChanged: function() {
        /* assume 110x110 on a 640x480 display and scale from there */
        let monitor = Main.layoutManager.monitors[this._monitorIndex];
        if (!monitor)
@ -200,12 +198,30 @@ const OsdWindow = new Lang.Class({
        let scalew = monitor.width / 640.0;
        let scaleh = monitor.height / 480.0;
        let scale = Math.min(scalew, scaleh);
-        let popupSize = 110 * Math.max(1, scale);
+        this._popupSize = 110 * Math.max(1, scale);
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._icon.icon_size = popupSize / (2 * scaleFactor);
+        this._icon.icon_size = this._popupSize / (2 * scaleFactor);
        this._box.translation_y = monitor.height / 4;
-        this._boxConstraint.minSize = popupSize;
+        this._box.style_changed();
    },
    _onStyleChanged: function() {
        let themeNode = this._box.get_theme_node();
        let horizontalPadding = themeNode.get_horizontal_padding();
        let verticalPadding = themeNode.get_vertical_padding();
        let topBorder = themeNode.get_border_width(St.Side.TOP);
        let bottomBorder = themeNode.get_border_width(St.Side.BOTTOM);
        let leftBorder = themeNode.get_border_width(St.Side.LEFT);
        let rightBorder = themeNode.get_border_width(St.Side.RIGHT);
        let minWidth = this._popupSize - verticalPadding - leftBorder - rightBorder;
        let minHeight = this._popupSize - horizontalPadding - topBorder - bottomBorder;
        // minWidth/minHeight here are in real pixels,
        // but the theme takes measures in unscaled dimensions
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        this._box.style = 'min-height: %dpx;'.format(Math.max(minWidth, minHeight) / scaleFactor);
    }
 });
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -107,12 +107,18 @@ const Overview = new Lang.Class({
        this._overviewCreated = true;
        let layout = new Clutter.BinLayout();
        this._stack = new Clutter.Actor({ layout_manager: layout });
        this._stack.add_constraint(new LayoutManager.MonitorConstraint({ primary: true }));
        /* Translators: This is the main view to select
           activities. See also note for "Activities" string. */
        this._overview = new St.BoxLayout({ name: 'overview',
                                            accessible_name: _("Overview"),
-                                            vertical: true });
+                                            reactive: true,
-        this._overview.add_constraint(new LayoutManager.MonitorConstraint({ primary: true }));
+                                            vertical: true,
                                            x_expand: true,
                                            y_expand: true });
        this._overview._delegate = this;
        // The main Background actors are inside global.window_group which are
@ -120,7 +126,7 @@ const Overview = new Lang.Class({
        // one. Instances of this class share a single CoglTexture behind the
        // scenes which allows us to show the background with different
        // rendering options without duplicating the texture data.
-        this._backgroundGroup = new Meta.BackgroundGroup({ reactive: true });
+        this._backgroundGroup = new Meta.BackgroundGroup();
        Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
        this._bgManagers = [];
@ -143,7 +149,8 @@ const Overview = new Lang.Class({
        Main.layoutManager.overviewGroup.add_child(this._coverPane);
        this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return Clutter.EVENT_STOP; }));
-        Main.layoutManager.overviewGroup.add_child(this._overview);
+        this._stack.add_actor(this._overview);
        Main.layoutManager.overviewGroup.add_child(this._stack);
        this._coverPane.hide();
@ -152,9 +159,6 @@ const Overview = new Lang.Class({
            dragMotion: Lang.bind(this, this._onDragMotion)
        };
        Main.layoutManager.overviewGroup.connect('scroll-event',
                                                 Lang.bind(this, this._onScrollEvent));
        Main.xdndHandler.connect('drag-begin', Lang.bind(this, this._onDragBegin));
        Main.xdndHandler.connect('drag-end', Lang.bind(this, this._onDragEnd));
@ -251,6 +255,7 @@ const Overview = new Lang.Class({
        // Add our same-line elements after the search entry
        this._overview.add(this._controls.actor, { y_fill: true, expand: true });
        this._controls.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
        // TODO - recalculate everything when desktop size changes
        this.dashIconSize = this._dash.iconSize;
@ -367,7 +372,7 @@ const Overview = new Lang.Class({
        if (this.isDummy)
            return;
-        this._backgroundGroup.add_action(action);
+        this._overview.add_action(action);
    },
    _getDesktopClone: function() {
@ -547,8 +552,8 @@ const Overview = new Lang.Class({
        Meta.disable_unredirect_for_screen(global.screen);
        this.viewSelector.show();
-        this._overview.opacity = 0;
+        this._stack.opacity = 0;
-        Tweener.addTween(this._overview,
+        Tweener.addTween(this._stack,
                         { opacity: 255,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
@ -613,7 +618,7 @@ const Overview = new Lang.Class({
        this.viewSelector.animateFromOverview();
        // Make other elements fade out.
-        Tweener.addTween(this._overview,
+        Tweener.addTween(this._stack,
                         { opacity: 0,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@ -421,6 +421,7 @@ const ControlsManager = new Lang.Class({
        let layout = new ControlsLayout();
        this.actor = new St.Widget({ layout_manager: layout,
                                     reactive: true,
                                     x_expand: true, y_expand: true,
                                     clip_to_allocation: true });
        this._group = new St.BoxLayout({ name: 'overview-group',
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@ -1,761 +0,0 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 const Rsvg = imports.gi.Rsvg;
 const GObject = imports.gi.GObject;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const Gio = imports.gi.Gio;
 const GDesktopEnums = imports.gi.GDesktopEnums;
 const Atk = imports.gi.Atk;
 const Cairo = imports.cairo;
 const Signals = imports.signals;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const Layout = imports.ui.layout;
 const ACTIVE_COLOR = "#729fcf";
 const LTR = 0;
 const RTL = 1;
 const CW = 0;
 const CCW = 1;
 const UP = 0;
 const DOWN = 1;
 const KeybindingEntry = new Lang.Class({
    Name: 'KeybindingEntry',
    _init: function () {
        this.actor = new St.Entry({ hint_text: _("New shortcut…"),
                                    style: 'width: 10em' });
        this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
    },
    _onCapturedEvent: function (actor, event) {
        if (event.type() != Clutter.EventType.KEY_PRESS)
            return Clutter.EVENT_PROPAGATE;
        let str = Gtk.accelerator_name_with_keycode(null,
                                                    event.get_key_symbol(),
                                                    event.get_key_code(),
                                                    event.get_state());
        this.actor.set_text(str);
        this.emit('keybinding-edited', str);
        return Clutter.EVENT_STOP;
    }
 });
 Signals.addSignalMethods(KeybindingEntry.prototype);
 const ActionComboBox = new Lang.Class({
    Name: 'ActionComboBox',
    _init: function () {
        this.actor = new St.Button({ style_class: 'button' });
        this.actor.connect('clicked', Lang.bind(this, this._onButtonClicked));
        this.actor.set_toggle_mode(true);
        let boxLayout = new Clutter.BoxLayout({ orientation: Clutter.Orientation.HORIZONTAL,
                                                spacing: 6 });
        let box = new St.Widget({ layout_manager: boxLayout });
        this.actor.set_child(box);
        this._label = new St.Label({ style_class: 'combo-box-label' });
        box.add_child(this._label)
        let arrow = new St.Icon({ style_class: 'popup-menu-arrow',
                                  icon_name: 'pan-down-symbolic',
                                  accessible_role: Atk.Role.ARROW,
                                  y_expand: true,
                                  y_align: Clutter.ActorAlign.CENTER });
        box.add_child(arrow);
        this._editMenu = new PopupMenu.PopupMenu(this.actor, 0, St.Side.TOP);
        this._editMenu.connect('menu-closed', Lang.bind(this, function() { this.actor.set_checked(false); }));
        this._editMenu.actor.hide();
        Main.uiGroup.add_actor(this._editMenu.actor);
        this._actionLabels = new Map();
        this._actionLabels.set(GDesktopEnums.PadButtonAction.NONE, _("Application defined"));
        this._actionLabels.set(GDesktopEnums.PadButtonAction.HELP, _("Show on-screen help"));
        this._actionLabels.set(GDesktopEnums.PadButtonAction.SWITCH_MONITOR, _("Switch monitor"));
        this._actionLabels.set(GDesktopEnums.PadButtonAction.KEYBINDING, _("Assign keystroke"));
        for (let [action, label] of this._actionLabels.entries()) {
            let selectedAction = action;
            this._editMenu.addAction(label, Lang.bind(this, function() { this._onActionSelected(selectedAction) }));
        }
        this.setAction(GDesktopEnums.PadButtonAction.NONE);
    },
    _onActionSelected: function (action) {
        this.setAction(action);
        this.popdown();
        this.emit('action-selected', action);
    },
    setAction: function (action) {
        this._label.set_text(this._actionLabels.get(action));
    },
    popup: function () {
        this._editMenu.open(true);
    },
    popdown: function () {
        this._editMenu.close(true);
    },
    _onButtonClicked: function () {
        if (this.actor.get_checked())
            this.popup();
        else
            this.popdown();
    }
 });
 Signals.addSignalMethods(ActionComboBox.prototype);
 const ActionEditor = new Lang.Class({
    Name: 'ActionEditor',
    _init: function () {
        let boxLayout = new Clutter.BoxLayout({ orientation: Clutter.Orientation.HORIZONTAL,
                                                spacing: 12 });
        this.actor = new St.Widget({ layout_manager: boxLayout });
        this._actionComboBox = new ActionComboBox();
        this._actionComboBox.connect('action-selected', Lang.bind(this, this._onActionSelected));
        this.actor.add_actor(this._actionComboBox.actor);
        this._keybindingEdit = new KeybindingEntry();
        this._keybindingEdit.connect('keybinding-edited', Lang.bind(this, this._onKeybindingEdited));
        this.actor.add_actor(this._keybindingEdit.actor);
        this._doneButton = new St.Button({ label: _("Done"),
                                           style_class: 'button',
                                           x_expand: false});
        this._doneButton.connect('clicked', Lang.bind(this, this._onEditingDone));
        this.actor.add_actor(this._doneButton);
    },
    _updateKeybindingEntryState: function () {
        if (this._currentAction == GDesktopEnums.PadButtonAction.KEYBINDING) {
            this._keybindingEdit.actor.set_text(this._currentKeybinding);
            this._keybindingEdit.actor.show();
            this._keybindingEdit.actor.grab_key_focus();
        } else {
            this._keybindingEdit.actor.hide();
        }
    },
    setSettings: function (settings) {
        this._buttonSettings = settings;
        this._currentAction = this._buttonSettings.get_enum('action');
        this._currentKeybinding = this._buttonSettings.get_string('keybinding');
        this._actionComboBox.setAction(this._currentAction);
        this._updateKeybindingEntryState();
    },
    close: function() {
        this._actionComboBox.popdown();
        this.actor.hide();
    },
    _onKeybindingEdited: function (entry, keybinding) {
        this._currentKeybinding = keybinding;
    },
    _onActionSelected: function (menu, action) {
        this._currentAction = action;
        this._updateKeybindingEntryState();
    },
    _storeSettings: function () {
        if (!this._buttonSettings)
            return;
        let keybinding = null;
        if (this._currentAction == GDesktopEnums.PadButtonAction.KEYBINDING)
            keybinding = this._currentKeybinding;
        this._buttonSettings.set_enum('action', this._currentAction);
        if (keybinding)
            this._buttonSettings.set_string('keybinding', keybinding);
        else
            this._buttonSettings.reset('keybinding');
    },
    _onEditingDone: function () {
        this._storeSettings();
        this.close();
        this.emit('done');
    }
 });
 Signals.addSignalMethods(ActionEditor.prototype);
 const PadDiagram = new Lang.Class({
    Name: 'PadDiagram',
    Extends: St.DrawingArea,
    Properties: { 'left-handed': GObject.ParamSpec.boolean('left-handed',
                                                           'left-handed', 'Left handed',
                                                           GObject.ParamFlags.READWRITE |
                                                           GObject.ParamFlags.CONSTRUCT_ONLY,
                                                           false),
                  'image': GObject.ParamSpec.string('image', 'image', 'Image',
                                                    GObject.ParamFlags.READWRITE |
                                                    GObject.ParamFlags.CONSTRUCT_ONLY,
                                                    null),
                  'editor-actor': GObject.ParamSpec.object('editor-actor',
                                                           'editor-actor',
                                                           'Editor actor',
                                                           GObject.ParamFlags.READWRITE |
                                                           GObject.ParamFlags.CONSTRUCT_ONLY,
                                                           Clutter.Actor.$gtype) },
    _init: function (params) {
        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/pad-osd.css');
        let [success, css, etag] = file.load_contents(null);
        this._css = css;
        this._labels = [];
        this._activeButtons = [];
        this.parent(params);
    },
    get left_handed() {
        return this._leftHanded;
    },
    set left_handed(leftHanded) {
        this._leftHanded = leftHanded;
    },
    get image() {
        return this._imagePath;
    },
    set image(imagePath) {
        let originalHandle = Rsvg.Handle.new_from_file(imagePath);
        let dimensions = originalHandle.get_dimensions();
        this._imageWidth = dimensions.width;
        this._imageHeight = dimensions.height;
        this._imagePath = imagePath;
        this._handle = this._composeStyledDiagram();
    },
    get editor_actor() {
        return this._editorActor;
    },
    set editor_actor(actor) {
        actor.hide();
        this._editorActor = actor;
        this.add_actor(actor);
    },
    _wrappingSvgHeader: function () {
        return ('<?xml version="1.0" encoding="UTF-8" standalone="no"?>' +
                '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" ' +
                'xmlns:xi="http://www.w3.org/2001/XInclude" ' +
                'width="' + this._imageWidth + '" height="' + this._imageHeight + '"> ' +
                '<style type="text/css">');
    },
    _wrappingSvgFooter: function () {
        return ('</style>' +
                '<xi:include href="' + this._imagePath + '" />' +
                '</svg>');
    },
    _cssString: function () {
        let css = this._css;
        for (let i = 0; i < this._activeButtons.length; i++) {
            let ch = String.fromCharCode('A'.charCodeAt() + this._activeButtons[i]);
            css += ('.' + ch + ' { ' +
 	            '  stroke: ' + ACTIVE_COLOR + ' !important; ' +
                    '  fill: ' + ACTIVE_COLOR + ' !important; ' +
                    '} ');
        }
        return css;
    },
    _composeStyledDiagram: function () {
        let svgData = '';
        if (!GLib.file_test(this._imagePath, GLib.FileTest.EXISTS))
            return null;
        svgData += this._wrappingSvgHeader();
        svgData += this._cssString();
        svgData += this._wrappingSvgFooter();
        let handle = new Rsvg.Handle();
        handle.set_base_uri(GLib.path_get_dirname(this._imagePath));
        handle.write(svgData);
        handle.close();
        return handle;
    },
    _updateDiagramScale: function () {
        if (this._handle == null)
            return;
        [this._actorWidth, this._actorHeight] = this.get_size();
        let dimensions = this._handle.get_dimensions();
        let scaleX = this._actorWidth / dimensions.width;
        let scaleY = this._actorHeight / dimensions.height;
        this._scale = Math.min(scaleX, scaleY);
    },
    _allocateChild: function (child, x, y, direction) {
        let [prefHeight, natHeight] = child.get_preferred_height(-1);
        let [prefWidth, natWidth] = child.get_preferred_width(natHeight);
        let childBox = new Clutter.ActorBox();
        if (direction == LTR) {
            childBox.x1 = x;
            childBox.x2 = x + natWidth;
        } else {
            childBox.x1 = x - natWidth;
            childBox.x2 = x;
        }
        childBox.y1 = y - natHeight / 2;
        childBox.y2 = y + natHeight / 2;
        child.allocate(childBox, 0);
    },
    vfunc_allocate: function (box, flags) {
        this.parent(box, flags);
        this._updateDiagramScale();
        for (let i = 0; i < this._labels.length; i++) {
            let [label, action, idx, dir] = this._labels[i];
            let [found, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
            this._allocateChild(label, x, y, arrangement);
        }
        if (this._editorActor && this._curEdited) {
            let [label, action, idx, dir] = this._curEdited;
            let [found, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
            this._allocateChild(this._editorActor, x, y, arrangement);
        }
    },
    vfunc_repaint: function () {
        if (this._handle == null)
            return;
        if (this._scale == null)
            this._updateDiagramScale();
        let [width, height] = this.get_surface_size();
        let dimensions = this._handle.get_dimensions();
        let cr = this.get_context();
        cr.save();
        cr.translate(width/2, height/2);
        cr.scale(this._scale, this._scale);
        if (this._leftHanded)
            cr.rotate(Math.PI);
        cr.translate(-dimensions.width/2, -dimensions.height/2);
        this._handle.render_cairo(cr);
        cr.restore();
        cr.$dispose();
    },
    _transformPoint: function (x, y) {
        if (this._handle == null || this._scale == null)
            return [x, y];
        // I miss Cairo.Matrix
        let dimensions = this._handle.get_dimensions();
        x = x * this._scale + this._actorWidth / 2 - dimensions.width / 2 * this._scale;
        y = y * this._scale + this._actorHeight / 2 - dimensions.height / 2 * this._scale;;
        return [Math.round(x), Math.round(y)];
    },
    _getItemLabelCoords: function (labelName, leaderName) {
        if (this._handle == null)
            return [false];
        let leaderPos, leaderSize, pos;
        let found, direction;
        [found, pos] = this._handle.get_position_sub('#' + labelName);
        if (!found)
            return [false];
        [found, leaderPos] = this._handle.get_position_sub('#' + leaderName);
        [found, leaderSize] = this._handle.get_dimensions_sub('#' + leaderName);
        if (!found)
            return [false];
        if (pos.x > leaderPos.x + leaderSize.width)
            direction = LTR;
        else
            direction = RTL;
        if (this._leftHanded) {
            direction = 1 - direction;
            pos.x = this._imageWidth - pos.x;
            pos.y = this._imageHeight - pos.y;
        }
        let [x, y] = this._transformPoint(pos.x, pos.y)
        return [true, x, y, direction];
    },
    getButtonLabelCoords: function (button) {
        let ch = String.fromCharCode('A'.charCodeAt() + button);
        let labelName = 'Label' + ch;
        let leaderName = 'Leader' + ch;
        return this._getItemLabelCoords(labelName, leaderName);
    },
    getRingLabelCoords: function (number, dir) {
        let numStr = number > 0 ? number.toString() : '';
        let dirStr = dir == CW ? 'CW' : 'CCW';
        let labelName = 'LabelRing' + numStr + dirStr;
        let leaderName = 'LeaderRing' + numStr + dirStr;
        return this._getItemLabelCoords(labelName, leaderName);
    },
    getStripLabelCoords: function (number, dir) {
        let numStr = number > 0 ? (number + 1).toString() : '';
        let dirStr = dir == UP ? 'Up' : 'Down';
        let labelName = 'LabelStrip' + numStr + dirStr;
        let leaderName = 'LeaderStrip' + numStr + dirStr;
        return this._getItemLabelCoords(labelName, leaderName);
    },
    getLabelCoords: function (action, idx, dir) {
        if (action == Meta.PadActionType.BUTTON)
            return this.getButtonLabelCoords(idx);
        else if (action == Meta.PadActionType.RING)
            return this.getRingLabelCoords(idx, dir);
        else if (action == Meta.PadActionType.STRIP)
            return this.getStripLabelCoords(idx, dir);
        return [false];
    },
    _invalidateSvg: function () {
        if (this._handle == null)
            return;
        this._handle = this._composeStyledDiagram();
        this.queue_repaint();
    },
    activateButton: function (button) {
        this._activeButtons.push(button);
        this._invalidateSvg();
    },
    deactivateButton: function (button) {
        for (let i = 0; i < this._activeButtons.length; i++) {
            if (this._activeButtons[i] == button)
                this._activeButtons.splice(i, 1);
        }
        this._invalidateSvg();
    },
    addLabel: function (label, type, idx, dir) {
        this._labels.push([label, type, idx, dir]);
        this.add_actor(label);
    },
    stopEdition: function (str) {
        this._editorActor.hide();
        if (this._curEdited) {
            let [label, action, idx, dir] = this._curEdited;
            if (str != null) {
                label.set_text(str);
                let [found, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
                this._allocateChild(label, x, y, arrangement);
            }
            label.show();
            this._curEdited = null;
        }
    },
    startEdition: function(action, idx, dir) {
        let editedLabel;
        this.stopEdition();
        for (let i = 0; i < this._labels.length; i++) {
            let [label, itemAction, itemIdx, itemDir] = this._labels[i];
            if (action == itemAction && idx == itemIdx && dir == itemDir) {
                this._curEdited = this._labels[i];
                editedLabel = label;
                break;
            }
        }
        if (this._curEdited == null)
            return;
        let [found] = this.getLabelCoords(action, idx, dir);
        if (!found)
            return;
        this._editorActor.show();
        editedLabel.hide();
    }
 });
 const PadOsd = new Lang.Class({
    Name: 'PadOsd',
    _init: function (padDevice, settings, imagePath, editionMode, monitorIndex) {
        this.padDevice = padDevice;
        this._settings = settings;
        this._imagePath = imagePath;
        this._editionMode = editionMode;
        this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
        let deviceManager = Clutter.DeviceManager.get_default();
        this._deviceRemovedId = deviceManager.connect('device-removed', Lang.bind(this, function (manager, device) {
            // If the device is being removed, destroy the padOsd.
            if (device == this.padDevice)
                this.destroy();
        }));
        this.actor = new St.BoxLayout({ style_class: 'pad-osd-window',
                                        x_expand: true,
                                        y_expand: true,
                                        vertical: true,
                                        reactive: true });
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
        Main.uiGroup.add_actor(this.actor);
        this._monitorIndex = monitorIndex;
        let constraint = new Layout.MonitorConstraint({ index: monitorIndex });
        this.actor.add_constraint(constraint);
        this._titleLabel = new St.Label({ style: 'font-side: larger; font-weight: bold;',
                                          x_align: Clutter.ActorAlign.CENTER });
        this._titleLabel.clutter_text.set_text(padDevice.get_device_name());
        this.actor.add_actor(this._titleLabel);
        this._tipLabel = new St.Label({ x_align: Clutter.ActorAlign.CENTER });
        this.actor.add_actor(this._tipLabel);
        this._actionEditor = new ActionEditor();
        this._actionEditor.connect('done', Lang.bind(this, this._endButtonActionEdition));
        this._padDiagram = new PadDiagram({ image: this._imagePath,
                                            left_handed: settings.get_boolean('left-handed'),
                                            editor_actor: this._actionEditor.actor,
                                            x_expand: true,
                                            y_expand: true });
        this.actor.add_actor(this._padDiagram);
        // FIXME: Fix num buttons.
        let i = 0;
        for (i = 0; i < 50; i++) {
            let [found] = this._padDiagram.getButtonLabelCoords(i);
            if (!found)
                break;
            this._createLabel(Meta.PadActionType.BUTTON, i);
        }
        for (i = 0; i < padDevice.get_n_rings(); i++) {
            this._createLabel(Meta.PadActionType.RING, i, CW);
            this._createLabel(Meta.PadActionType.RING, i, CCW);
        }
        for (i = 0; i < padDevice.get_n_strips(); i++) {
            this._createLabel(Meta.PadActionType.STRIP, i, UP);
            this._createLabel(Meta.PadActionType.STRIP, i, DOWN);
        }
        let buttonBox = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                         x_expand: true,
                                         x_align: Clutter.ActorAlign.CENTER,
                                         y_align: Clutter.ActorAlign.CENTER });
        this.actor.add_actor(buttonBox);
        this._editButton = new St.Button({ label: _("Edit…"),
                                           style_class: 'button',
                                           x_align: Clutter.ActorAlign.CENTER,
                                           can_focus: true });
        this._editButton.connect('clicked', Lang.bind(this, function () { this.setEditionMode(true) }));
        buttonBox.add_actor(this._editButton);
        this._syncEditionMode();
        Main.pushModal(this.actor);
    },
    _createLabel: function (type, number, dir) {
        let str = global.display.get_pad_action_label(this.padDevice, type, number);
        let label = new St.Label({ text: str ? str : _("None") });
        this._padDiagram.addLabel(label, type, number, dir);
    },
    _onCapturedEvent : function (actor, event) {
        if (event.type() == Clutter.EventType.PAD_BUTTON_PRESS &&
            event.get_source_device() == this.padDevice) {
            this._padDiagram.activateButton(event.get_button());
            if (this._editionMode)
                this._startButtonActionEdition(event.get_button());
            return Clutter.EVENT_STOP;
        } else if (event.type() == Clutter.EventType.PAD_BUTTON_RELEASE &&
                   event.get_source_device() == this.padDevice) {
            this._padDiagram.deactivateButton(event.get_button());
            return Clutter.EVENT_STOP;
        } else if (event.type() == Clutter.EventType.KEY_PRESS &&
                   (!this._editionMode || event.get_key_symbol() == Clutter.Escape)) {
            if (this._editingButtonAction != null)
                this._endButtonActionEdition();
            else
                this.destroy();
            return Clutter.EVENT_STOP;
        }
        return Clutter.EVENT_PROPAGATE;
    },
    _syncEditionMode: function () {
        this._editButton.set_reactive(!this._editionMode);
        this._editButton.save_easing_state();
        this._editButton.set_easing_duration(200);
        this._editButton.set_opacity(this._editionMode ? 128 : 255);
        this._editButton.restore_easing_state();
        let title;
        if (this._editionMode) {
            title = _("Press a button to configure");
            this._tipLabel.set_text(_("Press Esc to exit"));
        } else {
            title = this.padDevice.get_device_name();
            this._tipLabel.set_text(_("Press any key to exit"));
        }
        this._titleLabel.clutter_text.set_markup('<span size="larger"><b>' + title + '</b></span>');
    },
    _endButtonActionEdition: function () {
        this._actionEditor.close();
        if (this._editingButtonAction != null) {
            let str = global.display.get_pad_action_label(this.padDevice,
                                                          Meta.PadActionType.BUTTON,
                                                          this._editingButtonAction);
            this._padDiagram.stopEdition(str ? str : _("None"))
            this._editingButtonAction = null;
        }
        this._editedButtonSettings = null;
    },
    _startButtonActionEdition: function (button) {
        if (this._editingButtonAction == button)
            return;
        this._endButtonActionEdition();
        this._editingButtonAction = button;
        let ch = String.fromCharCode('A'.charCodeAt() + button);
        let settingsPath = this._settings.path + "button" + ch + '/';
        this._editedButtonSettings = Gio.Settings.new_with_path('org.gnome.desktop.peripherals.tablet.pad-button',
                                                                settingsPath);
        this._actionEditor.setSettings(this._editedButtonSettings);
        this._padDiagram.startEdition(Meta.PadActionType.BUTTON, button);
    },
    setEditionMode: function (editionMode) {
        if (this._editionMode == editionMode)
            return;
        this._editionMode = editionMode;
        this._syncEditionMode();
    },
    destroy: function () {
        this.actor.destroy();
    },
    _onDestroy: function () {
        Main.popModal(this.actor);
        this._actionEditor.close();
        if (this._deviceRemovedId != 0) {
            let deviceManager = Clutter.DeviceManager.get_default();
            deviceManager.disconnect(this._deviceRemovedId);
            this._deviceRemovedId = 0;
        }
        if (this._capturedEventId != 0) {
            global.stage.disconnect(this._capturedEventId);
            this._capturedEventId = 0;
        }
        this.actor = null;
        this.emit('closed');
    }
 });
 Signals.addSignalMethods(PadOsd.prototype);
 const PadOsdIface = '<node> \
 <interface name="org.gnome.Shell.Wacom.PadOsd"> \
 <method name="Show"> \
    <arg name="device_node" direction="in" type="o"/> \
    <arg name="edition_mode" direction="in" type="b"/> \
 </method> \
 </interface> \
 </node>';
 const PadOsdService = new Lang.Class({
    Name: 'PadOsdService',
    _init: function() {
        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(PadOsdIface, this);
        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/Wacom');
        Gio.DBus.session.own_name('org.gnome.Shell.Wacom.PadOsd', Gio.BusNameOwnerFlags.REPLACE, null, null);
    },
    ShowAsync: function(params, invocation) {
        let [deviceNode, editionMode] = params;
        let deviceManager = Clutter.DeviceManager.get_default();
        let devices = deviceManager.list_devices();
        let padDevice = null;
        devices.forEach(Lang.bind(this, function(device) {
            if (deviceNode == device.get_device_node())
                padDevice = device;
        }));
        if (padDevice == null ||
            padDevice.get_device_type() != Clutter.InputDeviceType.PAD_DEVICE) {
            invocation.return_error_literal(Gio.IOErrorEnum,
                                            Gio.IOErrorEnum.CANCELLED,
                                            "Invalid params");
            return;
        }
        global.display.request_pad_osd(padDevice, editionMode);
        invocation.return_value(null);
    }
 });
 Signals.addSignalMethods(PadOsdService.prototype);
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -95,7 +95,6 @@ const AppMenuButton = new Lang.Class({
        this._startingApps = [];
        this._menuManager = panel.menuManager;
        this._gtkSettings = Gtk.Settings.get_default();
        this._targetApp = null;
        this._appMenuNotifyId = 0;
        this._actionGroupNotifyId = 0;
@ -124,14 +123,11 @@ const AppMenuButton = new Lang.Class({
        this._arrow = PopupMenu.arrowIcon(St.Side.BOTTOM);
        this._container.add_actor(this._arrow);
-        this._visible = this._gtkSettings.gtk_shell_shows_app_menu &&
+        this._visible = !Main.overview.visible;
                        !Main.overview.visible;
        if (!this._visible)
            this.actor.hide();
        this._overviewHidingId = Main.overview.connect('hiding', Lang.bind(this, this._sync));
        this._overviewShowingId = Main.overview.connect('showing', Lang.bind(this, this._sync));
        this._showsAppMenuId = this._gtkSettings.connect('notify::gtk-shell-shows-app-menu',
                                                         Lang.bind(this, this._sync));
        this._stop = true;
@ -309,9 +305,7 @@ const AppMenuButton = new Lang.Class({
            }
        }
-        let visible = (this._targetApp != null &&
+        let visible = (this._targetApp != null && !Main.overview.visibleTarget);
                       this._gtkSettings.gtk_shell_shows_app_menu &&
                       !Main.overview.visibleTarget);
        if (visible)
            this.show();
        else
@ -384,10 +378,6 @@ const AppMenuButton = new Lang.Class({
            Main.overview.disconnect(this._overviewShowingId);
            this._overviewShowingId = 0;
        }
        if (this._showsAppMenuId > 0) {
            this._gtkSettings.disconnect(this._showsAppMenuId);
            this._showsAppMenuId = 0;
        }
        if (this._switchWorkspaceNotifyId > 0) {
            global.window_manager.disconnect(this._switchWorkspaceNotifyId);
            this._switchWorkspaceNotifyId = 0;
@ -459,8 +449,7 @@ const ActivitiesButton = new Lang.Class({
        if (event.type() == Clutter.EventType.TOUCH_END ||
            event.type() == Clutter.EventType.BUTTON_RELEASE)
-            if (Main.overview.shouldToggleByCornerOrButton())
+            Main.overview.toggle();
                Main.overview.toggle();
        return Clutter.EVENT_PROPAGATE;
    },
@ -468,8 +457,7 @@ const ActivitiesButton = new Lang.Class({
    _onKeyRelease: function(actor, event) {
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_space) {
-            if (Main.overview.shouldToggleByCornerOrButton())
+            Main.overview.toggle();
                Main.overview.toggle();
        }
        return Clutter.EVENT_PROPAGATE;
    },
@ -654,50 +642,14 @@ const PanelCorner = new Lang.Class({
    }
 });
 const AggregateLayout = new Lang.Class({
    Name: 'AggregateLayout',
    Extends: Clutter.BoxLayout,
    _init: function(params) {
        if (!params)
            params = {};
        params['orientation'] = Clutter.Orientation.VERTICAL;
        this.parent(params);
        this._sizeChildren = [];
    },
    addSizeChild: function(actor) {
        this._sizeChildren.push(actor);
        this.layout_changed();
    },
    vfunc_get_preferred_width: function(container, forHeight) {
        let themeNode = container.get_theme_node();
        let minWidth = themeNode.get_min_width();
        let natWidth = minWidth;
        for (let i = 0; i < this._sizeChildren.length; i++) {
            let child = this._sizeChildren[i];
            let [childMin, childNat] = child.get_preferred_width(forHeight);
            minWidth = Math.max(minWidth, childMin);
            natWidth = Math.max(minWidth, childNat);
        }
        return [minWidth, natWidth];
    }
 });
 const AggregateMenu = new Lang.Class({
    Name: 'AggregateMenu',
    Extends: PanelMenu.Button,
    _init: function() {
-        this.parent(0.0, C_("System menu in the top bar", "System"), false);
+        this.parent(0.0, _("Settings"), false);
        this.menu.actor.add_style_class_name('aggregate-menu');
        let menuLayout = new AggregateLayout();
        this.menu.box.set_layout_manager(menuLayout);
        this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
        this.actor.add_child(this._indicators);
@ -746,11 +698,6 @@ const AggregateMenu = new Lang.Class({
        this.menu.addMenuItem(this._rfkill.menu);
        this.menu.addMenuItem(this._power.menu);
        this.menu.addMenuItem(this._system.menu);
        menuLayout.addSizeChild(this._location.menu.actor);
        menuLayout.addSizeChild(this._rfkill.menu.actor);
        menuLayout.addSizeChild(this._power.menu.actor);
        menuLayout.addSizeChild(this._system.menu.actor);
    },
 });
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -396,7 +396,6 @@ const PopupImageMenuItem = new Lang.Class({
        this.actor.add_child(this.label);
        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
        this.actor.add_child(this._icon, { align: St.Align.END });
        this.actor.label_actor = this.label;
        this.setIcon(iconName);
    },
@ -783,16 +782,6 @@ const PopupMenu = new Lang.Class({
                break;
        }
        let state = event.get_state();
        // if user has a modifier down (except capslock)
        // then don't handle the key press here
        state &= ~Clutter.ModifierType.LOCK_MASK;
        state &= Clutter.ModifierType.MODIFIER_MASK;
        if (state)
            return Clutter.EVENT_PROPAGATE;
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
            this.toggle();
@ -1156,16 +1145,6 @@ const PopupSubMenuMenuItem = new Lang.Class({
        this.actor.remove_style_pseudo_class ('active');
        this._setOpenState(!this._getOpenState());
        return Clutter.EVENT_PROPAGATE;
    },
    _onTouchEvent: function(actor, event) {
        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.actor.remove_style_pseudo_class ('active');
            this._setOpenState(!this._getOpenState());
        }
        return Clutter.EVENT_PROPAGATE;
    }
 });
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@ -297,7 +297,7 @@ const RemoteSearchProvider = new Lang.Class({
        // the provider is not compatible with the new version of the interface, launch
        // the app itself but warn so we can catch the error in logs
        log('Search provider ' + this.appInfo.get_id() + ' does not implement LaunchSearch');
-        this.appInfo.launch([], global.create_app_launch_context(0, -1), false);
+        this.appInfo.launch([], global.create_app_launch_context(0, -1));
    }
 });
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -61,7 +61,6 @@ const RunDialog = new Lang.Class({
                                   // rt is short for "reload theme"
                                   'rt': Lang.bind(this, function() {
                                       Main.reloadThemeResource();
                                       Main.loadTheme();
                                   })
                                 };
@ -274,7 +273,7 @@ const RunDialog = new Lang.Class({
    _restart: function() {
        if (Meta.is_wayland_compositor()) {
-            this._showError(_("Restart is not available on Wayland"));
+            this._showError('Restart is not available on Wayland');
            return;
        }
        this._shouldFadeOut = false;
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -349,6 +349,7 @@ const Arrow = new Lang.Class({
    _init: function(params) {
        this.parent(params);
        this.x_fill = this.y_fill = true;
        this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
        this._drawingArea = new St.DrawingArea();
        this._drawingArea.connect('repaint', Lang.bind(this, this._drawArrow));
@ -376,22 +377,6 @@ const Arrow = new Lang.Class({
        cr.$dispose();
    },
    vfunc_get_paint_volume: function(volume) {
        if (!this.parent(volume))
            return false;
        if (!this._shadow)
            return true;
        let shadow_box = new Clutter.ActorBox();
        this._shadow.get_box(this._drawingArea.get_allocation_box(), shadow_box);
        volume.set_width(Math.max(shadow_box.x2 - shadow_box.x1, volume.get_width()));
        volume.set_height(Math.max(shadow_box.y2 - shadow_box.y1, volume.get_height()));
        return true;
    },
    vfunc_style_changed: function() {
        let node = this.get_theme_node();
        this._shadow = node.get_shadow('-arrow-shadow');
@ -399,8 +384,6 @@ const Arrow = new Lang.Class({
            this._shadowHelper = St.ShadowHelper.new(this._shadow);
        else
            this._shadowHelper = null;
        this.parent();
    },
    vfunc_paint: function() {
@ -576,9 +559,6 @@ const ScreenShield = new Lang.Class({
        if (prevIsActive != this._isActive)
            this.emit('active-changed');
        if (this._loginSession)
            this._loginSession.SetLockedHintRemote(active);
        this._syncInhibitor();
    },
@ -665,10 +645,7 @@ const ScreenShield = new Lang.Class({
        let isEnter = (symbol == Clutter.KEY_Return ||
                       symbol == Clutter.KEY_KP_Enter ||
                       symbol == Clutter.KEY_ISO_Enter);
-        let isEscape = (symbol == Clutter.KEY_Escape);
+        if (!isEnter && !(GLib.unichar_isprint(unichar) || symbol == Clutter.KEY_Escape))
        let isLiftChar = (GLib.unichar_isprint(unichar) &&
                          (this._isLocked || !GLib.unichar_isgraph(unichar)));
        if (!isEnter && !isEscape && !isLiftChar)
            return Clutter.EVENT_PROPAGATE;
        if (this._isLocked &&
@ -731,7 +708,7 @@ const ScreenShield = new Lang.Class({
        let unitaryDelay = ARROW_ANIMATION_TIME / (arrows.length + 1);
        let maxOpacity = 255 * ARROW_ANIMATION_PEAK_OPACITY;
        for (let i = 0; i < arrows.length; i++) {
-            arrows[i].opacity = 0;
+            arrows.opacity = 0;
            Tweener.addTween(arrows[i],
                             { opacity: 0,
                               delay: unitaryDelay * (N_ARROWS - (i + 1)),
@ -850,7 +827,6 @@ const ScreenShield = new Lang.Class({
    },
    _activateFade: function(lightbox, time) {
        Main.uiGroup.set_child_above_sibling(lightbox.actor, null);
        lightbox.show(time);
        if (this._becameActiveId == 0)
--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@ -137,10 +137,6 @@ const Slider = new Lang.Class({
            this._motionId = this.actor.connect('motion-event', Lang.bind(this, this._motionEvent));
        }
        // We need to emit 'drag-begin' before moving the handle to make
        // sure that no 'value-changed' signal is emitted before this one.
        this.emit('drag-begin');
        let absX, absY;
        [absX, absY] = event.get_coords();
        this._moveHandle(absX, absY);
@ -228,7 +224,6 @@ const Slider = new Lang.Class({
            let delta = key == Clutter.KEY_Right ? 0.1 : -0.1;
            this._value = Math.max(0, Math.min(this._value + delta, 1));
            this.actor.queue_repaint();
            this.emit('drag-begin');
            this.emit('value-changed', this._value);
            this.emit('drag-end');
            return Clutter.EVENT_STOP;
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@ -1,8 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const GnomeBluetooth = imports.gi.GnomeBluetooth;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
@ -20,8 +23,6 @@ const RfkillManagerInterface = '<node> \
 const RfkillManagerProxy = Gio.DBusProxy.makeProxyWrapper(RfkillManagerInterface);
 const HAD_BLUETOOTH_DEVICES_SETUP = 'had-bluetooth-devices-setup';
 const Indicator = new Lang.Class({
    Name: 'BTIndicator',
    Extends: PanelMenu.SystemIndicator,
@ -31,7 +32,6 @@ const Indicator = new Lang.Class({
        this._indicator = this._addIndicator();
        this._indicator.icon_name = 'bluetooth-active-symbolic';
        this._hadSetupDevices = global.settings.get_boolean(HAD_BLUETOOTH_DEVICES_SETUP);
        this._proxy = new RfkillManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
                                             Lang.bind(this, function(proxy, error) {
@ -44,15 +44,13 @@ const Indicator = new Lang.Class({
                                             }));
        this._proxy.connect('g-properties-changed', Lang.bind(this, this._sync));
-        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Bluetooth"), true);
+        // The Bluetooth menu only appears when Bluetooth is in use,
        // so just statically build it with a "Turn Off" menu item.
        this._item = new PopupMenu.PopupSubMenuMenuItem('', true);
        this._item.icon.icon_name = 'bluetooth-active-symbolic';
-
+        this._item.menu.addAction(_("Turn Off"), Lang.bind(this, function() {
-        this._toggleItem = new PopupMenu.PopupMenuItem('');
+            this._proxy.BluetoothAirplaneMode = true;
        this._toggleItem.connect('activate', Lang.bind(this, function() {
            this._proxy.BluetoothAirplaneMode = !this._proxy.BluetoothAirplaneMode;
        }));
        this._item.menu.addMenuItem(this._toggleItem);
        this._item.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-bluetooth-panel.desktop');
        this.menu.addMenuItem(this._item);
@ -70,75 +68,42 @@ const Indicator = new Lang.Class({
        while (ret) {
            let isDefault = this._model.get_value(iter,
                                                  GnomeBluetooth.Column.DEFAULT);
-            let isPowered = this._model.get_value(iter,
+            if (isDefault)
                                                  GnomeBluetooth.Column.POWERED);
            if (isDefault && isPowered)
                return iter;
            ret = this._model.iter_next(iter);
        }
        return null;
    },
-    // nDevices is the number of devices setup for the current default
+    _getNConnectedDevices: function() {
    // adapter if one exists and is powered. If unpowered or unavailable,
    // nDevice is "1" if it had setup devices associated to it the last
    // time it was seen, and "-1" if not.
    //
    // nConnectedDevices is the number of devices connected to the default
    // adapter if one exists and is powered, or -1 if it's not available.
    _getNDevices: function() {
        let adapter = this._getDefaultAdapter();
        if (!adapter)
-            return [ this._hadSetupDevices ? 1 : -1, -1 ];
+            return 0;
        let nConnectedDevices = 0;
        let nDevices = 0;
        let [ret, iter] = this._model.iter_children(adapter);
        while (ret) {
            let isConnected = this._model.get_value(iter,
                                                    GnomeBluetooth.Column.CONNECTED);
            if (isConnected)
                nConnectedDevices++;
            let isPaired = this._model.get_value(iter,
                                                 GnomeBluetooth.Column.PAIRED);
            let isTrusted = this._model.get_value(iter,
                                                  GnomeBluetooth.Column.TRUSTED);
            if (isPaired || isTrusted)
                nDevices++;
            ret = this._model.iter_next(iter);
        }
-
+        return nDevices;
        if (this._hadSetupDevices != (nDevices > 0)) {
            this._hadSetupDevices = !this._hadSetupDevices;
            global.settings.set_boolean(HAD_BLUETOOTH_DEVICES_SETUP, this._hadSetupDevices);
        }
        return [ nDevices, nConnectedDevices];
    },
    _sync: function() {
-        let [ nDevices, nConnectedDevices ] = this._getNDevices();
+        let nDevices = this._getNConnectedDevices();
        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
        this.menu.setSensitive(sensitive);
-        this._indicator.visible = nConnectedDevices > 0;
+        this._indicator.visible = nDevices > 0;
        this._item.actor.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
        // 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.actor.visible = !this._proxy.BluetoothHardwareAirplaneMode;
        else
            this._item.actor.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
        if (nConnectedDevices > 0)
            /* Translators: this is the number of connected bluetooth devices */
-            this._item.label.text = ngettext("%d Connected", "%d Connected", nConnectedDevices).format(nConnectedDevices);
+            this._item.label.text = ngettext("%d Connected", "%d Connected", nDevices).format(nDevices);
        else if (nConnectedDevices == -1)
            this._item.label.text = _("Off");
        else
-            this._item.label.text = _("On");
+            this._item.label.text = _("Not In Use");
        this._toggleItem.label.text = this._proxy.BluetoothAirplaneMode ? _("Turn On") : _("Turn Off");
    },
 });
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -61,8 +61,8 @@ const InputSource = new Lang.Class({
        this.emit('changed');
    },
-    activate: function(interactive) {
+    activate: function() {
-        this.emit('activate', !!interactive);
+        this.emit('activate');
    },
    _getXkbId: function() {
@ -109,7 +109,7 @@ const InputSourcePopup = new Lang.Class({
    _finish : function() {
        this.parent();
-        this._items[this._selectedIndex].activate(true);
+        this._items[this._selectedIndex].activate();
    },
 });
@ -159,14 +159,6 @@ const InputSourceSettings = new Lang.Class({
        return [];
    },
    get mruSources() {
        return [];
    },
    set mruSources(sourcesList) {
        // do nothing
    },
    get keyboardOptions() {
        return [];
    },
@ -259,7 +251,6 @@ const InputSourceSessionSettings = new Lang.Class({
    _DESKTOP_INPUT_SOURCES_SCHEMA: 'org.gnome.desktop.input-sources',
    _KEY_INPUT_SOURCES: 'sources',
    _KEY_MRU_SOURCES: 'mru-sources',
    _KEY_KEYBOARD_OPTIONS: 'xkb-options',
    _KEY_PER_WINDOW: 'per-window',
@ -270,9 +261,9 @@ const InputSourceSessionSettings = new Lang.Class({
        this._settings.connect('changed::' + this._KEY_PER_WINDOW, Lang.bind(this, this._emitPerWindowChanged));
    },
-    _getSourcesList: function(key) {
+    get inputSources() {
        let sourcesList = [];
-        let sources = this._settings.get_value(key);
+        let sources = this._settings.get_value(this._KEY_INPUT_SOURCES);
        let nSources = sources.n_children();
        for (let i = 0; i < nSources; i++) {
@ -282,19 +273,6 @@ const InputSourceSessionSettings = new Lang.Class({
        return sourcesList;
    },
    get inputSources() {
        return this._getSourcesList(this._KEY_INPUT_SOURCES);
    },
    get mruSources() {
        return this._getSourcesList(this._KEY_MRU_SOURCES);
    },
    set mruSources(sourcesList) {
        let sources = GLib.Variant.new('a(ss)', sourcesList);
        this._settings.set_value(this._KEY_MRU_SOURCES, sources);
    },
    get keyboardOptions() {
        return this._settings.get_strv(this._KEY_KEYBOARD_OPTIONS);
    },
@ -394,7 +372,7 @@ const InputSourceManager = new Lang.Class({
        while (!(is = this._inputSources[nextIndex]))
            nextIndex += 1;
-        is.activate(true);
+        is.activate();
        return true;
    },
@ -422,25 +400,6 @@ const InputSourceManager = new Lang.Class({
        this._keyboardManager.reapply();
    },
    _updateMruSettings: function() {
        // If IBus is not ready we don't have a full picture of all
        // the available sources, so don't update the setting
        if (!this._ibusReady)
            return;
        // If IBus is temporarily disabled, don't update the setting
        if (this._disableIBus)
            return;
        let sourcesList = [];
        for (let i = 0; i < this._mruSources.length; ++i) {
            let source = this._mruSources[i];
            sourcesList.push([source.type, source.id]);
        }
        this._settings.mruSources = sourcesList;
    },
    _currentInputSourceChanged: function(newSource) {
        let oldSource;
        [oldSource, this._currentSource] = [this._currentSource, newSource];
@ -457,7 +416,7 @@ const InputSourceManager = new Lang.Class({
        this._changePerWindowSource();
    },
-    _activateInputSource: function(is, interactive) {
+    _activateInputSource: function(is) {
        KeyboardManager.holdKeyboard();
        this._keyboardManager.apply(is.xkbId);
@ -475,54 +434,6 @@ const InputSourceManager = new Lang.Class({
        this._ibusManager.setEngine(engine, KeyboardManager.releaseKeyboard);
        this._currentInputSourceChanged(is);
        if (interactive)
            this._updateMruSettings();
    },
    _updateMruSources: function() {
        let sourcesList = [];
        for (let i in this._inputSources)
            sourcesList.push(this._inputSources[i]);
        this._keyboardManager.setUserLayouts(sourcesList.map(function(x) { return x.xkbId; }));
        if (!this._disableIBus && this._mruSourcesBackup) {
            this._mruSources = this._mruSourcesBackup;
            this._mruSourcesBackup = null;
        }
        // Initialize from settings when we have no MRU sources list
        if (this._mruSources.length == 0) {
            let mruSettings = this._settings.mruSources;
            for (let i = 0; i < mruSettings.length; i++) {
                let mruSettingSource = mruSettings[i];
                let mruSource = null;
                for (let j = 0; j < sourcesList.length; j++) {
                    let source = sourcesList[j];
                    if (source.type == mruSettingSource.type &&
                        source.id == mruSettingSource.id) {
                        mruSource = source;
                        break;
                    }
                }
                if (mruSource)
                    this._mruSources.push(mruSource);
            }
        }
        let mruSources = [];
        for (let i = 0; i < this._mruSources.length; i++) {
            for (let j = 0; j < sourcesList.length; j++)
                if (this._mruSources[i].type == sourcesList[j].type &&
                    this._mruSources[i].id == sourcesList[j].id) {
                    mruSources = mruSources.concat(sourcesList.splice(j, 1));
                    break;
                }
        }
        this._mruSources = mruSources.concat(sourcesList);
    },
    _inputSourcesChanged: function() {
@ -599,10 +510,30 @@ const InputSourceManager = new Lang.Class({
        this.emit('sources-changed');
-        this._updateMruSources();
+        let sourcesList = [];
        for (let i in this._inputSources)
            sourcesList.push(this._inputSources[i]);
        this._keyboardManager.setUserLayouts(sourcesList.map(function(x) { return x.xkbId; }));
        if (!this._disableIBus && this._mruSourcesBackup) {
            this._mruSources = this._mruSourcesBackup;
            this._mruSourcesBackup = null;
        }
        let mruSources = [];
        for (let i = 0; i < this._mruSources.length; i++) {
            for (let j = 0; j < sourcesList.length; j++)
                if (this._mruSources[i].type == sourcesList[j].type &&
                    this._mruSources[i].id == sourcesList[j].id) {
                    mruSources = mruSources.concat(sourcesList.splice(j, 1));
                    break;
                }
        }
        this._mruSources = mruSources.concat(sourcesList);
        if (this._mruSources.length > 0)
-            this._mruSources[0].activate(false);
+            this._mruSources[0].activate();
        // All ibus engines are preloaded here to reduce the launching time
        // when users switch the input sources.
@ -711,7 +642,7 @@ const InputSourceManager = new Lang.Class({
        }
        if (window._currentSource)
-            window._currentSource.activate(false);
+            window._currentSource.activate();
    },
    _sourcesPerWindowChanged: function() {
@ -832,10 +763,7 @@ const InputSourceIndicator = new Lang.Class({
            let is = this._inputSourceManager.inputSources[i];
            let menuItem = new LayoutMenuItem(is.displayName, is.shortName);
-            menuItem.connect('activate', function() {
+            menuItem.connect('activate', Lang.bind(is, is.activate));
                is.activate(true);
            });
            let indicatorLabel = new St.Label({ text: is.shortName,
                                                visible: false });
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
@ -8,18 +7,12 @@ const Lang = imports.lang;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ModalDialog = imports.ui.modalDialog;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
 const LOCATION_SCHEMA = 'org.gnome.system.location';
 const MAX_ACCURACY_LEVEL = 'max-accuracy-level';
 const ENABLED = 'enabled';
 const APP_PERMISSIONS_TABLE = 'gnome';
 const APP_PERMISSIONS_ID = 'geolocation';
 const GeoclueAccuracyLevel = {
    NONE: 0,
    COUNTRY: 1,
@ -29,15 +22,6 @@ const GeoclueAccuracyLevel = {
    EXACT: 8
 };
 function accuracyLevelToString(accuracyLevel) {
    for (let key in GeoclueAccuracyLevel) {
        if (GeoclueAccuracyLevel[key] == accuracyLevel)
            return key;
    }
    return 'NONE';
 }
 var GeoclueIface = '<node> \
  <interface name="org.freedesktop.GeoClue2.Manager"> \
    <property name="InUse" type="b" access="read"/> \
@ -62,26 +46,6 @@ var AgentIface = '<node> \
  </interface> \
 </node>';
 var PermissionStoreIface = '<node> \
  <interface name="org.freedesktop.impl.portal.PermissionStore"> \
    <method name="Lookup"> \
      <arg name="table" type="s" direction="in"/> \
      <arg name="id" type="s" direction="in"/> \
      <arg name="permissions" type="a{sas}" direction="out"/> \
      <arg name="data" type="v" direction="out"/> \
    </method> \
    <method name="Set"> \
      <arg name="table" type="s" direction="in"/> \
      <arg name="create" type="b" direction="in"/> \
      <arg name="id" type="s" direction="in"/> \
      <arg name="app_permissions" type="a{sas}" direction="in"/> \
      <arg name="data" type="v" direction="in"/> \
    </method> \
  </interface> \
 </node>';
 const PermissionStore = Gio.DBusProxy.makeProxyWrapper(PermissionStoreIface);
 const Indicator = new Lang.Class({
    Name: 'LocationIndicator',
    Extends: PanelMenu.SystemIndicator,
@ -119,66 +83,64 @@ const Indicator = new Lang.Class({
        this._onSessionUpdated();
        this._onMaxAccuracyLevelChanged();
        this._connectToGeoclue();
        this._connectToPermissionStore();
    },
    get MaxAccuracyLevel() {
        return this._getMaxAccuracyLevel();
    },
-    AuthorizeAppAsync: function(params, invocation) {
+    // We (and geoclue) have currently no way to reliably identifying apps so
-        let [desktopId, reqAccuracyLevel] = params;
+    // for now, lets just authorize all apps as long as they provide a valid
    // desktop ID. We also ensure they don't get more accuracy than global max.
    AuthorizeApp: function(desktop_id, reqAccuracyLevel) {
        var appSystem = Shell.AppSystem.get_default();
        var app = appSystem.lookup_app(desktop_id + ".desktop");
        if (app == null) {
            return [false, 0];
        }
-        let authorizer = new AppAuthorizer(desktopId,
+        let allowedAccuracyLevel = clamp(reqAccuracyLevel, 0, this._getMaxAccuracyLevel());
-                                           reqAccuracyLevel,
+        return [true, allowedAccuracyLevel];
                                           this._permStoreProxy,
                                           this._getMaxAccuracyLevel());
        authorizer.authorize(Lang.bind(this, function(accuracyLevel) {
            let ret = (accuracyLevel != GeoclueAccuracyLevel.NONE);
            invocation.return_value(GLib.Variant.new('(bu)',
                                                     [ret, accuracyLevel]));
        }));
    },
    _syncIndicator: function() {
-        if (this._managerProxy == null) {
+        if (this._proxy == null) {
            this._indicator.visible = false;
            this._item.actor.visible = false;
            return;
        }
-        this._indicator.visible = this._managerProxy.InUse;
+        this._indicator.visible = this._proxy.InUse;
        this._item.actor.visible = this._indicator.visible;
        this._updateMenuLabels();
    },
    _connectToGeoclue: function() {
-        if (this._managerProxy != null || this._connecting)
+        if (this._proxy != null || this._connecting)
            return false;
        this._connecting = true;
        new GeoclueManager(Gio.DBus.system,
                           'org.freedesktop.GeoClue2',
                           '/org/freedesktop/GeoClue2/Manager',
-                           Lang.bind(this, this._onManagerProxyReady));
+                           Lang.bind(this, this._onProxyReady));
        return true;
    },
-    _onManagerProxyReady: function(proxy, error) {
+    _onProxyReady: function(proxy, error) {
        if (error != null) {
            log(error.message);
            this._connecting = false;
            return;
        }
-        this._managerProxy = proxy;
+        this._proxy = proxy;
-        this._propertiesChangedId = this._managerProxy.connect('g-properties-changed',
+        this._propertiesChangedId = this._proxy.connect('g-properties-changed',
                                                        Lang.bind(this, this._onGeocluePropsChanged));
        this._syncIndicator();
-        this._managerProxy.AddAgentRemote('gnome-shell', Lang.bind(this, this._onAgentRegistered));
+        this._proxy.AddAgentRemote('gnome-shell', Lang.bind(this, this._onAgentRegistered));
    },
    _onAgentRegistered: function(result, error) {
@ -191,10 +153,10 @@ const Indicator = new Lang.Class({
    _onGeoclueVanished: function() {
        if (this._propertiesChangedId) {
-            this._managerProxy.disconnect(this._propertiesChangedId);
+            this._proxy.disconnect(this._propertiesChangedId);
            this._propertiesChangedId = 0;
        }
-        this._managerProxy = null;
+        this._proxy = null;
        this._syncIndicator();
    },
@ -249,206 +211,9 @@ const Indicator = new Lang.Class({
        let unpacked = properties.deep_unpack();
        if ("InUse" in unpacked)
            this._syncIndicator();
-    },
+    }
    _connectToPermissionStore: function() {
        this._permStoreProxy = null;
        new PermissionStore(Gio.DBus.session,
                           'org.freedesktop.impl.portal.PermissionStore',
                           '/org/freedesktop/impl/portal/PermissionStore',
                           Lang.bind(this, this._onPermStoreProxyReady));
    },
    _onPermStoreProxyReady: function(proxy, error) {
        if (error != null) {
            log(error.message);
            return;
        }
        this._permStoreProxy = proxy;
    },
 });
 function clamp(value, min, max) {
    return Math.max(min, Math.min(max, value));
 }
 const AppAuthorizer = new Lang.Class({
    Name: 'LocationAppAuthorizer',
    _init: function(desktopId,
                    reqAccuracyLevel,
                    permStoreProxy,
                    maxAccuracyLevel) {
        this.desktopId = desktopId;
        this.reqAccuracyLevel = reqAccuracyLevel;
        this._permStoreProxy = permStoreProxy;
        this._maxAccuracyLevel = maxAccuracyLevel;
        this._accuracyLevel = GeoclueAccuracyLevel.NONE;
    },
    authorize: function(onAuthDone) {
        this._onAuthDone = onAuthDone;
        let appSystem = Shell.AppSystem.get_default();
        this._app = appSystem.lookup_app(this.desktopId + ".desktop");
        if (this._app == null || this._permStoreProxy == null) {
            this._completeAuth();
            return;
        }
        this._permStoreProxy.LookupRemote(APP_PERMISSIONS_TABLE,
                                          APP_PERMISSIONS_ID,
                                          Lang.bind(this,
                                                    this._onPermLookupDone));
    },
    _onPermLookupDone: function(result, error) {
        if (error != null) {
            if (error.domain == Gio.DBusError) {
                // Likely no xdg-app installed, just authorize the app
                this._accuracyLevel = this.reqAccuracyLevel;
                this._permStoreProxy = null;
                this._completeAuth();
            } else {
                // Currently xdg-app throws an error if we lookup for
                // unknown ID (which would be the case first time this code
                // runs) so we continue with user authorization as normal
                // and ID is added to the store if user says "yes".
                log(error.message);
                this._permissions = {};
                this._userAuthorizeApp();
            }
            return;
        }
        [this._permissions] = result;
        let permission = this._permissions[this.desktopId];
        if (permission == null) {
            this._userAuthorizeApp();
        } else {
            let [levelStr] = permission || ['NONE'];
            this._accuracyLevel = GeoclueAccuracyLevel[levelStr] ||
                                  GeoclueAccuracyLevel.NONE;
            this._completeAuth();
        }
    },
    _userAuthorizeApp: function() {
        let name = this._app.get_name();
        let appInfo = this._app.get_app_info();
        let reason = appInfo.get_string("X-Geoclue-Reason");
        this._showAppAuthDialog(name, reason);
    },
    _showAppAuthDialog: function(name, reason) {
        this._dialog = new GeolocationDialog(name,
                                             reason,
                                             this.reqAccuracyLevel);
        let responseId = this._dialog.connect('response', Lang.bind(this,
            function(dialog, level) {
                this._dialog.disconnect(responseId);
                this._accuracyLevel = level;
                this._completeAuth();
            }));
        this._dialog.open();
    },
    _completeAuth: function() {
        if (this._accuracyLevel != GeoclueAccuracyLevel.NONE) {
            this._accuracyLevel = clamp(this._accuracyLevel,
                                        0,
                                        this._maxAccuracyLevel);
        }
        this._saveToPermissionStore();
        this._onAuthDone(this._accuracyLevel);
    },
    _saveToPermissionStore: function() {
        if (this._permStoreProxy == null)
            return;
        let levelStr = accuracyLevelToString(this._accuracyLevel);
        let dateStr = Math.round(Date.now() / 1000).toString();
        this._permissions[this.desktopId] = [levelStr, dateStr];
        let data = GLib.Variant.new('av', {});
        this._permStoreProxy.SetRemote(APP_PERMISSIONS_TABLE,
                                       true,
                                       APP_PERMISSIONS_ID,
                                       this._permissions,
                                       data,
                                       function (result, error) {
            if (error != null)
                log(error.message);
        });
    },
 });
 const GeolocationDialog = new Lang.Class({
    Name: 'GeolocationDialog',
    Extends: ModalDialog.ModalDialog,
    _init: function(name, reason, reqAccuracyLevel) {
        this.parent({ styleClass: 'geolocation-dialog' });
        this.reqAccuracyLevel = reqAccuracyLevel;
        let mainContentBox = new St.BoxLayout({ style_class: 'geolocation-dialog-main-layout' });
        this.contentLayout.add_actor(mainContentBox);
        let icon = new St.Icon({ style_class: 'geolocation-dialog-icon',
                                 icon_name: 'find-location-symbolic',
                                 y_align: Clutter.ActorAlign.START });
        mainContentBox.add_actor(icon);
        let messageBox = new St.BoxLayout({ style_class: 'geolocation-dialog-content',
                                            vertical: true });
        mainContentBox.add_actor(messageBox);
        this._title = new St.Label({ style_class: 'geolocation-dialog-title headline' });
        messageBox.add_actor(this._title);
        this._reason = new St.Label({ style_class: 'geolocation-dialog-reason' });
        messageBox.add_actor(this._reason);
        this._privacyNote = new St.Label();
        messageBox.add_actor(this._privacyNote);
        let button = this.addButton({ label: _("Deny Access"),
                                      action: Lang.bind(this, this._onDenyClicked),
                                      key: Clutter.KEY_Escape });
        this.addButton({ label: _("Grant Access"),
                         action: Lang.bind(this, this._onGrantClicked) });
        this.setInitialKeyFocus(button);
        /* Translators: %s is an application name */
        this._title.text = _("Give %s access to your location?").format(name);
        this._privacyNote.text = _("Location access can be changed at any time from the privacy settings.");
        if (reason)
            this._reason.text = reason;
        this._reason.visible = (reason != null);
    },
    _onGrantClicked: function() {
        this.emit('response', this.reqAccuracyLevel);
        this.close();
    },
    _onDenyClicked: function() {
        this.emit('response', GeoclueAccuracyLevel.NONE);
        this.close();
    }
 });
 Signals.addSignalMethods(GeolocationDialog.prototype);
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -5,7 +5,6 @@ const GObject = imports.gi.GObject;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const NetworkManager = imports.gi.NetworkManager;
 const NMClient = imports.gi.NMClient;
 const NMGtk = imports.gi.NMGtk;
@ -40,8 +39,6 @@ const NMAccessPointSecurity = {
    WPA2_ENT: 6
 };
 const MAX_DEVICE_ITEMS = 4;
 // small optimization, to avoid using [] all the time
 const NM80211Mode = NetworkManager['80211Mode'];
 const NM80211ApFlags = NetworkManager['80211ApFlags'];
@ -624,7 +621,7 @@ const NMDeviceBluetooth = new Lang.Class({
    _init: function(client, device, settings) {
        this.parent(client, device, settings);
-        this.item.menu.addMenuItem(createSettingsAction(_("Bluetooth Settings"), device));
+        this.item.menu.addMenuItem(createSettingsAction(_("Mobile Broadband Settings"), device));
    },
    _getDescription: function() {
@ -632,7 +629,7 @@ const NMDeviceBluetooth = new Lang.Class({
    },
    getConnectLabel: function() {
-        return _("Connect to Internet");
+        return _("Use as Internet connection");
    },
    getIndicatorIcon: function() {
@ -755,9 +752,10 @@ const NMWirelessDialog = new Lang.Class({
        this._updateSensitivity();
        this._syncView();
-        this._scanTimeoutId = Mainloop.timeout_add_seconds(15, Lang.bind(this, this._onScanTimeout));
+        if (accessPoints.length == 0) {
-        GLib.Source.set_name_by_id(this._scanTimeoutId, '[gnome-shell] this._onScanTimeout');
+            /* If there are no visible access points, request a scan */
-        this._onScanTimeout();
+            this._device.request_scan_simple(null);
        }
    },
    destroy: function() {
@ -782,19 +780,9 @@ const NMWirelessDialog = new Lang.Class({
            this._airplaneModeChangedId = 0;
        }
        if (this._scanTimeoutId) {
            Mainloop.source_remove(this._scanTimeoutId);
            this._scanTimeoutId = 0;
        }
        this.parent();
    },
    _onScanTimeout: function() {
        this._device.request_scan_simple(null);
        return GLib.SOURCE_CONTINUE;
    },
    _activeApChanged: function() {
        if (this._activeNetwork)
            this._activeNetwork.item.setActive(false);
@ -1503,7 +1491,7 @@ const NMVPNSection = new Lang.Class({
        if (nItems > 1) {
            let appSys = Shell.AppSystem.get_default();
            let app = appSys.lookup_app('gnome-network-panel.desktop');
-            app.launch(0, -1, false);
+            app.launch(0, -1);
        } else {
            let connection = this._connections[0];
            Util.spawnApp(['gnome-control-center', 'network', 'show-device',
@ -1564,73 +1552,6 @@ const NMVPNSection = new Lang.Class({
 });
 Signals.addSignalMethods(NMVPNSection.prototype);
 const DeviceCategory = new Lang.Class({
    Name: 'DeviceCategory',
    Extends: PopupMenu.PopupMenuSection,
    _init: function(category) {
        this.parent();
        this._category = category;
        this.devices = [];
        this.section = new PopupMenu.PopupMenuSection();
        this.section.box.connect('actor-added', Lang.bind(this, this._sync));
        this.section.box.connect('actor-removed', Lang.bind(this, this._sync));
        this.addMenuItem(this.section);
        this._summaryItem = new PopupMenu.PopupSubMenuMenuItem('', true);
        this._summaryItem.icon.icon_name = this._getSummaryIcon();
        this.addMenuItem(this._summaryItem);
        this._summaryItem.menu.addSettingsAction(_('Network Settings'),
                                                 'gnome-network-panel.desktop');
        this._summaryItem.actor.hide();
    },
    _sync: function() {
        let nDevices = this.section.box.get_children().reduce(
            function(prev, child) {
                return prev + (child.visible ? 1 : 0);
            }, 0);
        this._summaryItem.label.text = this._getSummaryLabel(nDevices);
        let shouldSummarize = nDevices > MAX_DEVICE_ITEMS;
        this._summaryItem.actor.visible = shouldSummarize;
        this.section.actor.visible = !shouldSummarize;
    },
    _getSummaryIcon: function() {
        switch(this._category) {
            case NMConnectionCategory.WIRED:
                return 'network-wired-symbolic';
            case NMConnectionCategory.WIRELESS:
            case NMConnectionCategory.WWAN:
                return 'network-wireless-symbolic';
        }
        return '';
    },
    _getSummaryLabel: function(nDevices) {
        switch(this._category) {
            case NMConnectionCategory.WIRED:
                return ngettext("%s Wired Connection",
                                "%s Wired Connections",
                                nDevices).format(nDevices);
            case NMConnectionCategory.WIRELESS:
                return ngettext("%s Wi-Fi Connection",
                                "%s Wi-Fi Connections",
                                nDevices).format(nDevices);
            case NMConnectionCategory.WWAN:
                return ngettext("%s Modem Connection",
                                "%s Modem Connections",
                                nDevices).format(nDevices);
        }
        return '';
    }
 });
 const NMApplet = new Lang.Class({
    Name: 'NMApplet',
    Extends: PanelMenu.SystemIndicator,
@ -1674,6 +1595,15 @@ const NMApplet = new Lang.Class({
        this._tryLateInit();
    },
    _createDeviceCategory: function() {
        let category = {
            section: new PopupMenu.PopupMenuSection(),
            devices: [ ],
        };
        this.menu.addMenuItem(category.section);
        return category;
    },
    _tryLateInit: function() {
        if (!this._client || !this._settings)
            return;
@ -1690,13 +1620,9 @@ const NMApplet = new Lang.Class({
        this._nmDevices = [];
        this._devices = { };
-        let categories = [NMConnectionCategory.WIRED,
+        this._devices.wired = this._createDeviceCategory();
-                          NMConnectionCategory.WIRELESS,
+        this._devices.wireless = this._createDeviceCategory();
-                          NMConnectionCategory.WWAN];
+        this._devices.wwan = this._createDeviceCategory();
        for (let category of categories) {
            this._devices[category] = new DeviceCategory(category);
            this.menu.addMenuItem(this._devices[category]);
        }
        this._vpnSection = new NMVPNSection(this._client);
        this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
@ -1706,8 +1632,6 @@ const NMApplet = new Lang.Class({
        this._readConnections();
        this._readDevices();
        this._syncNMState();
        this._syncMainConnection();
        this._syncVPNConnections();
        this._client.connect('notify::manager-running', Lang.bind(this, this._syncNMState));
        this._client.connect('notify::networking-enabled', Lang.bind(this, this._syncNMState));
@ -2084,24 +2008,13 @@ const NMApplet = new Lang.Class({
    },
    _updateIcon: function() {
-        if (!this._client.networking_enabled) {
+        if (!this._client.networking_enabled || !this._mainConnection) {
            this._primaryIndicator.visible = false;
        } else {
-            let dev = null;
+            let dev = this._mainConnection._primaryDevice;
-            if (this._mainConnection)
+            this._primaryIndicator.visible = (dev != null);
-                dev = this._mainConnection._primaryDevice;
+            if (dev)
            let state = this._client.get_state();
            let connected = state == NetworkManager.State.CONNECTED_GLOBAL;
            this._primaryIndicator.visible = (dev != null) || connected;
            if (dev) {
                this._primaryIndicator.icon_name = dev.getIndicatorIcon();
            } else if (connected) {
                if (this._client.connectivity == NetworkManager.ConnectivityState.FULL)
                    this._primaryIndicator.icon_name = 'network-wired-symbolic';
                else
                    this._primaryIndicator.icon_name = 'network-wired-no-route-symbolic';
            }
        }
        this._vpnIndicator.icon_name = this._vpnSection.getIndicatorIcon();
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 const Gio = imports.gi.Gio;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 const Lang = imports.lang;
 const UPower = imports.gi.UPowerGlib;
@ -27,8 +25,6 @@ const DisplayDeviceInterface = '<node> \
 const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(DisplayDeviceInterface);
 const SHOW_BATTERY_PERCENTAGE       = 'show-battery-percentage';
 const Indicator = new Lang.Class({
    Name: 'PowerIndicator',
    Extends: PanelMenu.SystemIndicator,
@ -36,15 +32,7 @@ const Indicator = new Lang.Class({
    _init: function() {
        this.parent();
        this._desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
        this._desktopSettings.connect('changed::' + SHOW_BATTERY_PERCENTAGE,
                                      Lang.bind(this, this._sync));
        this._indicator = this._addIndicator();
        this._percentageLabel = new St.Label({ y_expand: true,
                                               y_align: Clutter.ActorAlign.CENTER });
        this.indicators.add(this._percentageLabel, { expand: true, y_fill: true });
        this.indicators.add_style_class_name('power-status');
        this._proxy = new PowerManagerProxy(Gio.DBus.system, BUS_NAME, OBJECT_PATH,
                                            Lang.bind(this, function(proxy, error) {
@ -95,12 +83,12 @@ const Indicator = new Lang.Class({
        if (this._proxy.State == UPower.DeviceState.DISCHARGING) {
            // Translators: this is <hours>:<minutes> Remaining (<percentage>)
-            return _("%d\u2236%02d Remaining (%d\u2009%%)").format(hours, minutes, this._proxy.Percentage);
+            return _("%d\u2236%02d Remaining (%d%%)").format(hours, minutes, this._proxy.Percentage);
        }
        if (this._proxy.State == UPower.DeviceState.CHARGING) {
            // Translators: this is <hours>:<minutes> Until Full (<percentage>)
-            return _("%d\u2236%02d Until Full (%d\u2009%%)").format(hours, minutes, this._proxy.Percentage);
+            return _("%d\u2236%02d Until Full (%d%%)").format(hours, minutes, this._proxy.Percentage);
        }
        return null;
@ -111,12 +99,10 @@ const Indicator = new Lang.Class({
        let visible = this._proxy.IsPresent;
        if (visible) {
            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.actor.hide();
            this._indicator.icon_name = 'system-shutdown-symbolic';
            this._percentageLabel.hide();
            return;
        }
@ -125,14 +111,6 @@ const Indicator = new Lang.Class({
        this._indicator.icon_name = icon;
        this._item.icon.icon_name = icon;
        // The icon label
        let label
        if (this._proxy.State == UPower.DeviceState.FULLY_CHARGED)
          label = _("%d\u2009%%").format(100);
        else
          label = _("%d\u2009%%").format(this._proxy.Percentage);
        this._percentageLabel.clutter_text.set_markup('<span size="smaller">' + label + '</span>');
        // The status label
        this._item.label.text = this._getStatus();
    },
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@ -6,7 +6,6 @@ const Gdm = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
@ -111,7 +110,6 @@ const Indicator = new Lang.Class({
        this._session = new GnomeSession.SessionManager();
        this._loginManager = LoginManager.getLoginManager();
        this._monitorManager = Meta.MonitorManager.get();
        this._haveShutdown = true;
        this._haveSuspend = true;
@ -157,8 +155,6 @@ const Indicator = new Lang.Class({
        this._orientationSettings.connect('changed::orientation-lock',
                                          Lang.bind(this, this._updateOrientationLock));
        Main.layoutManager.connect('monitors-changed',
                                   Lang.bind(this, this._updateOrientationLock));
        Gio.DBus.system.watch_name(SENSOR_BUS_NAME,
                                   Gio.BusNameWatcherFlags.NONE,
                                   Lang.bind(this, this._sensorProxyAppeared),
@ -268,8 +264,7 @@ const Indicator = new Lang.Class({
    _updateOrientationLock: function() {
        if (this._sensorProxy)
-            this._orientationLockAction.visible = this._sensorProxy.HasAccelerometer &&
+            this._orientationLockAction.visible = this._sensorProxy.HasAccelerometer;
                                                  this._monitorManager.get_is_builtin_display_on();
        else
            this._orientationLockAction.visible = false;
@ -306,17 +301,14 @@ const Indicator = new Lang.Class({
    },
    _updateHaveSuspend: function() {
-        this._loginManager.canSuspend(Lang.bind(this,
+        this._loginManager.canSuspend(Lang.bind(this, function(result) {
-            function(canSuspend, needsAuth) {
+            this._haveSuspend = result;
-                this._haveSuspend = canSuspend;
+            this._updateSuspend();
-                this._suspendNeedsAuth = needsAuth;
+        }));
                this._updateSuspend();
            }));
    },
    _updateSuspend: function() {
-        let disabled = (Main.sessionMode.isLocked &&
+        let disabled = Main.sessionMode.isLocked ||
                        this._suspendNeedsAuth) ||
                       (Main.sessionMode.isGreeter &&
                        this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
        this._suspendAction.visible = this._haveSuspend && !disabled;
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -23,7 +23,6 @@ const EdgeDragAction = imports.ui.edgeDragAction;
 const IconGrid = imports.ui.iconGrid;
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 const PINCH_GESTURE_THRESHOLD = 0.7;
 const ViewPage = {
    WINDOWS: 1,
@ -52,28 +51,6 @@ function getTermsForSearchString(searchString) {
    return terms;
 }
 const TouchpadShowOverviewAction = new Lang.Class({
    Name: 'TouchpadShowOverviewAction',
    _init: function(actor) {
        actor.connect('captured-event', Lang.bind(this, this._handleEvent));
    },
    _handleEvent: function(actor, event) {
        if (event.type() != Clutter.EventType.TOUCHPAD_PINCH)
            return Clutter.EVENT_PROPAGATE;
        if (event.get_touchpad_gesture_finger_count() != 3)
            return Clutter.EVENT_PROPAGATE;
        if (event.get_gesture_phase() == Clutter.TouchpadGesturePhase.END)
            this.emit('activated', event.get_gesture_pinch_scale ());
        return Clutter.EVENT_STOP;
    }
 });
 Signals.addSignalMethods(TouchpadShowOverviewAction.prototype);
 const ShowOverviewAction = new Lang.Class({
    Name: 'ShowOverviewAction',
    Extends: Clutter.GestureAction,
@ -179,7 +156,7 @@ const ViewSelector = new Lang.Class({
        this.appDisplay = new AppDisplay.AppDisplay();
        this._appsPage = this._addPage(this.appDisplay.actor,
-                                       _("Applications"), 'view-app-grid-symbolic');
+                                       _("Applications"), 'view-grid-symbolic');
        this._searchResults = new Search.SearchResults();
        this._searchPage = this._addPage(this._searchResults.actor,
@ -253,16 +230,11 @@ const ViewSelector = new Lang.Class({
        global.stage.add_action(gesture);
        gesture = new ShowOverviewAction();
-        gesture.connect('activated', Lang.bind(this, this._pinchGestureActivated));
+        gesture.connect('activated', Lang.bind(this, function(action, areaDiff) {
            if (areaDiff < 0.7)
                Main.overview.show();
        }));
        global.stage.add_action(gesture);
        gesture = new TouchpadShowOverviewAction(global.stage);
        gesture.connect('activated', Lang.bind(this, this._pinchGestureActivated));
    },
    _pinchGestureActivated: function(action, scale) {
        if (scale < PINCH_GESTURE_THRESHOLD)
            Main.overview.show();
    },
    _toggleAppsPage: function() {
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -17,7 +17,6 @@ const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
 const WindowMenu = imports.ui.windowMenu;
 const PadOsd = imports.ui.padOsd;
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 const MINIMIZE_WINDOW_ANIMATION_TIME = 0.2;
@ -511,7 +510,7 @@ const TouchpadWorkspaceSwitchAction = new Lang.Class({
        if (event.type() != Clutter.EventType.TOUCHPAD_SWIPE)
            return Clutter.EVENT_PROPAGATE;
-        if (event.get_touchpad_gesture_finger_count() != 4)
+        if (event.get_gesture_swipe_finger_count() != 4)
            return Clutter.EVENT_PROPAGATE;
        if (event.get_gesture_phase() == Clutter.TouchpadGesturePhase.UPDATE) {
@ -678,14 +677,11 @@ const WindowManager = new Lang.Class({
        this._minimizing = [];
        this._unminimizing = [];
        this._mapping = [];
        this._resizing = [];
        this._destroying = [];
        this._movingWindow = null;
        this._dimmedWindows = [];
        this._skippedActors = [];
        this._allowedKeybindings = {};
        this._isWorkspacePrepended = false;
@ -696,7 +692,6 @@ const WindowManager = new Lang.Class({
            this._minimizeWindowDone(shellwm, actor);
            this._mapWindowDone(shellwm, actor);
            this._destroyWindowDone(shellwm, actor);
            this._sizeChangeWindowDone(shellwm, actor);
        }));
        this._shellwm.connect('switch-workspace', Lang.bind(this, this._switchWorkspace));
@ -706,7 +701,6 @@ const WindowManager = new Lang.Class({
        this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
        this._shellwm.connect('unminimize', Lang.bind(this, this._unminimizeWindow));
        this._shellwm.connect('size-change', Lang.bind(this, this._sizeChangeWindow));
        this._shellwm.connect('size-changed', Lang.bind(this, this._sizeChangedWindow));
        this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
        this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
        this._shellwm.connect('filter-keybinding', Lang.bind(this, this._filterKeybinding));
@ -854,34 +848,22 @@ const WindowManager = new Lang.Class({
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-applications',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-group',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-applications-backward',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-group-backward',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-windows',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startWindowSwitcher));
        this.setCustomKeybindingHandler('switch-windows-backward',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startWindowSwitcher));
        this.setCustomKeybindingHandler('cycle-windows',
                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startSwitcher));
        this.setCustomKeybindingHandler('cycle-windows-backward',
                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startSwitcher));
        this.setCustomKeybindingHandler('cycle-group',
                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startSwitcher));
        this.setCustomKeybindingHandler('cycle-group-backward',
                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startSwitcher));
        this.setCustomKeybindingHandler('switch-panels',
                                        Shell.ActionMode.NORMAL |
                                        Shell.ActionMode.OVERVIEW |
@ -919,7 +901,6 @@ const WindowManager = new Lang.Class({
                           Lang.bind(this, this._toggleCalendar));
        global.display.connect('show-resize-popup', Lang.bind(this, this._showResizePopup));
        global.display.connect('show-pad-osd', Lang.bind(this, this._showPadOsd));
        Main.overview.connect('showing', Lang.bind(this, function() {
            for (let i = 0; i < this._dimmedWindows.length; i++)
@ -949,13 +930,7 @@ const WindowManager = new Lang.Class({
        gesture = new AppSwitchAction();
        gesture.connect('activated', Lang.bind(this, this._switchApp));
        global.stage.add_action(gesture);
    },
    _showPadOsd: function (display, device, settings, imagePath, editionMode, monitorIndex) {
        this._currentPadOsd = new PadOsd.PadOsd(device, settings, imagePath, editionMode, monitorIndex);
        this._currentPadOsd.connect('closed', Lang.bind(this, function() { this._currentPadOsd = null }));
        return this._currentPadOsd.actor;
    },
    _actionSwitchWorkspace: function(action, direction) {
@ -1046,10 +1021,6 @@ const WindowManager = new Lang.Class({
        this._workspaceTracker.keepWorkspaceAlive(workspace, duration);
    },
    skipNextEffect: function(actor) {
        this._skippedActors.push(actor);
    },
    setCustomKeybindingHandler: function(name, modes, handler) {
        if (Meta.keybindings_set_custom_handler(name, handler))
            this.allowKeybinding(name, modes);
@ -1076,9 +1047,6 @@ const WindowManager = new Lang.Class({
    },
    _shouldAnimateActor: function(actor, types) {
        if (this._removeEffect(this._skippedActors, actor))
            return false;
        if (!this._shouldAnimate())
            return false;
@ -1250,133 +1218,15 @@ const WindowManager = new Lang.Class({
    },
    _sizeChangeWindow : function(shellwm, actor, whichChange, oldFrameRect, oldBufferRect) {
        let types = [Meta.WindowType.NORMAL];
        if (!this._shouldAnimateActor(actor, types)) {
            shellwm.completed_size_change(actor);
            return;
        }
        if ((whichChange == Meta.SizeChange.FULLSCREEN ||
             whichChange == Meta.SizeChange.UNFULLSCREEN) &&
            oldFrameRect.width > 0 && oldFrameRect.height > 0)
            this._fullscreenAnimation(shellwm, actor, oldFrameRect, whichChange);
        else
            shellwm.completed_size_change(actor);
    },
    _fullscreenAnimation: function(shellwm, actor, oldFrameRect, change) {
        // Position a clone of the window on top of the old position,
        // while actor updates are frozen.
        let actorContent = Shell.util_get_content_for_window_actor(actor, oldFrameRect);
        let actorClone = new St.Widget({ content: actorContent });
        actorClone.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
        actorClone.set_position(oldFrameRect.x, oldFrameRect.y);
        actorClone.set_size(oldFrameRect.width, oldFrameRect.height);
        Main.uiGroup.add_actor(actorClone);
        let rect = change == Meta.SizeChange.FULLSCREEN ? oldFrameRect : null;
        if (this._clearFullscreenInfo(actor))
            this._shellwm.completed_size_change(actor);
        actor.__fullscreenInfo = { clone: actorClone,
                                   oldRect: rect };
    },
    _sizeChangedWindow: function(shellwm, actor) {
        if (!actor.__fullscreenInfo)
            return;
        let actorClone = actor.__fullscreenInfo.clone;
        let targetRect = actor.meta_window.get_frame_rect();
        let scaleX = targetRect.width / actorClone.width;
        let scaleY = targetRect.height / actorClone.height;
        this._resizing.push(actor);
        // Now scale and fade out the clone
        Tweener.addTween(actorClone,
                         { x: targetRect.x,
                           y: targetRect.y,
                           scale_x: scaleX,
                           scale_y: scaleY,
                           opacity: 0,
                           time: WINDOW_ANIMATION_TIME,
                           transition: 'easeOutQuad'
                         });
        let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
        let oldRect = actor.__fullscreenInfo.oldRect;
        if (oldRect) {
            actor.translation_x = oldRect.x - monitor.x;
            actor.translation_y = oldRect.y - monitor.y;
        } else {
            actor.translation_x = -(targetRect.x - monitor.x);
            actor.translation_y = -(targetRect.y - monitor.y);
        }
        // Now set scale the actor to size it as the clone.
        actor.scale_x = 1 / scaleX;
        actor.scale_y = 1 / scaleY;
        // Scale it to its actual new size
        Tweener.addTween(actor,
                         { scale_x: 1.0,
                           scale_y: 1.0,
                           translation_x: 0,
                           translation_y: 0,
                           time: WINDOW_ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: this._sizeChangeWindowDone,
                           onCompleteScope: this,
                           onCompleteParams: [shellwm, actor],
                           onOverwrite: this._sizeChangeWindowOverwritten,
                           onOverwriteScope: this,
                           onOverwriteParams: [shellwm, actor]
                         });
        // Now unfreeze actor updates, to get it to the new size.
        // It's important that we don't wait until the animation is completed to
        // do this, otherwise our scale will be applied to the old texture size.
        shellwm.completed_size_change(actor);
    },
    _clearFullscreenInfo: function(actor) {
        if (actor.__fullscreenInfo) {
            actor.__fullscreenInfo.clone.destroy();
            delete actor.__fullscreenInfo;
            return true;
        }
        return false;
    },
    _sizeChangeWindowDone: function(shellwm, actor) {
        if (this._removeEffect(this._resizing, actor)) {
            Tweener.removeTweens(actor);
            actor.scale_x = 1.0;
            actor.scale_y = 1.0;
            actor.translation_x = 0;
            actor.translation_y = 0;
            this._clearFullscreenInfo(actor);
        }
    },
    _sizeChangeWindowOverwritten: function(shellwm, actor) {
        if (this._removeEffect(this._resizing, actor))
            this._clearFullscreenInfo(actor);
    },
    _hasAttachedDialogs: function(window, ignoreWindow) {
        var count = 0;
        window.foreach_transient(function(win) {
-            if (win != ignoreWindow &&
+            if (win != ignoreWindow && win.is_attached_dialog())
                win.is_attached_dialog() &&
                win.get_transient_for() == window) {
                count++;
-                return false;
+            return false;
            }
            return true;
        });
        return count != 0;
    },
@ -1404,14 +1254,11 @@ const WindowManager = new Lang.Class({
        let dimmer = getWindowDimmer(actor);
        if (!dimmer)
            return;
-        if (this._shouldAnimate())
+        Tweener.addTween(dimmer,
-            Tweener.addTween(dimmer,
+                         { dimFactor: 1.0,
-                             { dimFactor: 1.0,
+                           time: DIM_TIME,
-                               time: DIM_TIME,
+                           transition: 'linear'
-                               transition: 'linear'
+                         });
                             });
        else
            dimmer.dimFactor = 1.0;
    },
    _undimWindow: function(window) {
@ -1421,13 +1268,10 @@ const WindowManager = new Lang.Class({
        let dimmer = getWindowDimmer(actor);
        if (!dimmer)
            return;
-        if (this._shouldAnimate())
+        Tweener.addTween(dimmer,
-            Tweener.addTween(dimmer,
+                         { dimFactor: 0.0,
-                             { dimFactor: 0.0,
+                           time: UNDIM_TIME,
-                               time: UNDIM_TIME,
+                           transition: 'linear' });
                               transition: 'linear' });
        else
            dimmer.dimFactor = 0.0;
    },
    _mapWindow : function(shellwm, actor) {
@ -1445,14 +1289,6 @@ const WindowManager = new Lang.Class({
            actor._windowType = type;
        }));
        actor.meta_window.connect('unmanaged', Lang.bind(this, function(window) {
                let parent = window.get_transient_for();
                if (parent)
                    this._checkDimming(parent);
        }));
        if (actor.meta_window.is_attached_dialog())
            this._checkDimming(actor.get_meta_window().get_transient_for());
        let types = [Meta.WindowType.NORMAL,
                     Meta.WindowType.DIALOG,
@ -1462,6 +1298,9 @@ const WindowManager = new Lang.Class({
            return;
        }
        if (actor.meta_window.is_attached_dialog())
            this._checkDimming(actor.get_meta_window().get_transient_for());
        switch (actor._windowType) {
        case Meta.WindowType.NORMAL:
            actor.set_pivot_point(0.5, 1.0);
@ -1544,9 +1383,6 @@ const WindowManager = new Lang.Class({
                                                             });
        }
        if (window.is_attached_dialog())
            this._checkDimming(window.get_transient_for(), window);
        let types = [Meta.WindowType.NORMAL,
                     Meta.WindowType.DIALOG,
                     Meta.WindowType.MODAL_DIALOG];
@ -1581,6 +1417,7 @@ const WindowManager = new Lang.Class({
            if (window.is_attached_dialog()) {
                let parent = window.get_transient_for();
                this._checkDimming(parent, window);
                actor._parentDestroyId = parent.connect('unmanaged', Lang.bind(this, function () {
                    Tweener.removeTweens(actor);
                    this._destroyWindowDone(shellwm, actor);
@ -1786,37 +1623,23 @@ const WindowManager = new Lang.Class({
        this._windowMenuManager.showWindowMenuForWindow(window, menu, rect);
    },
-    _startSwitcher: function(display, screen, window, binding) {
+    _startAppSwitcher : function(display, screen, window, binding) {
        let constructor = null;
        switch (binding.get_name()) {
            case 'switch-applications':
            case 'switch-applications-backward':
            case 'switch-group':
            case 'switch-group-backward':
                constructor = AltTab.AppSwitcherPopup;
                break;
            case 'switch-windows':
            case 'switch-windows-backward':
                constructor = AltTab.WindowSwitcherPopup;
                break;
            case 'cycle-windows':
            case 'cycle-windows-backward':
                constructor = AltTab.WindowCyclerPopup;
                break;
            case 'cycle-group':
            case 'cycle-group-backward':
                constructor = AltTab.GroupCyclerPopup;
                break;
        }
        if (!constructor)
            return;
        /* prevent a corner case where both popups show up at once */
        if (this._workspaceSwitcherPopup != null)
            this._workspaceSwitcherPopup.destroy();
-        let tabPopup = new constructor();
+        let tabPopup = new AltTab.AppSwitcherPopup();
        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
            tabPopup.destroy();
    },
    _startWindowSwitcher : function(display, screen, window, binding) {
        /* prevent a corner case where both popups show up at once */
        if (this._workspaceSwitcherPopup != null)
            this._workspaceSwitcherPopup.destroy();
        let tabPopup = new AltTab.WindowSwitcherPopup();
        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
            tabPopup.destroy();
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@ -214,7 +214,7 @@ const WindowMenuManager = new Lang.Class({
                menu.close();
            });
-        this._sourceActor.set_size(Math.max(1, rect.width), Math.max(1, rect.height));
+        this._sourceActor.set_size(rect.width, rect.height);
        this._sourceActor.set_position(rect.x, rect.y);
        this._sourceActor.show();
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -361,9 +361,6 @@ const WindowClone = new Lang.Class({
        // a long-press canceled when the pointer movement
        // exceeds dnd-drag-threshold to manually start the drag
        if (state == Clutter.LongPressState.CANCEL) {
            let event = Clutter.get_current_event();
            this._dragTouchSequence = event.get_event_sequence();
            // A click cancels a long-press before any click handler is
            // run - make sure to not start a drag in that case
            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
@ -372,7 +369,7 @@ const WindowClone = new Lang.Class({
                        return;
                    let [x, y] = action.get_coords();
                    action.release();
-                    this._draggable.startDrag(x, y, global.get_current_time(), this._dragTouchSequence);
+                    this._draggable.startDrag(x, y, global.get_current_time());
                }));
        }
        return true;
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -19,7 +19,8 @@ const WorkspaceSwitcherPopup = new Lang.Class({
    Name: 'WorkspaceSwitcherPopup',
    _init : function() {
-        this.actor = new St.Widget({ x: 0,
+        this.actor = new St.Widget({ reactive: true,
                                     x: 0,
                                     y: 0,
                                     width: global.screen_width,
                                     height: global.screen_height,
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -45,11 +45,11 @@ const PrimaryActorLayout = new Lang.Class({
        this.primaryActor = primaryActor;
    },
-    vfunc_get_preferred_width: function(container, forHeight) {
+    vfunc_get_preferred_width: function(forHeight) {
        return this.primaryActor.get_preferred_width(forHeight);
    },
-    vfunc_get_preferred_height: function(container, forWidth) {
+    vfunc_get_preferred_height: function(forWidth) {
        return this.primaryActor.get_preferred_height(forWidth);
    },
 });
@ -80,8 +80,6 @@ const WindowClone = new Lang.Class({
        this.actor.connect('button-release-event',
                           Lang.bind(this, this._onButtonRelease));
        this.actor.connect('touch-event',
                           Lang.bind(this, this._onTouchEvent));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
@ -202,15 +200,6 @@ const WindowClone = new Lang.Class({
        return Clutter.EVENT_STOP;
    },
    _onTouchEvent : function (actor, event) {
        if (event.type() != Clutter.EventType.TOUCH_END ||
            !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
            return Clutter.EVENT_PROPAGATE;
        this.emit('selected', event.get_time());
        return Clutter.EVENT_STOP;
    },
    _onDragBegin : function (draggable, time) {
        this.inDrag = true;
        this.emit('drag-begin');
@ -653,7 +642,6 @@ const ThumbnailsBox = new Lang.Class({
        this.actor.connect('button-press-event', function() { return Clutter.EVENT_STOP; });
        this.actor.connect('button-release-event', Lang.bind(this, this._onButtonRelease));
        this.actor.connect('touch-event', Lang.bind(this, this._onTouchEvent));
        Main.overview.connect('showing',
                              Lang.bind(this, this._createThumbnails));
@ -684,31 +672,18 @@ const ThumbnailsBox = new Lang.Class({
                global.screen.n_workspaces > 1;
    },
-    _activateThumbnailAtPoint: function (stageX, stageY, time) {
+    _onButtonRelease: function(actor, event) {
        let [stageX, stageY] = event.get_coords();
        let [r, x, y] = this.actor.transform_stage_point(stageX, stageY);
        for (let i = 0; i < this._thumbnails.length; i++) {
            let thumbnail = this._thumbnails[i]
            let [w, h] = thumbnail.actor.get_transformed_size();
            if (y >= thumbnail.actor.y && y <= thumbnail.actor.y + h) {
-                thumbnail.activate(time);
+                thumbnail.activate(event.get_time());
                break;
            }
        }
    },
    _onButtonRelease: function(actor, event) {
        let [stageX, stageY] = event.get_coords();
        this._activateThumbnailAtPoint(stageX, stageY, event.get_time());
        return Clutter.EVENT_STOP;
    },
    _onTouchEvent: function (actor, event) {
        if (event.type() == Clutter.EventType.TOUCH_END &&
            global.display.is_pointer_emulating_sequence(event.get_event_sequence())) {
            let [stageX, stageY] = event.get_coords();
            this._activateThumbnailAtPoint(stageX, stageY, event.get_time());
        }
        return Clutter.EVENT_STOP;
    },
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -103,7 +103,7 @@ const WorkspacesView = new Lang.Class({
                                                    page_increment: 1,
                                                    page_size: 1,
                                                    step_increment: 0,
-                                                    upper: global.screen.n_workspaces });
+                                                    upper: 0 });
        this.scrollAdjustment.connect('notify::value',
                                      Lang.bind(this, this._onScroll));
@ -374,10 +374,6 @@ const ExtraWorkspaceView = new Lang.Class({
        this._workspace.setActualGeometry(this._actualGeometry);
    },
    getActiveWorkspace: function() {
        return this._workspace;
    },
    animateToOverview: function(animationType) {
        if (animationType == AnimationType.ZOOM)
            this._workspace.zoomToOverview();
@ -425,10 +421,8 @@ const WorkspacesDisplay = new Lang.Class({
            // Only switch to the workspace when there's no application
            // windows open. The problem is that it's too easy to miss
            // an app window and get the wrong one focused.
-            let event = Clutter.get_current_event();
+            if (action.get_button() == 1 &&
-            let index = this._getMonitorIndexForEvent(event);
+                this._getPrimaryView().getActiveWorkspace().isEmpty())
            if ((action.get_button() == 1 || action.get_button() == 0) &&
                this._workspacesViews[index].getActiveWorkspace().isEmpty())
                Main.overview.hide();
        }));
        Main.overview.addAction(clickAction);
@ -437,18 +431,11 @@ const WorkspacesDisplay = new Lang.Class({
        let panAction = new Clutter.PanAction({ threshold_trigger_edge: Clutter.GestureTriggerEdge.AFTER });
        panAction.connect('pan', Lang.bind(this, this._onPan));
        panAction.connect('gesture-begin', Lang.bind(this, function() {
            if (this._workspacesOnlyOnPrimary) {
                let event = Clutter.get_current_event();
                if (this._getMonitorIndexForEvent(event) != this._primaryIndex)
                    return false;
            }
            for (let i = 0; i < this._workspacesViews.length; i++)
                this._workspacesViews[i].startSwipeScroll();
            return true;
        }));
        panAction.connect('gesture-cancel', Lang.bind(this, function() {
            clickAction.release();
            for (let i = 0; i < this._workspacesViews.length; i++)
                this._workspacesViews[i].endSwipeScroll();
        }));
@ -594,12 +581,6 @@ const WorkspacesDisplay = new Lang.Class({
        }
    },
    _getMonitorIndexForEvent: function(event) {
        let [x, y] = event.get_coords();
        let rect = new Meta.Rectangle({ x: x, y: y, width: 1, height: 1 });
        return global.screen.get_monitor_index_for_rect(rect);
    },
    _getPrimaryView: function() {
        if (!this._workspacesViews.length)
            return null;
@ -680,11 +661,6 @@ const WorkspacesDisplay = new Lang.Class({
    _onScrollEvent: function(actor, event) {
        if (!this.actor.mapped)
            return Clutter.EVENT_PROPAGATE;
        if (this._workspacesOnlyOnPrimary &&
            this._getMonitorIndexForEvent(event) != this._primaryIndex)
            return Clutter.EVENT_PROPAGATE;
        let activeWs = global.screen.get_active_workspace();
        let ws;
        switch (event.get_scroll_direction()) {
--- a/man/gnome-shell.xml
+++ b/man/gnome-shell.xml
@ -140,7 +140,7 @@
                <para>
                        <filename>/usr/share/gnome-session/sessions/gnome.session</filename>,
-                        <filename>/usr/share/applications/org.gnome.Shell.desktop</filename>.</para>
+                        <filename>/usr/share/applications/gnome-shell.desktop</filename>.</para>
        </refsect1>
        <refsect1>
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -24,12 +24,10 @@ fi
 fr
 fur
 ga
 gd
 gl
 gu
 he
 hi
 hr
 hu
 ia
 id
--- a/po/Makevars
+++ b/po/Makevars
@ -1,68 +0,0 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 # Usually the message domain is the same as the package name.
 DOMAIN = $(PACKAGE)
 # These two variables depend on the location of this directory.
 subdir = po
 top_builddir = ..
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
        --keyword=C_:1c,2 --keyword=NC_:1c,2 \
        --keyword=g_dngettext:2,3 --add-comments \
        --flag=g_dngettext:2:pass-c-format \
        --flag=g_strdup_printf:1:c-format \
        --flag=g_string_printf:2:c-format \
        --flag=g_string_append_printf:2:c-format \
        --flag=g_error_new:3:c-format \
        --flag=g_set_error:4:c-format \
        --flag=g_markup_printf_escaped:1:c-format \
        --flag=g_log:3:c-format \
        --flag=g_print:1:c-format \
        --flag=g_printerr:1:c-format \
        --flag=g_printf:1:c-format \
        --flag=g_fprintf:2:c-format \
        --flag=g_sprintf:2:c-format \
        --flag=g_snprintf:3:c-format
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
 # package.  (Note that the msgstr strings, extracted from the package's
 # sources, belong to the copyright holder of the package.)  Translators are
 # expected to transfer the copyright for their translations to this person
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
 COPYRIGHT_HOLDER = Translation copyright holder
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
 #   in the GNU gettext documentation, section 'Preparing Strings'.
 # - Strings which use unclear terms or require additional context to be
 #   understood.
 # - Strings which make invalid assumptions about notation of date, time or
 #   money.
 # - Pluralisation problems.
 # - Incorrect English spelling.
 # - Incorrect formatting.
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
 MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 # Ignore the timestamp of the .pot file, as git clones do not have
 # deterministic timestamps, and .po files are updated by translators
 # (only) in GNOME projects.
 PO_DEPENDS_ON_POT = no
 # This tells whether or not to forcibly update $(DOMAIN).pot and
 # regenerate PO files on "make dist".  Possible values are "yes" and
 # "no".  Set this to no if the POT file and PO files are maintained
 # externally.
 DIST_DEPENDS_ON_UPDATE_PO = no
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -1,20 +1,20 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/50-gnome-shell-system.xml
+[encoding: UTF-8]
 data/50-gnome-shell-system.xml.in
 data/gnome-shell.desktop.in.in
 data/gnome-shell-extension-prefs.desktop.in.in
-data/org.gnome.Shell.desktop.in.in
+data/gnome-shell-wayland.desktop.in.in
-data/org.gnome.shell.gschema.xml.in
+data/org.gnome.shell.gschema.xml.in.in
-data/org.gnome.Shell.PortalHelper.desktop.in.in
+data/org.gnome.Shell.PortalHelper.desktop.in
 js/extensionPrefs/main.js
 js/gdm/authPrompt.js
 js/gdm/loginDialog.js
 js/gdm/util.js
 js/misc/util.js
 js/portalHelper/main.js
 js/ui/accessDialog.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js
 js/ui/audioDeviceSelection.js
 js/ui/backgroundMenu.js
 js/ui/calendar.js
 js/ui/components/automountManager.js
@ -33,13 +33,10 @@ js/ui/keyboard.js
 js/ui/legacyTray.js
 js/ui/lookingGlass.js
 js/ui/main.js
 js/ui/messageList.js
 js/ui/messageTray.js
 js/ui/mpris.js
 js/ui/notificationDaemon.js
 js/ui/overviewControls.js
 js/ui/overview.js
 js/ui/padOsd.js
 js/ui/panel.js
 js/ui/popupMenu.js
 js/ui/runDialog.js
@ -62,7 +59,7 @@ js/ui/viewSelector.js
 js/ui/windowAttentionHandler.js
 js/ui/windowManager.js
 js/ui/windowMenu.js
-src/calendar-server/evolution-calendar.desktop.in
+src/calendar-server/evolution-calendar.desktop.in.in
 # Please do not remove this file from POTFILES.in. Run "git submodule init && git submodule update" to get it.
 src/gvc/gvc-mixer-control.c
 src/main.c
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@ -0,0 +1,4 @@
 data/org.gnome.shell.evolution.calendar.gschema.xml.in
 src/calendar-server/evolution-calendar.desktop.in
 # Meh, autofools :-(
 sub/src/calendar-server/evolution-calendar.desktop.in
--- a/po/af.po
+++ b/po/af.po
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
@ -13,7 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2014-09-15 14:59+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <kde-i18n-doc@kde.org>\n"
-"Language: as\n"
+"Language: as_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/bn.po
+++ b/po/bn.po
@ -7,7 +7,6 @@ msgstr ""
 "PO-Revision-Date: 2011-04-04 11:04+0600\n"
 "Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
 "Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2014-12-30 16:45+0000\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: bn_IN\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@ -14,7 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2014-09-14 23:32+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"Language: ca@valencia\n"
+"Language: ca-XV\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/Show More
+++ b/Show More