overview: new transition

viewSelector: Move to a sync() model for deciding which page to show
https://bugzilla.gnome.org/show_bug.cgi?id=722196
2014-01-31 17:57:57 -05:00 · 2014-01-31 17:57:57 -05:00 · 2014-01-31 17:57:57 -05:00 · 2014-01-31 17:57:57 -05:00 · 2014-01-31 17:57:57 -05:00 · 2014-01-31 17:57:57 -05:00
174 changed files with 21539 additions and 31914 deletions
--- a/.gitignore
+++ b/.gitignore
@ -78,8 +78,11 @@ src/gnome-shell-calendar-server
 src/gnome-shell-extension-prefs
 src/gnome-shell-extension-tool
 src/gnome-shell-hotplug-sniffer
+src/gnome-shell-jhbuild
 src/gnome-shell-perf-helper
 src/gnome-shell-perf-tool
+src/gnome-shell-real
+src/gnome-shell-wayland
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
 src/run-js-test
 src/test-recorder
--- a/199
+++ b/199
@ -1,202 +1,3 @@
-3.13.2
-======
-* Make airplane mode menu insensitive in lock screen [Giovanni; #729224]
-* Don't always extend struts to the screen edge [Florian; #683819]
-* Fix keynav for alternatives in AltSwitcher [Florian; #727259]
-* Implement window menus in the shell [Jasper; #726352]
-* Support resource:/// URLs in GNOME_SHELL_JS envvar [Owen; #730409]
-* Fix switcher popups with keybindings containing Escape [Rui; #730739]
-* Update extension-prefs UI to follow GNOME 3 patterns [Florian; #730829]
-* Add support for fallback app menu in window decorations [Florian; #730752]
-* Fix keynav escaping open app folders [Florian; #726760]
-* Misc. bug fixes [Kalev, Florian, Owen; #729429, #728449, #730408, #730753,
-  #730653]
-
-Contributors:
-  Giovanni Campagna, Piotr Drąg, Kalev Lember, Rui Matos, Florian Müllner,
-  Vadim Rutkovsky, Carlos Soriano, Jasper St. Pierre, Owen W. Taylor
-
-Translations:
-  Ihar Hrachyshka [be], Giovanni Campagna [it], Carles Ferrando [ca@valencia],
-  Daniel Mustieles [es], Aurimas Černius [lt], Enrico Nicoletto [pt_BR],
-  Yosef Or Boczko [he], Marek Černocký [cs], Muhammet Kara [tr],
-  Georges Neto [pt_BR], Andika Triwidada [id]
-
-3.13.1
-======
-* Ensure the currently focused app icon is viewable [Rui; #726759]
-* Improve language in location menu [Zeeshan; #726498]
-* Improve HiDpi support [Cosimo; #726907]
-* Set accessible role for window previews [Alejandro; #726670]
-* Fix bad antialiasing on panel menu buttons [Carlos; #727336]
-* Don't hide location menu [Zeeshan; #727398]
-* Fix IM candidate window obscuring current text [Rui; #727579]
-* Don't always extend struts to the screen edge [Florian; #663690]
-* Add shortcuts for switching to the last workspace [Elad; #659288]
-* Show OSD window on all monitors [Adel; #722684]
-* Improve consistency of labels in network menu [Paul; #727163]
-* Fix zombie search providers showing up [Jasper; #728597]
-* Remove ConsoleKit support [Florian; #686626]
-* Fix region screenshots with open shell menus [Florian; #709126]
-* Support <shift>insert in text entries [Florian; #648318]
-* Improve app picker scrolling on touch [Jasper; #729064]
-* Don't make date button clickable when on current date [Carlos; #726724]
-* Tweak heuristic for hiding workspace switcher [Florian; #662457]
-* Add option to show in Software to app context menu [Matthias; #643043]
-* Misc. bug fixes and cleanups [Bastien, Florian, Giovanni, Adel, Vadim,
-  Carlos; #727983, #727948, #728512, #728681, #728897, #727384, #728820,
-  #715042, #728449, #728343]
-
-Contributors:
-  Elad Alfassa, Zeeshan Ali (Khattak), Giovanni Campagna, Cosimo Cecchi,
-  Matthias Clasen, Piotr Drąg, Adel Gadllah, Paul Lange, Rui Matos,
-  Simon McVittie, Florian Müllner, Bastien Nocera, Alejandro Piñeiro,
-  Vadim Rutkovsky, Carlos Soriano, Jasper St. Pierre
-
-Translations:
-  Khaled Hosny [ar], Piotr Drąg [pl], Yosef Or Boczko [he],
-  Antonio Fernandes C. Neto [pt_BR], Marek Černocký [cs], maria thukididu [el],
-  Andika Triwidada [id], Daniel Mustieles [es], Changwoo Ryu [ko],
-  Benjamin Steinwender [de], Sphinx Jiang [zh_CN],
-  Inaki Larranaga Murgoitio [eu], Marcus Lundblad [sv], Aurimas Černius [lt],
-  Stas Solovey [ru], Alexandre Franke [fr], Matej Urbančič [sl],
-  Fran Diéguez [gl], Pau Iranzo [ca], Luca Ferretti [it], Milo Casagrande [it],
-  Tiago S [pt], Victor Ibragimov [tg], Dirgita [id], Khoem Sokhem [km],
-  Rūdolfs Mazurs [lv], Balázs Úr [hu], Ask H. Larsen [da], Ikuya Awashiro [ja],
-  Wouter Bolsterlee [nl], Daniel Korostil [uk], Daniel Șerbănescu [ro],
-  Enrico Nicoletto [pt_BR]
-
-3.12.0
-======
-* gdm: Reset greeter when coming back to login screen [Jasper; #726989]
-
-Contributors:
-  Jasper St. Pierre
-
-Translations:
-  Daniel Martinez [an], Yuri Myasoedov [ru], Inaki Larranaga Murgoitio [eu],
-  Abderrahim Kitouni [ar], Praveen Illa [te], Matej Urbančič [sl],
-  Chao-Hsiung Liao [zh_HK, zh_TW], Frédéric Péters [fr],
-  Мирослав Николић [sr, sr@latin], Ask H. Larsen [da], Kenneth Nielsen [da],
-  Jiro Matsuzawa [ja], Dušan Kazik [sk]
-
-3.11.92
-=======
-* calendar: Grab key focus after changing day [Volker; #725606]
-* gdm: Don't load user list if disabled [Florian; #725905]
-* Don't show network-offline in the top bar [Jasper; #725340]
-* Improve radial shade effect of modal dialogs [Giovanni; #725830]
-* Fix broken suspend-on-idle functionality [Giovanni; #712706]
-* Close wifi selection dialog when device disappears [Giovanni; #723935]
-* Don't close chats when pressing Escape [Giovanni; #724178]
-* Improve smartcard support in login/lock screen [Ray; #726262, #726263]
-* Wake up screen when resuming from suspend [Giovanni; #726378]
-* Make bluetooth and location items insensitive when locked [Florian; #726319]
-* Don't show bluetooth icon when there is no adapter [Giovanni; #725057]
-* Make sure to keep the OSK on top of modal dialogs [Rui; #719451]
-* Misc. bug fixes and cleanups [Giovanni, Ray, Adel, Daniel, Jasper, Florian;
-  #725832, #725958, #722149, #724977, #724798, #725020, #723976, #726119,
-  #726238, #585500, #704844, #726323, #726322, #726120, #726414]
-
-Contributors:
-  Giovanni Campagna, Daniel Drake, Adel Gadllah, Rui Matos, Florian Müllner,
-  Volker Sobek, Jasper St. Pierre, Ray Strode
-
-Translations:
-  Fabio Tomat [fur], Rafael Ferreira [pt_BR], Fran Diéguez [gl],
-  Marek Černocký [cs], Baurzhan Muftakhidinov [kk], Andika Triwidada [id],
-  A S Alam [pa], Rūdolfs Mazurs [lv], Wylmer Wang [zh_CN],
-  Aurimas Černius [lt], Cheng-Chia Tseng [zh_TW], Stas Solovey [ru],
-  Tiagosdot [pt], Benjamin Steinwender [de], Frédéric Peters [fr],
-  Daniel Korostil [uk], Yaron Shahrabani [he], Ville-Pekka Vainio [fi],
-  maria thukididu [el], Victor Ibragimov [tg], Kjartan Maraas [nb],
-  Gábor Kelemen [hu], Ask H. Larsen [da]
-
-3.11.91
-=======
-* Don't use network profile name in menu [Giovanni; #725586]
-* calendar: Make date label clickable to return to current date [Vit; #641366]
-* Misc. bug fixes [Florian, Zeeshan, Adel, Jasper, Dan, Volker; #724813,
-  #724686, #725082, #724870, #724779, #725533]
-
-Contributors:
-  Zeeshan Ali (Khattak), Giovanni Campagna, Piotr Drąg, Adel Gadllah,
-  Florian Müllner, Volker Sobek, Vit Stanislav, Jasper St. Pierre, Dan Williams
-
-Translations:
-  Victor Ibragimov [tg], Aurimas Černius [lt], Dimitris Spingos [el],
-  Andika Triwidada [id], Rafael Ferreira [pt_BR], Daniel Mustieles [es],
-  Baurzhan Muftakhidinov [kk], Marek Černocký [cs], Ihar Hrachyshka [be],
-  eternalhui [zh_CN], Yosef Or Boczko [he], Fran Diéguez [gl],
-  Khaled Hosny [ar], Ville-Pekka Vainio [fi], Piotr Drąg [pl],
-  Kjartan Maraas [nb], Changwoo Ryu [ko]
-
-3.11.90
-=======
-* Stop showing two bluetooth entries [Giovanni; #709353]
-* Improve styling of login/lock screen [Reda; #723833]
-* Fix magnifier crosshairs [Magdalen; #723709]
-* Make NetworkManager support optional [Michael; #669495]
-* Make middle-click open a new instance [Florian; #695010]
-* Scale the UI on high resolution displays [Cosimo, Adel; #705410, #724607]
-* Remove notification counter on screen shield [Carlos; #709275]
-* Improve app picker transition [Carlos; #722331]
-* Add geolocation indicator to status menu [Zeeshan; #723684]
-* Improve timestamps in chat notifications [Carlos; #708031, #715158]
-* Improve network menus [Giovanni; #723570]
-* Add "VPN Setting" item to VPN submenu [Giovanni; #709167]
-* Improve appearance of disclosure arrows [Carlos; #720206]
-* Add GSetting key to disable version validation of extensions [Adel; #724683]
-* Delay auto-removing empty workspaces [Florian; #709064]
-* Offer offline updates in the shutdown dialog [Kalev; #722898]
-* Animate tile previews [Florian; #665758]
-* Misc. bug fixes and cleanups [Giovanni, Ryan, Debarshi, Florian; #709128,
-  #722342, #723661, #724184, #724256, #724293, #724305, #722554, #724282,
-  #724690, #722928]
-
-Contributors:
-  Zeeshan Ali (Khattak), Magdalen Berns, Michael Biebl, Giovanni Campagna,
-  Cosimo Cecchi, Adel Gadllah, Reda Lazri, Kalev Lember, Ryan Lortie,
-  Florian Müllner, Debarshi Ray, Carlos Soriano, Jasper St. Pierre,
-  Colin Walters
-
-Translations:
-  Victor Ibragimov [tg], Daniel Mustieles [es], Khaled Hosny [ar],
-  Enrico Nicoletto [pt_BR], Yosef Or Boczko [he], Fran Diéguez [gl],
-  Marek Černocký [cs], Baurzhan Muftakhidinov [kk], Jorge Pérez Pérez [an],
-  Kjartan Maraas [nb], David Lüder [de], Daniel Korostil [uk], ngoswami [as],
-  Rafael Ferreira [pt_BR]
-
-3.11.5
-======
-* Fix extension preference tool [Florian; #722334]
-* Fix keyboard activation of legacy tray icons [Giovanni; #721267]
-* Add radial background shade for modal dialogs [Giovanni; #669798]
-* Show attached modal windows in the overview [Giovanni; #650843]
-* Add support for desktop actions [Giovanni; #669603]
-* Indicate in system status when location service is used [Zeeshan; #709372]
-* Add support for extended app folder schema [Jasper; #723179]
-* Show status icon for wired network connections [Jasper; #708966]
-* Indicate airplane mode in network selection dialog [Giovanni; #709128]
-* Misc bug fixes and cleanups [Florian, Sebastian, Giovanni, Tim, Matt, Jasper;
-  #722417, #722494, #722547, #722593, #722434, #722787, #722690, #722840,
-  #722660, #722812, #723197, #722927, #723306, #723308, #723523, #709685,
-  #723570]
-
-Contributors:
-  Zeeshan Ali (Khattak), Magdalen Berns, Giovanni Campagna, William Jon McCann,
-  Sebastian Keller, Tim Lunn, Florian Müllner, Carlos Soriano,
-  Jasper St. Pierre, Rico Tzschichholz, Matt Watson
-
-Translations:
-  Marek Černocký [cs], Mattias Põldaru [et], Tong Hui [zh_CN],
-  Victor Ibragimov [tg], Enrico Nicoletto [pt_BR], Daniel Mustieles [es],
-  Fran Diéguez [gl], Kjartan Maraas [nb], Nilamdyuti Goswami [as],
-  Aurimas Černius [lt], Stas Solovey [ru], Yosef Or Boczko [he],
-  Jorge Pérez Pérez [an], Dimitris Spingos [el], Baurzhan Muftakhidinov [kk],
-  Chao-Hsiung Liao [zh_HK, zh_TW], Shankar Prasad [kn], Yaron Shahrabani [he],
-  Andika Triwidada [id]
-
 3.11.4
 ======
 * Fix removal of workspacaes that are not at the end [Giovanni; #721417]
--- a/2
+++ b/2
@ -8,7 +8,7 @@ For more information about GNOME Shell, including instructions on how
 to build GNOME Shell from source and how to get involved with the project,
 see:

- https://wiki.gnome.org/Projects/GnomeShell
+ http://live.gnome.org/GnomeShell

 Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
 product.
--- a/autogen.sh
+++ b/autogen.sh
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Run this to generate all the initial makefiles, etc.

 srcdir=`dirname $0`
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@ -41,8 +41,6 @@

 #define PLUGIN_API_VERSION 5

-#define EXTENSION_DISABLE_VERSION_CHECK_KEY "disable-extension-version-validation"
-
 typedef struct {
  GDBusProxy *proxy;
 } PluginData;
@ -833,16 +831,6 @@ plugin_get_shell_version (PluginObject  *obj,
  return ret;
 }

-static gboolean
-plugin_get_version_validation_enabled (PluginObject  *obj,
-                                       NPVariant     *result)
-{
-  gboolean is_enabled = !g_settings_get_boolean (obj->settings, EXTENSION_DISABLE_VERSION_CHECK_KEY);
-  BOOLEAN_TO_NPVARIANT(is_enabled, *result);
-
-  return TRUE;
-}
-
 #define METHODS                                 \
  METHOD (list_extensions)                      \
  METHOD (get_info)                             \
@ -862,8 +850,6 @@ static NPIdentifier api_version_id;
 static NPIdentifier shell_version_id;
 static NPIdentifier onextension_changed_id;
 static NPIdentifier onrestart_id;
-static NPIdentifier version_validation_enabled_id;
-

 static bool
 plugin_object_has_method (NPObject     *npobj,
@ -906,8 +892,7 @@ plugin_object_has_property (NPObject     *npobj,
  return (name == onextension_changed_id ||
          name == onrestart_id ||
          name == api_version_id ||
-          name == shell_version_id ||
-          name == version_validation_enabled_id);
+          name == shell_version_id);
 }

 static bool
@ -925,8 +910,6 @@ plugin_object_get_property (NPObject     *npobj,
    return plugin_get_api_version (obj, result);
  else if (name == shell_version_id)
    return plugin_get_shell_version (obj, result);
-  else if (name == version_validation_enabled_id)
-    return plugin_get_version_validation_enabled (obj, result);
  else if (name == onextension_changed_id)
    {
      if (obj->listener)
@ -1005,7 +988,6 @@ init_methods_and_properties (void)
  /* this is the JS public API; it is manipulated through NPIdentifiers for speed */
  api_version_id = funcs.getstringidentifier ("apiVersion");
  shell_version_id = funcs.getstringidentifier ("shellVersion");
-  version_validation_enabled_id = funcs.getstringidentifier ("versionValidationEnabled");

  get_info_id = funcs.getstringidentifier ("getExtensionInfo");
  list_extensions_id = funcs.getstringidentifier ("listExtensions");
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.13.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.11.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -76,7 +76,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.15.90
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.13.2
+MUTTER_MIN_VERSION=3.11.1
 GTK_MIN_VERSION=3.7.9
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
@ -105,13 +105,22 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
            libcanberra libcanberra-gtk3
            telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
            polkit-agent-1 >= $POLKIT_MIN_VERSION
-            gcr-base-3 >= $GCR_MIN_VERSION"
+            libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
+            libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
+            libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION"
 if test x$have_systemd = xyes; then
  SHARED_PCS="${SHARED_PCS} libsystemd-journal"
 fi

 PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
 PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION)
+PKG_CHECK_MODULES(MUTTER_WAYLAND, [libmutter-wayland >= $MUTTER_MIN_VERSION],
+                 [MUTTER_WAYLAND_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter-wayland`
+                  AC_SUBST(MUTTER_WAYLAND_TYPELIB_DIR)
+                  have_mutter_wayland=yes],
+                 [have_mutter_wayland=no])
+
+AM_CONDITIONAL(HAVE_MUTTER_WAYLAND, test $have_mutter_wayland != no)

 PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
@ -173,38 +182,6 @@ if test "$langinfo_ok" = "yes"; then
            [Define if _NL_TIME_FIRST_WEEKDAY is available])
 fi

-AC_ARG_ENABLE(networkmanager,
-             AS_HELP_STRING([--disable-networkmanager],
-                            [disable NetworkManager support  @<:@default=auto@:>@]),,
-              [enable_networkmanager=auto])
-
-if test "x$enable_networkmanager" != "xno"; then
-   PKG_CHECK_MODULES(NETWORKMANAGER,
-                     [libnm-glib
-                     libnm-util >= $NETWORKMANAGER_MIN_VERSION
-                     libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
-                     libsecret-unstable],
-                     [have_networkmanager=yes],
-                     [have_networkmanager=no])
-
-   GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
-   GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
-else
-   have_networkmanager="no  (disabled)"
-fi
-
-if test "x$have_networkmanager" = "xyes"; then
-   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
-   AC_SUBST([HAVE_NETWORKMANAGER], [1])
-else
-   if test "x$enable_networkmanager" = "xyes"; then
-      AC_MSG_ERROR([Couldn't find NetworkManager.])
-   fi
-   AC_SUBST([HAVE_NETWORKMANAGER], [0])
-fi
-
-AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
-
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()

@ -223,14 +200,6 @@ fi
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)

 GNOME_COMPILE_WARNINGS([error])
-case "$WARN_CFLAGS" in
-    *-Werror*)
-        WARN_CFLAGS="$WARN_CFLAGS -Wno-error=deprecated-declarations"
-        ;;
-esac
-
-AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
-AC_SUBST(AM_CFLAGS)

 BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
@ -254,15 +223,3 @@ AC_CONFIG_FILES([
  man/Makefile
 ])
 AC_OUTPUT
-
-echo "
-Build configuration:
-
-       Prefix:                                 ${prefix}
-       Source code location:                   ${srcdir}
-       Compiler:                               ${CC}
-       Compiler Warnings:                      $enable_compile_warnings
-
-       Support for NetworkManager:             $have_networkmanager
-       Support for GStreamer recording:        $build_recorder
-"
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -1,5 +1,9 @@
 desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop gnome-shell-wayland.desktop  gnome-shell-extension-prefs.desktop
+desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
+if HAVE_MUTTER_WAYLAND
+desktop_DATA += gnome-shell-wayland.desktop
+endif HAVE_MUTTER_WAYLAND
+

 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
@ -35,7 +39,6 @@ dist_theme_DATA =				\
 	theme/filter-selected-rtl.svg		\
 	theme/gnome-shell.css			\
 	theme/logged-in-indicator.svg		\
-	theme/menu-arrow-symbolic.svg		    \
 	theme/message-tray-background.png	\
 	theme/more-results.svg			\
 	theme/noise-texture.png			\
--- a/data/gnome-shell-wayland.desktop.in.in
+++ b/data/gnome-shell-wayland.desktop.in.in
@ -2,7 +2,7 @@
 Type=Application
 _Name=GNOME Shell (wayland compositor)
 _Comment=Window management and application launching
-Exec=@bindir@/gnome-shell --wayland --display-server
+Exec=@bindir@/mutter-launch -- gnome-shell-wayland --wayland
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
 X-GNOME-Bugzilla-Component=general
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@ -21,17 +21,8 @@
        EnableExtension and DisableExtension D-Bus methods on org.gnome.Shell.
      </_description>
    </key>
-    <key name="disable-extension-version-validation" type="b">
-      <default>false</default>
-      <_summary>Disables the validation of extension version compatibility</_summary>
-      <_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>
-    </key>
    <key name="favorite-apps" type="as">
-      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop' ]</default>
+      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
      <_summary>List of desktop file IDs for favorite applications</_summary>
      <_description>
        The applications corresponding to these identifiers
@ -74,7 +65,6 @@
    <child name="calendar" schema="org.gnome.shell.calendar"/>
    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
-    <child name="location" schema="org.gnome.shell.location"/>
  </schema>

  <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
@ -144,32 +134,6 @@
    </key>
  </schema>

-  <enum id="org.gnome.shell.geoclue.AccuracyLevel">
-    <value value="0" nick="off"/>
-    <value value="1" nick="country"/>
-    <value value="4" nick="city"/>
-    <value value="5" nick="neighborhood"/>
-    <value value="6" nick="street"/>
-    <value value="8" nick="exact"/>
-  </enum>
-  <schema id="org.gnome.shell.location"
-          path="/org/gnome/shell/location/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="max-accuracy-level" enum="org.gnome.shell.geoclue.AccuracyLevel">
-      <default>'exact'</default>
-      <_summary>The maximum accuracy level of location.</_summary>
-      <_description>
-        Configures the maximum level of location accuracy applications are
-        allowed to see. Valid options are 'off' (disable location tracking),
-        'country', 'city', 'neighborhood', 'street', and 'exact' (typically
-        requires GPS receiver). Please keep in mind that this only controls
-        what GeoClue will allow applications to see and they can find user's
-        location on their own using network resources (albeit with street-level
-        accuracy at best).
-      </_description>
-    </key>
-  </schema>
-
  <schema id="org.gnome.shell.app-switcher"
          path="/org/gnome/shell/app-switcher/"
          gettext-domain="@GETTEXT_PACKAGE@">
@ -221,6 +185,15 @@
      </_description>
    </key>

+    <key name="button-layout" type="s">
+      <default>":close"</default>
+      <_summary>Arrangement of buttons on the titlebar</_summary>
+      <_description>
+        This key overrides the key in org.gnome.desktop.wm.preferences when
+        running GNOME Shell.
+      </_description>
+    </key>
+
    <key name="edge-tiling" type="b">
      <default>true</default>
      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -153,43 +153,18 @@ StScrollBar StButton#vhandle:active {
    -arrow-rise: 11px;
 }

-.popup-menu-boxpointer.fallback-app-menu {
-    -arrow-border-radius: 4px;
-    -arrow-background-color: #ededed;
-    -arrow-border-width: 1px;
-    -arrow-border-color: #a6a6a6;
-    -arrow-base: 24px;
-    -arrow-rise: 11px;
-}
-
-.popup-menu-boxpointer.fallback-app-menu.dark {
-    -arrow-background-color: #3f4747;
-    -arrow-border-color: #282b2b;
-}
-
-
 .popup-menu {
    min-width: 200px;
 }

-.popup-menu-arrow {
-    width: 16px;
-    height: 16px;
+.unicode-arrow {
+    font-size: 120%;
 }

 .popup-submenu-menu-item:open {
    background-color: #333333;
 }

-.fallback-app-menu .popup-submenu-menu-item:open {
-    background-color: #888888;
-    color: white;
-}
-
-.fallback-app-menu.dark .popup-submenu-menu-item:open {
-    background-color: #333333;
-}
-
 .popup-sub-menu {
    background-gradient-start: rgba(80,80,80,0.3);
    background-gradient-end: rgba(80,80,80,0.4);
@ -197,20 +172,6 @@ StScrollBar StButton#vhandle:active {
    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
 }

-.fallback-app-menu .popup-sub-menu {
-    background-gradient-start: #dddddd;
-    background-gradient-end: #dfdfdf;
-    background-gradient-direction: vertical;
-    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.4);
-}
-
-.fallback-app-menu.dark .popup-sub-menu {
-    background-gradient-start: #474747;
-    background-gradient-end: #4b4b4b;
-    background-gradient-direction: vertical;
-    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
-}
-
 .popup-sub-menu:scrolled .popup-menu-item:ltr {
    padding-right: 0em;
 }
@ -259,29 +220,7 @@ StScrollBar StButton#vhandle:active {
    color: #9f9f9f;
 }

-.fallback-app-menu .popup-menu-item {
-    color: #43484a;
-}
-
-.fallback-app-menu .popup-menu-item:active {
-    color: white;
-    background-color: #4689cd;
-}
-
-.fallback-app-menu .popup-menu-item:insensitive {
-    color: gray;
-}
-
-.fallback-app-menu.dark .popup-menu-item {
-    color: white;
-}
-
-.fallback-app-menu.dark .popup-menu-item:active {
-    background-color: #445f7d;
-}
-
-.fallback-app-menu.dark .popup-menu-item:insensitive {
-    color: #9f9f9f;
+.popup-image-menu-item {
 }

 .popup-separator-menu-item {
@ -293,15 +232,8 @@ StScrollBar StButton#vhandle:active {
    padding: 8px 0px;
 }

-.fallback-app-menu .popup-separator-menu-item {
-    -gradient-start: #a0a2a3;
-    -gradient-end: #a0a2a3;
-    -margin-horizontal: 0;
-}
-
-.fallback-app-menu.dark .popup-separator-menu-item {
-    -gradient-start: #818584;
-    -gradient-end: #818584;
+.popup-alternating-menu-item:alternate {
+    font-weight: bold;
 }

 .popup-status-menu-item {
@ -357,20 +289,6 @@ StScrollBar StButton#vhandle:active {
    spacing: 10px;
 }

-.nm-dialog-airplane-box {
-    spacing: 12px;
-}
-
-.nm-dialog-airplane-headline {
-    font-size: 1.1em;
-    font-weight: bold;
-    text-align: center;
-}
-
-.nm-dialog-airplane-text {
-    color: #999999;
-}
-
 .nm-dialog-header-icon {
    icon-size: 32px;
 }
@ -649,6 +567,11 @@ StScrollBar StButton#vhandle:active {
    app-icon-bottom-clip: 2px;
 }

+.app-menu-icon {
+    width: 24px;
+    height: 24px;
+}
+
 .panel-button {
    -natural-hpadding: 12px;
    -minimum-hpadding: 6px;
@ -732,7 +655,7 @@ StScrollBar StButton#vhandle:active {
    color: #e6e6e6;
    border-radius: 32px; /* wish we could do 50% */
    padding: 13px;
-    border: 2px solid #5f5f5f; /* using rgba() is flaky unfortunately */
+    border: 1px solid #5f5f5f; /* using rgba() is flaky unfortunately */
 }

 .system-menu-action:hover,
@ -740,7 +663,7 @@ StScrollBar StButton#vhandle:active {
    color: white;
    background-color: #4c4c4c;
    border: none;
-    padding: 15px;
+    padding: 14px;
 }

 .system-menu-action:active {
@ -1041,8 +964,6 @@ StScrollBar StButton#vhandle:active {

 .app-folder-icon {
    padding: 5px;
-    spacing-rows: 5px;
-    spacing-columns: 5px;
 }

 .dash-item-container > StButton {
@ -1219,6 +1140,11 @@ StScrollBar StButton#vhandle:active {
    text-shadow: black 0px 2px 2px;
 }

+#LookingGlassDialog .lg-inspector-title {
+    font-weight: bold;
+    padding-bottom: 8px;
+}
+
 .lg-dialog StEntry {
    selection-background-color: #bbbbbb;
    selected-color: #333333;
@ -1298,6 +1224,10 @@ StScrollBar StButton#vhandle:active {
    width: 0.3em;
 }

+#calendarPopup .calendar {
+    padding: 10px;
+}
+
 .calendar {
    padding: .4em 1.75em .8em 1.75em;
    spacing-rows: 0px;
@ -1359,18 +1289,12 @@ StScrollBar StButton#vhandle:active {
    font-weight: bold;
    text-align: center;
    color: #eeeeec;
-    border-radius: 4px;
 }

-.datemenu-date-label:hover,
 .datemenu-date-label:focus {
    background-color: #999999;
 }

-.datemenu-date-label:active {
-    background-color: #aaaaaa;
-}
-
 .calendar-day-base {
    font-size: 9pt;
    text-align: center;
@ -1529,10 +1453,6 @@ StScrollBar StButton#vhandle:active {
    color: #999999;
 }

-.no-networks-box {
-    spacing: 12px;
-}
-
 .notification {
    border-radius: 10px 10px 0px 0px;
    background: rgba(0,0,0,0.9);
@ -1710,8 +1630,8 @@ StScrollBar StButton#vhandle:active {
    color: #888888;
 }

-.chat-empty-line {
-    font-size: 4px;
+.chat-group-sent, .chat-group-meta {
+    padding: 8px 0;
 }

 .chat-received {
@ -1736,7 +1656,6 @@ StScrollBar StButton#vhandle:active {
 .chat-meta-message {
    padding-left: 4px;
    font-size: 9pt;
-    font-weight: bold;
    color: #bbbbbb;
 }

@ -1826,6 +1745,26 @@ StScrollBar StButton#vhandle:active {
    spacing: 8px;
 }

+.thumbnail-scroll-gradient-left {
+    background-gradient-direction: horizontal;
+    background-gradient-start: rgba(51, 51, 51, 1.0);
+    background-gradient-end: rgba(51, 51, 51, 0);
+    border-radius: 24px;
+    border-radius-topright: 0px;
+    border-radius-bottomright: 0px;
+    width: 60px;
+}
+
+.thumbnail-scroll-gradient-right {
+    background-gradient-direction: horizontal;
+    background-gradient-start: rgba(51, 51, 51, 0);
+    background-gradient-end: rgba(51, 51, 51, 1.0);
+    border-radius: 24px;
+    border-radius-topleft: 0px;
+    border-radius-bottomleft: 0px;
+    width: 60px;
+}
+
 .switcher-list .item-box {
    padding: 8px;
    border-radius: 8px;
@ -1918,27 +1857,6 @@ StScrollBar StButton#vhandle:active {
    border-radius: 8px;
 }

-/* Tile previews */
-.tile-preview {
-    background-color: rgba(74, 144, 217, 0.35);
-    border: 1px solid #4a90d9; /* Adwaita selected bg color */
-}
-
-.tile-preview-left.on-primary {
-    /* keep in sync with -panel-corner-radius */
-    border-radius: 6px 0 0 0;
-}
-
-.tile-preview-right.on-primary {
-    /* keep in sync with -panel-corner-radius */
-    border-radius: 0 6px 0 0;
-}
-
-.tile-preview-left.tile-preview-right.on-primary {
-    /* keep in sync with -panel-corner-radius */
-    border-radius: 6px 6px 0 0;
-}
-
 /* Modal Dialogs */

 /* Dialog Subject Text Style */
@ -2009,57 +1927,45 @@ StScrollBar StButton#vhandle:active {
    padding-top: 20px;
 }

-.end-session-dialog-layout {
+.end-session-dialog-subject {
    padding-left: 17px;
+    padding-bottom: 20px;
 }

-.end-session-dialog-layout:rtl {
+.end-session-dialog-subject:rtl {
+    padding-left: 0px;
    padding-right: 17px;
 }

 .end-session-dialog-description {
+    padding-left: 17px;
    width: 28em;
-    padding-bottom: 10px;
 }

 .end-session-dialog-description:rtl {
-    width: 28em;
-    padding-bottom: 10px;
-    text-align: right;
-}
-
-.end-session-dialog-warning {
-    width: 28em;
-    color: #f57900;
-    padding-top: 6px;
-}
-
-.end-session-dialog-warning:rtl {
-    width: 28em;
-    color: #f57900;
-    padding-top: 6px;
+    padding-right: 17px;
    text-align: right;
 }

 .end-session-dialog-logout-icon {
    border: 2px solid #8b8b8b;
    border-radius: 5px;
-    width: 48px;
-    height: 48px;
+    width: 32px;
+    height: 32px;
    background-size: contain;
 }

 .end-session-dialog-shutdown-icon {
    color: #bebebe;
-    width: 48px;
-    height: 48px;
+    width: 32px;
+    height: 32px;
 }

 .end-session-dialog-inhibitor-layout {
    spacing: 16px;
    max-height: 200px;
-    padding-right: 65px;
-    padding-left: 65px;
+    padding-right: 50px;
+    padding-left: 50px;
 }

 .end-session-dialog-session-list,
@ -2095,6 +2001,10 @@ StScrollBar StButton#vhandle:active {
    icon-size: 48px;
 }

+.mount-password-reask {
+    color: red;
+}
+
 .show-processes-dialog,
 .mount-question-dialog {
    spacing: 24px;
@ -2390,6 +2300,13 @@ StScrollBar StButton#vhandle:active {
    padding-bottom: 1em;
 }

+.login-dialog-title {
+    font-size: 14pt;
+    font-weight: bold;
+    color: #666666;
+    padding-bottom: 2em;
+}
+
 .login-dialog {
    /* Reset border and background */
    border: none;
@ -2438,6 +2355,10 @@ StScrollBar StButton#vhandle:active {
    background-size: contain;
 }

+.login-dialog-user-list-item-text-box {
+    padding: 0 0.5em;
+}
+
 .login-dialog-user-list-item .login-dialog-timed-login-indicator {
    background-color: rgba(0,0,0,0.0);
    height: 2px;
@ -2467,13 +2388,12 @@ StScrollBar StButton#vhandle:active {
    color: #E8E8E8;
 }

-.login-dialog-username,
-.user-widget-label {
+.login-dialog-username {
    font-size: 16pt;
    font-weight: bold;
    text-align: left;
    padding-left: 15px;
-    text-shadow: rgba(0, 0, 0, 0.5) 0px 2px 1px 0px;
+    text-shadow: black 0px 4px 3px 0px;
 }

 .login-dialog-prompt-layout {
@ -2565,6 +2485,11 @@ StScrollBar StButton#vhandle:active {
 }

 .user-widget-label {
+    font-size: 20px;
+    font-weight: bold;
+    text-align: left;
+    color:white;
+    text-shadow: black 0px 4px 3px 0px;
 }

 .user-widget-label:ltr {
@ -2587,7 +2512,7 @@ StScrollBar StButton#vhandle:active {
    box-shadow: 0px 4px 8px rgba(0,0,0,0.9);
 }

-#lockDialogGroup {
+#systemGroup {
    background: #2e3436 url(noise-texture.png);
    background-repeat: repeat;
 }
--- a/data/theme/menu-arrow-symbolic.svg
+++ b/data/theme/menu-arrow-symbolic.svg
@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3863"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="menu-arrow.svg">
-  <defs
-     id="defs3865" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.836083"
-     inkscape:cx="-3.1641676"
-     inkscape:cy="11.823817"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="702"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true">
-    <sodipodi:guide
-       orientation="1,0"
-       position="15.996443,16.922964"
-       id="guide3873" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="28.041217,3.1256134"
-       id="guide3875" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-0.80372916,24.469088"
-       id="guide3877" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="3.0363102,34.649657"
-       id="guide3879" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="29.023553,28.577037"
-       id="guide3881" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid2988" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3868">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-16)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 4,23 8,0 -4,5 z"
-       id="path3883"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
--- a/gnome-shell.doap
+++ b/gnome-shell.doap
@ -17,15 +17,17 @@ packages. If you are interested in building GNOME Shell from source,
 we would recommend building from version control using the build
 script described at:

- https://wiki.gnome.org/Projects/GnomeShell
+ http://live.gnome.org/GnomeShell

 Not only will that give you the very latest version of this rapidly
 changing project, it will be much easier than get GNOME Shell and
 its dependencies to build from tarballs.</description>
-  <homepage rdf:resource="https://wiki.gnome.org/Projects/GnomeShell" />
+  <!--
+  <homepage rdf:resource="http://live.gnome.org/GnomeShell" />
+  -->
  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
  <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell/" />
-  <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=gnome-shell" />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell" />

  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />

--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -6,7 +6,6 @@ misc/config.js: misc/config.js.in Makefile
 	sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
 	    -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
 	    -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
-	    -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
 	    -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
 	    -e "s|[@]datadir@|$(datadir)|g" \
 	    -e "s|[@]libexecdir@|$(libexecdir)|g" \
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@ -23,11 +23,6 @@ const GnomeShellIface = '<node> \
 </interface> \
 </node>';

-const customCss = '.prefs-button { \
-                       padding: 8px; \
-                       border-radius: 20px; \
-                   }';
-
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);

 function stripPrefix(string, prefix) {
@ -51,9 +46,13 @@ const Application = new Lang.Class({

        this._extensionPrefsModules = {};

+        this._extensionIters = {};
        this._startupUuid = null;
-        this._loaded = false;
-        this._skipMainWindow = false;
+    },
+
+    _buildModel: function() {
+        this._model = new Gtk.ListStore();
+        this._model.set_column_types([GObject.TYPE_STRING, GObject.TYPE_STRING]);
    },

    _extensionAvailable: function(uuid) {
@ -71,6 +70,11 @@ const Application = new Lang.Class({
        return true;
    },

+    _setExtensionInsensitive: function(layout, cell, model, iter, data) {
+        let uuid = model.get_value(iter, 0);
+        cell.set_sensitive(this._extensionAvailable(uuid));
+    },
+
    _getExtensionPrefsModule: function(extension) {
        let uuid = extension.metadata.uuid;

@ -100,23 +104,21 @@ const Application = new Lang.Class({
            widget = this._buildErrorUI(extension, e);
        }

-        let dialog = new Gtk.Dialog({ use_header_bar: true,
-                                      modal: true,
-                                      title: extension.metadata.name });
+        // Destroy the current prefs widget, if it exists
+        if (this._extensionPrefsBin.get_child())
+            this._extensionPrefsBin.get_child().destroy();

-        if (this._skipMainWindow) {
-            this.application.add_window(dialog);
-            if (this._window)
-                this._window.destroy();
-            this._window = dialog;
-            this._window.window_position = Gtk.WindowPosition.CENTER;
-        } else {
-            dialog.transient_for = this._window;
-        }
+        this._extensionPrefsBin.add(widget);
+        this._extensionSelector.set_active_iter(this._extensionIters[uuid]);
+    },

-        dialog.set_default_size(600, 400);
-        dialog.get_content_area().add(widget);
-        dialog.show();
+    _extensionSelected: function() {
+        let [success, iter] = this._extensionSelector.get_active_iter();
+        if (!success)
+            return;
+
+        let uuid = this._model.get_value(iter, 0);
+        this._selectExtension(uuid);
    },

    _buildErrorUI: function(extension, exc) {
@ -149,26 +151,48 @@ const Application = new Lang.Class({

    _buildUI: function(app) {
        this._window = new Gtk.ApplicationWindow({ application: app,
-                                                   window_position: Gtk.WindowPosition.CENTER });
+                                                   window_position: Gtk.WindowPosition.CENTER,
+                                                   title: _("GNOME Shell Extension Preferences") });

-        this._window.set_size_request(800, 500);
+        this._window.set_size_request(600, 400);

-        this._titlebar = new Gtk.HeaderBar({ show_close_button: true,
-                                             title: _("GNOME Shell Extensions") });
-        this._window.set_titlebar(this._titlebar);
+        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
+        this._window.add(vbox);

-        let scroll = new Gtk.ScrolledWindow({ hscrollbar_policy: Gtk.PolicyType.NEVER,
-                                              shadow_type: Gtk.ShadowType.IN,
-                                              halign: Gtk.Align.CENTER,
-                                              margin: 18 });
-        this._window.add(scroll);
+        let toolbar = new Gtk.Toolbar();
+        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_PRIMARY_TOOLBAR);
+        vbox.add(toolbar);
+        let toolitem;

-        this._extensionSelector = new Gtk.ListBox({ selection_mode: Gtk.SelectionMode.NONE });
-        this._extensionSelector.set_sort_func(Lang.bind(this, this._sortList));
-        this._extensionSelector.set_header_func(Lang.bind(this, this._updateHeader));
+        let label = new Gtk.Label({ label: '<b>' + _("Extension") + '</b>',
+                                    use_markup: true });
+        toolitem = new Gtk.ToolItem({ child: label });
+        toolbar.add(toolitem);

-        scroll.add(this._extensionSelector);
+        this._extensionSelector = new Gtk.ComboBox({ model: this._model,
+                                                     margin_left: 8,
+                                                     hexpand: true });
+        this._extensionSelector.get_style_context().add_class(Gtk.STYLE_CLASS_RAISED);

+        let renderer = new Gtk.CellRendererText();
+        this._extensionSelector.pack_start(renderer, true);
+        this._extensionSelector.add_attribute(renderer, 'text', 1);
+        this._extensionSelector.set_cell_data_func(renderer, Lang.bind(this, this._setExtensionInsensitive));
+        this._extensionSelector.connect('changed', Lang.bind(this, this._extensionSelected));
+
+        toolitem = new Gtk.ToolItem({ child: this._extensionSelector });
+        toolitem.set_expand(true);
+        toolbar.add(toolitem);
+
+        this._extensionPrefsBin = new Gtk.Frame();
+        vbox.add(this._extensionPrefsBin);
+
+        let label = new Gtk.Label({
+            label: _("Select an extension to configure using the combobox above."),
+            vexpand: true
+        });
+
+        this._extensionPrefsBin.add(label);

        this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
        this._shellProxy.connectSignal('ExtensionStatusChanged', Lang.bind(this, function(proxy, senderName, [uuid, state, error]) {
@ -179,35 +203,6 @@ 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;
-        return name1.localeCompare(name2);
-    },
-
-    _updateHeader: function(row, before) {
-        if (!before || row.get_header())
-            return;
-
-        let sep = new Gtk.Separator({ orientation: Gtk.Orientation.HORIZONTAL });
-        row.set_header(sep);
-    },
-
    _scanExtensions: function() {
        let finder = new ExtensionUtils.ExtensionFinder();
        finder.connect('extension-found', Lang.bind(this, this._extensionFound));
@ -216,24 +211,15 @@ const Application = new Lang.Class({
    },

    _extensionFound: function(finder, extension) {
-        let row = new ExtensionRow(extension.uuid);
-
-        row.prefsButton.visible = this._extensionAvailable(row.uuid);
-        row.prefsButton.connect('clicked', Lang.bind(this,
-            function() {
-                this._selectExtension(row.uuid);
-            }));
-
-        row.show_all();
-        this._extensionSelector.add(row);
+        let iter = this._model.append();
+        this._model.set(iter, [0, 1], [extension.uuid, extension.metadata.name]);
+        this._extensionIters[extension.uuid] = iter;
    },

    _extensionsLoaded: function() {
        if (this._startupUuid && this._extensionAvailable(this._startupUuid))
            this._selectExtension(this._startupUuid);
        this._startupUuid = null;
-        this._skipMainWindow = false;
-        this._loaded = true;
    },

    _onActivate: function() {
@ -241,125 +227,29 @@ const Application = new Lang.Class({
    },

    _onStartup: function(app) {
+        this._buildModel();
        this._buildUI(app);
-        this._addCustomStyle();
        this._scanExtensions();
    },

    _onCommandLine: function(app, commandLine) {
        app.activate();
        let args = commandLine.get_arguments();
-
        if (args.length) {
            let uuid = args[0];

-            this._skipMainWindow = true;
-
            // Strip off "extension:///" prefix which fakes a URI, if it exists
            uuid = stripPrefix(uuid, "extension:///");

            if (this._extensionAvailable(uuid))
                this._selectExtension(uuid);
-            else if (!this._loaded)
-                this._startupUuid = uuid;
            else
-                this._skipMainWindow = false;
+                this._startupUuid = uuid;
        }
        return 0;
    }
 });

-const ExtensionRow = new Lang.Class({
-    Name: 'ExtensionRow',
-    Extends: Gtk.ListBoxRow,
-
-    _init: function(uuid) {
-        this.parent();
-
-        this.uuid = uuid;
-
-        this._settings = new Gio.Settings({ schema: 'org.gnome.shell' });
-        this._settings.connect('changed::enabled-extensions', Lang.bind(this,
-            function() {
-                this._switch.state = this._isEnabled();
-            }));
-
-        this._buildUI();
-    },
-
-    _buildUI: function() {
-        let extension = ExtensionUtils.extensions[this.uuid];
-
-        let hbox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL,
-                                 hexpand: true, margin: 12, spacing: 6 });
-        this.add(hbox);
-
-        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL,
-                                 spacing: 6, hexpand: true });
-        hbox.add(vbox);
-
-        let name = GLib.markup_escape_text(extension.metadata.name, -1);
-        let label = new Gtk.Label({ label: '<b>' + name + '</b>',
-                                    use_markup: true,
-                                    halign: Gtk.Align.START });
-        vbox.add(label);
-
-        let desc = extension.metadata.description.split('\n')[0];
-        label = new Gtk.Label({ label: desc,
-                                ellipsize: Pango.EllipsizeMode.END,
-                                halign: Gtk.Align.START });
-        vbox.add(label);
-
-        let button = new Gtk.Button({ valign: Gtk.Align.CENTER,
-                                      no_show_all: true });
-        button.add(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
-                                   icon_size: Gtk.IconSize.BUTTON,
-                                   visible: true }));
-        button.get_style_context().add_class('prefs-button');
-        hbox.add(button);
-
-        this.prefsButton = button;
-
-        this._switch = new Gtk.Switch({ valign: Gtk.Align.CENTER,
-                                        state: this._isEnabled() });
-        this._switch.connect('notify::active', Lang.bind(this,
-            function() {
-                if (this._switch.active)
-                    this._enable();
-                else
-                    this._disable();
-            }));
-        this._switch.connect('state-set', function() { return true; });
-        hbox.add(this._switch);
-    },
-
-    _isEnabled: function() {
-        let extensions = this._settings.get_strv('enabled-extensions');
-        return extensions.indexOf(this.uuid) != -1;
-    },
-
-    _enable: function() {
-        let extensions = this._settings.get_strv('enabled-extensions');
-        if (extensions.indexOf(this.uuid) != -1)
-            return;
-
-        extensions.push(this.uuid);
-        this._settings.set_strv('enabled-extensions', extensions);
-    },
-
-    _disable: function() {
-        let extensions = this._settings.get_strv('enabled-extensions');
-        let pos = extensions.indexOf(this.uuid);
-        if (pos == -1)
-            return;
-        do {
-            extensions.splice(pos, 1);
-            pos = extensions.indexOf(this.uuid);
-        } while (pos != -1);
-        this._settings.set_strv('enabled-extensions', extensions);
-    }
-});
-
 function initEnvironment() {
    // Monkey-patch in a "global" object that fakes some Shell utilities
    // that ExtensionUtils depends on.
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@ -450,7 +450,8 @@ const AuthPrompt = new Lang.Class({
            // respond to the request with the username
            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
        } else if (this._userVerifier.serviceIsForeground(GdmUtil.OVIRT_SERVICE_NAME) ||
-                   this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME)) {
+                   (this.smartcardDetected &&
+                    this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME))) {
            // We don't need to know the username if the user preempted the login screen
            // with a smartcard or with preauthenticated oVirt credentials
            beginRequestType = BeginRequestType.DONT_PROVIDE_USERNAME;
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -36,7 +36,6 @@ const BoxPointer = imports.ui.boxpointer;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const GdmUtil = imports.gdm.util;
 const Layout = imports.ui.layout;
-const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const Realmd = imports.gdm.realmd;
@ -275,7 +274,7 @@ const SessionMenuButton = new Lang.Class({
        this.actor = new St.Bin({ child: this._button });

        this._menu = new PopupMenu.PopupMenu(this._button, 0, St.Side.TOP);
-        Main.uiGroup.add_actor(this._menu.actor);
+        Main.layoutManager.menuGroup.add_actor(this._menu.actor);
        this._menu.actor.hide();

        this._menu.connect('open-state-changed',
@ -470,20 +469,7 @@ const LoginDialog = new Lang.Class({
        this._sessionMenuButton.actor.show();
        this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton.actor);

-        this._disableUserList = undefined;
-        this._userListLoaded = false;
-
-        LoginManager.getLoginManager().getCurrentSessionProxy(Lang.bind(this, this._gotGreeterSessionProxy));
-
-        // If the user list is enabled, it should take key focus; make sure the
-        // screen shield is initialized first to prevent it from stealing the
-        // focus later
-        Main.layoutManager.connect('startup-complete',
-                                   Lang.bind(this, this._updateDisableUserList));
-    },
-
-    _ensureUserListLoaded: function() {
-        if (!this._userManager.is_loaded) {
+        if (!this._userManager.is_loaded)
            this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',
                                                                  Lang.bind(this, function() {
                                                                      if (this._userManager.is_loaded) {
@ -492,11 +478,10 @@ const LoginDialog = new Lang.Class({
                                                                          this._userManagerLoadedId = 0;
                                                                      }
                                                                  }));
-        } else {
-            let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, this._loadUserList));
-            GLib.Source.set_name_by_id(id, '[gnome-shell] _loadUserList');
-        }
-    },
+        else
+            GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, this._loadUserList));
+
+   },

    _updateDisableUserList: function() {
        let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);
@ -539,12 +524,9 @@ const LoginDialog = new Lang.Class({
            return;

        this._logoBin.destroy_all_children();
-        if (this._logoFileUri) {
-            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        if (this._logoFileUri)
            this._logoBin.add_child(this._textureCache.load_uri_async(this._logoFileUri,
-                                                                      -1, _LOGO_ICON_HEIGHT,
-                                                                      scaleFactor));
-        }
+                                                                      -1, _LOGO_ICON_HEIGHT));
    },

    _updateLogo: function() {
@ -643,36 +625,6 @@ const LoginDialog = new Lang.Class({
        this._showPrompt();
    },

-    _loginScreenSessionActivated: function() {
-        if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            return;
-
-        Tweener.addTween(this.actor,
-                         { opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onUpdate: function() {
-                               let children = Main.layoutManager.uiGroup.get_children();
-
-                               for (let i = 0; i < children.length; i++) {
-                                   if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.actor.opacity;
-                               }
-                           },
-                           onUpdateScope: this,
-                           onComplete: function() {
-                               this._authPrompt.reset();
-                           },
-                           onCompleteScope: this });
-    },
-
-    _gotGreeterSessionProxy: function(proxy) {
-        proxy.connect('g-properties-changed', Lang.bind(this, function() {
-            if (proxy.Active)
-                this._loginScreenSessionActivated();
-        }));
-    },
-
    _startSession: function(serviceName) {
        Tweener.addTween(this.actor,
                         { opacity: 0,
@ -688,11 +640,10 @@ const LoginDialog = new Lang.Class({
                           },
                           onUpdateScope: this,
                           onComplete: function() {
-                               let id = Mainloop.idle_add(Lang.bind(this, function() {
+                               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 });
    },
@ -748,7 +699,6 @@ const LoginDialog = new Lang.Class({
                                                                         hold.release();
                                                                         return GLib.SOURCE_REMOVE;
                                                                     });
-        GLib.Source.set_name_by_id(this._timedLoginIdleTimeOutId, '[gnome-shell] this._timedLoginAnimationTime');
        return hold;
    },

@ -851,7 +801,6 @@ const LoginDialog = new Lang.Class({
    },

    _showUserList: function() {
-        this._ensureUserListLoaded();
        this._authPrompt.hide();
        this._sessionMenuButton.close();
        this._setUserListExpanded(true);
@ -895,17 +844,14 @@ const LoginDialog = new Lang.Class({
    },

    _loadUserList: function() {
-        if (this._userListLoaded)
-            return GLib.SOURCE_REMOVE;
-
-        this._userListLoaded = true;
-
        let users = this._userManager.list_users();

        for (let i = 0; i < users.length; i++) {
            this._userList.addUser(users[i]);
        }

+        this._updateDisableUserList();
+
        this._userManager.connect('user-added',
                                  Lang.bind(this, function(userManager, user) {
                                      this._userList.addUser(user);
@ -915,8 +861,6 @@ const LoginDialog = new Lang.Class({
                                  Lang.bind(this, function(userManager, user) {
                                      this._userList.removeUser(user);
                                  }));
-
-        return GLib.SOURCE_REMOVE;
    },

    open: function() {
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@ -252,7 +252,6 @@ const ShellUserVerifier = new Lang.Class({
                                                           this._queueMessageTimeout();
                                                           return GLib.SOURCE_REMOVE;
                                                       }));
-        GLib.Source.set_name_by_id(this._messageQueueTimeoutId, '[gnome-shell] this._queueMessageTimeout');
    },

    _queueMessage: function(message, messageType) {
@ -299,7 +298,7 @@ const ShellUserVerifier = new Lang.Class({

        if (!this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY))
            smartcardDetected = false;
-        else if (this._reauthOnly)
+        else if (this.reauthenticating)
            smartcardDetected = this._smartcardManager.hasInsertedLoginToken();
        else
            smartcardDetected = this._smartcardManager.hasInsertedTokens();
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@ -84,7 +84,6 @@
    <file>ui/userWidget.js</file>
    <file>ui/viewSelector.js</file>
    <file>ui/windowAttentionHandler.js</file>
-    <file>ui/windowMenu.js</file>
    <file>ui/windowManager.js</file>
    <file>ui/workspace.js</file>
    <file>ui/workspaceSwitcherPopup.js</file>
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@ -6,8 +6,6 @@ const PACKAGE_NAME = '@PACKAGE_NAME@';
 const PACKAGE_VERSION = '@PACKAGE_VERSION@';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-/* 1 if networkmanager is available, 0 otherwise */
-const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
 /* gettext package */
 const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
 /* locale dir */
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@ -39,13 +39,38 @@ const SystemdLoginSessionIface = '<node> \
 <interface name="org.freedesktop.login1.Session"> \
 <signal name="Lock" /> \
 <signal name="Unlock" /> \
-<property name="Active" type="b" access="read" /> \
 </interface> \
 </node>';

 const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
 const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);

+const ConsoleKitManagerIface = '<node> \
+<interface name="org.freedesktop.ConsoleKit.Manager"> \
+<method name="CanRestart"> \
+    <arg type="b" direction="out"/> \
+</method> \
+<method name="CanStop"> \
+    <arg type="b" direction="out"/> \
+</method> \
+<method name="Restart" /> \
+<method name="Stop" /> \
+<method name="GetCurrentSession"> \
+    <arg type="o" direction="out" /> \
+</method> \
+</interface> \
+</node>';
+
+const ConsoleKitSessionIface = '<node> \
+<interface name="org.freedesktop.ConsoleKit.Session"> \
+<signal name="Lock" /> \
+<signal name="Unlock" /> \
+</interface> \
+</node>';
+
+const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
+const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
+
 function haveSystemd() {
    return GLib.access("/run/systemd/seats", 0) >= 0;
 }
@ -75,7 +100,7 @@ function canLock() {
                                               -1, null);

        let version = result.deep_unpack()[0].deep_unpack();
-        return haveSystemd() && versionCompare('3.5.91', version);
+        return versionCompare('3.5.91', version);
    } catch(e) {
        return false;
    }
@ -93,7 +118,7 @@ function getLoginManager() {
        if (haveSystemd())
            _loginManager = new LoginManagerSystemd();
        else
-            _loginManager = new LoginManagerDummy();
+            _loginManager = new LoginManagerConsoleKit();
    }

    return _loginManager;
@ -110,6 +135,9 @@ const LoginManagerSystemd = new Lang.Class({
                                  Lang.bind(this, this._prepareForSleep));
    },

+    // Having this function is a bit of a hack since the Systemd and ConsoleKit
+    // session objects have different interfaces - but in both cases there are
+    // Lock/Unlock signals, and that's all we count upon at the moment.
    getCurrentSessionProxy: function(callback) {
        if (this._currentSession) {
            callback (this._currentSession);
@ -162,7 +190,7 @@ const LoginManagerSystemd = new Lang.Class({
                let fd = -1;
                try {
                    let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
-                    fd = fdList.steal_fds()[0];
+                    fd = fdList.steal_fds(outVariant.deep_unpack())[0];
                    callback(new Gio.UnixInputStream({ fd: fd }));
                } catch(e) {
                    logError(e, "Error getting systemd inhibitor");
@ -177,13 +205,35 @@ const LoginManagerSystemd = new Lang.Class({
 });
 Signals.addSignalMethods(LoginManagerSystemd.prototype);

-const LoginManagerDummy = new Lang.Class({
-    Name: 'LoginManagerDummy',
+const LoginManagerConsoleKit = new Lang.Class({
+    Name: 'LoginManagerConsoleKit',

+    _init: function() {
+        this._proxy = new ConsoleKitManager(Gio.DBus.system,
+                                            'org.freedesktop.ConsoleKit',
+                                            '/org/freedesktop/ConsoleKit/Manager');
+    },
+
+    // Having this function is a bit of a hack since the Systemd and ConsoleKit
+    // session objects have different interfaces - but in both cases there are
+    // Lock/Unlock signals, and that's all we count upon at the moment.
    getCurrentSessionProxy: function(callback) {
-        // we could return a DummySession object that fakes whatever callers
-        // expect (at the time of writing: connect() and connectSignal()
-        // methods), but just never calling the callback should be safer
+        if (this._currentSession) {
+            callback (this._currentSession);
+            return;
+        }
+
+        this._proxy.GetCurrentSessionRemote(Lang.bind(this,
+            function(result, error) {
+                if (error) {
+                    logError(error, 'Could not get a proxy for the current session');
+                } else {
+                    this._currentSession = new ConsoleKitSession(Gio.DBus.system,
+                                                                 'org.freedesktop.ConsoleKit',
+                                                                 result[0]);
+                    callback(this._currentSession);
+                }
+            }));
    },

    canSuspend: function(asyncCallback) {
@ -203,4 +253,4 @@ const LoginManagerDummy = new Lang.Class({
        callback(null);
    }
 });
-Signals.addSignalMethods(LoginManagerDummy.prototype);
+Signals.addSignalMethods(LoginManagerConsoleKit.prototype);
--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -129,7 +129,7 @@ function trySpawn(argv)
    // Dummy child watch; we don't want to double-fork internally
    // because then we lose the parent-child relationship, which
    // can break polkit.  See https://bugzilla.redhat.com//show_bug.cgi?id=819275
-    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function () {});
+    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function () {}, null);
 }

 // trySpawnCommandLine:
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -24,7 +24,7 @@ const WINDOW_PREVIEW_SIZE = 128;
 const APP_ICON_SIZE = 96;
 const APP_ICON_SIZE_SMALL = 48;

-const baseIconSizes = [96, 64, 48, 32, 22];
+const iconSizes = [96, 64, 48, 32, 22];

 const AppIconMode = {
    THUMBNAIL_ONLY: 1,
@ -167,8 +167,6 @@ const AppSwitcherPopup = new Lang.Class({
                this._select(this._selectedIndex, this._nextWindow());
            else if (keysym == Clutter.Up)
                this._select(this._selectedIndex, null, true);
-            else
-                return Clutter.EVENT_PROPAGATE;
        } else {
            if (keysym == Clutter.Left)
                this._select(this._previous());
@ -176,11 +174,7 @@ const AppSwitcherPopup = new Lang.Class({
                this._select(this._next());
            else if (keysym == Clutter.Down)
                this._select(this._selectedIndex, 0);
-            else
-                return Clutter.EVENT_PROPAGATE;
        }
-
-        return Clutter.EVENT_STOP;
    },

    _scrollHandler: function(direction) {
@ -311,7 +305,6 @@ const AppSwitcherPopup = new Lang.Class({
            this._thumbnailTimeoutId = Mainloop.timeout_add (
                THUMBNAIL_POPUP_TIME,
                Lang.bind(this, this._timeoutPopupThumbnails));
-            GLib.Source.set_name_by_id(this._thumbnailTimeoutId, '[gnome-shell] this._timeoutPopupThumbnails');
        }
    },

@ -410,11 +403,7 @@ const WindowSwitcherPopup = new Lang.Class({
                this._select(this._previous());
            else if (keysym == Clutter.Right)
                this._select(this._next());
-            else
-                return Clutter.EVENT_PROPAGATE;
        }
-
-        return Clutter.EVENT_STOP;
    },

    _finish: function() {
@ -441,6 +430,7 @@ const AppIcon = new Lang.Class({

    set_size: function(size) {
        this.icon = this.app.create_icon_texture(size);
+        this._iconBin.set_size(size, size);
        this._iconBin.child = this.icon;
    }
 });
@ -489,13 +479,12 @@ const AppSwitcher = new Lang.Class({
            Mainloop.source_remove(this._mouseTimeOutId);
    },

-    _setIconSize: function() {
+    _getPreferredHeight: function (actor, forWidth, alloc) {
        let j = 0;
        while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
                j++;
        }
        let themeNode = this._items[j].get_theme_node();
-
        let iconPadding = themeNode.get_horizontal_padding();
        let iconBorder = themeNode.get_border_width(St.Side.LEFT) + themeNode.get_border_width(St.Side.RIGHT);
        let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
@ -506,22 +495,19 @@ const AppSwitcher = new Lang.Class({
        let primary = Main.layoutManager.primaryMonitor;
        let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
        let availWidth = primary.width - parentPadding - this.actor.get_theme_node().get_horizontal_padding();
+        let height = 0;

-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        let iconSizes = baseIconSizes.map(function(s) {
-            return s * scaleFactor;
-        });
-
-        if (this._items.length == 1) {
-            this._iconSize = baseIconSizes[0];
-        } else {
-            for(let i =  0; i < baseIconSizes.length; i++) {
-                this._iconSize = baseIconSizes[i];
-                let height = iconSizes[i] + iconSpacing;
+        for(let i =  0; i < iconSizes.length; i++) {
+                this._iconSize = iconSizes[i];
+                height = iconSizes[i] + iconSpacing;
                let w = height * this._items.length + totalSpacing;
                if (w <= availWidth)
-                    break;
-            }
+                        break;
+        }
+
+        if (this._items.length == 1) {
+            this._iconSize = iconSizes[0];
+            height = iconSizes[0] + iconSpacing;
        }

        for(let i = 0; i < this.icons.length; i++) {
@ -529,11 +515,9 @@ const AppSwitcher = new Lang.Class({
                break;
            this.icons[i].set_size(this._iconSize);
        }
-    },

-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        this._setIconSize();
-        this.parent(actor, forWidth, alloc);
+        alloc.min_size = height;
+        alloc.natural_size = height;
    },

    _allocate: function (actor, box, flags) {
@ -567,7 +551,6 @@ const AppSwitcher = new Lang.Class({
                                                                            this._mouseTimeOutId = 0;
                                                                            return GLib.SOURCE_REMOVE;
                                                        }));
-            GLib.Source.set_name_by_id(this._mouseTimeOutId, '[gnome-shell] this._enterItem');
        } else
           this._itemEntered(index);
    },
@ -667,19 +650,17 @@ const ThumbnailList = new Lang.Class({
        totalPadding += this.actor.get_theme_node().get_horizontal_padding() + this.actor.get_theme_node().get_vertical_padding();
        let [labelMinHeight, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
        let spacing = this._items[0].child.get_theme_node().get_length('spacing');
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        let thumbnailSize = THUMBNAIL_DEFAULT_SIZE * scaleFactor;

-        availHeight = Math.min(availHeight - labelNaturalHeight - totalPadding - spacing, thumbnailSize);
+        availHeight = Math.min(availHeight - labelNaturalHeight - totalPadding - spacing, THUMBNAIL_DEFAULT_SIZE);
        let binHeight = availHeight + this._items[0].get_theme_node().get_vertical_padding() + this.actor.get_theme_node().get_vertical_padding() - spacing;
-        binHeight = Math.min(thumbnailSize, binHeight);
+        binHeight = Math.min(THUMBNAIL_DEFAULT_SIZE, binHeight);

        for (let i = 0; i < this._thumbnailBins.length; i++) {
            let mutterWindow = this._windows[i].get_compositor_private();
            if (!mutterWindow)
                continue;

-            let clone = _createWindowClone(mutterWindow, thumbnailSize);
+            let clone = _createWindowClone(mutterWindow, THUMBNAIL_DEFAULT_SIZE);
            this._thumbnailBins[i].set_height(binHeight);
            this._thumbnailBins[i].add_actor(clone);
            this._clones.push(clone);
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@ -21,9 +21,7 @@ const Animation = new Lang.Class({
        this._isPlaying = false;
        this._timeoutId = 0;
        this._frame = 0;
-
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height, scaleFactor,
+        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
                                                                            Lang.bind(this, this._animationsLoaded));
        this.actor.set_child(this._animations);
    },
@ -34,7 +32,6 @@ const Animation = new Lang.Class({
                this._showFrame(0);

            this._timeoutId = Mainloop.timeout_add(this._speed, Lang.bind(this, this._update));
-            GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._update');
        }

        this._isPlaying = true;
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -41,12 +41,11 @@ const MIN_FREQUENT_APPS_COUNT = 3;
 const INDICATORS_BASE_TIME = 0.25;
 const INDICATORS_ANIMATION_DELAY = 0.125;
 const INDICATORS_ANIMATION_MAX_TIME = 0.75;
-
+// Fraction of page height the finger or mouse must reach
+// to change page
+const PAGE_SWITCH_TRESHOLD = 0.2;
 const PAGE_SWITCH_TIME = 0.3;

-const VIEWS_SWITCH_TIME = 0.4;
-const VIEWS_SWITCH_ANIMATION_DELAY = 0.1;
-
 function _getCategories(info) {
    let categoriesStr = info.get_categories();
    if (!categoriesStr)
@ -54,6 +53,14 @@ function _getCategories(info) {
    return categoriesStr.split(';');
 }

+function _isTerminal(app) {
+    let info = app.get_app_info();
+    if (!info)
+        return false;
+    let categories = _getCategories(info);
+    return categories.indexOf('TerminalEmulator') > -1;
+}
+
 function _listsIntersect(a, b) {
    for (let itemA of a)
        if (b.indexOf(itemA) >= 0)
@ -79,10 +86,6 @@ function _getFolderName(folder) {
    return name;
 }

-function clamp(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-}
-
 const BaseAppView = new Lang.Class({
    Name: 'BaseAppView',
    Abstract: true,
@ -101,9 +104,6 @@ const BaseAppView = new Lang.Class({
        else
            this._grid = new IconGrid.IconGrid(gridParams);

-        this._grid.connect('key-focus-in', Lang.bind(this, function(grid, actor) {
-            this._keyFocusIn(actor);
-        }));
        // Standard hack for ClutterBinLayout
        this._grid.actor.x_expand = true;

@ -111,10 +111,6 @@ const BaseAppView = new Lang.Class({
        this._allItems = [];
    },

-    _keyFocusIn: function(actor) {
-        // Nothing by default
-    },
-
    removeAll: function() {
        this._grid.destroyAll();
        this._items = {};
@ -260,8 +256,7 @@ const PageIndicators = new Lang.Class({
            Tweener.addTween(children[i],
                             { translation_x: 0,
                               time: INDICATORS_BASE_TIME + delay * i,
-                               transition: 'easeInOutQuad',
-                               delay: VIEWS_SWITCH_ANIMATION_DELAY
+                               transition: 'easeInOutQuad'
                             });
        }
    }
@ -441,8 +436,8 @@ const AllView = new Lang.Class({
    },

    goToPage: function(pageNumber) {
-        pageNumber = clamp(pageNumber, 0, this._grid.nPages() - 1);
-
+        if(pageNumber < 0 || pageNumber > this._grid.nPages() - 1)
+            return;
        if (this._currentPage == pageNumber && this._displayingPopup && this._currentPopup)
            return;
        if (this._displayingPopup && this._currentPopup)
@ -474,12 +469,14 @@ const AllView = new Lang.Class({
        // longer than PAGE_SWITCH_TIME
        time = Math.min(time, PAGE_SWITCH_TIME);

-        this._currentPage = pageNumber;
-        Tweener.addTween(this._adjustment,
-                         { value: this._grid.getPageY(this._currentPage),
-                           time: time,
-                           transition: 'easeOutQuad' });
-        this._pageIndicators.setCurrentPage(pageNumber);
+        if (pageNumber < this._grid.nPages() && pageNumber >= 0) {
+            this._currentPage = pageNumber;
+            Tweener.addTween(this._adjustment,
+                             { value: this._grid.getPageY(this._currentPage),
+                               time: time,
+                               transition: 'easeOutQuad' });
+            this._pageIndicators.setCurrentPage(pageNumber);
+        }
    },

    _diffToPage: function (pageNumber) {
@ -526,19 +523,15 @@ const AllView = new Lang.Class({
    _onPanEnd: function(action) {
         if (this._displayingPopup)
            return;
-
-        let pageHeight = this._grid.getPageHeight();
-
-        // Calculate the scroll value we'd be at, which is our current
-        // scroll plus any velocity the user had when they released
-        // their finger.
-
-        let velocity = -action.get_velocity(0)[2];
-        let endPanValue = this._adjustment.value + velocity;
-
-        let closestPage = Math.round(endPanValue / pageHeight);
-        this.goToPage(closestPage);
-
+        let diffCurrentPage = this._diffToPage(this._currentPage);
+        if (diffCurrentPage > this._scrollView.height * PAGE_SWITCH_TRESHOLD) {
+            if (action.get_velocity(0)[2] > 0)
+                this.goToPage(this._currentPage - 1);
+            else
+                this.goToPage(this._currentPage + 1);
+        } else {
+            this.goToPage(this._currentPage);
+        }
        this._panning = false;
    },

@ -569,7 +562,7 @@ const AllView = new Lang.Class({
            }));
    },

-    _keyFocusIn: function(icon) {
+    _ensureIconVisible: function(icon) {
        let itemPage = this._grid.getItemPage(icon);
        this.goToPage(itemPage);
    },
@ -768,7 +761,7 @@ const AppDisplay = new Lang.Class({
        this._viewStack = new St.Widget({ x_expand: true, y_expand: true,
                                          layout_manager: this._viewStackLayout });
        this._viewStackLayout.connect('allocated-size-changed', Lang.bind(this, this._onAllocatedSizeChanged));
-        this.actor.add_actor(this._viewStack);
+        this.actor.add_actor(this._viewStack, { expand: true });
        let layout = new ControlsBoxLayout({ homogeneous: true });
        this._controls = new St.Widget({ style_class: 'app-view-controls',
                                         layout_manager: layout });
@ -798,10 +791,8 @@ const AppDisplay = new Lang.Class({
    _showView: function(activeIndex) {
        for (let i = 0; i < this._views.length; i++) {
            let actor = this._views[i].view.actor;
-
-            let params = { time: VIEWS_SWITCH_TIME,
-                           opacity: (i == activeIndex) ? 255 : 0,
-                           delay: (i == activeIndex) ? VIEWS_SWITCH_ANIMATION_DELAY : 0 };
+            let params = { time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
+                           opacity: (i == activeIndex) ? 255 : 0 };
            if (i == activeIndex)
                actor.visible = true;
            else
@ -897,7 +888,7 @@ const AppSearchProvider = new Lang.Class({
        let app = this._appSys.lookup_app(result);
        let event = Clutter.get_current_event();
        let modifiers = event ? event.get_state() : 0;
-        let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK;
+        let openNewWindow = (modifiers & Clutter.ModifierType.CONTROL_MASK) || _isTerminal(app);

        if (openNewWindow)
            app.open_new_window(-1);
@ -940,27 +931,20 @@ const FolderView = new Lang.Class({
        this.actor.add_action(action);
    },

-    _keyFocusIn: function(actor) {
-        Util.ensureActorVisibleInScrollView(this.actor, actor);
-    },
-
    createFolderIcon: function(size) {
-        let layout = new Clutter.TableLayout();
-        let icon = new St.Widget({ layout_manager: layout,
-                                   style_class: 'app-folder-icon' });
-        layout.hookup_style(icon);
+        let icon = new St.Widget({ layout_manager: new Clutter.BinLayout(),
+                                   style_class: 'app-folder-icon',
+                                   width: size, height: size });
        let subSize = Math.floor(FOLDER_SUBICON_FRACTION * size);

-        let numItems = this._allItems.length;
-        for (let i = 0; i < 4; i++) {
-            let bin;
-            if (i < numItems) {
-                let texture = this._allItems[i].app.create_icon_texture(subSize);
-                bin = new St.Bin({ child: texture });
-            } else {
-                bin = new St.Bin({ width: subSize, height: subSize });
-            }
-            layout.pack(bin, i % 2, Math.floor(i / 2));
+        let aligns = [ Clutter.ActorAlign.START, Clutter.ActorAlign.END ];
+        for (let i = 0; i < Math.min(this._allItems.length, 4); i++) {
+            let texture = this._allItems[i].app.create_icon_texture(subSize);
+            let bin = new St.Bin({ child: texture,
+                                   x_expand: true, y_expand: true });
+            bin.set_x_align(aligns[i % 2]);
+            bin.set_y_align(aligns[Math.floor(i / 2)]);
+            icon.add_actor(bin);
        }

        return icon;
@ -1406,7 +1390,6 @@ const AppIcon = new Lang.Class({
                    this.popupMenu();
                    return GLib.SOURCE_REMOVE;
                }));
-            GLib.Source.set_name_by_id(this._menuTimeoutId, '[gnome-shell] this.popupMenu');
        } else if (button == 3) {
            this.popupMenu();
            return Clutter.EVENT_STOP;
@ -1420,6 +1403,9 @@ const AppIcon = new Lang.Class({
        if (button == 1) {
            this._onActivate(Clutter.get_current_event());
        } else if (button == 2) {
+            // Last workspace is always empty
+            let launchWorkspace = global.screen.get_workspace_by_index(global.screen.n_workspaces - 1);
+            launchWorkspace.activate(global.get_current_time());
            this.app.open_new_window(-1);
            Main.overview.hide();
        }
@ -1480,8 +1466,9 @@ const AppIcon = new Lang.Class({
    _onActivate: function (event) {
        let modifiers = event.get_state();

-        if (modifiers & Clutter.ModifierType.CONTROL_MASK
-            && this.app.state == Shell.AppState.RUNNING) {
+        if ((modifiers & Clutter.ModifierType.CONTROL_MASK
+             && this.app.state == Shell.AppState.RUNNING)
+            || _isTerminal(this.app)) {
            this.app.open_new_window(-1);
        } else {
            this.app.activate();
@ -1538,7 +1525,7 @@ const AppIconMenu = new Lang.Class({
        }));
        source.actor.connect('destroy', Lang.bind(this, function () { this.actor.destroy(); }));

-        Main.uiGroup.add_actor(this.actor);
+        Main.layoutManager.menuGroup.add_actor(this.actor);
    },

    _redisplay: function() {
@ -1602,26 +1589,6 @@ const AppIconMenu = new Lang.Class({
                    favs.addFavorite(this._source.app.get_id());
                }));
            }
-
-            if (Shell.AppSystem.get_default().lookup_app('org.gnome.Software.desktop')) {
-                this._appendSeparator();
-                let item = this._appendMenuItem(_("Show Details"));
-                item.connect('activate', Lang.bind(this, function() {
-                    let id = this._source.app.get_id();
-                    let args = GLib.Variant.new('(ss)', [id, '']);
-                    Gio.DBus.get(Gio.BusType.SESSION, null,
-                        function(o, res) {
-                            let bus = Gio.DBus.get_finish(res);
-                            bus.call('org.gnome.Software',
-                                     '/org/gnome/Software',
-                                     'org.gtk.Actions', 'Activate',
-                                     GLib.Variant.new('(sava{sv})',
-                                                      ['details', [args], null]),
-                                     null, 0, -1, null, null);
-                            Main.overview.hide();
-                        });
-                }));
-            }
        }
    },

--- a/js/ui/background.js
+++ b/js/ui/background.js
@ -132,23 +132,44 @@ const BackgroundCache = new Lang.Class({
        this._removeContent(this._images, content);
    },

-    _attachCallerToFileLoad: function(caller, fileLoad) {
-        fileLoad.callers.push(caller);
+    _loadImageContentInternal: function(filename, style) {
+        let cancellable = new Gio.Cancellable();
+        let content = new Meta.Background({ meta_screen: global.screen });

-        if (!caller.cancellable)
-            return;
+        let info = { filename: filename,
+                     style: style,
+                     cancellable: cancellable,
+                     callers: [] };

-        caller.cancellable.connect(Lang.bind(this, function() {
-            let idx = fileLoad.callers.indexOf(caller);
-            fileLoad.callers.splice(idx, 1);
+        content.load_file_async(filename, style, cancellable, Lang.bind(this, function(object, result) {
+            if (cancellable.is_cancelled())
+                return;

-            if (fileLoad.callers.length == 0) {
-                fileLoad.cancellable.cancel();
-
-                let idx = this._pendingFileLoads.indexOf(fileLoad);
-                this._pendingFileLoads.splice(idx, 1);
+            try {
+                content.load_file_finish(result);
+            } catch(e) {
+                content = null;
            }
+
+            if (content) {
+                this._monitorFile(filename);
+                info.callers.forEach(Lang.bind(this, function(caller) {
+                    let newContent = content.copy(caller.monitorIndex, caller.effects);
+                    this._images.push(newContent);
+                    caller.onFinished(newContent);
+                }));
+            } else {
+                info.callers.forEach(Lang.bind(this, function(caller) {
+                    caller.onFinished(null);
+                }));
+            }
+
+            let idx = this._pendingFileLoads.indexOf(info);
+            this._pendingFileLoads.splice(idx, 1);
        }));
+
+        this._pendingFileLoads.push(info);
+        return info;
    },

    _loadImageContent: function(params) {
@ -164,54 +185,33 @@ const BackgroundCache = new Lang.Class({
                       cancellable: params.cancellable,
                       onFinished: params.onFinished };

+        let info = null;
        for (let i = 0; i < this._pendingFileLoads.length; i++) {
-            let fileLoad = this._pendingFileLoads[i];
-
-            if (fileLoad.filename == params.filename &&
-                fileLoad.style == params.style) {
-                this._attachCallerToFileLoad(caller, fileLoad);
-                return;
+            let pendingLoad = this._pendingFileLoads[i];
+            if (pendingLoad.filename == params.filename && pendingLoad.style == params.style) {
+                info = pendingLoad;
+                break;
            }
        }

-        let fileLoad = { filename: params.filename,
-                         style: params.style,
-                         cancellable: new Gio.Cancellable(),
-                         callers: [] };
-        this._attachCallerToFileLoad(caller, fileLoad);
+        if (!info)
+            info = this._loadImageContentInternal(params.filename, params.style);

-        let content = new Meta.Background({ meta_screen: global.screen });
+        info.callers.push(caller);

-        content.load_file_async(params.filename,
-                                params.style,
-                                params.cancellable,
-                                Lang.bind(this,
-                                          function(object, result) {
-                                              try {
-                                                  content.load_file_finish(result);
+        if (caller.cancellable) {
+            caller.cancellable.connect(Lang.bind(this, function() {
+                let idx = info.callers.indexOf(caller);
+                info.callers.splice(idx, 1);

-                                                  this._monitorFile(params.filename);
-                                              } catch(e) {
-                                                  content = null;
-                                              }
+                if (info.callers.length == 0) {
+                    info.cancellable.cancel();

-                                              for (let i = 0; i < fileLoad.callers.length; i++) {
-                                                  let caller = fileLoad.callers[i];
-                                                  if (caller.onFinished) {
-                                                      let newContent;
-
-                                                      if (content) {
-                                                          newContent = content.copy(caller.monitorIndex, caller.effects);
-                                                          this._images.push(newContent);
-                                                      }
-
-                                                      caller.onFinished(newContent);
-                                                  }
-                                              }
-
-                                              let idx = this._pendingFileLoads.indexOf(fileLoad);
-                                              this._pendingFileLoads.splice(idx, 1);
-                                          }));
+                    let idx = this._pendingFileLoads.indexOf(info);
+                    this._pendingFileLoads.splice(idx, 1);
+                }
+            }));
+        }
    },

    getImageContent: function(params) {
@ -261,7 +261,6 @@ const BackgroundCache = new Lang.Class({
                                     monitorIndex: params.monitorIndex,
                                     cancellable: params.cancellable,
                                     onFinished: params.onFinished });
-
        }
    },

@ -271,11 +270,10 @@ const BackgroundCache = new Lang.Class({

        if (this._animationFilename == params.filename) {
            if (params.onLoaded) {
-                let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+                GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
                    params.onLoaded(this._animation);
                    return GLib.SOURCE_REMOVE;
                }));
-                GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
            }
        }

@ -287,11 +285,10 @@ const BackgroundCache = new Lang.Class({
                           this._animation = animation;

                           if (params.onLoaded) {
-                               let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+                               GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
                                   params.onLoaded(this._animation);
                                   return GLib.SOURCE_REMOVE;
                               }));
-                               GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
                           }
                       }));
    }
@ -388,11 +385,10 @@ const Background = new Lang.Class({

        this.isLoaded = true;

-        let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
            this.emit('loaded');
            return GLib.SOURCE_REMOVE;
        }));
-        GLib.Source.set_name_by_id(id, '[gnome-shell] this.emit');
    },

    _loadPattern: function() {
@ -535,7 +531,6 @@ const Background = new Lang.Class({
                                                                    this._updateAnimation();
                                                                    return GLib.SOURCE_REMOVE;
                                                                }));
-        GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
    },

    _loadAnimation: function(filename) {
@ -639,31 +634,6 @@ const Background = new Lang.Class({
 });
 Signals.addSignalMethods(Background.prototype);

-const SystemBackground = new Lang.Class({
-    Name: 'SystemBackground',
-
-    _init: function() {
-        this._cache = getBackgroundCache();
-        this.actor = new Meta.BackgroundActor();
-
-        this._cache.getImageContent({ style: GDesktopEnums.BackgroundStyle.WALLPAPER,
-                                      filename: global.datadir + '/theme/noise-texture.png',
-                                      effects: Meta.BackgroundEffects.NONE,
-                                      onFinished: Lang.bind(this, function(content) {
-                                          this.actor.content = content;
-                                          this.emit('loaded');
-                                      })
-                                    });
-
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-    },
-
-    _onDestroy: function() {
-        this._cache.removeImageContent(this.actor.content);
-    },
-});
-Signals.addSignalMethods(SystemBackground.prototype);
-
 const Animation = new Lang.Class({
    Name: 'Animation',

@ -758,18 +728,17 @@ const BackgroundManager = new Lang.Class({
            Lang.bind(this, function() {
                newBackground.disconnect(newBackground.loadedSignalId);
                newBackground.loadedSignalId = 0;
-
-                if (this._newBackground != newBackground) {
-                    /* Not interesting, we queued another load */
-                    newBackground.actor.destroy();
-                    return;
-                }
-
                Tweener.addTween(this.background.actor,
                                 { opacity: 0,
                                   time: FADE_ANIMATION_TIME,
                                   transition: 'easeOutQuad',
                                   onComplete: Lang.bind(this, function() {
+                                       if (this._newBackground != newBackground) {
+                                           /* Not interesting, we queued another load */
+                                           newBackground.actor.destroy();
+                                           return;
+                                       }
+
                                       this.background.actor.destroy();
                                       this.background = newBackground;
                                       this._newBackground = null;
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@ -22,7 +22,7 @@ const BackgroundMenu = new Lang.Class({

        this.actor.add_style_class_name('background-menu');

-        layoutManager.uiGroup.add_actor(this.actor);
+        layoutManager.menuGroup.add_actor(this.actor);
        this.actor.hide();
    }
 });
@ -35,7 +35,7 @@ function addBackgroundMenu(actor, layoutManager) {

    function openMenu() {
        let [x, y] = global.get_pointer();
-        Main.layoutManager.setDummyCursorGeometry(x, y, 0, 0);
+        Main.layoutManager.setDummyCursorPosition(x, y);
        actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
    }

--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -14,9 +14,6 @@ const Shell = imports.gi.Shell;
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';

-// alias to prevent xgettext from picking up strings translated in GTK+
-const gtk30_ = Gettext_gtk30.gettext;
-
 // in org.gnome.desktop.interface
 const CLOCK_FORMAT_KEY        = 'clock-format';

@ -390,7 +387,7 @@ const Calendar = new Lang.Class({

        // Find the ordering for month/year in the calendar heading
        this._headerFormatWithoutYear = '%B';
-        switch (gtk30_('calendar:MY')) {
+        switch (Gettext_gtk30.gettext('calendar:MY')) {
        case 'calendar:MY':
            this._headerFormat = '%B %Y';
            break;
@ -406,8 +403,6 @@ const Calendar = new Lang.Class({
        // Start off with the current date
        this._selectedDate = new Date();

-        this._shouldDateGrabFocus = false;
-
        this.actor = new St.Table({ homogeneous: false,
                                    style_class: 'calendar',
                                    reactive: true });
@ -423,10 +418,8 @@ const Calendar = new Lang.Class({
    setEventSource: function(eventSource) {
        this._eventSource = eventSource;
        this._eventSource.connect('changed', Lang.bind(this, function() {
-            this._rebuildCalendar();
            this._update();
        }));
-        this._rebuildCalendar();
        this._update();
    },

@ -555,7 +548,6 @@ const Calendar = new Lang.Class({
    _onSettingsChange: function() {
        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
        this._buildHeader();
-        this._rebuildCalendar();
        this._update();
    },

@ -615,9 +607,7 @@ const Calendar = new Lang.Class({

            button._date = new Date(iter);
            button.connect('clicked', Lang.bind(this, function() {
-                this._shouldDateGrabFocus = true;
                this.setDate(button._date);
-                this._shouldDateGrabFocus = false;
            }));

            let hasEvents = this._eventSource.hasEvents(iter);
@ -683,11 +673,8 @@ const Calendar = new Lang.Class({
            this._rebuildCalendar();

        this._buttons.forEach(Lang.bind(this, function(button) {
-            if (_sameDay(button._date, this._selectedDate)) {
+            if (_sameDay(button._date, this._selectedDate))
                button.add_style_pseudo_class('active');
-                if (this._shouldDateGrabFocus)
-                    button.grab_key_focus();
-            }
            else
                button.remove_style_pseudo_class('active');
        }));
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@ -43,7 +43,6 @@ const AutomountManager = new Lang.Class({
        this._driveEjectButtonId = this._volumeMonitor.connect('drive-eject-button', Lang.bind(this, this._onDriveEjectButton));

        this._mountAllId = Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
-        GLib.Source.set_name_by_id(this._mountAllId, '[gnome-shell] this._startupMountAll');
    },

    disable: function() {
@ -235,11 +234,10 @@ const AutomountManager = new Lang.Class({
    },

    _allowAutorunExpire: function(volume) {
-        let id = Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, function() {
+        Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, function() {
            volume.allowAutorun = false;
            return GLib.SOURCE_REMOVE;
        });
-        GLib.Source.set_name_by_id(id, '[gnome-shell] volume.allowAutorun');
    }
 });
 const Component = AutomountManager;
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@ -510,12 +510,10 @@ const VPNRequestHandler = new Lang.Class({

    _showNewStyleDialog: function() {
        let keyfile = new GLib.KeyFile();
-        let data;
        let contentOverride;

        try {
-            data = this._dataStdout.peek_buffer();
-
+            let data = this._dataStdout.peek_buffer();
            keyfile.load_from_data(data.toString(), data.length,
                                   GLib.KeyFileFlags.NONE);

@ -548,16 +546,13 @@ const VPNRequestHandler = new Lang.Class({
                }
            }
        } catch(e) {
-            // No output is a valid case it means "both secrets are stored"
-            if (data.length > 0) {
-                logError(e, 'error while reading VPN plugin output keyfile');
+            logError(e, 'error while reading VPN plugin output keyfile');

-                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-                return;
-            }
+            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+            return;
        }

-        if (contentOverride && contentOverride.secrets.length) {
+        if (contentOverride.secrets.length) {
            // Only show the dialog if we actually have something to ask
            this._shellDialog = new NetworkSecretDialog(this._agent, this._requestId, this._connection, 'vpn', [], contentOverride);
            this._shellDialog.open(global.get_current_time());
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
@ -29,8 +28,6 @@ const SCROLLBACK_HISTORY_LINES = 10;
 // See Notification._onEntryChanged
 const COMPOSING_STOP_TIMEOUT = 5;

-const CLOCK_FORMAT_KEY = 'clock-format';
-
 const NotificationDirection = {
    SENT: 'chat-sent',
    RECEIVED: 'chat-received'
@ -681,7 +678,6 @@ const ChatSource = new Lang.Class({
            Mainloop.source_remove(this._notifyTimeoutId);
        this._notifyTimeoutId = Mainloop.timeout_add(500,
            Lang.bind(this, this._notifyTimeout));
-        GLib.Source.set_name_by_id(this._notifyTimeoutId, '[gnome-shell] this._notifyTimeout');
    },

    _notifyTimeout: function() {
@ -909,14 +905,14 @@ const ChatNotification = new Lang.Class({

        let group = props.group;
        if (group != this._lastGroup) {
+            let style = 'chat-group-' + group;
            this._lastGroup = group;
-            let emptyLine = new St.Label({ style_class: 'chat-empty-line' });
-            this.addActor(emptyLine);
+            this._lastGroupActor = new St.BoxLayout({ style_class: style,
+                                                      vertical: true });
+            this.addActor(this._lastGroupActor);
        }

-        this._lastMessageBox = new St.BoxLayout({ vertical: false });
-        this._lastMessageBox.add(body, props.childProps);
-        this.addActor(this._lastMessageBox);
+        this._lastGroupActor.add(body, props.childProps);

        this.updated();

@ -925,16 +921,14 @@ const ChatNotification = new Lang.Class({
                                realMessage: group != 'meta' });

        if (!props.noTimestamp) {
-            if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME) {
+            if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME)
                this.appendTimestamp();
-            } else {
+            else
                // Schedule a new timestamp in SCROLLBACK_IMMEDIATE_TIME
                // from the timestamp of the message.
                this._timestampTimeoutId = Mainloop.timeout_add_seconds(
                    SCROLLBACK_IMMEDIATE_TIME - (currentTime - timestamp),
                    Lang.bind(this, this.appendTimestamp));
-                GLib.Source.set_name_by_id(this._timestampTimeoutId, '[gnome-shell] this.appendTimestamp');
-            }
        }

        this._filterMessages();
@ -947,81 +941,32 @@ const ChatNotification = new Lang.Class({

        let format;

-        let desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
-        let clockFormat = desktopSettings.get_string(CLOCK_FORMAT_KEY);
-
-        switch (clockFormat) {
-            case '24h':
-                // Show only the time if date is on today
-                if(daysAgo < 1){
-                    /* Translators: Time in 24h format */
-                    format = _("%H\u2236%M");
-                }
-                // Show the word "Yesterday" and time if date is on yesterday
-                else if(daysAgo <2){
-                    /* Translators: this is the word "Yesterday" followed by a
-                     time string in 24h format. i.e. "Yesterday, 14:30" */
-                    // xgettext:no-c-format
-                    format = _("Yesterday, %H\u2236%M");
-                }
-                // Show a week day and time if date is in the last week
-                else if (daysAgo < 7) {
-                    /* Translators: this is the week day name followed by a time
-                     string in 24h format. i.e. "Monday, 14:30" */
-                    // xgettext:no-c-format
-                    format = _("%A, %H\u2236%M");
-
-                } else if (date.getYear() == now.getYear()) {
-                    /* Translators: this is the month name and day number
-                     followed by a time string in 24h format.
-                     i.e. "May 25, 14:30" */
-                    // xgettext:no-c-format
-                    format = _("%B %d, %H\u2236%M");
-                } else {
-                    /* Translators: this is the month name, day number, year
-                     number followed by a time string in 24h format.
-                     i.e. "May 25 2012, 14:30" */
-                    // xgettext:no-c-format
-                    format = _("%B %d %Y, %H\u2236%M");
-                }
-                break;
-        default:
-            /* explicit fall-through */
-            case '12h':
-                // Show only the time if date is on today
-                if(daysAgo < 1){
-                    /* Translators: Time in 24h format */
-                    format = _("%l\u2236%M %p");
-                }
-                // Show the word "Yesterday" and time if date is on yesterday
-                else if(daysAgo <2){
-                    /* Translators: this is the word "Yesterday" followed by a
-                     time string in 12h format. i.e. "Yesterday, 2:30 pm" */
-                    // xgettext:no-c-format
-                    format = _("Yesterday, %l\u2236%M %p");
-                }
-                // Show a week day and time if date is in the last week
-                else if (daysAgo < 7) {
-                    /* Translators: this is the week day name followed by a time
-                     string in 12h format. i.e. "Monday, 2:30 pm" */
-                    // xgettext:no-c-format
-                    format = _("%A, %l\u2236%M %p");
-
-                } else if (date.getYear() == now.getYear()) {
-                    /* Translators: this is the month name and day number
-                     followed by a time string in 12h format.
-                     i.e. "May 25, 2:30 pm" */
-                    // xgettext:no-c-format
-                    format = _("%B %d, %l\u2236%M %p");
-                } else {
-                    /* Translators: this is the month name, day number, year
-                     number followed by a time string in 12h format.
-                     i.e. "May 25 2012, 2:30 pm"*/
-                    // xgettext:no-c-format
-                    format = _("%B %d %Y, %l\u2236%M %p");
-                }
-                break;
+        // Show only the hour if date is on today
+        if(daysAgo < 1){
+            format = "<b>%H:%M</b>";
        }
+        // Show the word "Yesterday" and time if date is on yesterday
+        else if(daysAgo <2){
+            /* Translators: this is the word "Yesterday" followed by a time string. i.e. "Yesterday, 14:30"*/
+            // xgettext:no-c-format
+            format = _("<b>Yesterday</b>, <b>%H:%M</b>");
+        }
+        // Show a week day and time if date is in the last week
+        else if (daysAgo < 7) {
+            /* Translators: this is the week day name followed by a time string. i.e. "Monday, 14:30*/
+            // xgettext:no-c-format
+            format = _("<b>%A</b>, <b>%H:%M</b>");
+
+        } else if (date.getYear() == now.getYear()) {
+            /* Translators: this is the month name and day number followed by a time string. i.e. "May 25, 14:30"*/
+            // xgettext:no-c-format
+            format = _("<b>%B</b> <b>%d</b>, <b>%H:%M</b>");
+        } else {
+            /* Translators: this is the month name, day number, year number followed by a time string. i.e. "May 25 2012, 14:30"*/
+            // xgettext:no-c-format
+            format = _("<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> ");
+        }
+
        return date.toLocaleFormat(format);
    },

@ -1031,14 +976,13 @@ const ChatNotification = new Lang.Class({
        let lastMessageTime = this._history[0].time;
        let lastMessageDate = new Date(lastMessageTime * 1000);

-        let timeLabel = new St.Label({ text: this._formatTimestamp(lastMessageDate),
-                                       style_class: 'chat-meta-message',
-                                       x_expand: true,
-                                       y_expand: true,
-                                       x_align: Clutter.ActorAlign.END,
-                                       y_align: Clutter.ActorAlign.END });
-
-        this._lastMessageBox.add_actor(timeLabel);
+        let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate),
+                                       group: 'meta',
+                                       styles: ['chat-meta-message'],
+                                       childProps: { expand: true, x_fill: false,
+                                                     x_align: St.Align.END },
+                                       noTimestamp: true,
+                                       timestamp: lastMessageTime });

        this._filterMessages();

@ -1103,7 +1047,6 @@ const ChatNotification = new Lang.Class({
            this._composingTimeoutId = Mainloop.timeout_add_seconds(
                COMPOSING_STOP_TIMEOUT,
                Lang.bind(this, this._composingStopTimeout));
-            GLib.Source.set_name_by_id(this._composingTimeoutId, '[gnome-shell] this._composingStopTimeout');
        } else {
            this.source.setChatState(Tp.ChannelChatState.ACTIVE);
        }
@ -1274,8 +1217,7 @@ const SubscriptionRequestNotification = new Lang.Class({

        if (file) {
            let uri = file.get_uri();
-            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
+            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size);
        }
        else {
            iconBox.child = new St.Icon({ icon_name: 'avatar-default',
@ -1426,12 +1368,7 @@ const AccountNotification = new Lang.Class({
                if (status == Tp.ConnectionStatus.CONNECTED) {
                    this.destroy();
                } else if (status == Tp.ConnectionStatus.DISCONNECTED) {
-                    let connectionError = account.connection_error;
-
-                    if (connectionError == Tp.error_get_dbus_name(Tp.Error.CANCELLED))
-                        this.destroy();
-                    else
-                        this.update(this.title, this._getMessage(connectionError));
+                    this.update(this.title, this._getMessage(account.connection_error));
                }
            }));
    },
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@ -165,10 +165,6 @@ const CtrlAltTabPopup = new Lang.Class({
            this._select(this._previous());
        else if (keysym == Clutter.Right)
            this._select(this._next());
-        else
-            return Clutter.EVENT_PROPAGATE;
-
-        return Clutter.EVENT_STOP;
    },

    _finish : function(time) {
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -381,8 +381,6 @@ const DashActor = new Lang.Class({
    }
 });

-const baseIconSizes = [ 16, 22, 24, 32, 48, 64 ];
-
 const Dash = new Lang.Class({
    Name: 'Dash',

@ -582,7 +580,6 @@ const Dash = new Lang.Class({
                        this._showLabelTimeoutId = 0;
                        return GLib.SOURCE_REMOVE;
                    }));
-                GLib.Source.set_name_by_id(this._showLabelTimeoutId, '[gnome-shell] item.showLabel');
                if (this._resetHoverTimeoutId > 0) {
                    Mainloop.source_remove(this._resetHoverTimeoutId);
                    this._resetHoverTimeoutId = 0;
@ -600,7 +597,6 @@ const Dash = new Lang.Class({
                        this._resetHoverTimeoutId = 0;
                        return GLib.SOURCE_REMOVE;
                    }));
-                GLib.Source.set_name_by_id(this._resetHoverTimeoutId, '[gnome-shell] this._labelShowing');
            }
        }
    },
@ -636,24 +632,25 @@ const Dash = new Lang.Class({
        let minHeight, natHeight;

        // Enforce the current icon size during the size request
-        firstIcon.setIconSize(this.iconSize);
+        let [currentWidth, currentHeight] = firstIcon.icon.get_size();
+
+        firstIcon.icon.set_size(this.iconSize, this.iconSize);
        [minHeight, natHeight] = firstButton.get_preferred_height(-1);

-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        let iconSizes = baseIconSizes.map(function(s) {
-            return s * scaleFactor;
-        });
+        firstIcon.icon.set_size(currentWidth, currentHeight);

        // Subtract icon padding and box spacing from the available height
-        availHeight -= iconChildren.length * (natHeight - this.iconSize * scaleFactor) +
+        availHeight -= iconChildren.length * (natHeight - this.iconSize) +
                       (iconChildren.length - 1) * spacing;

        let availSize = availHeight / iconChildren.length;

-        let newIconSize = baseIconSizes[0];
+        let iconSizes = [ 16, 22, 24, 32, 48, 64 ];
+
+        let newIconSize = 16;
        for (let i = 0; i < iconSizes.length; i++) {
            if (iconSizes[i] < availSize)
-                newIconSize = baseIconSizes[i];
+                newIconSize = iconSizes[i];
        }

        if (newIconSize == this.iconSize)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -63,17 +63,9 @@ const DateMenuButton = new Lang.Class({
        hbox.add(vbox);

        // Date
-        // Having the ability to go to the current date if the user is already
-        // on the current date can be confusing. So don't make the button reactive
-        // until the selected date changes.
-        this._date = new St.Button({ style_class: 'datemenu-date-label',
-                                     reactive: false
-                                   });
-        this._date.connect('clicked',
-                           Lang.bind(this, function() {
-                               this._calendar.setDate(new Date(), false);
-                           }));
-        vbox.add(this._date, { x_fill: false  });
+        this._date = new St.Label({ style_class: 'datemenu-date-label',
+                                    can_focus: true });
+        vbox.add(this._date);

        this._eventList = new Calendar.EventsList();
        this._calendar = new Calendar.Calendar();
@ -85,9 +77,6 @@ const DateMenuButton = new Lang.Class({
                                  // and the calender makes those dates unclickable when instantiated with
                                  // a null event source
                                   this._eventList.setDate(date);
-
-                                   // Make the button reactive only if the selected date is not the current date.
-                                   this._date.can_focus = this._date.reactive = !this._isToday(date)
                               }));
        vbox.add(this._calendar.actor);

@ -138,13 +127,6 @@ const DateMenuButton = new Lang.Class({
        this._sessionUpdated();
    },

-    _isToday: function(date) {
-        let now = new Date();
-        return now.getYear() == date.getYear() &&
-               now.getMonth() == date.getMonth() &&
-               now.getDay() == date.getDay();
-    },
-
    _appInstalledChanged: function() {
        this._calendarApp = undefined;
        this._updateEventsVisibility();
@ -204,7 +186,7 @@ const DateMenuButton = new Lang.Class({
         */
        let dateFormat = _("%A %B %e, %Y");
        let displayDate = new Date();
-        this._date.set_label(displayDate.toLocaleFormat(dateFormat));
+        this._date.set_text(displayDate.toLocaleFormat(dateFormat));
    },

    _getCalendarApp: function() {
@ -220,7 +202,7 @@ const DateMenuButton = new Lang.Class({
    },

    _getClockApp: function() {
-        return Shell.AppSystem.get_default().lookup_app('org.gnome.clocks.desktop');
+        return Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
    },

    _onOpenCalendarActivate: function() {
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -46,7 +46,7 @@ let dragMonitors = [];
 function _getEventHandlerActor() {
    if (!eventHandlerActor) {
        eventHandlerActor = new Clutter.Actor({ width: 0, height: 0 });
-        Main.uiGroup.add_actor(eventHandlerActor);
+        Main.layoutManager.sessionGroup.add_actor(eventHandlerActor);
        // We connect to 'event' rather than 'captured-event' because the capturing phase doesn't happen
        // when you've grabbed the pointer.
        eventHandlerActor.connect('event',
@ -236,7 +236,7 @@ const _Draggable = new Lang.Class({

        if (this.actor._delegate && this.actor._delegate.getDragActor) {
            this._dragActor = this.actor._delegate.getDragActor();
-            Main.uiGroup.add_child(this._dragActor);
+            Main.layoutManager.sessionGroup.add_child(this._dragActor);
            this._dragActor.raise_top();
            Shell.util_set_hidden_from_pick(this._dragActor, true);

@ -276,7 +276,7 @@ const _Draggable = new Lang.Class({
            this._dragOrigScale = this._dragActor.scale_x;

            // Set the actor's scale such that it will keep the same
-            // transformed size when it's reparented to the uiGroup
+            // transformed size when it's reparented to the sessionGroup
            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
            this._dragActor.set_scale(scaledWidth / this.actor.width,
                                      scaledHeight / this.actor.height);
@ -286,7 +286,7 @@ const _Draggable = new Lang.Class({
            this._dragOffsetY = actorStageY - this._dragStartY;

            this._dragOrigParent.remove_actor(this._dragActor);
-            Main.uiGroup.add_child(this._dragActor);
+            Main.layoutManager.sessionGroup.add_child(this._dragActor);
            this._dragActor.raise_top();
            Shell.util_set_hidden_from_pick(this._dragActor, true);
        }
@ -395,7 +395,6 @@ const _Draggable = new Lang.Class({

        this._updateHoverId = GLib.idle_add(GLib.PRIORITY_DEFAULT,
                                            Lang.bind(this, this._updateDragHover));
-        GLib.Source.set_name_by_id(this._updateHoverId, '[gnome-shell] this._updateDragHover');
    },

    _updateDragPosition : function (event) {
@ -449,7 +448,7 @@ const _Draggable = new Lang.Class({
                                                event.get_time())) {
                    // If it accepted the drop without taking the actor,
                    // handle it ourselves.
-                    if (this._dragActor.get_parent() == Main.uiGroup) {
+                    if (this._dragActor.get_parent() == Main.layoutManager.sessionGroup) {
                        if (this._restoreOnSuccess) {
                            this._restoreDragActor(event.get_time());
                            return true;
@ -558,7 +557,7 @@ const _Draggable = new Lang.Class({

    _onAnimationComplete : function (dragActor, eventTime) {
        if (this._dragOrigParent) {
-            Main.uiGroup.remove_child(this._dragActor);
+            Main.layoutManager.sessionGroup.remove_child(this._dragActor);
            this._dragOrigParent.add_actor(this._dragActor);
            dragActor.set_scale(this._dragOrigScale, this._dragOrigScale);
            dragActor.set_position(this._dragOrigX, this._dragOrigY);
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -25,11 +25,9 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const Pango = imports.gi.Pango;
-const Polkit = imports.gi.Polkit;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

-const CheckBox = imports.ui.checkBox;
 const GnomeSession = imports.misc.gnomeSession;
 const LoginManager = imports.misc.loginManager;
 const ModalDialog = imports.ui.modalDialog;
@ -38,10 +36,8 @@ const UserWidget = imports.ui.userWidget;

 let _endSessionDialog = null;

-const TRIGGER_OFFLINE_UPDATE = '/usr/libexec/pk-trigger-offline-update';
-
 const _ITEM_ICON_SIZE = 48;
-const _DIALOG_ICON_SIZE = 48;
+const _DIALOG_ICON_SIZE = 32;

 const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;

@ -75,7 +71,6 @@ const logoutDialogContent = {
                        "You will be logged out automatically in %d seconds.",
                        seconds).format(seconds);
    },
-    showBatteryWarning: false,
    confirmButtons: [{ signal: 'ConfirmedLogout',
                       label:  C_("button", "Log Out") }],
    iconStyleClass: 'end-session-dialog-logout-icon',
@ -84,14 +79,11 @@ const logoutDialogContent = {

 const shutdownDialogContent = {
    subject: C_("title", "Power Off"),
-    subjectWithUpdates: C_("title", "Install Updates & Power Off"),
    description: function(seconds) {
        return ngettext("The system will power off automatically in %d second.",
                        "The system will power off automatically in %d seconds.",
                        seconds).format(seconds);
    },
-    checkBoxText: C_("checkbox", "Install pending software updates"),
-    showBatteryWarning: true,
    confirmButtons: [{ signal: 'ConfirmedReboot',
                       label:  C_("button", "Restart") },
                     { signal: 'ConfirmedShutdown',
@ -108,7 +100,6 @@ const restartDialogContent = {
                        "The system will restart automatically in %d seconds.",
                        seconds).format(seconds);
    },
-    showBatteryWarning: false,
    confirmButtons: [{ signal: 'ConfirmedReboot',
                       label:  C_("button", "Restart") }],
    iconName: 'view-refresh-symbolic',
@ -124,11 +115,8 @@ const restartInstallDialogContent = {
                        "The system will automatically restart and install updates in %d seconds.",
                        seconds).format(seconds);
    },
-    showBatteryWarning: true,
    confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label:  C_("button", "Restart &amp; Install") }],
-    unusedFutureButtonForTranslation: C_("button", "Install &amp; Power Off"),
-    unusedFutureCheckBoxForTranslation: C_("checkbox", "Power off after updates are installed"),
+                       label:  C_("button", "Restart & Install") }],
    iconName: 'view-refresh-symbolic',
    iconStyleClass: 'end-session-dialog-shutdown-icon',
    showOtherSessions: true,
@ -155,14 +143,6 @@ const LogindSessionIface = '<node> \

 const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface);

-const UPowerIface = '<node> \
-<interface name="org.freedesktop.UPower"> \
-    <property name="OnBattery" type="b" access="read"/> \
-</interface> \
-</node>';
-
-const UPowerProxy = Gio.DBusProxy.makeProxyWrapper(UPowerIface);
-
 function findAppFromInhibitor(inhibitor) {
    let desktopFile;
    try {
@ -215,18 +195,6 @@ function _setLabelText(label, text) {
    }
 }

-function _setCheckBoxLabel(checkBox, text) {
-    let label = checkBox.getLabelActor();
-
-    if (text) {
-        label.set_text(text);
-        checkBox.actor.show();
-    } else {
-        label.set_text('');
-        checkBox.actor.hide();
-    }
-}
-
 function init() {
    // This always returns the same singleton object
    // By instantiating it initially, we register the
@ -246,20 +214,6 @@ const EndSessionDialog = new Lang.Class({
        this._userManager = AccountsService.UserManager.get_default();
        this._user = this._userManager.get_user(GLib.get_user_name());
        this._updatesFile = Gio.File.new_for_path('/system-update');
-        this._preparedUpdateFile = Gio.File.new_for_path('/var/lib/PackageKit/prepared-update');
-
-        this._powerProxy = new UPowerProxy(Gio.DBus.system,
-                                           'org.freedesktop.UPower',
-                                           '/org/freedesktop/UPower',
-                                           Lang.bind(this, function(proxy, error) {
-                                               if (error) {
-                                                   log(error.message);
-                                                   return;
-                                               }
-                                               this._powerProxy.connect('g-properties-changed',
-                                                                        Lang.bind(this, this._sync));
-                                               this._sync();
-                                           }));

        this._secondsLeft = 0;
        this._totalSecondsToStayOpen = 0;
@ -286,8 +240,7 @@ const EndSessionDialog = new Lang.Class({
                                x_align: St.Align.END,
                                y_align: St.Align.START });

-        let messageLayout = new St.BoxLayout({ vertical: true,
-                                               style_class: 'end-session-dialog-layout' });
+        let messageLayout = new St.BoxLayout({ vertical: true });
        mainContentLayout.add(messageLayout,
                              { y_align: St.Align.START });

@ -307,16 +260,6 @@ const EndSessionDialog = new Lang.Class({
                          { y_fill:  true,
                            y_align: St.Align.START });

-        this._checkBox = new CheckBox.CheckBox();
-        this._checkBox.actor.connect('clicked', Lang.bind(this, this._sync));
-        messageLayout.add(this._checkBox.actor);
-
-        this._batteryWarning = new St.Label({ style_class: 'end-session-dialog-warning',
-                                              text: _("Running on battery power: please plug in before installing updates.") });
-        this._batteryWarning.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._batteryWarning.clutter_text.line_wrap = true;
-        messageLayout.add(this._batteryWarning);
-
        this._scrollView = new St.ScrollView({ style_class: 'end-session-dialog-list' });
        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        this.contentLayout.add(this._scrollView,
@ -342,12 +285,6 @@ const EndSessionDialog = new Lang.Class({
        this._inhibitorSection.add_actor(this._sessionHeader);
        this._inhibitorSection.add_actor(this._sessionList);

-        try {
-            this._updatesPermission = Polkit.Permission.new_sync("org.freedesktop.packagekit.trigger-offline-update", null, null);
-        } catch(e) {
-            log('No permission to trigger offline updates: %s'.format(e.toString()));
-        }
-
        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
    },
@ -362,22 +299,13 @@ const EndSessionDialog = new Lang.Class({
        if (!open)
            return;

+        if (this._type == 2 && this._updatesFile.query_exists(null))
+            this._type = 3;
+
        let dialogContent = DialogContent[this._type];

        let subject = dialogContent.subject;

-        // Use different title when we are installing updates
-        if (dialogContent.subjectWithUpdates && this._checkBox.actor.checked)
-            subject = dialogContent.subjectWithUpdates;
-
-        if (dialogContent.showBatteryWarning) {
-            // Warn when running on battery power
-            if (this._powerProxy.OnBattery && this._checkBox.actor.checked)
-                this._batteryWarning.opacity = 255;
-            else
-                this._batteryWarning.opacity = 0;
-        }
-
        let description;
        let displayTime = _roundSecondsToInterval(this._totalSecondsToStayOpen,
                                                  this._secondsLeft,
@ -460,75 +388,15 @@ const EndSessionDialog = new Lang.Class({
    },

    _confirm: function(signal) {
-        let callback = Lang.bind(this, function() {
-            this._fadeOutDialog();
-            this._stopTimer();
-            this._dbusImpl.emit_signal(signal, null);
-        });
-
-        // Offline update not available; just emit the signal
-        if (!this._checkBox.actor.visible) {
-            callback();
-            return;
-        }
-
-        // Trigger the offline update as requested
-        if (this._checkBox.actor.checked) {
-            switch (signal) {
-                case "ConfirmedReboot":
-                    this._triggerOfflineUpdateReboot(callback);
-                    break;
-                case "ConfirmedShutdown":
-                    // To actually trigger the offline update, we need to
-                    // reboot to do the upgrade. When the upgrade is complete,
-                    // the computer will shut down automatically.
-                    signal = "ConfirmedReboot";
-                    this._triggerOfflineUpdateShutdown(callback);
-                    break;
-                default:
-                    callback();
-                    break;
-            }
-        } else {
-            this._triggerOfflineUpdateCancel(callback);
-        }
+        this._fadeOutDialog();
+        this._stopTimer();
+        this._dbusImpl.emit_signal(signal, null);
    },

    _onOpened: function() {
        this._sync();
    },

-    _triggerOfflineUpdateReboot: function(callback) {
-        this._pkexecSpawn([TRIGGER_OFFLINE_UPDATE, 'reboot'], callback);
-    },
-
-    _triggerOfflineUpdateShutdown: function(callback) {
-        this._pkexecSpawn([TRIGGER_OFFLINE_UPDATE, 'power-off'], callback);
-    },
-
-    _triggerOfflineUpdateCancel: function(callback) {
-        this._pkexecSpawn([TRIGGER_OFFLINE_UPDATE, '--cancel'], callback);
-    },
-
-    _pkexecSpawn: function(argv, callback) {
-        let ret, pid;
-        try {
-            [ret, pid] = GLib.spawn_async(null, ['pkexec'].concat(argv), null,
-                                          GLib.SpawnFlags.DO_NOT_REAP_CHILD | GLib.SpawnFlags.SEARCH_PATH,
-                                          null);
-        } catch (e) {
-            log('Error spawning "pkexec %s": %s'.format(argv.join(' '), e.toString()));
-            callback();
-            return;
-        }
-
-        GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function(pid, status) {
-            GLib.spawn_close_pid(pid);
-
-            callback();
-        });
-    },
-
    _startTimer: function() {
        let startTime = GLib.get_monotonic_time();
        this._secondsLeft = this._totalSecondsToStayOpen;
@ -551,7 +419,6 @@ const EndSessionDialog = new Lang.Class({

                return GLib.SOURCE_REMOVE;
            }));
-        GLib.Source.set_name_by_id(this._timerId, '[gnome-shell] this._confirm');
    },

    _stopTimer: function() {
@ -677,9 +544,6 @@ const EndSessionDialog = new Lang.Class({
        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
        this._type = type;

-        if (this._type == 2 && this._updatesFile.query_exists(null))
-            this._type = 3;
-
        this._applications = [];
        this._applicationList.destroy_all_children();

@ -692,8 +556,6 @@ const EndSessionDialog = new Lang.Class({
            return;
        }

-        let dialogContent = DialogContent[this._type];
-
        for (let i = 0; i < inhibitorObjectPaths.length; i++) {
            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], Lang.bind(this, function(proxy, error) {
                this._onInhibitorLoaded(proxy);
@ -702,23 +564,9 @@ const EndSessionDialog = new Lang.Class({
            this._applications.push(inhibitor);
        }

-        if (dialogContent.showOtherSessions)
+        if (DialogContent[type].showOtherSessions)
            this._loadSessions();

-        let preparedUpdate = this._preparedUpdateFile.query_exists(null);
-        let updateAlreadyTriggered = this._updatesFile.query_exists(null);
-        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
-
-        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText);
-        this._checkBox.actor.visible = (dialogContent.checkBoxText && preparedUpdate && updatesAllowed);
-        this._checkBox.actor.checked = (preparedUpdate && 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 || preparedUpdate && updateAlreadyTriggered && !updatesAllowed));
-
        this._updateButtons();

        if (!this.open(timestamp)) {
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@ -5,8 +5,6 @@ imports.gi.versions.Gio = '2.0';
 imports.gi.versions.Gdk = '3.0';
 imports.gi.versions.GdkPixbuf = '2.0';
 imports.gi.versions.Gtk = '3.0';
-imports.gi.versions.TelepathyGLib = '0.12';
-imports.gi.versions.TelepathyLogger = '0.2';

 const Clutter = imports.gi.Clutter;;
 const Gettext = imports.gettext;
@ -47,11 +45,8 @@ function _patchLayoutClass(layoutClass, styleProps) {
        layoutClass.prototype.hookup_style = function(container) {
            container.connect('style-changed', Lang.bind(this, function() {
                let node = container.get_theme_node();
-                for (let prop in styleProps) {
-                    let [found, length] = node.lookup_length(styleProps[prop], false);
-                    if (found)
-                        this[prop] = length;
-                }
+                for (let prop in styleProps)
+                    this[prop] = node.get_length(styleProps[prop]);
            }));
        };
    layoutClass.prototype.child_set = function(actor, props) {
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -38,7 +38,6 @@ const connect = Lang.bind(_signals, _signals.connect);
 const disconnect = Lang.bind(_signals, _signals.disconnect);

 const ENABLED_EXTENSIONS_KEY = 'enabled-extensions';
-const EXTENSION_DISABLE_VERSION_CHECK_KEY = 'disable-extension-version-validation';

 var initted = false;
 var enabled;
@ -157,9 +156,7 @@ function loadExtension(extension) {
    // Default to error, we set success as the last step
    extension.state = ExtensionState.ERROR;

-    let checkVersion = !global.settings.get_boolean(EXTENSION_DISABLE_VERSION_CHECK_KEY);
-
-    if (checkVersion && ExtensionUtils.isOutOfDate(extension)) {
+    if (ExtensionUtils.isOutOfDate(extension)) {
        extension.state = ExtensionState.OUT_OF_DATE;
    } else {
        let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
@ -270,19 +267,8 @@ function onEnabledExtensionsChanged() {
    enabledExtensions = newEnabledExtensions;
 }

-function _onVersionValidationChanged() {
-    if (Main.sessionMode.allowExtensions) {
-        enabledExtensions.forEach(function(uuid) {
-            if (ExtensionUtils.extensions[uuid])
-                reloadExtension(ExtensionUtils.extensions[uuid]);
-        });
-    }
-}
-
 function _loadExtensions() {
    global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
-    global.settings.connect('changed::' + EXTENSION_DISABLE_VERSION_CHECK_KEY, _onVersionValidationChanged);
-
    enabledExtensions = getEnabledExtensions();

    let finder = new ExtensionUtils.ExtensionFinder();
--- a/js/ui/focusCaretTracker.js
+++ b/js/ui/focusCaretTracker.js
@ -34,11 +34,7 @@ const FocusCaretTracker = new Lang.Class({
    _init: function() {
        Atspi.init();
        Atspi.set_timeout(250, 250);
-
        this._atspiListener = Atspi.EventListener.new(Lang.bind(this, this._onChanged));
-
-        this._focusListenerRegistered = false;
-        this._caretListenerRegistered = false;
    },

    _onChanged: function(event) {
@ -49,39 +45,21 @@ const FocusCaretTracker = new Lang.Class({
    },

    registerFocusListener: function() {
-        if (this._focusListenerRegistered)
-            return;
-
-        // Ignore the return value, we get an exception if they fail
-        // And they should never fail
-        this._atspiListener.register(STATECHANGED + ':focused');
-        this._atspiListener.register(STATECHANGED + ':selected');
-        this._focusListenerRegistered = true;
+        return this._atspiListener.register(STATECHANGED + ':focused') &&
+               this._atspiListener.register(STATECHANGED + ':selected');
    },

    registerCaretListener: function() {
-        if (this._caretListenerRegistered)
-            return;
-
-        this._atspiListener.register(CARETMOVED);
-        this._caretListenerRegistered = true;
+        return this._atspiListener.register(CARETMOVED);
    },

    deregisterFocusListener: function() {
-        if (!this._focusListenerRegistered)
-            return;
-
-        this._atspiListener.deregister(STATECHANGED + ':focused');
-        this._atspiListener.deregister(STATECHANGED + ':selected');
-        this._focusListenerRegistered = false;
+        return this._atspiListener.deregister(STATECHANGED + ':focused') &&
+               this._atspiListener.deregister(STATECHANGED + ':selected');
    },

    deregisterCaretListener: function() {
-        if (!this._caretListenerRegistered)
-            return;
-
-        this._atspiListener.deregister(CARETMOVED);
-        this._caretListenerRegistered = false;
+        return this._atspiListener.deregister(CARETMOVED);
    }
 });
 Signals.addSignalMethods(FocusCaretTracker.prototype);
--- a/js/ui/ibusCandidatePopup.js
+++ b/js/ui/ibusCandidatePopup.js
@ -155,7 +155,7 @@ const CandidatePopup = new Lang.Class({

        panelService.connect('set-cursor-location',
                             Lang.bind(this, function(ps, x, y, w, h) {
-                                 Main.layoutManager.setDummyCursorGeometry(x, y, w, h);
+                                 Main.layoutManager.setDummyCursorPosition(x, y);
                                 if (this._boxPointer.actor.visible)
                                     this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
                             }));
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@ -143,6 +143,11 @@ const BaseIcon = new Lang.Class({
        this.icon = this.createIcon(this.iconSize);

        this._iconBin.child = this.icon;
+
+        // The icon returned by createIcon() might actually be smaller than
+        // the requested icon size (for instance StTextureCache does this
+        // for fallback icons), so set the size explicitly.
+        this._iconBin.set_size(this.iconSize, this.iconSize);
    },

    _onStyleChanged: function() {
@ -214,20 +219,6 @@ const IconGrid = new Lang.Class({
        this._grid.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
        this._grid.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
        this._grid.connect('allocate', Lang.bind(this, this._allocate));
-        this._grid.connect('actor-added', Lang.bind(this, this._childAdded));
-        this._grid.connect('actor-removed', Lang.bind(this, this._childRemoved));
-    },
-
-    _keyFocusIn: function(actor) {
-        this.emit('key-focus-in', actor);
-    },
-
-    _childAdded: function(grid, child) {
-        child._iconGridKeyFocusInId = child.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
-    },
-
-    _childRemoved: function(grid, child) {
-        child.disconnect(child._iconGridKeyFocusInId);
    },

    _getPreferredWidth: function (grid, forHeight, alloc) {
@ -541,7 +532,6 @@ const IconGrid = new Lang.Class({
        }
    }
 });
-Signals.addSignalMethods(IconGrid.prototype);

 const PaginatedIconGrid = new Lang.Class({
    Name: 'PaginatedIconGrid',
@ -645,10 +635,6 @@ const PaginatedIconGrid = new Lang.Class({
        return this._nPages;
    },

-    getPageHeight: function() {
-        return this._availableHeightPerPageForItems();
-    },
-
    getPageY: function(pageNumber) {
        if (!this._nPages)
            return 0;
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@ -266,14 +266,12 @@ const Keyboard = new Lang.Class({
            return;
        }

-        if (!this._showIdleId) {
-          this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE,
-                                           Lang.bind(this, function() {
-                                               this.Show(time);
-                                               return GLib.SOURCE_REMOVE;
-                                           }));
-          GLib.Source.set_name_by_id(this._showIdleId, '[gnome-shell] this.Show');
-        }
+        if (!this._showIdleId)
+            this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE,
+                                             Lang.bind(this, function() {
+                                                 this.Show(time);
+                                                 return GLib.SOURCE_REMOVE;
+                                             }));
    },

    _createLayersForGroup: function (gname) {
@ -502,7 +500,6 @@ const Keyboard = new Lang.Class({
                                                       this._show(monitor);
                                                       return GLib.SOURCE_REMOVE;
                                                   }));
-        GLib.Source.set_name_by_id(this._keyboardRestingId, '[gnome-shell] this._clearKeyboardRestTimer');
    },

    _show: function(monitor) {
@ -529,7 +526,6 @@ const Keyboard = new Lang.Class({
                                                       this._hide();
                                                       return GLib.SOURCE_REMOVE;
                                                   }));
-        GLib.Source.set_name_by_id(this._keyboardRestingId, '[gnome-shell] this._clearKeyboardRestTimer');
    },

    _hide: function() {
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
@ -161,9 +162,9 @@ const LayoutManager = new Lang.Class({
        this._startingUp = true;

        // Normally, the stage is always covered so Clutter doesn't need to clear
-        // it; however it becomes visible during the startup animation
-        // See the comment below for a longer explanation
+        // it; however it becomes visible when using the magnifier.
        global.stage.color = DEFAULT_BACKGROUND_COLOR;
+        global.stage.no_clear_hint = true;

        // Set up stage hierarchy to group all UI actors under one container.
        this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
@ -183,52 +184,72 @@ const LayoutManager = new Lang.Class({
                            let height = global.stage.height;
                            [alloc.min_size, alloc.natural_size] = [height, height];
                        });
+        global.stage.add_child(this.uiGroup);
+
+        this.systemGroup = new St.Widget({ name: 'systemGroup',
+                                           layout_manager: new Clutter.BinLayout() });
+        this.uiGroup.add_actor(this.systemGroup);
+
+        this.sessionGroup = new St.Widget({ name: 'sessionGroup' });
+        this.uiGroup.add_child(this.sessionGroup);

        global.stage.remove_actor(global.window_group);
-        this.uiGroup.add_actor(global.window_group);
-
-        global.stage.add_child(this.uiGroup);
+        this.sessionGroup.add_actor(global.window_group);

        this.overviewGroup = new St.Widget({ name: 'overviewGroup',
                                             visible: false });
        this.addChrome(this.overviewGroup);

        this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
-                                                 visible: false,
                                                 clip_to_allocation: true,
                                                 layout_manager: new Clutter.BinLayout(),
                                               });
-        this.addChrome(this.screenShieldGroup);
-
-        this.panelBox = new St.BoxLayout({ name: 'panelBox',
-                                           vertical: true });
-        this.addChrome(this.panelBox, { affectsStruts: true,
-                                        trackFullscreen: true });
-        this.panelBox.connect('allocation-changed',
-                              Lang.bind(this, this._panelBoxChanged));
+        this.uiGroup.add_child(this.screenShieldGroup);

        this.trayBox = new St.Widget({ name: 'trayBox',
                                       layout_manager: new Clutter.BinLayout() }); 
        this.addChrome(this.trayBox);
        this._setupTrayPressure();

-        this.modalDialogGroup = new St.Widget({ name: 'modalDialogGroup',
-                                                layout_manager: new Clutter.BinLayout() });
-        this.uiGroup.add_actor(this.modalDialogGroup);
-
        this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
                                              reactive: true,
                                              track_hover: true });
        this.addChrome(this.keyboardBox);
        this._keyboardHeightNotifyId = 0;

-        // A dummy actor that tracks the mouse or text cursor, based on the
-        // position and size set in setDummyCursorGeometry.
-        this.dummyCursor = new St.Widget({ width: 0, height: 0 });
-        this.uiGroup.add_actor(this.dummyCursor);
+        this.osdGroup = new St.Widget();
+        this.sessionGroup.add_child(this.osdGroup);

-        global.stage.remove_actor(global.top_window_group);
-        this.uiGroup.add_actor(global.top_window_group);
+        this.switcherPopupGroup = new St.Widget();
+        this.sessionGroup.add_child(this.switcherPopupGroup);
+
+        this.dialogGroup = new St.Widget();
+        this.sessionGroup.add_child(this.dialogGroup);
+
+        // A dummy actor that tracks the mouse or text cursor, based on the
+        // position set in setDummyCursorPosition.
+        this.dummyCursor = new St.Widget({ width: 0, height: 0 });
+        this.uiGroup.add_child(this.dummyCursor);
+
+        // The panel group isn't in the session, as it needs to go above the screen
+        // shield, and it isn't animated in the login animation.
+        this.panelGroup = new St.Widget({ name: 'panelGroup' });
+        this.uiGroup.add_child(this.panelGroup);
+        this._trackActor(this.panelGroup, { affectsStruts: true,
+                                            trackFullscreen: true });
+        this.panelGroup.connect('allocation-changed',
+                                Lang.bind(this, this._panelGroupChanged));
+
+        this.overlayGroup = new St.Widget({ name: 'overlayGroup' });
+        this.uiGroup.add_child(this.overlayGroup);
+
+        this.menuGroup = new St.Widget();
+        this.overlayGroup.add_child(this.menuGroup);
+
+        this._topSessionGroup = new St.Widget();
+        this.overlayGroup.add_child(this._topSessionGroup);
+        global.stage.remove_child(global.top_window_group);
+        this._topSessionGroup.add_child(global.top_window_group);

        this._backgroundGroup = new Meta.BackgroundGroup();
        global.window_group.add_child(this._backgroundGroup);
@ -250,8 +271,7 @@ const LayoutManager = new Lang.Class({
    // This is called by Main after everything else is constructed
    init: function() {
        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-
-        this._loadBackground();
+        this._prepareStartupAnimation();
    },

    showOverview: function() {
@ -260,6 +280,9 @@ const LayoutManager = new Lang.Class({
        this._inOverview = true;
        this._updateVisibility();
        this._updateRegions();
+
+        global.window_group.hide();
+        global.top_window_group.hide();
    },

    hideOverview: function() {
@ -268,6 +291,9 @@ const LayoutManager = new Lang.Class({
        this._inOverview = false;
        this._updateVisibility();
        this._queueUpdateRegions();
+
+        global.window_group.show();
+        global.top_window_group.show();
    },

    _sessionUpdated: function() {
@ -309,7 +335,7 @@ const LayoutManager = new Lang.Class({
        });
        this.hotCorners = [];

-        let size = this.panelBox.height;
+        let size = this.panelGroup.height;

        // build new hot corners
        for (let i = 0; i < this.monitors.length; i++) {
@ -409,11 +435,11 @@ const LayoutManager = new Lang.Class({
    },

    _updateBoxes: function() {
-        this.screenShieldGroup.set_position(0, 0);
-        this.screenShieldGroup.set_size(global.screen_width, global.screen_height);
+        this.systemGroup.set_position(0, 0);
+        this.systemGroup.set_size(global.screen_width, global.screen_height);

-        this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
-        this.panelBox.set_size(this.primaryMonitor.width, -1);
+        this.panelGroup.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
+        this.panelGroup.set_size(this.primaryMonitor.width, -1);

        if (this.keyboardIndex < 0)
            this.keyboardIndex = this.primaryIndex;
@ -423,10 +449,10 @@ const LayoutManager = new Lang.Class({
        this.trayBox.set_size(this.bottomMonitor.width, -1);
    },

-    _panelBoxChanged: function() {
+    _panelGroupChanged: function() {
        this._updatePanelBarrier();

-        let size = this.panelBox.height;
+        let size = this.panelGroup.height;
        this.hotCorners.forEach(function(corner) {
            if (corner)
                corner.setBarrierSize(size);
@ -439,12 +465,12 @@ const LayoutManager = new Lang.Class({
            this._rightPanelBarrier = null;
        }

-        if (this.panelBox.height) {
+        if (this.panelGroup.height) {
            let primary = this.primaryMonitor;

            this._rightPanelBarrier = new Meta.Barrier({ display: global.display,
                                                         x1: primary.x + primary.width, y1: primary.y,
-                                                         x2: primary.x + primary.width, y2: primary.y + this.panelBox.height,
+                                                         x2: primary.x + primary.width, y2: primary.y + this.panelGroup.height,
                                                         directions: Meta.BarrierDirection.NEGATIVE_X });
        }
    },
@ -550,25 +576,6 @@ const LayoutManager = new Lang.Class({
        return this._keyboardIndex;
    },

-    _loadBackground: function() {
-        this._systemBackground = new Background.SystemBackground();
-        this._systemBackground.actor.hide();
-
-        global.stage.insert_child_below(this._systemBackground.actor, null);
-
-        let constraint = new Clutter.BindConstraint({ source: global.stage,
-                                                      coordinate: Clutter.BindCoordinate.ALL });
-        this._systemBackground.actor.add_constraint(constraint);
-
-        let signalId = this._systemBackground.connect('loaded', Lang.bind(this, function() {
-            this._systemBackground.disconnect(signalId);
-            this._systemBackground.actor.show();
-            global.stage.show();
-
-            this._prepareStartupAnimation();
-        }));
-    },
-
    // Startup Animations
    //
    // We have two different animations, depending on whether we're a greeter
@ -589,6 +596,8 @@ const LayoutManager = new Lang.Class({
    // screen. So, we set no_clear_hint at the end of the animation.

    _prepareStartupAnimation: function() {
+        global.stage.show();
+
        // During the initial transition, add a simple actor to block all events,
        // so they don't get delivered to X11 windows that have been transformed.
        this._coverPane = new Clutter.Actor({ opacity: 0,
@ -598,12 +607,12 @@ const LayoutManager = new Lang.Class({
        this.addChrome(this._coverPane);

        if (Main.sessionMode.isGreeter) {
-            this.panelBox.translation_y = -this.panelBox.height;
+            this.panelGroup.translation_y = -this.panelGroup.height;
        } else {
            this._updateBackgrounds();

            // We need to force an update of the regions now before we scale
-            // the UI group to get the correct allocation for the struts.
+            // the UI group to get the coorect allocation for the struts.
            this._updateRegions();

            this.trayBox.hide();
@ -613,10 +622,10 @@ const LayoutManager = new Lang.Class({
            let x = monitor.x + monitor.width / 2.0;
            let y = monitor.y + monitor.height / 2.0;

-            this.uiGroup.set_pivot_point(x / global.screen_width,
-                                         y / global.screen_height);
-            this.uiGroup.scale_x = this.uiGroup.scale_y = 0.75;
-            this.uiGroup.opacity = 0;
+            this.sessionGroup.set_pivot_point(x / global.screen_width,
+                                              y / global.screen_height);
+            this.sessionGroup.scale_x = this.sessionGroup.scale_y = 0.75;
+            this.sessionGroup.opacity = 0;
            global.window_group.set_clip(monitor.x, monitor.y, monitor.width, monitor.height);
        }

@ -628,11 +637,10 @@ const LayoutManager = new Lang.Class({
        // until the event loop is uncontended and idle.
        // This helps to prevent us from running the animation
        // when the system is bogged down
-        let id = GLib.idle_add(GLib.PRIORITY_LOW, Lang.bind(this, function() {
+        GLib.idle_add(GLib.PRIORITY_LOW, Lang.bind(this, function() {
            this._startupAnimation();
            return GLib.SOURCE_REMOVE;
        }));
-        GLib.Source.set_name_by_id(id, '[gnome-shell] this._startupAnimation');
    },

    _startupAnimation: function() {
@ -643,7 +651,7 @@ const LayoutManager = new Lang.Class({
    },

    _startupAnimationGreeter: function() {
-        Tweener.addTween(this.panelBox,
+        Tweener.addTween(this.panelGroup,
                         { translation_y: 0,
                           time: STARTUP_ANIMATION_TIME,
                           transition: 'easeOutQuad',
@ -652,7 +660,7 @@ const LayoutManager = new Lang.Class({
    },

    _startupAnimationSession: function() {
-        Tweener.addTween(this.uiGroup,
+        Tweener.addTween(this.sessionGroup,
                         { scale_x: 1,
                           scale_y: 1,
                           opacity: 255,
@ -663,16 +671,9 @@ const LayoutManager = new Lang.Class({
    },

    _startupAnimationComplete: function() {
-        // At this point, the UI group is covering everything, so
-        // we no longer need to clear the stage
-        global.stage.no_clear_hint = true;
-
        this._coverPane.destroy();
        this._coverPane = null;

-        this._systemBackground.actor.destroy();
-        this._systemBackground = null;
-
        this._startingUp = false;

        this.trayBox.show();
@ -729,7 +730,7 @@ const LayoutManager = new Lang.Class({
        this._updateRegions();
    },

-    // setDummyCursorGeometry:
+    // setDummyCursorPosition:
    //
    // The cursor dummy is a standard widget commonly used for popup
    // menus and box pointers to track, as the box pointer API only
@ -738,10 +739,9 @@ const LayoutManager = new Lang.Class({
    // is what you should use. Given that the menu should not track
    // the actual mouse pointer as it moves, you need to call this
    // function before you show the menu to ensure it is at the right
-    // position and has the right size.
-    setDummyCursorGeometry: function(x, y, w, h) {
+    // position.
+    setDummyCursorPosition: function(x, y) {
        this.dummyCursor.set_position(Math.round(x), Math.round(y));
-        this.dummyCursor.set_size(Math.round(w), Math.round(h));
    },

    // addChrome:
@ -763,9 +763,9 @@ const LayoutManager = new Lang.Class({
    // monitor (it will be hidden whenever a fullscreen window is visible,
    // and shown otherwise)
    addChrome: function(actor, params) {
-        this.uiGroup.add_actor(actor);
-        if (this.uiGroup.contains(global.top_window_group))
-            this.uiGroup.set_child_below_sibling(actor, global.top_window_group);
+        this.sessionGroup.add_actor(actor);
+        if (this.sessionGroup.contains(global.top_window_group))
+            this.sessionGroup.set_child_below_sibling(actor, global.top_window_group);
        this._trackActor(actor, params);
    },

@ -816,7 +816,7 @@ const LayoutManager = new Lang.Class({
    //
    // Removes @actor from the chrome
    removeChrome: function(actor) {
-        this.uiGroup.remove_actor(actor);
+        this.sessionGroup.remove_actor(actor);
        this._untrackActor(actor);
    },

@ -839,8 +839,6 @@ const LayoutManager = new Lang.Class({
                                            Lang.bind(this, this._queueUpdateRegions));
        actorData.allocationId = actor.connect('notify::allocation',
                                               Lang.bind(this, this._queueUpdateRegions));
-        actorData.destroyId = actor.connect('destroy',
-                                            Lang.bind(this, this._untrackActor));
        // Note that destroying actor will unset its parent, so we don't
        // need to connect to 'destroy' too.

@ -858,7 +856,7 @@ const LayoutManager = new Lang.Class({
        this._trackedActors.splice(i, 1);
        actor.disconnect(actorData.visibleId);
        actor.disconnect(actorData.allocationId);
-        actor.disconnect(actorData.destroyId);
+        actor.disconnect(actorData.parentSetId);

        this._queueUpdateRegions();
    },
@ -866,9 +864,6 @@ const LayoutManager = new Lang.Class({
    _updateVisibility: function() {
        let windowsVisible = Main.sessionMode.hasWindows && !this._inOverview;

-        global.window_group.visible = windowsVisible;
-        global.top_window_group.visible = windowsVisible;
-
        for (let i = 0; i < this._trackedActors.length; i++) {
            let actorData = this._trackedActors[i], visible;
            if (!actorData.trackFullscreen)
@ -912,8 +907,8 @@ const LayoutManager = new Lang.Class({
            return;

        if (!this._updateRegionIdle)
-            this._updateRegionIdle = Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                                                    Lang.bind(this, this._updateRegions));
+            this._updateRegionIdle = Mainloop.idle_add(Lang.bind(this, this._updateRegions),
+                                                       Meta.PRIORITY_BEFORE_REDRAW);
    },

    _getWindowActorsForWorkspace: function(workspace) {
@ -944,7 +939,7 @@ const LayoutManager = new Lang.Class({
        let rects = [], struts = [], i;

        if (this._updateRegionIdle) {
-            Meta.later_remove(this._updateRegionIdle);
+            Mainloop.source_remove(this._updateRegionIdle);
            delete this._updateRegionIdle;
        }

@ -1018,39 +1013,19 @@ const LayoutManager = new Lang.Class({
                    continue;

                // Ensure that the strut rects goes all the way to the screen edge,
-                // as this really what mutter expects. However skip this step
-                // in cases where this would render an entire monitor unusable.
+                // as this really what mutter expects.
                switch (side) {
                case Meta.Side.TOP:
-                    let hasMonitorsAbove = this.monitors.some(Lang.bind(this,
-                        function(mon) {
-                            return this._isAboveOrBelowPrimary(mon) &&
-                                   mon.y < primary.y;
-                        }));
-                    if (!hasMonitorsAbove)
-                        y1 = 0;
+                    y1 = 0;
                    break;
                case Meta.Side.BOTTOM:
-                    if (this.primaryIndex == this.bottomIndex)
-                        y2 = global.screen_height;
+                    y2 = global.screen_height;
                    break;
                case Meta.Side.LEFT:
-                    let hasMonitorsLeft = this.monitors.some(Lang.bind(this,
-                        function(mon) {
-                            return !this._isAboveOrBelowPrimary(mon) &&
-                                   mon.x < primary.x;
-                        }));
-                    if (!hasMonitorsLeft)
-                        x1 = 0;
+                    x1 = 0;
                    break;
                case Meta.Side.RIGHT:
-                    let hasMonitorsRight = this.monitors.some(Lang.bind(this,
-                        function(mon) {
-                            return !this._isAboveOrBelowPrimary(mon) &&
-                                   mon.x > primary.x;
-                        }));
-                    if (!hasMonitorsRight)
-                        x2 = global.screen_width;
+                    x2 = global.screen_width;
                    break;
                }

@ -1107,9 +1082,9 @@ const HotCorner = new Lang.Class({
        this._ripple2 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
        this._ripple3 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });

-        layoutManager.uiGroup.add_actor(this._ripple1);
-        layoutManager.uiGroup.add_actor(this._ripple2);
-        layoutManager.uiGroup.add_actor(this._ripple3);
+        layoutManager.sessionGroup.add_actor(this._ripple1);
+        layoutManager.sessionGroup.add_actor(this._ripple2);
+        layoutManager.sessionGroup.add_actor(this._ripple3);
    },

    setBarrierSize: function(size) {
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@ -11,60 +11,30 @@ const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;

 const DEFAULT_FADE_FACTOR = 0.4;
-const VIGNETTE_BRIGHTNESS = 0.8;
-const VIGNETTE_SHARPNESS = 0.7;

-const VIGNETTE_DECLARATIONS = '\
-uniform float brightness;\n\
-uniform float vignette_sharpness;\n';
-
-const VIGNETTE_CODE = '\
-cogl_color_out.a = cogl_color_in.a;\n\
-cogl_color_out.rgb = vec3(0.0, 0.0, 0.0);\n\
-vec2 position = cogl_tex_coord_in[0].xy - 0.5;\n\
-float t = length(2.0 * position);\n\
-t = clamp(t, 0.0, 1.0);\n\
-float pixel_brightness = mix(1.0, 1.0 - vignette_sharpness, t);\n\
-cogl_color_out.a = cogl_color_out.a * (1 - pixel_brightness * brightness);';
+const GLSL_DIM_EFFECT_DECLARATIONS = '\
+float compute_dim_factor (const vec2 coords) {\
+   vec2 dist = coords - vec2(0.5, 0.5); \
+   float elipse_radius = 0.5; \
+   /* interpolate darkening value, based on distance from screen center */ \
+   float val = min(length(dist), elipse_radius); \
+   return mix(0.3, 1.0, val / elipse_radius) * 0.4; \
+}';
+const GLSL_DIM_EFFECT_CODE = '\
+   float a = compute_dim_factor (cogl_tex_coord0_in.xy);\
+   cogl_color_out = vec4(0, 0, 0, cogl_color_in.a * a);'
+;

 const RadialShaderQuad = new Lang.Class({
    Name: 'RadialShaderQuad',
    Extends: Shell.GLSLQuad,

-    _init: function(params) {
-        this.parent(params);
-
-        this._brightnessLocation = this.get_uniform_location('brightness');
-        this._sharpnessLocation = this.get_uniform_location('vignette_sharpness');
-
-        this.brightness = 1.0;
-        this.vignetteSharpness = 0.0;
-    },
-
    vfunc_build_pipeline: function() {
        this.add_glsl_snippet(Shell.SnippetHook.FRAGMENT,
-                              VIGNETTE_DECLARATIONS, VIGNETTE_CODE, true);
+                              GLSL_DIM_EFFECT_DECLARATIONS,
+                              GLSL_DIM_EFFECT_CODE,
+                              true);
    },
-
-    get brightness() {
-        return this._brightness;
-    },
-
-    set brightness(v) {
-        this._brightness = v;
-        this.set_uniform_float(this._brightnessLocation,
-                               1, [this._brightness]);
-    },
-
-    get vignetteSharpness() {
-        return this._sharpness;
-    },
-
-    set vignetteSharpness(v) {
-        this._sharpness = v;
-        this.set_uniform_float(this._sharpnessLocation,
-                               1, [this._sharpness]);
-    }
 });

 /**
@ -105,7 +75,6 @@ const Lightbox = new Lang.Class({
        this._container = container;
        this._children = container.get_children();
        this._fadeFactor = params.fadeFactor;
-        this._radialEffect = params.radialEffect;
        if (params.radialEffect)
            this.actor = new RadialShaderQuad({ x: 0,
                                                y: 0,
@ -113,7 +82,6 @@ const Lightbox = new Lang.Class({
        else
            this.actor = new St.Bin({ x: 0,
                                      y: 0,
-                                      opacity: 0,
                                      style_class: 'lightbox',
                                      reactive: params.inhibitEvents });

@ -165,18 +133,9 @@ const Lightbox = new Lang.Class({
        fadeInTime = fadeInTime || 0;

        Tweener.removeTweens(this.actor);
-        if (this._radialEffect) {
-            Tweener.addTween(this.actor,
-                             { brightness: VIGNETTE_BRIGHTNESS,
-                               vignetteSharpness: VIGNETTE_SHARPNESS,
-                               time: fadeInTime,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this, function() {
-                                   this.shown = true;
-                                   this.emit('shown');
-                               })
-                             });
-        } else {
+        if (fadeInTime != 0) {
+            this.shown = false;
+            this.actor.opacity = 0;
            Tweener.addTween(this.actor,
                             { opacity: 255 * this._fadeFactor,
                               time: fadeInTime,
@ -186,8 +145,11 @@ const Lightbox = new Lang.Class({
                                   this.emit('shown');
                               })
                             });
+        } else {
+            this.actor.opacity = 255 * this._fadeFactor;
+            this.shown = true;
+            this.emit('shown');
        }
-
        this.actor.show();
    },

@ -196,18 +158,7 @@ const Lightbox = new Lang.Class({

        this.shown = false;
        Tweener.removeTweens(this.actor);
-        if (this._radialEffect) {
-            Tweener.addTween(this.actor,
-                             { brightness: 1.0,
-                               vignetteSharpness: 0.0,
-                               opacity: 0,
-                               time: fadeOutTime,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this, function() {
-                                   this.actor.hide();
-                               })
-                             });
-        } else {
+        if (fadeOutTime != 0) {
            Tweener.addTween(this.actor,
                             { opacity: 0,
                               time: fadeOutTime,
@ -216,6 +167,8 @@ const Lightbox = new Lang.Class({
                                   this.actor.hide();
                               })
                             });
+        } else {
+            this.actor.hide();
        }
    },

--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -27,8 +27,6 @@ const CHEVRON = '>>> ';
 /* Imports...feel free to add here as needed */
 var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                    'const GLib = imports.gi.GLib; ' +
-                    'const GObject = imports.gi.GObject; ' +
-                    'const Gio = imports.gi.Gio; ' +
                    'const Gtk = imports.gi.Gtk; ' +
                    'const Mainloop = imports.mainloop; ' +
                    'const Meta = imports.gi.Meta; ' +
@ -505,7 +503,7 @@ const Inspector = new Lang.Class({
        let container = new Shell.GenericContainer({ width: 0,
                                                     height: 0 });
        container.connect('allocate', Lang.bind(this, this._allocate));
-        Main.uiGroup.add_actor(container);
+        Main.layoutManager.sessionGroup.add_actor(container);

        let eventHandler = new St.BoxLayout({ name: 'LookingGlassDialog',
                                              vertical: false,
@ -803,16 +801,14 @@ const LookingGlass = new Lang.Class({
        this._updateFont();

        // We want it to appear to slide out from underneath the panel
-        Main.uiGroup.add_actor(this.actor);
-        Main.uiGroup.set_child_below_sibling(this.actor,
-                                             Main.layoutManager.panelBox);
-        Main.layoutManager.panelBox.connect('allocation-changed',
-                                            Lang.bind(this, this._queueResize));
+        Main.layoutManager.sessionGroup.add_actor(this.actor);
+        Main.layoutManager.panelGroup.connect('allocation-changed',
+                                              Lang.bind(this, this._queueResize));
        Main.layoutManager.keyboardBox.connect('allocation-changed',
                                               Lang.bind(this, this._queueResize));

        this._objInspector = new ObjInspector(this);
-        Main.uiGroup.add_actor(this._objInspector.actor);
+        Main.layoutManager.sessionGroup.add_actor(this._objInspector.actor);
        this._objInspector.actor.hide();

        let toolbar = new St.BoxLayout({ name: 'Toolbar' });
@ -843,10 +839,9 @@ const LookingGlass = new Lang.Class({
           System.gc();
           this._timeoutId = Mainloop.timeout_add(500, Lang.bind(this, function () {
                gcIcon.icon_name = 'gnome-fs-trash-full';
-                this._timeoutId = 0;
+                Mainloop.source_remove(this._timeoutId);
                return GLib.SOURCE_REMOVE;
           }));
-           GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] gcIcon.icon_name = \'gnome-fs-trash-full\'');
           return Clutter.EVENT_PROPAGATE;
        }));

@ -1040,7 +1035,7 @@ const LookingGlass = new Lang.Class({
        let availableHeight = primary.height - Main.layoutManager.keyboardBox.height;
        let myHeight = Math.min(primary.height * 0.7, availableHeight * 0.9);
        this.actor.x = primary.x + (primary.width - myWidth) / 2;
-        this._hiddenY = primary.y + Main.layoutManager.panelBox.height - myHeight - 4; // -4 to hide the top corners
+        this._hiddenY = primary.y + Main.layoutManager.panelGroup.height - myHeight - 4; // -4 to hide the top corners
        this._targetY = this._hiddenY + myHeight;
        this.actor.y = this._hiddenY;
        this.actor.width = myWidth;
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@ -11,7 +11,6 @@ const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;

-const Background = imports.ui.background;
 const FocusCaretTracker = imports.ui.focusCaretTracker;
 const Main = imports.ui.main;
 const MagnifierDBus = imports.ui.magnifierDBus;
@ -58,6 +57,20 @@ const Magnifier = new Lang.Class({
        // Magnifier is a manager of ZoomRegions.
        this._zoomRegions = [];

+        // Export to dbus.
+        magDBusService = new MagnifierDBus.ShellMagnifier();
+
+        let showAtLaunch = this._settingsInit();
+        this.setActive(showAtLaunch);
+    },
+
+    _initialize: function() {
+        if (this._initialized)
+            return;
+        this._initialized = true;
+
+        this._settingsInitLate();
+
        // Create small clutter tree for the magnified mouse.
        let cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
        this._mouseSprite = new Clutter.Texture();
@ -73,15 +86,11 @@ const Magnifier = new Lang.Class({

        let aZoomRegion = new ZoomRegion(this, this._cursorRoot);
        this._zoomRegions.push(aZoomRegion);
-        let showAtLaunch = this._settingsInit(aZoomRegion);
+        this._settingsInitRegion(aZoomRegion);
        aZoomRegion.scrollContentsTo(this.xMouse, this.yMouse);

        cursorTracker.connect('cursor-changed', Lang.bind(this, this._updateMouseSprite));
        this._cursorTracker = cursorTracker;
-
-        // Export to dbus.
-        magDBusService = new MagnifierDBus.ShellMagnifier();
-        this.setActive(showAtLaunch);
    },

    /**
@ -106,21 +115,20 @@ const Magnifier = new Lang.Class({
     * @activate:   Boolean to activate or de-activate the magnifier.
     */
    setActive: function(activate) {
-        let isActive = this.isActive();
+        if (activate == this.isActive())
+            return;
+
+        if (activate)
+            this._initialize();

        this._zoomRegions.forEach (function(zoomRegion, index, array) {
            zoomRegion.setActive(activate);
        });

-        if (isActive != activate) {
-            if (activate) {
-                Meta.disable_unredirect_for_screen(global.screen);
-                this.startTrackingMouse();
-            } else {
-                Meta.enable_unredirect_for_screen(global.screen);
-                this.stopTrackingMouse();
-            }
-        }
+        if (activate)
+            this.startTrackingMouse();
+        else
+            this.stopTrackingMouse();

        // Make sure system mouse pointer is shown when all zoom regions are
        // invisible.
@ -440,64 +448,68 @@ const Magnifier = new Lang.Class({
        this._mouseSprite.set_anchor_point(xHot, yHot);
    },

-    _settingsInit: function(zoomRegion) {
+    _settingsInitRegion: function(zoomRegion) {
+        // Mag factor is accurate to two decimal places.
+        let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
+        if (aPref != 0.0)
+            zoomRegion.setMagFactor(aPref, aPref);
+
+        aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
+        if (aPref)
+            zoomRegion.setScreenPosition(aPref);
+
+        zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
+        zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
+
+        aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
+        if (aPref)
+            zoomRegion.setMouseTrackingMode(aPref);
+
+        aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
+        if (aPref)
+            zoomRegion.setFocusTrackingMode(aPref);
+
+        aPref = this._settings.get_enum(CARET_TRACKING_KEY);
+        if (aPref)
+            zoomRegion.setCaretTrackingMode(aPref);
+
+        aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
+        if (aPref)
+            zoomRegion.setInvertLightness(aPref);
+
+        aPref = this._settings.get_double(COLOR_SATURATION_KEY);
+        if (aPref)
+            zoomRegion.setColorSaturation(aPref);
+
+        let bc = {};
+        bc.r = this._settings.get_double(BRIGHT_RED_KEY);
+        bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
+        bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
+        zoomRegion.setBrightness(bc);
+
+        bc.r = this._settings.get_double(CONTRAST_RED_KEY);
+        bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
+        bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
+        zoomRegion.setContrast(bc);
+    },
+
+    _settingsInit: function() {
        this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
        this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });

-        if (zoomRegion) {
-            // Mag factor is accurate to two decimal places.
-            let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
-            if (aPref != 0.0)
-                zoomRegion.setMagFactor(aPref, aPref);
+        this._appSettings.connect('changed::' + SHOW_KEY, Lang.bind(this, function() {
+            let active = this._appSettings.get_boolean(SHOW_KEY);
+            this.setActive(active);
+        }));

-            aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
-            if (aPref)
-                zoomRegion.setScreenPosition(aPref);
-
-            zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
-            zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
-
-            aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
-            if (aPref)
-                zoomRegion.setMouseTrackingMode(aPref);
-
-            aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
-            if (aPref)
-                zoomRegion.setFocusTrackingMode(aPref);
-
-            aPref = this._settings.get_enum(CARET_TRACKING_KEY);
-            if (aPref)
-                zoomRegion.setCaretTrackingMode(aPref);
-
-            aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
-            if (aPref)
-                zoomRegion.setInvertLightness(aPref);
-
-            aPref = this._settings.get_double(COLOR_SATURATION_KEY);
-            if (aPref)
-                zoomRegion.setColorSaturation(aPref);
-
-            let bc = {};
-            bc.r = this._settings.get_double(BRIGHT_RED_KEY);
-            bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
-            bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
-            zoomRegion.setBrightness(bc);
-
-            bc.r = this._settings.get_double(CONTRAST_RED_KEY);
-            bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-            bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-            zoomRegion.setContrast(bc);
-        }
+        return this._appSettings.get_boolean(SHOW_KEY);
+    },

+    _settingsInitLate: function() {
        let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
        this.addCrosshairs();
        this.setCrosshairsVisible(showCrosshairs);

-        this._appSettings.connect('changed::' + SHOW_KEY,
-                                  Lang.bind(this, function() {
-            this.setActive(this._appSettings.get_boolean(SHOW_KEY));
-        }));
-
        this._settings.connect('changed::' + SCREEN_POSITION_KEY,
                               Lang.bind(this, this._updateScreenPosition));
        this._settings.connect('changed::' + MAG_FACTOR_KEY,
@ -561,7 +573,6 @@ const Magnifier = new Lang.Class({
                               Lang.bind(this, function() {
            this.setCrosshairsClip(this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY));
        }));
-        return this._appSettings.get_boolean(SHOW_KEY);
   },

    _updateScreenPosition: function() {
@ -720,16 +731,8 @@ const ZoomRegion = new Lang.Class({
        let component = event.source.get_component_iface();
        if (!component || event.detail1 != 1)
            return;
-        let extents;
-        try {
-            extents = component.get_extents(Atspi.CoordType.SCREEN);
-        } catch(e) {
-            log('Failed to read extents of focused component: ' + e.message);
-            return;
-        }
-
-        [this._xFocus, this._yFocus] = [extents.x + (extents.width / 2),
-                                        extents.y + (extents.height / 2)];
+        let extents = component.get_extents(Atspi.CoordType.SCREEN);
+        [this._xFocus, this._yFocus] = [extents.x, extents.y]
        this._centerFromFocusPosition();
    },

@ -737,14 +740,7 @@ const ZoomRegion = new Lang.Class({
        let text = event.source.get_text_iface();
        if (!text)
            return;
-        let extents;
-        try {
-            extents = text.get_character_extents(text.get_caret_offset(), 0);
-        } catch(e) {
-            log('Failed to read extents of text caret: ' + e.message);
-            return;
-        }
-
+        let extents = text.get_character_extents(text.get_caret_offset(), 0);
        [this._xCaret, this._yCaret] = [extents.x, extents.y];
        this._centerFromCaretPosition();
    },
@ -767,9 +763,6 @@ const ZoomRegion = new Lang.Class({
        } else {
            this._destroyActors();
        }
-
-        this._syncCaretTracking();
-        this._syncFocusTracking();
    },

    /**
@ -829,7 +822,10 @@ const ZoomRegion = new Lang.Class({
     */
    setFocusTrackingMode: function(mode) {
        this._focusTrackingMode = mode;
-        this._syncFocusTracking();
+        if (this._focusTrackingMode == GDesktopEnums.MagnifierFocusTrackingMode.NONE)
+            this._focusCaretTracker.deregisterFocusListener();
+        else
+            this._focusCaretTracker.registerFocusListener();
    },

    /**
@ -838,27 +834,10 @@ const ZoomRegion = new Lang.Class({
     */
    setCaretTrackingMode: function(mode) {
        this._caretTrackingMode = mode;
-        this._syncCaretTracking();
-    },
-
-    _syncFocusTracking: function() {
-        let enabled = this._focusTrackingMode != GDesktopEnums.MagnifierFocusTrackingMode.NONE &&
-            this.isActive();
-
-        if (enabled)
-            this._focusCaretTracker.registerFocusListener();
-        else
-            this._focusCaretTracker.deregisterFocusListener();
-    },
-
-    _syncCaretTracking: function() {
-        let enabled = this._caretTrackingMode != GDesktopEnums.MagnifierCaretTrackingMode.NONE &&
-            this.isActive();
-
-        if (enabled)
-            this._focusCaretTracker.registerCaretListener();
-        else
+        if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.NONE)
            this._focusCaretTracker.deregisterCaretListener();
+        else
+            this._focusCaretTracker.registerCaretListener();
    },

    /**
@ -1199,17 +1178,13 @@ const ZoomRegion = new Lang.Class({
        // Add a background for when the magnified uiGroup is scrolled
        // out of view (don't want to see desktop showing through).
        this._background = new Clutter.Actor({ background_color: Main.DEFAULT_BACKGROUND_COLOR,
-                                               layout_manager: new Clutter.BinLayout(),
                                               width: global.screen_width,
                                               height: global.screen_height });
-        let noiseTexture = (new Background.SystemBackground()).actor;
-        this._background.add_actor(noiseTexture);
        mainGroup.add_actor(this._background);

        // Clone the group that contains all of UI on the screen.  This is the
        // chrome, the windows, etc.
-        this._uiGroupClone = new Clutter.Clone({ source: Main.uiGroup,
-                                                 clip_to_allocation: true });
+        this._uiGroupClone = new Clutter.Clone({ source: Main.layoutManager.uiGroup });
        mainGroup.add_actor(this._uiGroupClone);

        // Add either the given mouseSourceActor to the ZoomRegion, or a clone of
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -43,7 +43,6 @@ const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);

 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
 const STICKY_KEYS_ENABLE = 'stickykeys-enable';
-const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a';

 let componentManager = null;
 let panel = null;
@ -56,7 +55,7 @@ let screenShield = null;
 let notificationDaemon = null;
 let windowAttentionHandler = null;
 let ctrlAltTabManager = null;
-let osdWindowManager = null;
+let osdWindow = null;
 let sessionMode = null;
 let shellDBusService = null;
 let shellMountOpDBusService = null;
@ -65,7 +64,6 @@ let screencastService = null;
 let modalCount = 0;
 let keybindingMode = Shell.KeyBindingMode.NONE;
 let modalActorFocusStack = [];
-let uiGroup = null;
 let magnifier = null;
 let xdndHandler = null;
 let keyboard = null;
@ -104,6 +102,9 @@ function start() {
    global.logError = window.log;
    global.log = window.log;

+    if (!Meta.is_wayland_compositor)
+        Meta.is_wayland_compositor = function () { return false; };
+
    // Chain up async errors reported from C
    global.connect('notify-error', function (global, msg, detail) { notifyError(msg, detail); });

@ -148,15 +149,10 @@ function _initializeUI() {
    // Setup the stage hierarchy early
    layoutManager = new Layout.LayoutManager();

-    // Various parts of the codebase still refers to Main.uiGroup
-    // instead using the layoutManager.  This keeps that code
-    // working until it's updated.
-    uiGroup = layoutManager.uiGroup;
-
    screencastService = new Screencast.ScreencastService();
    xdndHandler = new XdndHandler.XdndHandler();
    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
-    osdWindowManager = new OsdWindow.OsdWindowManager();
+    osdWindow = new OsdWindow.OsdWindow();
    overview = new Overview.Overview();
    wm = new WindowManager.WindowManager();
    magnifier = new Magnifier.Magnifier();
@ -170,6 +166,19 @@ function _initializeUI() {
    windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
    componentManager = new Components.ComponentManager();

+    if (sessionMode.isGreeter && screenShield) {
+        layoutManager.connect('startup-prepared', function() {
+            screenShield.showDialog();
+        });
+    }
+
+    layoutManager.connect('startup-complete', function() {
+        if (keybindingMode == Shell.KeyBindingMode.NONE)
+            keybindingMode = Shell.KeyBindingMode.NORMAL;
+        if (screenShield)
+            screenShield.lockIfWasLocked();
+    });
+
    layoutManager.init();
    overview.init();

@ -189,6 +198,8 @@ function _initializeUI() {

    _startDate = new Date();

+    log('GNOME Shell started at ' + _startDate);
+
    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
    if (perfModuleName) {
        let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
@ -198,32 +209,6 @@ function _initializeUI() {

    ExtensionDownloader.init();
    ExtensionSystem.init();
-
-    if (sessionMode.isGreeter && screenShield) {
-        layoutManager.connect('startup-prepared', function() {
-            screenShield.showDialog();
-        });
-    }
-
-    layoutManager.connect('startup-complete', function() {
-                              if (keybindingMode == Shell.KeyBindingMode.NONE) {
-                                  keybindingMode = Shell.KeyBindingMode.NORMAL;
-                              }
-                              if (screenShield) {
-                                  screenShield.lockIfWasLocked();
-                              }
-                              if (LoginManager.haveSystemd() &&
-                                  sessionMode.currentMode != 'gdm' &&
-                                  sessionMode.currentMode != 'initial-setup') {
-                                  // Do not import globally to not depend
-                                  // on systemd on non-systemd systems.
-                                  let GSystem = imports.gi.GSystem;
-                                  GSystem.log_structured_print('GNOME Shell started at ' + _startDate,
-                                                               ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
-                              } else {
-                                  log('GNOME Shell started at ' + _startDate);
-                              }
-                          });
 }

 function _loadDefaultStylesheet() {
@ -618,6 +603,5 @@ function queueDeferredWork(workId) {
            _deferredTimeoutId = 0;
            return GLib.SOURCE_REMOVE;
        });
-        GLib.Source.set_name_by_id(_deferredTimeoutId, '[gnome-shell] _runAllDeferredWork');
    }
 }
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -1162,12 +1162,32 @@ const SourceActor = new Lang.Class({
        }));
        this._actorDestroyed = false;

-        let scale_factor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._iconBin = new St.Bin({ x_fill: true,
-                                     height: size * scale_factor,
-                                     width: size * scale_factor });
+        this._counterLabel = new St.Label({ x_align: Clutter.ActorAlign.CENTER,
+                                            x_expand: true,
+                                            y_align: Clutter.ActorAlign.CENTER,
+                                            y_expand: true });
+
+        this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
+                                        child: this._counterLabel,
+                                        layout_manager: new Clutter.BinLayout() });
+        this._counterBin.hide();
+
+        this._counterBin.connect('style-changed', Lang.bind(this, function() {
+            let themeNode = this._counterBin.get_theme_node();
+            this._counterBin.translation_x = themeNode.get_length('-shell-counter-overlap-x');
+            this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y');
+        }));
+
+        this._iconBin = new St.Bin({ width: size,
+                                     height: size,
+                                     x_fill: true,
+                                     y_fill: true });

        this.actor.add_actor(this._iconBin);
+        this.actor.add_actor(this._counterBin);
+
+        this._source.connect('count-updated', Lang.bind(this, this._updateCount));
+        this._updateCount();

        this._source.connect('icon-updated', Lang.bind(this, this._updateIcon));
        this._updateIcon();
@ -1191,48 +1211,6 @@ const SourceActor = new Lang.Class({
    _allocate: function(actor, box, flags) {
        // the iconBin should fill our entire box
        this._iconBin.allocate(box, flags);
-    },
-
-    _updateIcon: function() {
-        if (this._actorDestroyed)
-            return;
-
-        if (!this._iconSet)
-            this._iconBin.child = this._source.createIcon(this._size);
-    }
-});
-
-const SourceActorWithLabel = new Lang.Class({
-    Name: 'SourceActorWithLabel',
-    Extends: SourceActor,
-
-    _init: function(source, size) {
-        this.parent(source, size);
-
-        this._counterLabel = new St.Label({ x_align: Clutter.ActorAlign.CENTER,
-                                            x_expand: true,
-                                            y_align: Clutter.ActorAlign.CENTER,
-                                            y_expand: true });
-
-        this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
-                                        child: this._counterLabel,
-                                        layout_manager: new Clutter.BinLayout() });
-        this._counterBin.hide();
-
-        this._counterBin.connect('style-changed', Lang.bind(this, function() {
-            let themeNode = this._counterBin.get_theme_node();
-            this._counterBin.translation_x = themeNode.get_length('-shell-counter-overlap-x');
-            this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y');
-        }));
-
-        this.actor.add_actor(this._counterBin);
-
-        this._source.connect('count-updated', Lang.bind(this, this._updateCount));
-        this._updateCount();
-    },
-
-    _allocate: function(actor, box, flags) {
-        this.parent(actor, box, flags);

        let childBox = new Clutter.ActorBox();

@ -1255,6 +1233,14 @@ const SourceActorWithLabel = new Lang.Class({
        this._counterBin.allocate(childBox, flags);
    },

+    _updateIcon: function() {
+        if (this._actorDestroyed)
+            return;
+
+        if (!this._iconSet)
+            this._iconBin.child = this._source.createIcon(this._size);
+    },
+
    _updateCount: function() {
        if (this._actorDestroyed)
            return;
@ -1367,7 +1353,7 @@ const Source = new Lang.Class({
        if (this._mainIcon)
            return;

-        this._mainIcon = new SourceActorWithLabel(this, this.SOURCE_ICON_SIZE);
+        this._mainIcon = new SourceActor(this, this.SOURCE_ICON_SIZE);
    },

    // Unlike createIcon, this always returns the same actor;
@ -1625,7 +1611,7 @@ const MessageTrayMenu = new Lang.Class({
        this._accountManager.prepare_async(null, Lang.bind(this, this._onIMPresenceChanged));

        this.actor.hide();
-        Main.layoutManager.addChrome(this.actor);
+        Main.layoutManager.menuGroup.add_child(this.actor);

        this._busyItem = new PopupMenu.PopupSwitchMenuItem(_("Notifications"));
        this._busyItem.connect('toggled', Lang.bind(this, this._updatePresence));
@ -1987,7 +1973,6 @@ const MessageTray = new Lang.Class({

                this._trayDwellTimeoutId = Mainloop.timeout_add(TRAY_DWELL_TIME,
                                                                Lang.bind(this, this._trayDwellTimeout));
-                GLib.Source.set_name_by_id(this._trayDwellTimeoutId, '[gnome-shell] this._trayDwellTimeout');
            }
            this._trayDwelling = true;
        } else {
@ -2028,18 +2013,13 @@ const MessageTray = new Lang.Class({

    _onNotificationKeyRelease: function(actor, event) {
        if (event.get_key_symbol() == Clutter.KEY_Escape && event.get_state() == 0) {
-            this._expireNotification();
+            this._closeNotification();
            return Clutter.EVENT_STOP;
        }

        return Clutter.EVENT_PROPAGATE;
    },

-    _expireNotification: function() {
-        this._notificationExpired = true;
-        this._updateState();
-    },
-
    _closeNotification: function() {
        if (this._notificationState == State.SHOWN) {
            this._closeButton.hide();
@ -2317,7 +2297,6 @@ const MessageTray = new Lang.Class({
            // That gives the user more time to mouse away from the notification and mouse back in in order to expand it.
            let timeout = this._useLongerNotificationLeftTimeout ? LONGER_HIDE_TIMEOUT * 1000 : HIDE_TIMEOUT * 1000;
            this._notificationLeftTimeoutId = Mainloop.timeout_add(timeout, Lang.bind(this, this._onNotificationLeftTimeout));
-            GLib.Source.set_name_by_id(this._notificationLeftTimeoutId, '[gnome-shell] this._onNotificationLeftTimeout');
        }
    },

@ -2353,7 +2332,6 @@ const MessageTray = new Lang.Class({
            this._notificationLeftMouseX = -1;
            this._notificationLeftTimeoutId = Mainloop.timeout_add(LONGER_HIDE_TIMEOUT * 1000,
                                                             Lang.bind(this, this._onNotificationLeftTimeout));
-            GLib.Source.set_name_by_id(this._notificationLeftTimeoutId, '[gnome-shell] this._onNotificationLeftTimeout');
        } else {
            this._notificationLeftTimeoutId = 0;
            this._useLongerNotificationLeftTimeout = false;
@ -2406,7 +2384,7 @@ const MessageTray = new Lang.Class({
                           this._notificationTimeoutId == 0 &&
                           this._notification.urgency != Urgency.CRITICAL &&
                           !this._notification.focused &&
-                           !this._pointerInNotification) || this._notificationExpired;
+                           !this._pointerInNotification);
            let mustClose = (this._notificationRemoved || !hasNotifications || expired || this._traySummoned);

            if (mustClose) {
@ -2467,10 +2445,6 @@ const MessageTray = new Lang.Class({
            this._hideDesktopClone();

        this._updatingState = false;
-
-        // Clean transient variables that are used to communicate actions
-        // to updateState()
-        this._notificationExpired = false;
    },

    _tween: function(actor, statevar, value, params) {
@ -2538,7 +2512,7 @@ const MessageTray = new Lang.Class({
        let cloneSource = Main.overview.visible ? Main.layoutManager.overviewGroup : global.window_group;
        this._desktopClone = new Clutter.Clone({ source: cloneSource,
                                                 clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
-        Main.uiGroup.insert_child_above(this._desktopClone, cloneSource);
+        Main.layoutManager.sessionGroup.insert_child_above(this._desktopClone, cloneSource);
        this._desktopClone.x = 0;
        this._desktopClone.y = 0;
        this._desktopClone.show();
@ -2671,12 +2645,10 @@ const MessageTray = new Lang.Class({
            Mainloop.source_remove(this._notificationTimeoutId);
            this._notificationTimeoutId = 0;
        }
-        if (timeout > 0) {
+        if (timeout > 0)
            this._notificationTimeoutId =
                Mainloop.timeout_add(timeout,
                                     Lang.bind(this, this._notificationTimeout));
-            GLib.Source.set_name_by_id(this._notificationTimeoutId, '[gnome-shell] this._notificationTimeout');
-        }
    },

    _notificationTimeout: function() {
@ -2795,12 +2767,7 @@ const MessageTray = new Lang.Class({
                             { y: expandedY,
                               opacity: 255,
                               time: ANIMATION_TIME,
-                               transition: 'easeOutQuad',
-                               // HACK: Drive the state machine here better,
-                               // instead of overwriting tweens
-                               onComplete: Lang.bind(this, function() {
-                                   this._notificationState = State.SHOWN;
-                               }),
+                               transition: 'easeOutQuad'
                             });
        }
    },
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -41,6 +41,7 @@ const ModalDialog = new Lang.Class({
    _init: function(params) {
        params = Params.parse(params, { shellReactive: false,
                                        styleClass: null,
+                                        parentActor: Main.layoutManager.dialogGroup,
                                        keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL,
                                        shouldFadeIn: true,
                                        destroyOnClose: true });
@ -56,7 +57,7 @@ const ModalDialog = new Lang.Class({
                                      x: 0,
                                      y: 0,
                                      accessible_role: Atk.Role.DIALOG });
-        Main.layoutManager.modalDialogGroup.add_actor(this._group);
+        params.parentActor.add_actor(this._group);

        let constraint = new Clutter.BindConstraint({ source: global.stage,
                                                      coordinate: Clutter.BindCoordinate.ALL });
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -244,12 +244,11 @@ const FdoNotificationDaemon = new Lang.Class({
            // Ignore replacesId since we already sent back a
            // NotificationClosed for that id.
            id = this._nextNotificationId++;
-            let idle_id = Mainloop.idle_add(Lang.bind(this,
-                                            function () {
-                                                this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
-                                                return GLib.SOURCE_REMOVE;
-                                            }));
-            GLib.Source.set_name_by_id(idle_id, '[gnome-shell] this._emitNotificationClosed');
+            Mainloop.idle_add(Lang.bind(this,
+                                        function () {
+                                            this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
+                                            return GLib.SOURCE_REMOVE;
+                                        }));
            return invocation.return_value(GLib.Variant.new('(u)', [id]));
        }

--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@ -73,17 +73,14 @@ const LevelBar = new Lang.Class({
 const OsdWindow = new Lang.Class({
    Name: 'OsdWindow',

-    _init: function(monitorIndex) {
+    _init: function() {
        this._popupSize = 0;
        this.actor = new St.Widget({ x_expand: true,
                                     y_expand: true,
                                     x_align: Clutter.ActorAlign.CENTER,
                                     y_align: Clutter.ActorAlign.CENTER });
-
-        this._monitorIndex = monitorIndex;
-        let constraint = new Layout.MonitorConstraint({ index: monitorIndex });
-        this.actor.add_constraint(constraint);
-
+        this._currentMonitor = undefined;
+        this.setMonitor (-1);
        this._box = new St.BoxLayout({ style_class: 'osd-window',
                                       vertical: true });
        this.actor.add_actor(this._box);
@ -112,7 +109,8 @@ const OsdWindow = new Lang.Class({
        Main.layoutManager.connect('monitors-changed',
                                   Lang.bind(this, this._monitorsChanged));
        this._monitorsChanged();
-        Main.uiGroup.add_child(this.actor);
+
+        Main.layoutManager.osdGroup.add_child(this.actor);
    },

    setIcon: function(icon) {
@ -127,7 +125,7 @@ const OsdWindow = new Lang.Class({

    setLevel: function(level) {
        this._level.actor.visible = (level != undefined);
-        if (level != undefined) {
+        if (level) {
            if (this.actor.visible)
                Tweener.addTween(this._level,
                                 { level: level,
@ -158,7 +156,6 @@ const OsdWindow = new Lang.Class({
            Mainloop.source_remove(this._hideTimeoutId);
        this._hideTimeoutId = Mainloop.timeout_add(HIDE_TIMEOUT,
                                                   Lang.bind(this, this._hide));
-        GLib.Source.set_name_by_id(this._hideTimeoutId, '[gnome-shell] this._hide');
    },

    cancel: function() {
@ -191,18 +188,20 @@ const OsdWindow = new Lang.Class({

    _monitorsChanged: function() {
        /* assume 110x110 on a 640x480 display and scale from there */
-        let monitor = Main.layoutManager.monitors[this._monitorIndex];
-        if (!monitor)
-            return; // we are about to be removed
+        let monitor;
+
+        if (this._currentMonitor >= 0)
+            monitor = Main.layoutManager.monitors[this._currentMonitor];
+        else
+            monitor = Main.layoutManager.primaryMonitor;

        let scalew = monitor.width / 640.0;
        let scaleh = monitor.height / 480.0;
        let scale = Math.min(scalew, scaleh);
        this._popupSize = 110 * Math.max(1, scale);

-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._icon.icon_size = this._popupSize / (2 * scaleFactor);
        this._box.translation_y = monitor.height / 4;
+        this._icon.icon_size = this._popupSize / 2;
        this._box.style_changed();
    },

@ -218,60 +217,24 @@ const OsdWindow = new Lang.Class({
        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);
-    }
-});
-
-const OsdWindowManager = new Lang.Class({
-    Name: 'OsdWindowManager',
-
-    _init: function() {
-        this._osdWindows = [];
-        Main.layoutManager.connect('monitors-changed',
-                                    Lang.bind(this, this._monitorsChanged));
-        this._monitorsChanged();
-    },
-
-    _monitorsChanged: function() {
-        for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
-            if (this._osdWindows[i] == undefined)
-                this._osdWindows[i] = new OsdWindow(i);
-        }
-
-        for (let i = Main.layoutManager.monitors.length; i < this._osdWindows.length; i++) {
-            this._osdWindows[i].actor.destroy();
-            this._osdWindows[i] = null;
-        }
-
-        this._osdWindows.length = Main.layoutManager.monitors.length;
-    },
-
-    _showOsdWindow: function(monitorIndex, icon, label, level) {
-        this._osdWindows[monitorIndex].setIcon(icon);
-        this._osdWindows[monitorIndex].setLabel(label);
-        this._osdWindows[monitorIndex].setLevel(level);
-        this._osdWindows[monitorIndex].show();
-    },
-
-    show: function(monitorIndex, icon, label, level) {
-        if (monitorIndex != -1) {
-            for (let i = 0; i < this._osdWindows.length; i++) {
-                if (i == monitorIndex)
-                    this._showOsdWindow(i, icon, label, level);
-                else
-                    this._osdWindows[i].cancel();
-            }
-        } else {
-            for (let i = 0; i < this._osdWindows.length; i++)
-                this._showOsdWindow(i, icon, label, level);
-        }
-    },
-
-    hideAll: function() {
-        for (let i = 0; i < this._osdWindows.length; i++)
-            this._osdWindows[i].cancel();
+        this._box.style = 'min-height: %dpx;'.format(Math.max(minWidth, minHeight));
+    },
+
+    setMonitor: function(index) {
+        let constraint;
+
+        if (index < 0)
+            index = -1;
+        if (this._currentMonitor == index)
+            return;
+
+        if (index < 0)
+            constraint = new Layout.MonitorConstraint({ primary: true });
+        else
+            constraint = new Layout.MonitorConstraint({ index: index });
+
+        this.actor.clear_constraints();
+        this.actor.add_constraint(constraint);
+        this._currentMonitor = index;
    }
 });
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -14,7 +14,6 @@ const Gdk = imports.gi.Gdk;
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const LayoutManager = imports.ui.layout;
-const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const OverviewControls = imports.ui.overviewControls;
@ -197,7 +196,11 @@ const Overview = new Lang.Class({

            Tweener.addTween(background,
                             { brightness: 1.0,
-                               vignetteSharpness: 0.0,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+            Tweener.addTween(background,
+                             { vignetteSharpness: 0.0,
                               time: SHADE_ANIMATION_TIME,
                               transition: 'easeOutQuad'
                             });
@ -210,8 +213,12 @@ const Overview = new Lang.Class({
            let background = backgrounds[i]._delegate;

            Tweener.addTween(background,
-                             { brightness: Lightbox.VIGNETTE_BRIGHTNESS,
-                               vignetteSharpness: Lightbox.VIGNETTE_SHARPNESS,
+                             { brightness: 0.8,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+            Tweener.addTween(background,
+                             { vignetteSharpness: 0.7,
                               time: SHADE_ANIMATION_TIME,
                               transition: 'easeOutQuad'
                             });
@ -365,7 +372,6 @@ const Overview = new Lang.Class({
                                                this._lastHoveredWindow = null;
                                                return GLib.SOURCE_REMOVE;
                                            }));
-            GLib.Source.set_name_by_id(this._windowSwitchTimeoutId, '[gnome-shell] Main.activateWindow');
        }

        return DND.DragMotionResult.CONTINUE;
@ -487,13 +493,8 @@ const Overview = new Lang.Class({
    },

    fadeOutDesktop: function() {
-        if (!this._desktopFade.get_n_children()) {
-            let clone = this._getDesktopClone();
-            if (!clone)
-                return;
-
-            this._desktopFade.add_child(clone);
-        }
+        if (!this._desktopFade.get_n_children())
+            this._desktopFade.add_child(this._getDesktopClone());

        this._desktopFade.opacity = 255;
        this._desktopFade.show();
@ -621,7 +622,7 @@ const Overview = new Lang.Class({
        this.animationInProgress = true;
        this.visibleTarget = false;

-        this.viewSelector.zoomFromOverview();
+        this.viewSelector.leaveOverview();

        // Make other elements fade out.
        Tweener.addTween(this._stack,
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@ -259,18 +259,13 @@ const ThumbnailsSlider = new Lang.Class({

        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._updateSlide));
        this.actor.connect('notify::hover', Lang.bind(this, this._updateSlide));
-        global.window_manager.connect('switch-workspace', Lang.bind(this, this._updateSlide));
        this._thumbnailsBox.actor.bind_property('visible', this.actor, 'visible', GObject.BindingFlags.SYNC_CREATE);
    },

    _getAlwaysZoomOut: function() {
        // Always show the pager when hover, during a drag, or if workspaces are
-        // actually used, e.g. there are windows on any non-active workspace
-        let alwaysZoomOut = this.actor.hover ||
-                            this._inDrag ||
-                            !Meta.prefs_get_dynamic_workspaces() ||
-                            global.screen.n_workspaces > 2 ||
-                            global.screen.get_active_workspace_index() != 0;
+        // actually used, e.g. there are windows on more than one
+        let alwaysZoomOut = this.actor.hover || this._inDrag || !Meta.prefs_get_dynamic_workspaces() || global.screen.n_workspaces > 2;

        if (!alwaysZoomOut) {
            let monitors = Main.layoutManager.monitors;
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -213,7 +213,7 @@ const AppMenuButton = new Lang.Class({
        this._label = new TextShadower();
        this._label.actor.y_align = Clutter.ActorAlign.CENTER;
        this._hbox.add_actor(this._label.actor);
-        this._arrow = PopupMenu.arrowIcon(St.Side.BOTTOM);
+        this._arrow = PopupMenu.unicodeArrow(St.Side.BOTTOM);
        this._hbox.add_actor(this._arrow);

        this._iconBottomClip = 0;
@ -595,7 +595,6 @@ const ActivitiesButton = new Lang.Class({
            Mainloop.source_remove(this._xdndTimeOut);
        this._xdndTimeOut = Mainloop.timeout_add(BUTTON_DND_ACTIVATION_TIMEOUT,
                                                 Lang.bind(this, this._xdndToggleOverview, actor));
-        GLib.Source.set_name_by_id(this._xdndTimeOut, '[gnome-shell] this._xdndToggleOverview');

        return DND.DragMotionResult.CONTINUE;
    },
@ -813,11 +812,7 @@ const AggregateMenu = new Lang.Class({
        this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
        this.actor.add_child(this._indicators);

-        if (Config.HAVE_NETWORKMANAGER) {
-            this._network = new imports.ui.status.network.NMApplet();
-        } else {
-            this._network = null;
-        }
+        this._network = new imports.ui.status.network.NMApplet();
        if (Config.HAVE_BLUETOOTH) {
            this._bluetooth = new imports.ui.status.bluetooth.Indicator();
        } else {
@ -834,27 +829,22 @@ const AggregateMenu = new Lang.Class({

        this._indicators.add_child(this._screencast.indicators);
        this._indicators.add_child(this._location.indicators);
-        if (this._network) {
-            this._indicators.add_child(this._network.indicators);
-        }
+        this._indicators.add_child(this._network.indicators);
        if (this._bluetooth) {
            this._indicators.add_child(this._bluetooth.indicators);
        }
        this._indicators.add_child(this._rfkill.indicators);
        this._indicators.add_child(this._volume.indicators);
        this._indicators.add_child(this._power.indicators);
-        this._indicators.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this._indicators.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));

        this.menu.addMenuItem(this._volume.menu);
        this.menu.addMenuItem(this._brightness.menu);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        if (this._network) {
-            this.menu.addMenuItem(this._network.menu);
-        }
+        this.menu.addMenuItem(this._network.menu);
        if (this._bluetooth) {
            this.menu.addMenuItem(this._bluetooth.menu);
        }
-        this.menu.addMenuItem(this._location.menu);
        this.menu.addMenuItem(this._rfkill.menu);
        this.menu.addMenuItem(this._power.menu);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@ -911,7 +901,7 @@ const Panel = new Lang.Class({
            this.actor.remove_style_pseudo_class('overview');
        }));

-        Main.layoutManager.panelBox.add(this.actor);
+        Main.layoutManager.panelGroup.add_child(this.actor);
        Main.ctrlAltTabManager.addGroup(this.actor, _("Top Bar"), 'emblem-system-symbolic',
                                        { sortGroup: CtrlAltTab.SortGroup.TOP });

--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@ -130,7 +130,7 @@ const Button = new Lang.Class({
            this.menu.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));
            this.menu.actor.connect('key-press-event', Lang.bind(this, this._onMenuKeyPress));

-            Main.uiGroup.add_actor(this.menu.actor);
+            Main.layoutManager.menuGroup.add_child(this.menu.actor);
            this.menu.actor.hide();
        }
    },
--- a/js/ui/pointerWatcher.js
+++ b/js/ui/pointerWatcher.js
@ -107,7 +107,6 @@ const PointerWatcher = new Lang.Class({

        this._timeoutId = Mainloop.timeout_add(minInterval,
                                               Lang.bind(this, this._onTimeout));
-        GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._onTimeout');
    },

    _onTimeout: function() {
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -45,35 +45,28 @@ function isPopupMenuItemVisible(child) {
 /**
 * @side Side to which the arrow points.
 */
-function arrowIcon(side) {
-    let rotation;
+function unicodeArrow(side) {
+    let arrowChar;
    switch (side) {
        case St.Side.TOP:
-            rotation = 180;
+            arrowChar = '\u25B4';
            break;
        case St.Side.RIGHT:
-            rotation = - 90;
+            arrowChar = '\u25B8';
            break;
        case St.Side.BOTTOM:
-            rotation = 0;
+            arrowChar = '\u25BE';
            break;
        case St.Side.LEFT:
-            rotation = 90;
+            arrowChar = '\u25C2';
            break;
    }

-    let gicon = new Gio.FileIcon({ file: Gio.File.new_for_path(global.datadir +
-                                             '/theme/menu-arrow-symbolic.svg') });
-
-    let arrow = new St.Icon({ style_class: 'popup-menu-arrow',
-                              gicon: gicon,
-                              accessible_role: Atk.Role.ARROW,
-                              y_expand: true,
-                              y_align: Clutter.ActorAlign.CENTER });
-
-    arrow.rotation_angle_z = rotation;
-
-    return arrow;
+    return new St.Label({ text: arrowChar,
+                          style_class: 'unicode-arrow',
+                          accessible_role: Atk.Role.ARROW,
+                          y_expand: true,
+                          y_align: Clutter.ActorAlign.CENTER });
 }

 const PopupBaseMenuItem = new Lang.Class({
@ -118,7 +111,6 @@ const PopupBaseMenuItem = new Lang.Class({

        this.actor.connect('key-focus-in', Lang.bind(this, this._onKeyFocusIn));
        this.actor.connect('key-focus-out', Lang.bind(this, this._onKeyFocusOut));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
    },

    _getTopMenu: function() {
@ -200,9 +192,6 @@ const PopupBaseMenuItem = new Lang.Class({

    destroy: function() {
        this.actor.destroy();
-    },
-
-    _onDestroy: function() {
        this.emit('destroy');
    },

@ -251,16 +240,8 @@ const PopupSeparatorMenuItem = new Lang.Class({
        this.actor.add(this.label);
        this.actor.label_actor = this.label;

-        this.label.connect('notify::text',
-                           Lang.bind(this, this._syncVisibility));
-        this._syncVisibility();
-
        this._separator = new Separator.HorizontalSeparator({ style_class: 'popup-separator-menu-item' });
        this.actor.add(this._separator.actor, { expand: true });
-    },
-
-    _syncVisibility: function() {
-        this.label.visible = this.label.text != '';
    }
 });

@ -887,14 +868,14 @@ const PopupSubMenu = new Lang.Class({
        if (animate) {
            let [minHeight, naturalHeight] = this.actor.get_preferred_height(-1);
            this.actor.height = 0;
-            this.actor._arrowRotation = this._arrow.rotation_angle_z;
+            this.actor._arrow_rotation = this._arrow.rotation_angle_z;
            Tweener.addTween(this.actor,
-                             { _arrowRotation: this.actor._arrowRotation + 90,
+                             { _arrow_rotation: 90,
                               height: naturalHeight,
                               time: 0.25,
                               onUpdateScope: this,
                               onUpdate: function() {
-                                   this._arrow.rotation_angle_z = this.actor._arrowRotation;
+                                   this._arrow.rotation_angle_z = this.actor._arrow_rotation;
                               },
                               onCompleteScope: this,
                               onComplete: function() {
@ -902,7 +883,7 @@ const PopupSubMenu = new Lang.Class({
                               }
                             });
        } else {
-            this._arrow.rotation_angle_z = this.actor._arrowRotation + 90;
+            this._arrow.rotation_angle_z = 90;
        }
    },

@ -920,14 +901,14 @@ const PopupSubMenu = new Lang.Class({
            animate = false;

        if (animate) {
-            this.actor._arrowRotation = this._arrow.rotation_angle_z;
+            this.actor._arrow_rotation = this._arrow.rotation_angle_z;
            Tweener.addTween(this.actor,
-                             { _arrowRotation: this.actor._arrowRotation - 90,
+                             { _arrow_rotation: 0,
                               height: 0,
                               time: 0.25,
                               onUpdateScope: this,
                               onUpdate: function() {
-                                   this._arrow.rotation_angle_z = this.actor._arrowRotation;
+                                   this._arrow.rotation_angle_z = this.actor._arrow_rotation;
                               },
                               onCompleteScope: this,
                               onComplete: function() {
@ -936,7 +917,7 @@ const PopupSubMenu = new Lang.Class({
                               },
                             });
        } else {
-            this._arrow.rotation_angle_z = this.actor._arrowRotation - 90;
+            this._arrow.rotation_angle_z = 0;
            this.actor.hide();
        }
    },
@ -1008,7 +989,7 @@ const PopupSubMenuMenuItem = new Lang.Class({
                                     y_align: Clutter.ActorAlign.CENTER });
        this.actor.add_child(this.status);

-        this._triangle = arrowIcon(St.Side.RIGHT);
+        this._triangle = unicodeArrow(St.Side.RIGHT);
        this._triangle.pivot_point = new Clutter.Point({ x: 0.5, y: 0.6 });

        this._triangleBin = new St.Widget({ y_expand: true,
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -301,7 +301,7 @@ const NotificationsBox = new Lang.Class({
                             });

            this._updateVisibility();
-            this.emit('wake-up-screen');
+            Shell.util_wake_up_screen();
        }
    },

@ -327,7 +327,7 @@ const NotificationsBox = new Lang.Class({

        this._updateVisibility();
        if (obj.sourceBox.visible)
-            this.emit('wake-up-screen');
+            Shell.util_wake_up_screen();
    },

    _visibleChanged: function(source, obj) {
@ -342,7 +342,7 @@ const NotificationsBox = new Lang.Class({

        this._updateVisibility();
        if (obj.sourceBox.visible)
-            this.emit('wake-up-screen');
+            Shell.util_wake_up_screen();
    },

    _detailedChanged: function(source, obj) {
@ -380,7 +380,6 @@ const NotificationsBox = new Lang.Class({
        this._sources.delete(source);
    },
 });
-Signals.addSignalMethods(NotificationsBox.prototype);

 const Arrow = new Lang.Class({
    Name: 'Arrow',
@ -457,8 +456,6 @@ const ScreenShield = new Lang.Class({
    Name: 'ScreenShield',

    _init: function() {
-        this.actor = Main.layoutManager.screenShieldGroup;
-
        this._lockScreenState = MessageTray.State.HIDDEN;
        this._lockScreenGroup = new St.Widget({ x_expand: true,
                                                y_expand: true,
@ -467,6 +464,7 @@ const ScreenShield = new Lang.Class({
                                                name: 'lockScreenGroup',
                                                visible: false,
                                              });
+
        this._lockScreenGroup.connect('key-press-event',
                                      Lang.bind(this, this._onLockScreenKeyPress));
        this._lockScreenGroup.connect('scroll-event',
@ -517,10 +515,9 @@ const ScreenShield = new Lang.Class({
                                                reactive: true,
                                                pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
                                                name: 'lockDialogGroup' });
+        Main.layoutManager.systemGroup.add_child(this._lockDialogGroup);

-        this.actor.add_actor(this._lockDialogGroup);
-        this.actor.add_actor(this._lockScreenGroup);
-
+        Main.layoutManager.screenShieldGroup.add_child(this._lockScreenGroup);
        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
            if (error) {
                logError(error, 'Error while reading gnome-session presence');
@ -537,7 +534,7 @@ const ScreenShield = new Lang.Class({

        this._smartcardManager = SmartcardManager.getSmartcardManager();
        this._smartcardManager.connect('smartcard-inserted',
-                                       Lang.bind(this, function(manager, token) {
+                                       Lang.bind(this, function(token) {
                                           if (this._isLocked && token.UsedToLogin)
                                               this._liftShield(true, 0);
                                       }));
@ -578,19 +575,27 @@ const ScreenShield = new Lang.Class({
        // The "long" lightbox is used for the longer (20 seconds) fade from session
        // to idle status, the "short" is used for quickly fading to black when locking
        // manually
-        this._longLightbox = new Lightbox.Lightbox(Main.uiGroup,
+        this._longLightbox = new Lightbox.Lightbox(Main.layoutManager.overlayGroup,
                                                   { inhibitEvents: true,
                                                     fadeFactor: 1 });
        this._longLightbox.connect('shown', Lang.bind(this, this._onLongLightboxShown));
-        this._shortLightbox = new Lightbox.Lightbox(Main.uiGroup,
+        this._shortLightbox = new Lightbox.Lightbox(Main.layoutManager.overlayGroup,
                                                    { inhibitEvents: true,
                                                      fadeFactor: 1 });
        this._shortLightbox.connect('shown', Lang.bind(this, this._onShortLightboxShown));

+        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._monitorsChanged));
+        this._monitorsChanged();
+
        this.idleMonitor = Meta.IdleMonitor.get_core();
        this._cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
    },

+    _monitorsChanged: function() {
+        this._longLightbox.actor.set_size(global.screen_width, global.screen_height);
+        this._shortLightbox.actor.set_size(global.screen_width, global.screen_height);
+    },
+
    _createBackground: function(monitorIndex) {
        let monitor = Main.layoutManager.monitors[monitorIndex];
        let widget = new St.Widget({ style_class: 'screen-shield-background',
@ -648,14 +653,14 @@ const ScreenShield = new Lang.Class({
        if (this._isModal)
            return true;

-        this._isModal = Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
+        this._isModal = Main.pushModal(this._lockDialogGroup, { keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
        if (this._isModal)
            return true;

        // We failed to get a pointer grab, it means that
        // something else has it. Try with a keyboard grab only
-        this._isModal = Main.pushModal(this.actor, { options: Meta.ModalOptions.POINTER_ALREADY_GRABBED,
-                                                     keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
+        this._isModal = Main.pushModal(this._lockDialogGroup, { options: Meta.ModalOptions.POINTER_ALREADY_GRABBED,
+                                                                keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
        return this._isModal;
    },

@ -729,7 +734,7 @@ const ScreenShield = new Lang.Class({
        } else {
            this._inhibitSuspend();

-            this._wakeUpScreen();
+            this._onUserBecameActive();
        }
    },

@ -850,7 +855,6 @@ const ScreenShield = new Lang.Class({
                                                           this.lock(false);
                                                           return GLib.SOURCE_REMOVE;
                                                       }));
-            GLib.Source.set_name_by_id(this._lockTimeoutId, '[gnome-shell] this.lock');
        }

        this._activateFade(this._longLightbox, STANDARD_FADE_TIME);
@ -914,7 +918,7 @@ const ScreenShield = new Lang.Class({
            return false;
        }));

-        this.actor.show();
+        this._lockDialogGroup.show();
        this._isGreeter = Main.sessionMode.isGreeter;
        this._isLocked = true;
        if (this._ensureUnlockDialog(true, true))
@ -1004,6 +1008,7 @@ const ScreenShield = new Lang.Class({
            return;

        this._ensureLockScreen();
+        this._lockDialogGroup.hide();
        this._lockDialogGroup.scale_x = 1;
        this._lockDialogGroup.scale_y = 1;

@ -1042,7 +1047,6 @@ const ScreenShield = new Lang.Class({

        if (!this._arrowAnimationId) {
            this._arrowAnimationId = Mainloop.timeout_add(6000, Lang.bind(this, this._animateArrows));
-            GLib.Source.set_name_by_id(this._arrowAnimationId, '[gnome-shell] this._animateArrows');
            this._animateArrows();
        }

@ -1103,18 +1107,19 @@ const ScreenShield = new Lang.Class({
        }));
        this._cursorTracker.set_pointer_visible(false);

-        this._lockScreenState = MessageTray.State.SHOWN;
+        this._lockDialogGroup.show();
        this._lockScreenGroup.fixed_position_set = false;
+        this._lockScreenState = MessageTray.State.SHOWN;
+        Main.layoutManager.sessionGroup.hide();
        this._lockScreenScrollCounter = 0;

        if (params.fadeToBlack && params.animateFade) {
            // Take a beat

-            let id = Mainloop.timeout_add(1000 * MANUAL_FADE_TIME, Lang.bind(this, function() {
+            Mainloop.timeout_add(1000 * MANUAL_FADE_TIME, Lang.bind(this, function() {
                this._activateFade(this._shortLightbox, MANUAL_FADE_TIME);
                return GLib.SOURCE_REMOVE;
            }));
-            GLib.Source.set_name_by_id(id, '[gnome-shell] this._activateFade');
        } else {
            if (params.fadeToBlack)
                this._activateFade(this._shortLightbox, 0);
@ -1155,7 +1160,6 @@ const ScreenShield = new Lang.Class({
        this._lockScreenContents.add_actor(this._lockScreenContentsBox);

        this._notificationsBox = new NotificationsBox();
-        this._wakeUpScreenId = this._notificationsBox.connect('wake-up-screen', Lang.bind(this, this._wakeUpScreen));
        this._lockScreenContentsBox.add(this._notificationsBox.actor, { x_fill: true,
                                                                        y_fill: true,
                                                                        expand: true });
@ -1163,17 +1167,11 @@ const ScreenShield = new Lang.Class({
        this._hasLockScreen = true;
    },

-    _wakeUpScreen: function() {
-        this._onUserBecameActive();
-        this.emit('wake-up-screen');
-    },
-
    _clearLockScreen: function() {
        this._clock.destroy();
        this._clock = null;

        if (this._notificationsBox) {
-            this._notificationsBox.disconnect(this._wakeUpScreenId);
            this._notificationsBox.destroy();
            this._notificationsBox = null;
        }
@ -1235,10 +1233,11 @@ const ScreenShield = new Lang.Class({
            this._dialog.popModal();

        if (this._isModal) {
-            Main.popModal(this.actor);
+            Main.popModal(this._lockDialogGroup);
            this._isModal = false;
        }

+        Main.layoutManager.sessionGroup.show();
        Tweener.addTween(this._lockDialogGroup, {
            scale_x: 0,
            scale_y: 0,
@ -1257,7 +1256,7 @@ const ScreenShield = new Lang.Class({

        this._longLightbox.hide();
        this._shortLightbox.hide();
-        this.actor.hide();
+        this._lockScreenGroup.hide();

        if (this._becameActiveId != 0) {
            this.idleMonitor.remove_watch(this._becameActiveId);
@ -1281,7 +1280,7 @@ const ScreenShield = new Lang.Class({
        if (this._activationTime == 0)
            this._activationTime = GLib.get_monotonic_time();

-        this.actor.show();
+        this._lockScreenGroup.show();

        if (Main.sessionMode.currentMode != 'unlock-dialog' &&
            Main.sessionMode.currentMode != 'lock-screen') {
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@ -11,7 +11,6 @@ const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;

-const GrabHelper = imports.ui.grabHelper;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@ -140,7 +139,6 @@ const SelectArea = new Lang.Class({
        this._startY = -1;
        this._lastX = 0;
        this._lastY = 0;
-        this._result = null;

        this._initRubberbandColors();

@ -148,14 +146,14 @@ const SelectArea = new Lang.Class({
                                      reactive: true,
                                      x: 0,
                                      y: 0 });
-        Main.uiGroup.add_actor(this._group);
-
-        this._grabHelper = new GrabHelper.GrabHelper(this._group);
+        Main.layoutManager.osdGroup.add_actor(this._group);

        this._group.connect('button-press-event',
                            Lang.bind(this, this._onButtonPress));
        this._group.connect('button-release-event',
                            Lang.bind(this, this._onButtonRelease));
+        this._group.connect('key-press-event',
+                            Lang.bind(this, this._onKeyPress));
        this._group.connect('motion-event',
                            Lang.bind(this, this._onMotionEvent));

@ -171,12 +169,10 @@ const SelectArea = new Lang.Class({
    },

    show: function() {
-        if (!this._grabHelper.grab({ actor: this._group,
-                                     onUngrab: Lang.bind(this, this._onUngrab) }))
+        if (!Main.pushModal(this._group) || this._group.visible)
            return;

        global.screen.set_cursor(Meta.Cursor.CROSSHAIR);
-        Main.uiGroup.set_child_above_sibling(this._group, null);
        this._group.visible = true;
    },

@ -206,6 +202,13 @@ const SelectArea = new Lang.Class({
                 height: Math.abs(this._startY - this._lastY) };
    },

+    _onKeyPress: function(actor, event) {
+        if (event.get_key_symbol() == Clutter.Escape)
+            this._destroy(null, false);
+
+        return Clutter.EVENT_PROPAGATE;
+    },
+
    _onMotionEvent: function(actor, event) {
        if (this._startX == -1 || this._startY == -1)
            return Clutter.EVENT_PROPAGATE;
@ -227,28 +230,24 @@ const SelectArea = new Lang.Class({
    },

    _onButtonRelease: function(actor, event) {
-        this._result = this._getGeometry();
-        Tweener.addTween(this._group,
-                         { opacity: 0,
-                           time: 0.2,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this,
-                               function() {
-                                   this._grabHelper.ungrab();
-                               })
-                         });
+        this._destroy(this._getGeometry(), true);
        return Clutter.EVENT_PROPAGATE;
    },

-    _onUngrab: function() {
-        global.screen.set_cursor(Meta.Cursor.DEFAULT);
-        this.emit('finished', this._result);
+    _destroy: function(geometry, fade) {
+        Tweener.addTween(this._group,
+                         { opacity: 0,
+                           time: fade ? 0.2 : 0,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   Main.popModal(this._group);
+                                   this._group.destroy();
+                                   global.screen.set_cursor(Meta.Cursor.DEFAULT);

-        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this,
-            function() {
-                this._group.destroy();
-                return GLib.SOURCE_REMOVE;
-            }));
+                                   this.emit('finished', geometry);
+                               })
+                         });
    }
 });
 Signals.addSignalMethods(SelectArea.prototype);
@ -260,9 +259,9 @@ const Flashspot = new Lang.Class({
    Extends: Lightbox.Lightbox,

    _init: function(area) {
-        this.parent(Main.uiGroup, { inhibitEvents: true,
-                                    width: area.width,
-                                    height: area.height });
+        this.parent(Main.layoutManager.osdGroup, { inhibitEvents: true,
+                                                   width: area.width,
+                                                   height: area.height });

        this.actor.style_class = 'flashspot';
        this.actor.set_position(area.x, area.y);
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@ -39,12 +39,11 @@ const Main = imports.ui.main;
 function sleep(milliseconds) {
    let cb;

-    let id = Mainloop.timeout_add(milliseconds, function() {
+    Mainloop.timeout_add(milliseconds, function() {
                             if (cb)
                                 cb();
                             return GLib.SOURCE_REMOVE;
                         });
-    GLib.Source.set_name_by_id(id, '[gnome-shell] sleep');

    return function(callback) {
        cb = callback;
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -68,9 +68,6 @@ const SearchSystem = new Lang.Class({
    _unregisterProvider: function (provider) {
        let index = this._providers.indexOf(provider);
        this._providers.splice(index, 1);
-
-        if (provider.display)
-            provider.display.destroy();
    },

    getProviders: function() {
@ -318,8 +315,6 @@ const SearchResultsBase = new Lang.Class({
    },

    clear: function() {
-        for (let resultId in this._resultDisplays)
-            this._resultDisplays[resultId].actor.destroy();
        this._resultDisplays = {};
        this._clearResultDisplay();
        this.actor.hide();
@ -343,22 +338,12 @@ const SearchResultsBase = new Lang.Class({
        }));

        if (metasNeeded.length === 0) {
-            callback(true);
+            callback();
        } else {
            this._cancellable.cancel();
            this._cancellable.reset();

            this.provider.getResultMetas(metasNeeded, Lang.bind(this, function(metas) {
-                if (metas.length == 0) {
-                    callback(false);
-                    return;
-                }
-                if (metas.length != metasNeeded.length) {
-                    log('Wrong number of result metas returned by search provider');
-                    callback(false);
-                    return;
-                }
-
                metasNeeded.forEach(Lang.bind(this, function(resultId, i) {
                    let meta = metas[i];
                    let display = this._createResultDisplay(meta);
@ -366,7 +351,7 @@ const SearchResultsBase = new Lang.Class({
                    display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
                    this._resultDisplays[resultId] = display;
                }));
-                callback(true);
+                callback();
            }), this._cancellable);
        }
    },
@ -383,10 +368,8 @@ const SearchResultsBase = new Lang.Class({
            let results = this.provider.filterResults(providerResults, maxResults);
            let hasMoreResults = results.length < providerResults.length;

-            this._ensureResultActors(results, Lang.bind(this, function(successful) {
+            this._ensureResultActors(results, Lang.bind(this, function() {
                this._clearResultDisplay();
-                if (!successful)
-                    return;

                // To avoid CSS transitions causing flickering when
                // the first search result stays the same, we hide the
@ -632,11 +615,8 @@ const SearchResults = new Lang.Class({
        if (newDefaultResult != this._defaultResult) {
            if (this._defaultResult)
                this._defaultResult.setSelected(false);
-            if (newDefaultResult) {
+            if (newDefaultResult)
                newDefaultResult.setSelected(this._highlightDefault);
-                if (this._highlightDefault)
-                    Util.ensureActorVisibleInScrollView(this._scrollView, newDefaultResult.actor);
-            }

            this._defaultResult = newDefaultResult;
        }
@ -673,11 +653,8 @@ const SearchResults = new Lang.Class({

    highlightDefault: function(highlight) {
        this._highlightDefault = highlight;
-        if (this._defaultResult) {
+        if (this._defaultResult)
            this._defaultResult.setSelected(highlight);
-            if (highlight)
-                Util.ensureActorVisibleInScrollView(this._scrollView, this._defaultResult.actor);
-        }
    },

    navigateFocus: function(direction) {
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@ -10,8 +10,6 @@ const FileUtils = imports.misc.fileUtils;
 const Main = imports.ui.main;
 const Params = imports.misc.params;

-const Config = imports.misc.config;
-
 const DEFAULT_MODE = 'restrictive';

 const _modes = {
@ -94,12 +92,8 @@ const _modes = {
        isLocked: false,
        isPrimary: true,
        unlockDialog: imports.ui.unlockDialog.UnlockDialog,
-        components: Config.HAVE_NETWORKMANAGER ?
-                    ['networkAgent', 'polkitAgent', 'telepathyClient',
-                     'keyring', 'autorunManager', 'automountManager'] :
-                    ['polkitAgent', 'telepathyClient',
+        components: ['networkAgent', 'polkitAgent', 'telepathyClient',
                     'keyring', 'autorunManager', 'automountManager'],
-
        panel: {
            left: ['activities', 'appMenu'],
            center: ['dateMenu'],
@ -140,14 +134,13 @@ function _loadModes() {

 function listModes() {
    _loadModes();
-    let id = Mainloop.idle_add(function() {
+    Mainloop.idle_add(function() {
        let names = Object.getOwnPropertyNames(_modes);
        for (let i = 0; i < names.length; i++)
            if (_modes[names[i]].isPrimary)
                print(names[i]);
        Mainloop.quit('listModes');
    });
-    GLib.Source.set_name_by_id(id, '[gnome-shell] listModes');
    Mainloop.run('listModes');
 }

--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@ -69,7 +69,6 @@ const ScreenSaverIface = '<node> \
 <signal name="ActiveChanged"> \
    <arg name="new_value" type="b" /> \
 </signal> \
-<signal name="WakeUpScreen" /> \
 </interface> \
 </node>';

@ -141,7 +140,12 @@ const GnomeShell = new Lang.Class({
        if (params['icon'])
            icon = Gio.Icon.new_for_string(params['icon']);

-        Main.osdWindowManager.show(monitorIndex, icon, params['label'], params['level']);
+        Main.osdWindow.setIcon(icon);
+        Main.osdWindow.setMonitor (monitorIndex);
+        Main.osdWindow.setLabel(params['label']);
+        Main.osdWindow.setLevel(params['level']);
+
+        Main.osdWindow.show();
    },

    FocusApp: function(id) {
@ -367,10 +371,8 @@ const GnomeShellExtensions = new Lang.Class({
    LaunchExtensionPrefs: function(uuid) {
        let appSys = Shell.AppSystem.get_default();
        let app = appSys.lookup_app('gnome-shell-extension-prefs.desktop');
-        let info = app.get_app_info();
-        let timestamp = global.display.get_current_time_roundtrip();
-        info.launch_uris(['extension:///' + uuid],
-                         global.create_app_launch_context(timestamp, -1));
+        app.launch(global.display.get_current_time_roundtrip(),
+                   ['extension:///' + uuid], -1, null);
    },

    ReloadExtension: function(uuid) {
@ -403,9 +405,6 @@ const ScreenSaverDBus = new Lang.Class({
        screenShield.connect('active-changed', Lang.bind(this, function(shield) {
            this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.active]));
        }));
-        screenShield.connect('wake-up-screen', Lang.bind(this, function(shield) {
-            this._dbusImpl.emit_signal('WakeUpScreen', null);
-        }));

        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenSaverIface, this);
        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/ScreenSaver');
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@ -36,7 +36,7 @@ const EntryMenu = new Lang.Class({

        this._passwordItem = null;

-        Main.uiGroup.add_actor(this.actor);
+        Main.layoutManager.menuGroup.add_actor(this.actor);
        this.actor.hide();
    },

--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@ -1,11 +1,11 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Atk = imports.gi.Atk;
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Signals = imports.signals;
+const Atk = imports.gi.Atk;

 const SLIDER_SCROLL_STEP = 0.05; /* Slider scrolling step in % */

--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@ -44,7 +44,7 @@ const ATIndicator = new Lang.Class({
        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
        this._hbox.add_child(new St.Icon({ style_class: 'system-status-icon',
                                           icon_name: 'preferences-desktop-accessibility-symbolic' }));
-        this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this._hbox.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));

        this.actor.add_child(this._hbox);

@ -103,7 +103,6 @@ const ATIndicator = new Lang.Class({
            return;

        this._syncMenuVisbilityIdle = Mainloop.idle_add(Lang.bind(this, this._syncMenuVisibility));
-        GLib.Source.set_name_by_id(this._syncMenuVisbilityIdle, '[gnome-shell] this._syncMenuVisibility');
    },

    _buildItemExtended: function(string, initial_value, writable, on_set) {
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@ -17,7 +17,6 @@ const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill';
 const RfkillManagerInterface = '<node> \
 <interface name="org.gnome.SettingsDaemon.Rfkill"> \
 <property name="BluetoothAirplaneMode" type="b" access="readwrite" /> \
-<property name="BluetoothHasAirplaneMode" type="b" access="read" /> \
 </interface> \
 </node>';

@ -39,10 +38,7 @@ const Indicator = new Lang.Class({
                                                     log(error.message);
                                                     return;
                                                 }
-
-                                                 this._sync();
                                             }));
-        this._proxy.connect('g-properties-changed', Lang.bind(this, this._sync));

        // The Bluetooth menu only appears when Bluetooth is in use,
        // so just statically build it with a "Turn Off" menu item.
@ -59,7 +55,6 @@ const Indicator = new Lang.Class({
        this._model.connect('row-changed', Lang.bind(this, this._sync));
        this._model.connect('row-deleted', Lang.bind(this, this._sync));
        this._model.connect('row-inserted', Lang.bind(this, this._sync));
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sync));
        this._sync();
    },

@ -94,15 +89,12 @@ const Indicator = new Lang.Class({

    _sync: function() {
        let nDevices = this._getNConnectedDevices();
-        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;

-        this.menu.setSensitive(sensitive);
-        this._indicator.visible = nDevices > 0;
-        this._item.actor.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
+        let on = nDevices > 0;
+        this._indicator.visible = on;
+        this._item.actor.visible = on;

-        if (nDevices > 0)
+        if (on)
            this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices", nDevices).format(nDevices);
-        else
-            this._item.status.text = _("Not Connected");
    },
 });
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -292,10 +292,6 @@ const InputSourcePopup = new Lang.Class({
            this._select(this._previous());
        else if (keysym == Clutter.Right)
            this._select(this._next());
-        else
-            return Clutter.EVENT_PROPAGATE;
-
-        return Clutter.EVENT_STOP;
    },

    _finish : function() {
@ -345,7 +341,7 @@ const InputSourceIndicator = new Lang.Class({

        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
        this._hbox.add_child(this._container);
-        this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this._hbox.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));

        this.actor.add_child(this._hbox);
        this.actor.add_style_class_name('panel-status-button');
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@ -1,41 +1,18 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;

-const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-const Shell = imports.gi.Shell;
-
-const LOCATION_SCHEMA = 'org.gnome.shell.location';
-const MAX_ACCURACY_LEVEL = 'max-accuracy-level';

 var GeoclueIface = '<node> \
  <interface name="org.freedesktop.GeoClue2.Manager"> \
    <property name="InUse" type="b" access="read"/> \
-    <property name="AvailableAccuracyLevel" type="u" access="read"/> \
-    <method name="AddAgent"> \
-      <arg name="id" type="s" direction="in"/> \
-    </method> \
  </interface> \
 </node>';

 const GeoclueManager = Gio.DBusProxy.makeProxyWrapper(GeoclueIface);

-var AgentIface = '<node> \
-  <interface name="org.freedesktop.GeoClue2.Agent"> \
-    <property name="MaxAccuracyLevel" type="u" access="read"/> \
-    <method name="AuthorizeApp"> \
-      <arg name="desktop_id" type="s" direction="in"/> \
-      <arg name="req_accuracy_level" type="u" direction="in"/> \
-      <arg name="authorized" type="b" direction="out"/> \
-      <arg name="allowed_accuracy_level" type="u" direction="out"/> \
-    </method> \
-  </interface> \
-</node>';
-
 const Indicator = new Lang.Class({
    Name: 'LocationIndicator',
    Extends: PanelMenu.SystemIndicator,
@ -43,159 +20,39 @@ const Indicator = new Lang.Class({
    _init: function() {
        this.parent();

-        this._settings = new Gio.Settings({ schema: LOCATION_SCHEMA });
-        this._settings.connect('changed::' + MAX_ACCURACY_LEVEL,
-                               Lang.bind(this, this._onMaxAccuracyLevelChanged));
-
        this._indicator = this._addIndicator();
        this._indicator.icon_name = 'find-location-symbolic';
-
-        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Location"), true);
-        this._item.icon.icon_name = 'find-location-symbolic';
-
-        this._agent = Gio.DBusExportedObject.wrapJSObject(AgentIface, this);
-        this._agent.export(Gio.DBus.system, '/org/freedesktop/GeoClue2/Agent');
-
-        this._item.status.text = _("Enabled");
-        this._onOffAction = this._item.menu.addAction(_("Disable"), Lang.bind(this, this._onOnOffAction));
-
-        this.menu.addMenuItem(this._item);
+        this._sync();

        this._watchId = Gio.bus_watch_name(Gio.BusType.SYSTEM,
                                           'org.freedesktop.GeoClue2',
                                           0,
-                                           Lang.bind(this, this._connectToGeoclue),
+                                           Lang.bind(this, this._onGeoclueAppeared),
                                           Lang.bind(this, this._onGeoclueVanished));
-        Main.sessionMode.connect('updated', Lang.bind(this, this._onSessionUpdated));
-        this._onSessionUpdated();
-        this._onMaxAccuracyLevelChanged();
-        this._connectToGeoclue();
    },

-    get MaxAccuracyLevel() {
-        return this._getMaxAccuracyLevel();
-    },
-
-    // We (and geoclue) have currently no way to reliably identifying apps so
-    // 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 allowedAccuracyLevel = clamp(reqAccuracyLevel, 0, this._getMaxAccuracyLevel());
-        return [true, allowedAccuracyLevel];
-    },
-
-    _syncIndicator: function() {
+    _sync: function() {
        if (this._proxy == null) {
            this._indicator.visible = false;
            return;
        }

        this._indicator.visible = this._proxy.InUse;
-        this._updateMenuLabels();
    },

-    _connectToGeoclue: function() {
-        if (this._proxy != null || this._connecting)
-            return false;
+    _onGeoclueAppeared: function() {
+        // FIXME: This should be done async
+        this._proxy = new GeoclueManager(Gio.DBus.system,
+                                         'org.freedesktop.GeoClue2',
+                                         '/org/freedesktop/GeoClue2/Manager');
+        this._proxy.connect('g-properties-changed', Lang.bind(this, this._sync));

-        this._connecting = true;
-        new GeoclueManager(Gio.DBus.system,
-                           'org.freedesktop.GeoClue2',
-                           '/org/freedesktop/GeoClue2/Manager',
-                           Lang.bind(this, this._onProxyReady));
-        return true;
-    },
-
-    _onProxyReady: function(proxy, error) {
-        if (error != null) {
-            log(error.message);
-            this._connecting = false;
-            return;
-        }
-
-        this._proxy = proxy;
-        this._propertiesChangedId = this._proxy.connect('g-properties-changed',
-                                                        Lang.bind(this, this._onGeocluePropsChanged));
-
-        this._availableAccuracyLevel = this._proxy.AvailableAccuracyLevel;
-        this._syncIndicator();
-
-        this._proxy.AddAgentRemote('gnome-shell', Lang.bind(this, this._onAgentRegistered));
-    },
-
-    _onAgentRegistered: function(result, error) {
-        this._connecting = false;
-        this._notifyMaxAccuracyLevel();
-
-        if (error != null)
-            log(error.message);
+        this._sync();
    },

    _onGeoclueVanished: function() {
-        if (this._propertiesChangedId) {
-            this._proxy.disconnect(this._propertiesChangedId);
-            this._propertiesChangedId = 0;
-        }
        this._proxy = null;

-        this._syncIndicator();
-    },
-
-    _onOnOffAction: function() {
-        if (this._getMaxAccuracyLevel() == 0)
-            this._settings.set_enum(MAX_ACCURACY_LEVEL, this._availableAccuracyLevel);
-        else
-            this._settings.set_enum(MAX_ACCURACY_LEVEL, 0);
-    },
-
-    _onSessionUpdated: function() {
-        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
-        this.menu.setSensitive(sensitive);
-    },
-
-    _updateMenuLabels: function() {
-        if (this._getMaxAccuracyLevel() == 0) {
-            this._item.status.text = _("Disabled");
-            this._onOffAction.label.text = _("Enable");
-        } else {
-            this._item.status.text = this._indicator.visible ? _("In Use") : _("Enabled");
-            this._onOffAction.label.text = _("Disable");
-        }
-    },
-
-    _onMaxAccuracyLevelChanged: function() {
-        this._updateMenuLabels();
-
-        // Gotta ensure geoclue is up and we are registered as agent to it
-        // before we emit the notify for this property change.
-        if (!this._connectToGeoclue())
-            this._notifyMaxAccuracyLevel();
-    },
-
-    _getMaxAccuracyLevel: function() {
-        return this._settings.get_enum(MAX_ACCURACY_LEVEL);
-    },
-
-    _notifyMaxAccuracyLevel: function() {
-        let variant = new GLib.Variant('u', this._getMaxAccuracyLevel());
-        this._agent.emit_property_changed('MaxAccuracyLevel', variant);
-    },
-
-    _onGeocluePropsChanged: function(proxy, properties) {
-        let unpacked = properties.deep_unpack();
-        if ("InUse" in unpacked)
-            this._syncIndicator();
-        if ("AvailableAccuracyLevel" in unpacked)
-            this._availableAccuracyLevel = this._proxy.AvailableAccuracyLevel;
+        this._sync();
    }
 });
-
-function clamp(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-}
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -9,17 +9,14 @@ const NetworkManager = imports.gi.NetworkManager;
 const NMClient = imports.gi.NMClient;
 const NMGtk = imports.gi.NMGtk;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;

-const Animation = imports.ui.animation;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const MessageTray = imports.ui.messageTray;
 const ModalDialog = imports.ui.modalDialog;
 const ModemManager = imports.misc.modemManager;
-const Rfkill = imports.ui.status.rfkill;
 const Util = imports.misc.util;

 const NMConnectionCategory = {
@ -105,34 +102,18 @@ const NMConnectionItem = new Lang.Class({
        this._activeConnection = null;
        this._activeConnectionChangedId = 0;

-        this._buildUI();
-        this._sync();
-    },
-
-    _buildUI: function() {
        this.labelItem = new PopupMenu.PopupMenuItem('');
        this.labelItem.connect('activate', Lang.bind(this, this._toggle));

-        this.radioItem = new PopupMenu.PopupMenuItem(this._connection.get_id(), false);
-        this.radioItem.connect('activate', Lang.bind(this, this._activate));
+        this.switchItem = new PopupMenu.PopupSwitchMenuItem(connection.get_id(), false);
+        this.switchItem.connect('toggled', Lang.bind(this, this._toggle));
+
+        this._sync();
    },

    destroy: function() {
        this.labelItem.destroy();
-        this.radioItem.destroy();
-    },
-
-    updateForConnection: function(connection) {
-        // connection should always be the same object
-        // (and object path) as this._connection, but
-        // this can be false if NetworkManager was restarted
-        // and picked up connections in a different order
-        // Just to be safe, we set it here again
-
-        this._connection = connection;
-        this.radioItem.label.text = connection.get_id();
-        this._sync();
-        this.emit('name-changed');
+        this.switchItem.destroy();
    },

    getName: function() {
@ -148,8 +129,9 @@ const NMConnectionItem = new Lang.Class({

    _sync: function() {
        let isActive = this.isActive();
-        this.labelItem.label.text = isActive ? _("Turn Off") : this._section.getConnectLabel();
-        this.radioItem.setOrnament(isActive ? PopupMenu.Ornament.DOT : PopupMenu.Ornament.NONE);
+        this.labelItem.label.text = isActive ? _("Turn Off") : _("Connect");
+        this.switchItem.setToggleState(isActive);
+        this.switchItem.setStatus(this._getStatus());
        this.emit('icon-changed');
    },

@ -162,11 +144,8 @@ const NMConnectionItem = new Lang.Class({
        this._sync();
    },

-    _activate: function() {
-        if (this._activeConnection == null)
-            this._section.activateConnection(this._connection);
-
-        this._sync();
+    _getStatus: function() {
+        return null;
    },

    _connectionStateChanged: function(ac, newstate, reason) {
@ -201,11 +180,11 @@ const NMConnectionSection = new Lang.Class({
        this._connections = [];

        this._labelSection = new PopupMenu.PopupMenuSection();
-        this._radioSection = new PopupMenu.PopupMenuSection();
+        this._switchSection = new PopupMenu.PopupMenuSection();

        this.item = new PopupMenu.PopupSubMenuMenuItem('', true);
        this.item.menu.addMenuItem(this._labelSection);
-        this.item.menu.addMenuItem(this._radioSection);
+        this.item.menu.addMenuItem(this._switchSection);

        this.connect('icon-changed', Lang.bind(this, this._sync));
    },
@ -217,7 +196,7 @@ const NMConnectionSection = new Lang.Class({
    _sync: function() {
        let nItems = this._connectionItems.size;

-        this._radioSection.actor.visible = (nItems > 1);
+        this._switchSection.actor.visible = (nItems > 1);
        this._labelSection.actor.visible = (nItems == 1);

        this.item.status.text = this._getStatus();
@ -232,12 +211,18 @@ const NMConnectionSection = new Lang.Class({
            this.item.label.text = '';
    },

-    _getMenuIcon: function() {
-        return this.getIndicatorIcon();
+    _getStatus: function() {
+        let values = this._connectionItems.values();
+        for (let item of values) {
+            if (item.isActive())
+                return item.getName();
+        }
+
+        return _("Off");
    },

-    getConnectLabel: function() {
-        return _("Connect");
+    _hasConnection: function(connection) {
+        return this._connectionItems.has(connection.get_uuid());
    },

    _connectionValid: function(connection) {
@ -245,7 +230,10 @@ const NMConnectionSection = new Lang.Class({
    },

    _connectionSortFunction: function(one, two) {
-        return GLib.utf8_collate(one.get_id(), two.get_id());
+        if (one._timestamp == two._timestamp)
+            return GLib.utf8_collate(one.get_id(), two.get_id());
+
+        return two._timestamp - one._timestamp;
    },

    _makeConnectionItem: function(connection) {
@ -256,20 +244,10 @@ const NMConnectionSection = new Lang.Class({
        if (!this._connectionValid(connection))
            return;

-        // This function is called everytime connection is added or updated
-        // In the usual case, we already added this connection and UUID
-        // didn't change. So we need to check if we already have an item,
-        // and update it for properties in the connection that changed
-        // (the only one we care about is the name)
-        // But it's also possible we didn't know about this connection
-        // (eg, during coldplug, or because it was updated and suddenly
-        // it's valid for this device), in which case we add a new item
+        if (this._hasConnection(connection))
+            return;

-        let item = this._connectionItems.get(connection.get_uuid());
-        if (item)
-            item.updateForConnection(connection);
-        else
-            this._addConnection(connection);
+        this._addConnection(connection);
    },

    _addConnection: function(connection) {
@ -283,23 +261,17 @@ const NMConnectionSection = new Lang.Class({
        item.connect('activation-failed', Lang.bind(this, function(item, reason) {
            this.emit('activation-failed', reason);
        }));
-        item.connect('name-changed', Lang.bind(this, this._sync));

        let pos = Util.insertSorted(this._connections, connection, Lang.bind(this, this._connectionSortFunction));
        this._labelSection.addMenuItem(item.labelItem, pos);
-        this._radioSection.addMenuItem(item.radioItem, pos);
+        this._switchSection.addMenuItem(item.switchItem, pos);
        this._connectionItems.set(connection.get_uuid(), item);
        this._sync();
    },

    removeConnection: function(connection) {
-        let uuid = connection.get_uuid();
-        let item = this._connectionItems.get(uuid);
-        if (item == undefined)
-            return;
-
-        item.destroy();
-        this._connectionItems.delete(uuid);
+        this._connectionItems.get(connection.get_uuid()).destroy();
+        this._connectionItems.delete(connection.get_uuid());

        let pos = this._connections.indexOf(connection);
        this._connections.splice(pos, 1);
@ -320,19 +292,11 @@ const NMConnectionDevice = new Lang.Class({
        this._settings = settings;

        this._autoConnectItem = this.item.menu.addAction(_("Connect"), Lang.bind(this, this._autoConnect));
-        this._deactivateItem = this._radioSection.addAction(_("Turn Off"), Lang.bind(this, this.deactivateConnection));

        this._stateChangedId = this._device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));
        this._activeConnectionChangedId = this._device.connect('notify::active-connection', Lang.bind(this, this._activeConnectionChanged));
    },

-    _canReachInternet: function() {
-        if (this._client.primary_connection != this._device.active_connection)
-            return true;
-
-        return this._client.connectivity == NetworkManager.ConnectivityState.FULL;
-    },
-
    _autoConnect: function() {
        let connection = new NetworkManager.Connection();
        this._client.add_and_activate_connection(connection, this._device, null, null);
@ -407,7 +371,6 @@ const NMConnectionDevice = new Lang.Class({
    _sync: function() {
        let nItems = this._connectionItems.size;
        this._autoConnectItem.actor.visible = (nItems == 0);
-        this._deactivateItem.actor.visible = this._device.state > NetworkManager.DeviceState.DISCONNECTED;
        this.parent();
    },

@ -419,22 +382,22 @@ const NMConnectionDevice = new Lang.Class({
        case NetworkManager.DeviceState.DISCONNECTED:
            return _("Off");
        case NetworkManager.DeviceState.ACTIVATED:
-            return _("Connected");
+            return this.parent();
        case NetworkManager.DeviceState.UNMANAGED:
            /* Translators: this is for network devices that are physically present but are not
               under NetworkManager's control (and thus cannot be used in the menu) */
-            return _("Unmanaged");
+            return _("unmanaged");
        case NetworkManager.DeviceState.DEACTIVATING:
-            return _("Disconnecting");
+            return _("disconnecting...");
        case NetworkManager.DeviceState.PREPARE:
        case NetworkManager.DeviceState.CONFIG:
        case NetworkManager.DeviceState.IP_CONFIG:
        case NetworkManager.DeviceState.IP_CHECK:
        case NetworkManager.DeviceState.SECONDARIES:
-            return _("Connecting");
+            return _("connecting...");
        case NetworkManager.DeviceState.NEED_AUTH:
            /* Translators: this is for network connections that require some kind of key or password */
-            return _("Authentication required");
+            return _("authentication required");
        case NetworkManager.DeviceState.UNAVAILABLE:
            // This state is actually a compound of various states (generically unavailable,
            // firmware missing), that are exposed by different properties (whose state may
@ -442,13 +405,13 @@ const NMConnectionDevice = new Lang.Class({
            if (this._device.firmware_missing) {
                /* Translators: this is for devices that require some kind of firmware or kernel
                   module, which is missing */
-                return _("Firmware missing");
+                return _("firmware missing");
            }
            /* Translators: this is for a network device that cannot be activated (for example it
               is disabled by rfkill, or it has no coverage */
-            return _("Unavailable");
+            return _("unavailable");
        case NetworkManager.DeviceState.FAILED:
-            return _("Connection failed");
+            return _("connection failed");
        default:
            log('Device state invalid, is %d'.format(this._device.state));
            return 'invalid';
@ -467,33 +430,33 @@ const NMDeviceWired = new Lang.Class({
        this.item.menu.addMenuItem(createSettingsAction(_("Wired Settings"), device));
    },

-    _hasCarrier: function() {
-        if (this._device instanceof NMClient.DeviceEthernet)
-            return this._device.carrier;
-        else
-            return true;
+    _isConnected: function() {
+        if (!this._device.active_connection)
+            return false;
+
+        let state = this._device.active_connection.state;
+        return state >= NetworkManager.ActiveConnectionState.ACTIVATING;
    },

    _sync: function() {
-        this.item.actor.visible = this._hasCarrier();
+        this.item.actor.visible = this._isConnected();
        this.parent();
    },

-    getIndicatorIcon: function() {
-        if (this._device.active_connection) {
-            let state = this._device.active_connection.state;
+    _getMenuIcon: function() {
+        if (this._device.active_connection)
+            return this.getIndicatorIcon();
+        else
+            return 'network-wired-disconnected-symbolic';
+    },

-            if (state == NetworkManager.ActiveConnectionState.ACTIVATING) {
-                return 'network-wired-acquiring-symbolic';
-            } else if (state == NetworkManager.ActiveConnectionState.ACTIVATED) {
-                if (this._canReachInternet())
-                    return 'network-wired-symbolic';
-                else
-                    return 'network-wired-no-route-symbolic';
-            } else {
-                return 'network-wired-disconnected-symbolic';
-            }
-        } else
+    getIndicatorIcon: function() {
+        let state = this._device.active_connection.state;
+        if (state == NetworkManager.ActiveConnectionState.ACTIVATING)
+            return 'network-wired-acquiring-symbolic';
+        else if (state == NetworkManager.ActiveConnectionState.ACTIVATED)
+            return 'network-wired-symbolic';
+        else
            return 'network-wired-disconnected-symbolic';
    }
 });
@ -560,20 +523,28 @@ const NMDeviceModem = new Lang.Class({
            return this.parent();
    },

-    getIndicatorIcon: function() {
-        if (this._device.active_connection) {
-            if (this._device.active_connection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
-                return 'network-cellular-acquiring-symbolic';
-
-            return this._getSignalIcon();
-        } else {
+    _getMenuIcon: function() {
+        if (this._device.active_connection)
+            return this.getIndicatorIcon();
+        else
            return 'network-cellular-signal-none-symbolic';
-        }
    },

    _getSignalIcon: function() {
        return 'network-cellular-signal-' + signalToIcon(this._mobileDevice.signal_quality) + '-symbolic';
    },
+
+    getIndicatorIcon: function() {
+        if (this._device.active_connection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
+            return 'network-cellular-acquiring-symbolic';
+
+        if (!this._mobileDevice) {
+            // this can happen for bluetooth in PAN mode
+            return 'network-cellular-connected-symbolic';
+        }
+
+        return this._getSignalIcon();
+    }
 });

 const NMDeviceBluetooth = new Lang.Class({
@ -587,26 +558,21 @@ const NMDeviceBluetooth = new Lang.Class({
        this.item.menu.addMenuItem(createSettingsAction(_("Mobile Broadband Settings"), device));
    },

-    _getDescription: function() {
-        return this._device.name;
-    },
-
-    getConnectLabel: function() {
-        return _("Use as Internet connection");
+    _getMenuIcon: function() {
+        if (this._device.active_connection)
+            return this.getIndicatorIcon();
+        else
+            return 'network-cellular-signal-none-symbolic';
    },

    getIndicatorIcon: function() {
-        if (this._device.active_connection) {
-            let state = this._device.active_connection.state;
-            if (state == NetworkManager.ActiveConnectionState.ACTIVATING)
-                return 'network-cellular-acquiring-symbolic';
-            else if (state == NetworkManager.ActiveConnectionState.ACTIVATED)
-                return 'network-cellular-connected-symbolic';
-            else
-                return 'network-cellular-signal-none-symbolic';
-        } else {
+        let state = this._device.active_connection.state;
+        if (state == NetworkManager.ActiveConnectionState.ACTIVATING)
+            return 'network-cellular-acquiring-symbolic';
+        else if (state == NetworkManager.ActiveConnectionState.ACTIVATED)
+            return 'network-cellular-connected-symbolic';
+        else
            return 'network-cellular-signal-none-symbolic';
-        }
    }
 });

@ -679,26 +645,16 @@ const NMWirelessDialog = new Lang.Class({
    Name: 'NMWirelessDialog',
    Extends: ModalDialog.ModalDialog,

-    _init: function(client, device, settings) {
+    _init: function(client, device) {
        this.parent({ styleClass: 'nm-dialog' });

        this._client = client;
        this._device = device;

-        this._wirelessEnabledChangedId = this._client.connect('notify::wireless-enabled',
-                                                              Lang.bind(this, this._syncView));
-
-        this._rfkill = Rfkill.getRfkillManager();
-        this._airplaneModeChangedId = this._rfkill.connect('airplane-mode-changed',
-                                                           Lang.bind(this, this._syncView));
-
        this._networks = [];
        this._buildLayout();

-        let connections = settings.list_connections();
-        this._connections = connections.filter(Lang.bind(this, function(connection) {
-            return device.connection_valid(connection);
-        }));
+        this._connections = device.get_available_connections();

        this._apAddedId = device.connect('access-point-added', Lang.bind(this, this._accessPointAdded));
        this._apRemovedId = device.connect('access-point-removed', Lang.bind(this, this._accessPointRemoved));
@ -713,12 +669,6 @@ const NMWirelessDialog = new Lang.Class({
        this._selectedNetwork = null;
        this._activeApChanged();
        this._updateSensitivity();
-        this._syncView();
-
-        if (accessPoints.length == 0) {
-            /* If there are no visible access points, request a scan */
-            this._device.request_scan_simple(null);
-        }
    },

    destroy: function() {
@ -734,14 +684,6 @@ const NMWirelessDialog = new Lang.Class({
            GObject.Object.prototype.disconnect.call(this._device, this._activeApChangedId);
            this._activeApChangedId = 0;
        }
-        if (this._wirelessEnabledChangedId) {
-            this._client.disconnect(this._wirelessEnabledChangedId);
-            this._wirelessEnabledChangedId = 0;
-        }
-        if (this._airplaneModeChangedId) {
-            this._rfkill.disconnect(this._airplaneModeChangedId);
-            this._airplaneModeChangedId = 0;
-        }

        this.parent();
    },
@ -763,44 +705,13 @@ const NMWirelessDialog = new Lang.Class({
    },

    _updateSensitivity: function() {
-        let connectSensitive = this._client.wireless_enabled && this._selectedNetwork && (this._selectedNetwork != this._activeNetwork);
+        let connectSensitive = this._selectedNetwork && (this._selectedNetwork != this._activeNetwork);
        this._connectButton.reactive = connectSensitive;
        this._connectButton.can_focus = connectSensitive;
    },

-    _syncView: function() {
-        if (this._rfkill.airplaneMode) {
-            this._airplaneBox.show();
-
-            this._airplaneIcon.icon_name = 'airplane-mode-symbolic';
-            this._airplaneHeadline.text = _("Airplane Mode is On");
-            this._airplaneText.text = _("Wi-Fi is disabled when airplane mode is on.");
-            this._airplaneButton.label = _("Turn Off Airplane Mode");
-
-            this._airplaneButton.visible = !this._rfkill.hwAirplaneMode;
-            this._airplaneInactive.visible = this._rfkill.hwAirplaneMode;
-            this._noNetworksBox.hide();
-        } else if (!this._client.wireless_enabled) {
-            this._airplaneBox.show();
-
-            this._airplaneIcon.icon_name = 'dialog-information-symbolic';
-            this._airplaneHeadline.text = _("Wi-Fi is Off");
-            this._airplaneText.text = _("Wi-Fi needs to be turned on in order to connect to a network.");
-            this._airplaneButton.label = _("Turn On Wi-Fi");
-
-            this._airplaneButton.show();
-            this._airplaneInactive.hide();
-            this._noNetworksBox.hide();
-        } else {
-            this._airplaneBox.hide();
-
-            this._noNetworksBox.visible = (this._networks.length == 0);
-        }
-
-        if (this._noNetworksBox.visible)
-            this._noNetworksSpinner.play();
-        else
-            this._noNetworksSpinner.stop();
+    _updateVisibility: function() {
+        this._noNetworksLabel.visible = (this._networks.length == 0);
    },

    _buildLayout: function() {
@ -834,43 +745,11 @@ const NMWirelessDialog = new Lang.Class({
        this._scrollView.add_actor(this._itemBox);
        this._stack.add_child(this._scrollView);

-        this._noNetworksBox = new St.BoxLayout({ vertical: true,
-                                                 style_class: 'no-networks-box',
-                                                 x_align: Clutter.ActorAlign.CENTER,
-                                                 y_align: Clutter.ActorAlign.CENTER });
-
-        this._noNetworksSpinner = new Animation.AnimatedIcon(global.datadir + '/theme/process-working.svg', 24, 24);
-        this._noNetworksBox.add_actor(this._noNetworksSpinner.actor);
-        this._noNetworksBox.add_actor(new St.Label({ style_class: 'no-networks-label',
-                                                     text: _("No Networks") }));
-        this._stack.add_child(this._noNetworksBox);
-
-        this._airplaneBox = new St.BoxLayout({ vertical: true,
-                                               style_class: 'nm-dialog-airplane-box',
+        this._noNetworksLabel = new St.Label({ style_class: 'no-networks-label',
                                               x_align: Clutter.ActorAlign.CENTER,
-                                               y_align: Clutter.ActorAlign.CENTER });
-        this._airplaneIcon = new St.Icon({ icon_size: 48 });
-        this._airplaneHeadline = new St.Label({ style_class: 'nm-dialog-airplane-headline' });
-        this._airplaneText = new St.Label({ style_class: 'nm-dialog-airplane-text' });
-
-        let airplaneSubStack = new St.Widget({ layout_manager: new Clutter.BinLayout });
-        this._airplaneButton = new St.Button({ style_class: 'modal-dialog-button' });
-        this._airplaneButton.connect('clicked', Lang.bind(this, function() {
-            if (this._rfkill.airplaneMode)
-                this._rfkill.airplaneMode = false;
-            else
-                this._client.wireless_enabled = true;
-        }));
-        airplaneSubStack.add_actor(this._airplaneButton);
-        this._airplaneInactive = new St.Label({ style_class: 'nm-dialog-airplane-text',
-                                                text: _("Use hardware switch to turn off") });
-        airplaneSubStack.add_actor(this._airplaneInactive);
-
-        this._airplaneBox.add(this._airplaneIcon, { x_align: St.Align.MIDDLE });
-        this._airplaneBox.add(this._airplaneHeadline, { x_align: St.Align.MIDDLE });
-        this._airplaneBox.add(this._airplaneText, { x_align: St.Align.MIDDLE });
-        this._airplaneBox.add(airplaneSubStack, { x_align: St.Align.MIDDLE });
-        this._stack.add_child(this._airplaneBox);
+                                               y_align: Clutter.ActorAlign.CENTER,
+                                               text: _("No Networks") });
+        this._stack.add_child(this._noNetworksLabel);

        this.contentLayout.add(this._stack, { expand: true });

@ -1063,7 +942,7 @@ const NMWirelessDialog = new Lang.Class({
            this._itemBox.insert_child_at_index(network.item.actor, newPos);
        }

-        this._syncView();
+        this._updateVisibility();
    },

    _accessPointRemoved: function(device, accessPoint) {
@ -1078,14 +957,14 @@ const NMWirelessDialog = new Lang.Class({
        network.accessPoints.splice(res.ap, 1);

        if (network.accessPoints.length == 0) {
-            network.item.actor.destroy();
+            network.item.destroy();
            this._networks.splice(res.network, 1);
        } else {
            network.item.updateBestAP(network.accessPoints[0]);
            this._resortItems();
        }

-        this._syncView();
+        this._updateVisibility();
    },

    _resortItems: function() {
@ -1125,10 +1004,9 @@ const NMDeviceWireless = new Lang.Class({
    Name: 'NMDeviceWireless',
    category: NMConnectionCategory.WIRELESS,

-    _init: function(client, device, settings) {
+    _init: function(client, device) {
        this._client = client;
        this._device = device;
-        this._settings = settings;

        this._description = '';

@ -1170,10 +1048,6 @@ const NMDeviceWireless = new Lang.Class({
            this._client.disconnect(this._wirelessHwEnabledChangedId);
            this._wirelessHwEnabledChangedId = 0;
        }
-        if (this._dialog) {
-            this._dialog.destroy();
-            this._dialog = null;
-        }

        this.item.destroy();
    },
@ -1200,7 +1074,7 @@ const NMDeviceWireless = new Lang.Class({
    },

    _showDialog: function() {
-        this._dialog = new NMWirelessDialog(this._client, this._device, this._settings);
+        this._dialog = new NMWirelessDialog(this._client, this._device);
        this._dialog.connect('closed', Lang.bind(this, this._dialogClosed));
        this._dialog.open();
    },
@ -1247,12 +1121,7 @@ const NMDeviceWireless = new Lang.Class({
    _getStatus: function() {
        let ap = this._device.active_access_point;

-        if (this._isHotSpotMaster())
-            return _("Hotspot Active");
-        else if (this._device.state >= NetworkManager.DeviceState.PREPARE &&
-                 this._device.state < NetworkManager.DeviceState.ACTIVATED)
-            return _("Connecting");
-        else if (ap)
+        if (ap)
            return ssidToLabel(ap.get_ssid());
        else if (!this._client.wireless_hardware_enabled)
            return _("Hardware Disabled");
@ -1271,52 +1140,20 @@ const NMDeviceWireless = new Lang.Class({
            return 'network-wireless-signal-none-symbolic';
    },

-    _canReachInternet: function() {
-        if (this._client.primary_connection != this._device.active_connection)
-            return true;
-
-        return this._client.connectivity == NetworkManager.ConnectivityState.FULL;
-    },
-
-    _isHotSpotMaster: function() {
-        if (!this._device.active_connection)
-            return false;
-
-        let connection = this._settings.get_connection_by_path(this._device.active_connection.connection);
-        if (!connection)
-            return false;
-
-        let ip4config = connection.get_setting_ip4_config();
-        if (!ip4config)
-            return false;
-
-        return ip4config.get_method() == NetworkManager.SETTING_IP4_CONFIG_METHOD_SHARED;
-    },
-
    getIndicatorIcon: function() {
-        if (this._device.state < NetworkManager.DeviceState.PREPARE)
-            return 'network-wireless-disconnected-symbolic';
-        if (this._device.state < NetworkManager.DeviceState.ACTIVATED)
+        if (this._device.state >= NetworkManager.DeviceState.PREPARE &&
+            this._device.state < NetworkManager.DeviceState.ACTIVATED)
            return 'network-wireless-acquiring-symbolic';

-        if (this._isHotSpotMaster())
-            return 'network-wireless-hotspot-symbolic';
-
        let ap = this._device.active_access_point;
        if (!ap) {
            if (this._device.mode != NM80211Mode.ADHOC)
                log('An active wireless connection, in infrastructure mode, involves no access point?');

-            if (this._canReachInternet())
-                return 'network-wireless-connected-symbolic';
-            else
-                return 'network-wireless-no-route-symbolic';
+            return 'network-wireless-connected-symbolic';
        }

-        if (this._canReachInternet())
-            return 'network-wireless-signal-' + signalToIcon(ap.strength) + '-symbolic';
-        else
-            return 'network-wireless-no-route-symbolic';
+        return 'network-wireless-signal-' + signalToIcon(ap.strength) + '-symbolic';
    },
 });
 Signals.addSignalMethods(NMDeviceWireless.prototype);
@ -1332,22 +1169,6 @@ const NMVPNConnectionItem = new Lang.Class({
        return this._activeConnection.vpn_state != NetworkManager.VPNConnectionState.DISCONNECTED;
    },

-    _buildUI: function() {
-        this.labelItem = new PopupMenu.PopupMenuItem('');
-        this.labelItem.connect('activate', Lang.bind(this, this._toggle));
-
-        this.radioItem = new PopupMenu.PopupSwitchMenuItem(this._connection.get_id(), false);
-        this.radioItem.connect('toggled', Lang.bind(this, this._toggle));
-    },
-
-    _sync: function() {
-        let isActive = this.isActive();
-        this.labelItem.label.text = isActive ? _("Turn Off") : this._section.getConnectLabel();
-        this.radioItem.setToggleState(isActive);
-        this.radioItem.setStatus(this._getStatus());
-        this.emit('icon-changed');
-    },
-
    _getStatus: function() {
        if (this._activeConnection == null)
            return null;
@ -1417,53 +1238,19 @@ const NMVPNSection = new Lang.Class({

    _init: function(client) {
        this.parent(client);
-
-        this._vpnSettings = new PopupMenu.PopupMenuItem('');
-        this.item.menu.addMenuItem(this._vpnSettings);
-        this._vpnSettings.connect('activate', Lang.bind(this, this._onSettingsActivate));
-
        this._sync();
    },

    _sync: function() {
        let nItems = this._connectionItems.size;
        this.item.actor.visible = (nItems > 0);
-
-        if (nItems > 1)
-            this._vpnSettings.label.text = _("Network Settings");
-        else
-            this._vpnSettings.label.text = _("VPN Settings");
-
        this.parent();
    },

-    _onSettingsActivate: function() {
-        let nItems = this._connectionItems.size;
-        if (nItems > 1) {
-            let appSys = Shell.AppSystem.get_default();
-            let app = appSys.lookup_app('gnome-network-panel.desktop');
-            app.launch(0, -1);
-        } else {
-            let connection = this._connections[0];
-            Util.spawnApp(['gnome-control-center', 'network', 'show-device',
-                           connection.get_path()]);
-        }
-    },
-
    _getDescription: function() {
        return _("VPN");
    },

-    _getStatus: function() {
-        let values = this._connectionItems.values();
-        for (let item of values) {
-            if (item.isActive())
-                return item.getName();
-        }
-
-        return _("Off");
-    },
-
    _getMenuIcon: function() {
        return this.getIndicatorIcon() || 'network-vpn-symbolic';
    },
@ -1842,6 +1629,7 @@ const NMApplet = new Lang.Class({
        let connectionSettings = connection.get_setting_by_name(NetworkManager.SETTING_CONNECTION_SETTING_NAME);
        connection._type = connectionSettings.type;
        connection._section = this._ctypes[connection._type] || NMConnectionCategory.INVALID;
+        connection._timestamp = connectionSettings.timestamp;

        let section = connection._section;

@ -1866,7 +1654,8 @@ const NMApplet = new Lang.Class({

    _updateIcon: function() {
        if (!this._client.networking_enabled || !this._mainConnection) {
-            this._primaryIndicator.visible = false;
+            this._primaryIndicator.icon_name = 'network-offline-symbolic';
+            this._primaryIndicator.visible = true;
        } else {
            let dev = this._mainConnection._primaryDevice;
            this._primaryIndicator.visible = (dev != null);
--- a/js/ui/status/rfkill.js
+++ b/js/ui/status/rfkill.js
@ -2,9 +2,7 @@

 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const Signals = imports.signals;

-const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

@ -14,55 +12,11 @@ const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill';
 const RfkillManagerInterface = '<node> \
 <interface name="org.gnome.SettingsDaemon.Rfkill"> \
 <property name="AirplaneMode" type="b" access="readwrite" /> \
-<property name="HardwareAirplaneMode" type="b" access="read" /> \
 </interface> \
 </node>';

 const RfkillManagerProxy = Gio.DBusProxy.makeProxyWrapper(RfkillManagerInterface);

-const RfkillManager = new Lang.Class({
-    Name: 'RfkillManager',
-
-    _init: function() {
-        this._proxy = new RfkillManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
-                                             Lang.bind(this, function(proxy, error) {
-                                                 if (error) {
-                                                     log(error.message);
-                                                     return;
-                                                 }
-                                                 this._proxy.connect('g-properties-changed',
-                                                                     Lang.bind(this, this._changed));
-                                                 this._changed();
-                                             }));
-    },
-
-    get airplaneMode() {
-        return this._proxy.AirplaneMode;
-    },
-
-    set airplaneMode(v) {
-        this._proxy.AirplaneMode = v;
-    },
-
-    get hwAirplaneMode() {
-        return this._proxy.HardwareAirplaneMode;
-    },
-
-    _changed: function() {
-        this.emit('airplane-mode-changed');
-    }
-});
-Signals.addSignalMethods(RfkillManager.prototype);
-
-var _manager;
-function getRfkillManager() {
-    if (_manager != null)
-        return _manager;
-
-    _manager = new RfkillManager();
-    return _manager;
-}
-
 const Indicator = new Lang.Class({
    Name: 'RfkillIndicator',
    Extends: PanelMenu.SystemIndicator,
@ -70,8 +24,16 @@ const Indicator = new Lang.Class({
    _init: function() {
        this.parent();

-        this._manager = getRfkillManager();
-        this._manager.connect('airplane-mode-changed', Lang.bind(this, this._sync));
+        this._proxy = new RfkillManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
+                                             Lang.bind(this, function(proxy, error) {
+                                                 if (error) {
+                                                     log(error.message);
+                                                     return;
+                                                 }
+                                                 this._proxy.connect('g-properties-changed',
+                                                                     Lang.bind(this, this._sync));
+                                                 this._sync();
+                                             }));

        this._indicator = this._addIndicator();
        this._indicator.icon_name = 'airplane-mode-symbolic';
@ -83,34 +45,16 @@ const Indicator = new Lang.Class({
        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Airplane Mode"), true);
        this._item.icon.icon_name = 'airplane-mode-symbolic';
        this._item.status.text = _("On");
-        this._offItem = this._item.menu.addAction(_("Turn Off"), Lang.bind(this, function() {
-            this._manager.airplaneMode = false;
+        this._item.menu.addAction(_("Turn Off"), Lang.bind(this, function() {
+            this._proxy.AirplaneMode = false;
        }));
        this._item.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');
        this.menu.addMenuItem(this._item);
-
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-        this._sessionUpdated();
-    },
-
-    _sessionUpdated: function() {
-        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
-        this.menu.setSensitive(sensitive);
    },

    _sync: function() {
-        let airplaneMode = this._manager.airplaneMode;
-        let hwAirplaneMode = this._manager.hwAirplaneMode;
-        let changed = (airplaneMode != this._indicator.visible) ||
-            (hwAirplaneMode != this._offItem.actor.visible);
-
+        let airplaneMode = this._proxy.AirplaneMode;
        this._indicator.visible = airplaneMode;
        this._item.actor.visible = airplaneMode;
-        this._offItem.setSensitive(!hwAirplaneMode);
-
-        if (hwAirplaneMode)
-            this._offItem.label.text = _("Use hardware switch to turn off");
-        else
-            this._offItem.label.text = _("Turn Off");
    },
 });
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@ -56,10 +56,7 @@ const AltSwitcher = new Lang.Class({
        }

        if (this.actor.get_child() != childToShow) {
-            let hasFocus = this.actor.contains(global.stage.get_key_focus());
            this.actor.set_child(childToShow);
-            if (hasFocus)
-                childToShow.grab_key_focus();

            // The actors might respond to hover, so
            // sync the pointer to make sure they update.
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@ -54,7 +54,7 @@ const SwitcherPopup = new Lang.Class({
        this.actor.connect('allocate', Lang.bind(this, this._allocate));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

-        Main.uiGroup.add_actor(this.actor);
+        Main.layoutManager.switcherPopupGroup.add_child(this.actor);

        this._haveModal = false;
        this._modifierMask = 0;
@ -161,12 +161,11 @@ const SwitcherPopup = new Lang.Class({
        // disturbed by the popup briefly flashing.
        this._initialDelayTimeoutId = Mainloop.timeout_add(POPUP_DELAY_TIMEOUT,
                                                           Lang.bind(this, function () {
-                                                               Main.osdWindowManager.hideAll();
+                                                               Main.osdWindow.cancel();
                                                               this.actor.opacity = 255;
                                                               this._initialDelayTimeoutId = 0;
                                                               return GLib.SOURCE_REMOVE;
                                                           }));
-        GLib.Source.set_name_by_id(this._initialDelayTimeoutId, '[gnome-shell] Main.osdWindow.cancel');
        return true;
    },

@ -190,11 +189,10 @@ const SwitcherPopup = new Lang.Class({

        this._disableHover();

-        if (this._keyPressHandler(keysym, backwards, action) != Clutter.EVENT_PROPAGATE)
-            return Clutter.EVENT_STOP;
-
        if (keysym == Clutter.Escape)
            this.destroy();
+        else
+            this._keyPressHandler(keysym, backwards, action);

        return Clutter.EVENT_STOP;
    },
@ -252,7 +250,6 @@ const SwitcherPopup = new Lang.Class({
            Mainloop.source_remove(this._motionTimeoutId);

        this._motionTimeoutId = Mainloop.timeout_add(DISABLE_HOVER_TIMEOUT, Lang.bind(this, this._mouseTimedOut));
-        GLib.Source.set_name_by_id(this._motionTimeoutId, '[gnome-shell] this._mouseTimedOut');
    },

    _mouseTimedOut: function() {
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -118,13 +118,11 @@ const ViewSelector = new Lang.Class({
        this._stageKeyPressId = 0;
        Main.overview.connect('showing', Lang.bind(this,
            function () {
-                this._resetShowAppsButton();
                this._stageKeyPressId = global.stage.connect('key-press-event',
                                                             Lang.bind(this, this._onStageKeyPress));
            }));
        Main.overview.connect('hiding', Lang.bind(this,
            function () {
-                this._resetShowAppsButton();
                if (this._stageKeyPressId != 0) {
                    global.stage.disconnect(this._stageKeyPressId);
                    this._stageKeyPressId = 0;
@ -160,19 +158,26 @@ const ViewSelector = new Lang.Class({
    show: function() {
        this.reset();

+        this._showAppsBlocked = true;
+        this._showAppsButton.checked = false;
+        this._showAppsBlocked = false;
+
+        this._workspacesPage.opacity = 255;
        this._workspacesDisplay.show();
        this._activePage = null;
-        this._showPage(this._workspacesPage);
+        this._syncActivePage();

        if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
            Main.overview.fadeOutDesktop();
    },

-    zoomFromOverview: function() {
-        this._workspacesDisplay.zoomFromOverview();
-
+    leaveOverview: function() {
        if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
            Main.overview.fadeInDesktop();
+
+        // If we're not on the windows page, don't zoom back the primary monitor.
+        let zoomPrimary = (this._activePage == this._workspacesPage);
+        this._workspacesDisplay.leaveOverview(zoomPrimary);
    },

    setWorkspacesFullGeometry: function(geom) {
@ -181,12 +186,16 @@ const ViewSelector = new Lang.Class({

    hide: function() {
        this._workspacesDisplay.hide();
+        if (this._activePage)
+            this._activePage.hide();
+        this._activePage = null;
    },

    _addPage: function(actor, name, a11yIcon, params) {
        params = Params.parse(params, { a11yFocus: null });

        let page = new St.Bin({ child: actor,
+                                visible: false,
                                x_align: St.Align.START,
                                y_align: St.Align.START,
                                x_fill: true,
@ -211,16 +220,16 @@ const ViewSelector = new Lang.Class({
            oldPage.hide();

        this.emit('page-empty');
-
+        this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
        this._activePage.show();
        Tweener.addTween(this._activePage,
-            { opacity: 255,
-              time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
-              transition: 'easeOutQuad'
-            });
+                         { opacity: 255,
+                           time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
+                           transition: 'easeOutQuad'
+                         });
    },

-    _showPage: function(page, noFade) {
+    _setActivePage: function(page) {
        if (page == this._activePage)
            return;

@ -228,7 +237,7 @@ const ViewSelector = new Lang.Class({
        this._activePage = page;
        this.emit('page-changed');

-        if (oldPage && !noFade)
+        if (oldPage)
            Tweener.addTween(oldPage,
                             { opacity: 0,
                               time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
@ -247,20 +256,25 @@ const ViewSelector = new Lang.Class({
        page.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
    },

-    _onShowAppsButtonToggled: function() {
-        if (this._showAppsBlocked)
-            return;
-
-        this._showPage(this._showAppsButton.checked ?
-                       this._appsPage : this._workspacesPage);
+    _getActivePage: function() {
+        if (this._searchActive)
+            return this._searchPage;
+        else if (this._showAppsButton.checked)
+            return this._appsPage;
+        else
+            return this._workspacesPage;
    },

-    _resetShowAppsButton: function() {
-        this._showAppsBlocked = true;
-        this._showAppsButton.checked = false;
-        this._showAppsBlocked = false;
+    _syncActivePage: function() {
+        let activePage = this._getActivePage();
+        if (activePage == this._activePage)
+            return;
+        this._setActivePage(activePage);
+    },

-        this._showPage(this._workspacesPage, true);
+    _onShowAppsButtonToggled: function() {
+        if (!this._showAppsBlocked)
+            this._syncActivePage();
    },

    _onStageKeyPress: function(actor, event) {
@ -282,32 +296,10 @@ const ViewSelector = new Lang.Class({
            return Clutter.EVENT_STOP;
        } else if (this._shouldTriggerSearch(symbol)) {
            this.startSearch(event);
-        } else if (!this._searchActive && !global.stage.key_focus) {
-            if (symbol == Clutter.Tab || symbol == Clutter.Down) {
-                this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-                return true;
-            } else if (symbol == Clutter.ISO_Left_Tab) {
-                this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_BACKWARD, false);
-                return true;
-            }
        }
        return Clutter.EVENT_PROPAGATE;
    },

-    _searchCancelled: function() {
-        this._showPage(this._showAppsButton.checked ? this._appsPage
-                                                    : this._workspacesPage);
-
-        // Leave the entry focused when it doesn't have any text;
-        // when replacing a selected search term, Clutter emits
-        // two 'text-changed' signals, one for deleting the previous
-        // text and one for the new one - the second one is handled
-        // incorrectly when we remove focus
-        // (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */
-        if (this._text.text != '')
-            this.reset();
-    },
-
    reset: function () {
        global.stage.set_key_focus(null);

@ -383,11 +375,9 @@ const ViewSelector = new Lang.Class({
                this._iconClickedId = this._entry.connect('secondary-icon-clicked',
                    Lang.bind(this, this.reset));

-            if (this._searchTimeoutId == 0) {
+            if (this._searchTimeoutId == 0)
                this._searchTimeoutId = Mainloop.timeout_add(150,
                    Lang.bind(this, this._doSearch));
-                GLib.Source.set_name_by_id(this._searchTimeoutId, '[gnome-shell] this._doSearch');
-            }
        } else {
            if (this._iconClickedId > 0) {
                this._entry.disconnect(this._iconClickedId);
@ -400,8 +390,18 @@ const ViewSelector = new Lang.Class({
            }

            this._entry.set_secondary_icon(null);
-            this._searchCancelled();
+
+            // Leave the entry focused when it doesn't have any text;
+            // when replacing a selected search term, Clutter emits
+            // two 'text-changed' signals, one for deleting the previous
+            // text and one for the new one - the second one is handled
+            // incorrectly when we remove focus
+            // (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */
+            if (this._text.text != '')
+                this.reset();
        }
+
+        this._syncActivePage();
    },

    _onKeyPress: function(entry, event) {
@ -468,9 +468,7 @@ const ViewSelector = new Lang.Class({
        this._searchTimeoutId = 0;

        let terms = getTermsForSearchString(this._entry.get_text());
-
        this._searchResults.setTerms(terms);
-        this._showPage(this._searchPage);

        return GLib.SOURCE_REMOVE;
    },
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -15,7 +15,6 @@ const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
-const WindowMenu = imports.ui.windowMenu;

 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 const WINDOW_ANIMATION_TIME = 0.25;
@ -83,7 +82,6 @@ const DisplayChangeDialog = new Lang.Class({
                                        { expand: false, x_fill: false, x_align: St.Align.END });

        this._timeoutId = Mainloop.timeout_add(ONE_SECOND, Lang.bind(this, this._tick));
-        GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._tick');
    },

    close: function(timestamp) {
@ -193,7 +191,6 @@ const WorkspaceTracker = new Lang.Class({
        tracker.connect('startup-sequence-changed', Lang.bind(this, this._queueCheckWorkspaces));

        global.screen.connect('notify::n-workspaces', Lang.bind(this, this._nWorkspacesChanged));
-        global.window_manager.connect('switch-workspace', Lang.bind(this, this._queueCheckWorkspaces));

        global.screen.connect('window-entered-monitor', Lang.bind(this, this._windowEnteredMonitor));
        global.screen.connect('window-left-monitor', Lang.bind(this, this._windowLeftMonitor));
@ -252,7 +249,13 @@ const WorkspaceTracker = new Lang.Class({
        }

        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        emptyWorkspaces[activeWorkspaceIndex] = false;
+        let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
+                                        activeWorkspaceIndex < emptyWorkspaces.length - 1);
+
+        if (removingCurrentWorkspace) {
+            // "Merge" the empty workspace we are removing with the one at the end
+            this._wm.blockAnimations();
+        }

        // Delete other empty workspaces; do it from the end to avoid index changes
        for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
@ -260,6 +263,11 @@ const WorkspaceTracker = new Lang.Class({
                global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
        }

+        if (removingCurrentWorkspace) {
+            global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
+            this._wm.unblockAnimations();
+        }
+
        this._checkWorkspacesId = 0;
        return false;
    },
@ -273,20 +281,18 @@ const WorkspaceTracker = new Lang.Class({
            this._queueCheckWorkspaces();
            return GLib.SOURCE_REMOVE;
        }));
-        GLib.Source.set_name_by_id(workspace._keepAliveId, '[gnome-shell] this._queueCheckWorkspaces');
    },

    _windowRemoved: function(workspace, window) {
        workspace._lastRemovedWindow = window;
        this._queueCheckWorkspaces();
-        let id = Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, Lang.bind(this, function() {
+        Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, Lang.bind(this, function() {
            if (workspace._lastRemovedWindow == window) {
                workspace._lastRemovedWindow = null;
                this._queueCheckWorkspaces();
            }
            return GLib.SOURCE_REMOVE;
        }));
-        GLib.Source.set_name_by_id(id, '[gnome-shell] this._queueCheckWorkspaces');
    },

    _windowLeftMonitor: function(metaScreen, monitorIndex, metaWin) {
@ -362,93 +368,6 @@ const WorkspaceTracker = new Lang.Class({
    }
 });

-const TilePreview = new Lang.Class({
-    Name: 'TilePreview',
-
-    _init: function() {
-        this.actor = new St.Widget();
-        global.window_group.add_actor(this.actor);
-
-        this._reset();
-        this._showing = false;
-    },
-
-    show: function(window, tileRect, monitorIndex) {
-        let windowActor = window.get_compositor_private();
-        if (!windowActor)
-            return;
-
-        global.window_group.set_child_below_sibling(this.actor, windowActor);
-
-        if (this._rect && this._rect.equal(tileRect))
-            return;
-
-        let changeMonitor = (this._monitorIndex == -1 ||
-                             this._monitorIndex != monitorIndex);
-
-        this._monitorIndex = monitorIndex;
-        this._rect = tileRect;
-
-        let monitor = Main.layoutManager.monitors[monitorIndex];
-
-        this._updateStyle(monitor);
-
-        if (!this._showing || changeMonitor) {
-            let monitorRect = new Meta.Rectangle({ x: monitor.x,
-                                                   y: monitor.y,
-                                                   width: monitor.width,
-                                                   height: monitor.height });
-            let [, rect] = window.get_outer_rect().intersect(monitorRect);
-            this.actor.set_size(rect.width, rect.height);
-            this.actor.set_position(rect.x, rect.y);
-            this.actor.opacity = 0;
-        }
-
-        this._showing = true;
-        this.actor.show();
-        Tweener.addTween(this.actor,
-                         { x: tileRect.x,
-                           y: tileRect.y,
-                           width: tileRect.width,
-                           height: tileRect.height,
-                           opacity: 255,
-                           time: WINDOW_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
-    },
-
-    hide: function() {
-        if (!this._showing)
-            return;
-
-        this._showing = false;
-        Tweener.addTween(this.actor,
-                         { opacity: 0,
-                           time: WINDOW_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, this._reset)
-                         });
-    },
-
-    _reset: function() {
-        this.actor.hide();
-        this._rect = null;
-        this._monitorIndex = -1;
-    },
-
-    _updateStyle: function(monitor) {
-        let styles = ['tile-preview'];
-        if (this._monitorIndex == Main.layoutManager.primaryIndex)
-            styles.push('on-primary');
-        if (this._rect.x == monitor.x)
-            styles.push('tile-preview-left');
-        if (this._rect.x + this._rect.width == monitor.x + monitor.width)
-            styles.push('tile-preview-right');
-
-        this.actor.style_class = styles.join(' ');
-    }
-});
-
 const WindowManager = new Lang.Class({
    Name: 'WindowManager',

@ -479,9 +398,6 @@ const WindowManager = new Lang.Class({
        }));

        this._shellwm.connect('switch-workspace', Lang.bind(this, this._switchWorkspace));
-        this._shellwm.connect('show-tile-preview', Lang.bind(this, this._showTilePreview));
-        this._shellwm.connect('hide-tile-preview', Lang.bind(this, this._hideTilePreview));
-        this._shellwm.connect('show-window-menu', Lang.bind(this, this._showWindowMenu));
        this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
        this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
        this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
@ -491,8 +407,6 @@ const WindowManager = new Lang.Class({
        this._shellwm.connect('confirm-display-change', Lang.bind(this, this._confirmDisplayChange));

        this._workspaceSwitcherPopup = null;
-        this._tilePreview = null;
-
        this.setCustomKeybindingHandler('switch-to-workspace-left',
                                        Shell.KeyBindingMode.NORMAL |
                                        Shell.KeyBindingMode.OVERVIEW,
@ -509,10 +423,6 @@ const WindowManager = new Lang.Class({
                                        Shell.KeyBindingMode.NORMAL |
                                        Shell.KeyBindingMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-last',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-left',
                                        Shell.KeyBindingMode.NORMAL |
                                        Shell.KeyBindingMode.OVERVIEW,
@ -613,9 +523,6 @@ const WindowManager = new Lang.Class({
        this.setCustomKeybindingHandler('move-to-workspace-12',
                                        Shell.KeyBindingMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-last',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-applications',
                                        Shell.KeyBindingMode.NORMAL,
                                        Lang.bind(this, this._startAppSwitcher));
@ -671,8 +578,6 @@ const WindowManager = new Lang.Class({
                this._dimWindow(this._dimmedWindows[i]);
        }));

-        this._windowMenuManager = new WindowMenu.WindowMenuManager();
-
        if (Main.sessionMode.hasWorkspaces)
            this._workspaceTracker = new WorkspaceTracker(this);

@ -1151,22 +1056,6 @@ const WindowManager = new Lang.Class({
        shellwm.completed_switch_workspace();
    },

-    _showTilePreview: function(shellwm, window, tileRect, monitorIndex) {
-        if (!this._tilePreview)
-            this._tilePreview = new TilePreview();
-        this._tilePreview.show(window, tileRect, monitorIndex);
-    },
-
-    _hideTilePreview: function(shellwm) {
-        if (!this._tilePreview)
-            return;
-        this._tilePreview.hide();
-    },
-
-    _showWindowMenu: function(shellwm, window, menu, x, y) {
-        this._windowMenuManager.showWindowMenuForWindow(window, menu, x, y);
-    },
-
    _startAppSwitcher : function(display, screen, window, binding) {
        /* prevent a corner case where both popups show up at once */
        if (this._workspaceSwitcherPopup != null)
@ -1223,10 +1112,7 @@ const WindowManager = new Lang.Class({
        let newWs;
        let direction;

-        if (target == 'last') {
-            direction = Meta.MotionDirection.DOWN;
-            newWs = screen.get_workspace_by_index(screen.n_workspaces - 1);
-        } else if (isNaN(target)) {
+        if (isNaN(target)) {
            direction = Meta.MotionDirection[target.toUpperCase()];
            newWs = screen.get_active_workspace().get_neighbor(direction);
        } else if (target > 0) {
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@ -1,172 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*
-
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-
-const BoxPointer = imports.ui.boxpointer;
-const Main = imports.ui.main;
-const PopupMenu = imports.ui.popupMenu;
-const RemoteMenu = imports.ui.remoteMenu;
-
-const WindowMenu = new Lang.Class({
-    Name: 'WindowMenu',
-    Extends: PopupMenu.PopupMenu,
-
-    _init: function(window) {
-        this.parent(Main.layoutManager.dummyCursor, 0, St.Side.TOP);
-
-        this.actor.add_style_class_name('window-menu');
-
-        Main.layoutManager.uiGroup.add_actor(this.actor);
-        this.actor.hide();
-
-        this._buildMenu(window);
-    },
-
-    _buildMenu: function(window) {
-        let type = window.get_window_type();
-
-        let item;
-
-        item = this.addAction(_("Minimize"), Lang.bind(this, function(event) {
-            window.minimize();
-        }));
-        if (!window.can_minimize())
-            item.setSensitive(false);
-
-        if (window.get_maximized()) {
-            item = this.addAction(_("Unmaximize"), Lang.bind(this, function() {
-                window.unmaximize(Meta.MaximizeFlags.BOTH);
-            }));
-        } else {
-            item = this.addAction(_("Maximize"), Lang.bind(this, function() {
-                window.maximize(Meta.MaximizeFlags.BOTH);
-            }));
-        }
-        if (!window.can_maximize())
-            item.setSensitive(false);
-
-        item = this.addAction(_("Move"), Lang.bind(this, function(event) {
-            window.begin_grab_op(Meta.GrabOp.KEYBOARD_MOVING, true, event.get_time());
-        }));
-        if (!window.allows_move())
-            item.setSensitive(false);
-
-        item = this.addAction(_("Resize"), Lang.bind(this, function(event) {
-            window.begin_grab_op(Meta.GrabOp.KEYBOARD_RESIZING_UNKNOWN, true, event.get_time());
-        }));
-        if (!window.allows_resize())
-            item.setSensitive(false);
-
-        if (!window.titlebar_is_onscreen() && type != Meta.WindowType.DOCK && type != Meta.WindowType.DESKTOP) {
-            this.addAction(_("Move Titlebar Onscreen"), Lang.bind(this, function(event) {
-                window.shove_titlebar_onscreen();
-            }));
-        }
-
-        item = this.addAction(_("Always on Top"), Lang.bind(this, function() {
-            if (window.is_above())
-                window.unmake_above();
-            else
-                window.make_above();
-        }));
-        if (window.is_above())
-            item.setOrnament(PopupMenu.Ornament.DOT);
-        if (window.get_maximized() ||
-            type == Meta.WindowType.DOCK ||
-            type == Meta.WindowType.DESKTOP ||
-            type == Meta.WindowType.SPLASHSCREEN)
-            item.setSensitive(false);
-
-        if (Main.sessionMode.hasWorkspaces &&
-            (!Meta.prefs_get_workspaces_only_on_primary() ||
-             window.is_on_primary_monitor())) {
-            let isSticky = window.is_on_all_workspaces();
-
-            item = this.addAction(_("Always on Visible Workspace"), Lang.bind(this, function() {
-                if (isSticky)
-                    window.unstick();
-                else
-                    window.stick();
-            }));
-            if (isSticky)
-                item.setOrnament(PopupMenu.Ornament.DOT);
-            if (window.is_always_on_all_workspaces())
-                item.setSensitive(false);
-
-            let nWorkspaces = global.screen.n_workspaces;
-
-            if (!isSticky) {
-                let workspace = window.get_workspace();
-                let idx = workspace.index();
-                if (idx > 0) {
-                    this.addAction(_("Move to Workspace Up"), Lang.bind(this, function(event) {
-                        window.change_workspace(workspace.get_neighbor(Meta.MotionDirection.UP));
-                    }));
-                }
-                if (idx < nWorkspaces) {
-                     this.addAction(_("Move to Workspace Down"), Lang.bind(this, function(event) {
-                        window.change_workspace(workspace.get_neighbor(Meta.MotionDirection.DOWN));
-                    }));
-                }
-            }
-        }
-
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        item = this.addAction(_("Close"), Lang.bind(this, function(event) {
-            window.delete(event.get_time());
-        }));
-        if (!window.can_close())
-            item.setSensitive(false);
-    }
-});
-
-const AppMenu = new Lang.Class({
-    Name: 'AppMenu',
-    Extends: RemoteMenu.RemoteMenu,
-
-    _init: function(window) {
-        let app = Shell.WindowTracker.get_default().get_window_app(window);
-
-        this.parent(Main.layoutManager.dummyCursor, app.menu, app.action_group);
-
-        this.actor.add_style_class_name('fallback-app-menu');
-        let variant = window.get_gtk_theme_variant();
-        if (variant)
-            this.actor.add_style_class_name(variant);
-
-        Main.layoutManager.uiGroup.add_actor(this.actor);
-        this.actor.hide();
-    }
-});
-
-const WindowMenuManager = new Lang.Class({
-    Name: 'WindowMenuManager',
-
-    _init: function() {
-        this._manager = new PopupMenu.PopupMenuManager({ actor: Main.layoutManager.dummyCursor });
-    },
-
-    showWindowMenuForWindow: function(window, type, x, y) {
-        let menu = (type == Meta.WindowMenuType.WM) ? new WindowMenu(window)
-                                                    : new AppMenu(window);
-
-        this._manager.addMenu(menu);
-
-        menu.connect('activate', function() {
-            window.check_alive(global.get_current_time());
-        });
-
-        Main.layoutManager.setDummyCursorGeometry(x, y, 0, 0);
-        menu.open(BoxPointer.PopupAnimation.NONE);
-        menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-        menu.connect('open-state-changed', Lang.bind(this, function(menu_, isOpen) {
-            if (!isOpen)
-                menu.destroy();
-        }));
-    }
-});
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -8,8 +8,6 @@ const Meta = imports.gi.Meta;
 const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Atk = imports.gi.Atk;
-
 const Signals = imports.signals;

 const DND = imports.ui.dnd;
@ -123,7 +121,6 @@ const WindowClone = new Lang.Class({
        // the hierarchy that is sized to only the visible portion.
        this.actor = new St.Widget({ reactive: true,
                                     can_focus: true,
-                                     accessible_role: Atk.Role.PUSH_BUTTON,
                                     layout_manager: new WindowCloneLayout() });

        this.actor.add_child(this._windowClone);
@ -134,7 +131,7 @@ const WindowClone = new Lang.Class({
        this._dragSlot = [0, 0, 0, 0];
        this._stackAbove = null;

-        this._windowClone._updateId = this.metaWindow.connect('size-changed',
+        this._windowClone._updateId = this.realWindow.connect('size-changed',
            Lang.bind(this, this._onRealWindowSizeChanged));
        this._windowClone._destroyId = this.realWindow.connect('destroy', Lang.bind(this, function() {
            // First destroy the clone and then destroy everything
@ -202,7 +199,7 @@ const WindowClone = new Lang.Class({

    _doAddAttachedDialog: function(metaWin, realWin) {
        let clone = new Clutter.Clone({ source: realWin });
-        clone._updateId = metaWin.connect('size-changed', Lang.bind(this, function() {
+        clone._updateId = realWin.connect('size-changed', Lang.bind(this, function() {
            this._computeBoundingBox();
            this.emit('size-changed');
        }));
@ -298,7 +295,7 @@ const WindowClone = new Lang.Class({
            else
                realWindow = child.source;

-            realWindow.meta_window.disconnect(child._updateId);
+            realWindow.disconnect(child._updateId);
            realWindow.disconnect(child._destroyId);
        }));
    },
@ -427,7 +424,6 @@ const WindowOverlay = new Lang.Class({
                                   text: metaWindow.title });
        title.clutter_text.ellipsize = Pango.EllipsizeMode.END;
        title._spacing = 0;
-        windowClone.actor.label_actor = title;

        this._updateCaptionId = metaWindow.connect('notify::title',
            Lang.bind(this, function(w) {
@ -594,12 +590,11 @@ const WindowOverlay = new Lang.Class({

            // use an idle handler to avoid mapping problems -
            // see comment in Workspace._windowAdded
-            let id = Mainloop.idle_add(Lang.bind(this,
-                                            function() {
-                                                this._windowClone.emit('selected');
-                                                return GLib.SOURCE_REMOVE;
-                                            }));
-            GLib.Source.set_name_by_id(id, '[gnome-shell] this._windowClone.emit');
+            Mainloop.idle_add(Lang.bind(this,
+                                        function() {
+                                            this._windowClone.emit('selected');
+                                            return GLib.SOURCE_REMOVE;
+                                        }));
        }
    },

@ -670,10 +665,8 @@ const WindowOverlay = new Lang.Class({
    },

    _onLeave: function() {
-        if (this._idleToggleCloseId == 0) {
+        if (this._idleToggleCloseId == 0)
            this._idleToggleCloseId = Mainloop.timeout_add(750, Lang.bind(this, this._idleToggleCloseButton));
-            GLib.Source.set_name_by_id(this._idleToggleCloseId, '[gnome-shell] this._idleToggleCloseButton');
-        }
        return Clutter.EVENT_PROPAGATE;
    },

@ -1421,7 +1414,6 @@ const Workspace = new Lang.Class({
        this._currentLayout = null;
        this._repositionWindowsId = Mainloop.timeout_add(750,
            Lang.bind(this, this._delayedWindowRepositioning));
-        GLib.Source.set_name_by_id(this._repositionWindowsId, '[gnome-shell] this._delayedWindowRepositioning');
    },

    _doAddWindow : function(metaWin) {
@ -1433,15 +1425,14 @@ const Workspace = new Lang.Class({
        if (!win) {
            // Newly-created windows are added to a workspace before
            // the compositor finds out about them...
-            let id = Mainloop.idle_add(Lang.bind(this,
-                                            function () {
-                                                if (this.actor &&
-                                                    metaWin.get_compositor_private() &&
-                                                    metaWin.get_workspace() == this.metaWorkspace)
-                                                    this._doAddWindow(metaWin);
-                                                return GLib.SOURCE_REMOVE;
-                                            }));
-            GLib.Source.set_name_by_id(id, '[gnome-shell] this._doAddWindow');
+            Mainloop.idle_add(Lang.bind(this,
+                                        function () {
+                                            if (this.actor &&
+                                                metaWin.get_compositor_private() &&
+                                                metaWin.get_workspace() == this.metaWorkspace)
+                                                this._doAddWindow(metaWin);
+                                            return GLib.SOURCE_REMOVE;
+                                        }));
            return;
        }

@ -1530,34 +1521,39 @@ const Workspace = new Lang.Class({
        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE | WindowPositionFlags.INITIAL);
    },

-    // Animates the return from Overview mode
-    zoomFromOverview : function() {
+    _leavingOverview: function() {
        let currentWorkspace = global.screen.get_active_workspace();
+        if (this.metaWorkspace != null && this.metaWorkspace != currentWorkspace)
+            return false;

        this.leavingOverview = true;
+        this._overviewHiddenId = Main.overview.connect('hidden', Lang.bind(this,
+                                                                           this._doneLeavingOverview));

        for (let i = 0; i < this._windows.length; i++) {
            let clone = this._windows[i];
            Tweener.removeTweens(clone.actor);
+
+            let overlay = this._windowOverlays[i];
+            if (overlay)
+                overlay.hide();
        }

        if (this._repositionWindowsId > 0) {
            Mainloop.source_remove(this._repositionWindowsId);
            this._repositionWindowsId = 0;
        }
-        this._overviewHiddenId = Main.overview.connect('hidden', Lang.bind(this,
-                                                                           this._doneLeavingOverview));

-        if (this.metaWorkspace != null && this.metaWorkspace != currentWorkspace)
+        return true;
+    },
+
+    // Animates the return from Overview mode
+    zoomFromOverview : function() {
+        if (!this._leavingOverview())
            return;

-        // Position and scale the windows.
        for (let i = 0; i < this._windows.length; i++) {
            let clone = this._windows[i];
-            let overlay = this._windowOverlays[i];
-
-            if (overlay)
-                overlay.hide();

            if (clone.metaWindow.showing_on_its_workspace()) {
                let [origX, origY] = clone.getOriginalPosition();
@ -1584,6 +1580,31 @@ const Workspace = new Lang.Class({
        }
    },

+    fadeFromOverview: function() {
+        if (!this._leavingOverview())
+            return;
+
+        for (let i = 0; i < this._windows.length; i++) {
+            let clone = this._windows[i];
+
+            if (clone.metaWindow.showing_on_its_workspace()) {
+                clone.actor.x = clone.origX;
+                clone.actor.y = clone.origY;
+                clone.actor.scale_x = 1.0;
+                clone.actor.scale_y = 1.0;
+                clone.actor.opacity = 0;
+
+                Tweener.addTween(clone.actor,
+                                 { opacity: 255,
+                                   time: Overview.ANIMATION_TIME,
+                                   transition: 'easeOutQuad'
+                                 });
+            } else {
+                clone.actor.hide();
+            }
+        }
+    },
+
    destroy : function() {
        this.actor.destroy();
    },
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -25,7 +25,7 @@ const WorkspaceSwitcherPopup = new Lang.Class({
                                     width: global.screen_width,
                                     height: global.screen_height,
                                     style_class: 'workspace-switcher-group' });
-        Main.uiGroup.add_actor(this.actor);
+        Main.layoutManager.osdGroup.add_child(this.actor);

        this._container = new St.BoxLayout({ style_class: 'workspace-switcher-container' });
        this._list = new Shell.GenericContainer({ style_class: 'workspace-switcher' });
@ -52,7 +52,6 @@ const WorkspaceSwitcherPopup = new Lang.Class({
        this._globalSignals.push(global.screen.connect('workspace-removed', Lang.bind(this, this._redisplay)));

        this._timeoutId = Mainloop.timeout_add(DISPLAY_TIMEOUT, Lang.bind(this, this._onTimeout));
-        GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._onTimeout');
    },

    _getPreferredHeight : function (actor, forWidth, alloc) {
@ -146,7 +145,6 @@ const WorkspaceSwitcherPopup = new Lang.Class({
        if (this._timeoutId != 0)
            Mainloop.source_remove(this._timeoutId);
        this._timeoutId = Mainloop.timeout_add(DISPLAY_TIMEOUT, Lang.bind(this, this._onTimeout));
-        GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._onTimeout');
        this._show();
    },

--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -68,7 +68,7 @@ const WindowClone = new Lang.Class({
        this.realWindow = realWindow;
        this.metaWindow = realWindow.meta_window;

-        this.clone._updateId = this.metaWindow.connect('position-changed',
+        this.clone._updateId = this.realWindow.connect('position-changed',
                                                       Lang.bind(this, this._onPositionChanged));
        this.clone._destroyId = this.realWindow.connect('destroy', Lang.bind(this, function() {
            // First destroy the clone and then destroy everything
@ -151,7 +151,7 @@ const WindowClone = new Lang.Class({
        let clone = new Clutter.Clone({ source: realDialog });
        this._updateDialogPosition(realDialog, clone);

-        clone._updateId = metaDialog.connect('position-changed',
+        clone._updateId = realDialog.connect('position-changed',
                                             Lang.bind(this, this._updateDialogPosition, clone));
        clone._destroyId = realDialog.connect('destroy', Lang.bind(this, function() {
            clone.destroy();
@ -176,7 +176,7 @@ const WindowClone = new Lang.Class({
        this.actor.get_children().forEach(function(child) {
            let realWindow = child.source;

-            realWindow.meta_window.disconnect(child._updateId);
+            realWindow.disconnect(child._updateId);
            realWindow.disconnect(child._destroyId);
        });
    },
@ -386,15 +386,14 @@ const WorkspaceThumbnail = new Lang.Class({
        if (!win) {
            // Newly-created windows are added to a workspace before
            // the compositor finds out about them...
-            let id = Mainloop.idle_add(Lang.bind(this,
-                                       function () {
+            Mainloop.idle_add(Lang.bind(this,
+                                        function () {
                                            if (!this._removed &&
                                                metaWin.get_compositor_private() &&
                                                metaWin.get_workspace() == this.metaWorkspace)
                                                this._doAddWindow(metaWin);
                                            return GLib.SOURCE_REMOVE;
                                        }));
-            GLib.Source.set_name_by_id(id, '[gnome-shell] this._doAddWindow');
            return;
        }

@ -805,35 +804,28 @@ const ThumbnailsBox = new Lang.Class({
            [newWorkspaceIndex, this._dropPlaceholderPos] = [this._dropPlaceholderPos, -1];

            // Nab all the windows below us.
-            let windows = global.get_window_actors().filter(function(winActor) {
+            let windows = global.get_window_actors().filter(function(win) {
                // If the window is attached to an ancestor, we don't need/want to move it
-                let window = winActor.meta_window;
-
-                if (window.get_transient_for() != null)
+                if (!!win.meta_window.get_transient_for())
                    return false;

                if (isWindow)
-                    return window.get_workspace().index() >= newWorkspaceIndex && winActor != source;
+                    return win.get_workspace() >= newWorkspaceIndex && win != source;
                else
-                    return window.get_workspace().index() >= newWorkspaceIndex;
+                    return win.get_workspace() >= newWorkspaceIndex;
            });

            this._spliceIndex = newWorkspaceIndex;

            // ... move them down one.
-            windows.forEach(function(winActor) {
-                let window = winActor.meta_window;
-                window.change_workspace_by_index(window.get_workspace().index() + 1, true);
+            windows.forEach(function(win) {
+                win.meta_window.change_workspace_by_index(win.get_workspace() + 1, true);
            });

-            if (isWindow) {
+            if (isWindow)
                // ... and bam, a workspace, good as new.
-                // Move the window to our monitor first if necessary.
-                let thumbMonitor = this._thumbnails[newWorkspaceIndex].monitorIndex;
-                if (source.metaWindow.get_monitor() != thumbMonitor)
-                    source.metaWindow.move_to_monitor(thumbMonitor);
                source.metaWindow.change_workspace_by_index(newWorkspaceIndex, true);
-            } else if (source.shellWorkspaceLaunch) {
+            else if (source.shellWorkspaceLaunch) {
                source.shellWorkspaceLaunch({ workspace: newWorkspaceIndex,
                                              timestamp: time });
                // This new workspace will be automatically removed if the application fails
@ -907,10 +899,7 @@ const ThumbnailsBox = new Lang.Class({
    },

    _workspacesChanged: function() {
-        let validThumbnails = this._thumbnails.filter(function(t) {
-            return t.state <= ThumbnailState.NORMAL;
-        });
-        let oldNumWorkspaces = validThumbnails.length;
+        let oldNumWorkspaces = this._thumbnails.length;
        let newNumWorkspaces = global.screen.n_workspaces;
        let active = global.screen.get_active_workspace_index();

--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -145,11 +145,22 @@ const WorkspacesView = new Lang.Class({
        this._updateWorkspaceActors(false);
    },

-    zoomFromOverview: function() {
+    _leaveOverview: function() {
        this.actor.remove_clip();
+    },

-        for (let w = 0; w < this._workspaces.length; w++)
-            this._workspaces[w].zoomFromOverview();
+    zoomFromOverview: function() {
+        this._leaveOverview();
+        this._workspaces.forEach(function(w) {
+            w.zoomFromOverview();
+        });
+    },
+
+    fadeFromOverview: function() {
+        this._leaveOverview();
+        this._workspaces.forEach(function(w) {
+            w.fadeFromOverview();
+        });
    },

    syncStacking: function(stackIndices) {
@ -365,6 +376,10 @@ const ExtraWorkspaceView = new Lang.Class({
        this._workspace.zoomFromOverview();
    },

+    fadeFromOverview: function() {
+        this._workspace.fadeFromOverview();
+    },
+
    syncStacking: function(stackIndices) {
        this._workspace.syncStacking(stackIndices);
    },
@ -466,9 +481,18 @@ const WorkspacesDisplay = new Lang.Class({
            this._scrollEventId = Main.overview.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
    },

-    zoomFromOverview: function() {
-        for (let i = 0; i < this._workspacesViews.length; i++)
-            this._workspacesViews[i].zoomFromOverview();
+    leaveOverview: function(zoomPrimary) {
+        for (let i = 0; i < this._workspacesViews.length; i++) {
+            let view = this._workspacesViews[i];
+            if (i == this._primaryIndex) {
+                if (zoomPrimary)
+                    view.zoomFromOverview();
+                else
+                    view.fadeFromOverview();
+            } else {
+                view.zoomFromOverview();
+            }
+        }
    },

    hide: function() {
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@ -18,7 +18,7 @@ const XdndHandler = new Lang.Class({

        // Used as a drag actor in case we don't have a cursor window clone
        this._dummy = new Clutter.Actor({ width: 1, height: 1, opacity: 0 });
-        Main.uiGroup.add_actor(this._dummy);
+        Main.layoutManager.sessionGroup.add_actor(this._dummy);
        this._dummy.hide();

        if (!Meta.is_wayland_compositor())
@ -69,7 +69,7 @@ const XdndHandler = new Lang.Class({
                                                                   source: cursorWindow});

            this._cursorWindowClone = new Clutter.Clone({ source: cursorWindow });
-            Main.uiGroup.add_actor(this._cursorWindowClone);
+            Main.layoutManager.sessionGroup.add_actor(this._cursorWindowClone);

            // Make sure that the clone has the same position as the source
            this._cursorWindowClone.add_constraint(constraint_position);
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -33,7 +33,6 @@ id
 it
 ja
 kk
-km
 kn
 ko
 ku
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -45,7 +45,6 @@ js/ui/status/accessibility.js
 js/ui/status/bluetooth.js
 js/ui/status/brightness.js
 js/ui/status/keyboard.js
-js/ui/status/location.js
 js/ui/status/network.js
 js/ui/status/power.js
 js/ui/status/rfkill.js
@ -55,7 +54,6 @@ js/ui/unlockDialog.js
 js/ui/viewSelector.js
 js/ui/windowAttentionHandler.js
 js/ui/windowManager.js
-js/ui/windowMenu.js
 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
--- a/po/an.po
+++ b/po/an.po
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-02-11 08:31+0000\n"
-"PO-Revision-Date: 2014-02-11 18:44+0630\n"
+"POT-Creation-Date: 2014-01-17 21:35+0000\n"
+"PO-Revision-Date: 2014-01-23 19:06+0630\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <kde-i18n-doc@kde.org>\n"
 "Language: as_IN\n"
@ -83,10 +83,16 @@ msgstr ""
 "দিয়ে।"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
+#| msgid "Uuids of extensions to enable"
 msgid "UUIDs of extensions to enable"
 msgstr "সামৰ্থবান কৰিব লগিয়া সম্প্ৰসাৰণসমূহৰ UUIDs"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
+#| msgid ""
+#| "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 DBus methods on org.gnome.Shell."
 msgid ""
 "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 "
@ -120,17 +126,20 @@ msgid "History for the looking glass dialog"
 msgstr "চোৱা কাঁচ ডাইলগৰ কাৰণে ইতিহাস"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
+#| msgid "Always show the 'Log out' menuitem in the user menu."
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "ব্যৱহাৰকাৰী মেনুত 'লগ আউট' মেনু আইটেম সদায় দেখুৱাব।"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:10
+#| msgid ""
+#| "This key overrides the automatic hiding of the 'Log out' menuitem in "
+#| "single-user, single-session situations."
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
 msgstr ""
 "এই কি'য়ে এটা-ব্যৱহাৰকাৰী, এটা-অধিবেশন অৱস্থাবোৰত 'লগ আউট' মেনুআইটেম "
-"স্বচালিতভাৱে "
-"লুকুৱা অভাৰৰাইড কৰে।"
+"স্বচালিতভাৱে লুকুৱা অভাৰৰাইড কৰে।"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid ""
@ -280,7 +289,7 @@ msgstr "উপৰত দিয়া কম্বোবাকচ ব্যৱহা
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:357
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:857
+#: ../js/ui/status/network.js:724
 msgid "Cancel"
 msgstr "বাতিল কৰক"

@ -338,30 +347,31 @@ msgstr "কমান্ড বিশ্লেষন কৰিব নোৱাৰ

 #: ../js/misc/util.js:156
 #, javascript-format
+#| msgid "Execution of '%s' failed:"
 msgid "Execution of “%s” failed:"
 msgstr "“%s” ৰ প্ৰেৰণ ব্যৰ্থ হল:"

-#: ../js/ui/appDisplay.js:633
+#: ../js/ui/appDisplay.js:540
 msgid "Frequently used applications will appear here"
 msgstr "সঘনে ব্যৱহাৰ কৰা এপ্লিকেচনসমূহ ইয়াত উপস্থিত হব"

-#: ../js/ui/appDisplay.js:744
+#: ../js/ui/appDisplay.js:660
 msgid "Frequent"
 msgstr "সঘন"

-#: ../js/ui/appDisplay.js:751
+#: ../js/ui/appDisplay.js:667
 msgid "All"
 msgstr "সকলো"

-#: ../js/ui/appDisplay.js:1558
+#: ../js/ui/appDisplay.js:1498
 msgid "New Window"
 msgstr "নতুন উইন্ডো"

-#: ../js/ui/appDisplay.js:1580 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1501 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "পছন্দৰ পৰা আতৰাওক"

-#: ../js/ui/appDisplay.js:1586
+#: ../js/ui/appDisplay.js:1502
 msgid "Add to Favorites"
 msgstr "পছন্দলে যোগ কৰক"

@ -574,8 +584,8 @@ msgstr "পাছৱাৰ্ড:"
 msgid "Type again:"
 msgstr "আকৌ টাইপ কৰক:"

-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:227
-#: ../js/ui/status/network.js:300 ../js/ui/status/network.js:860
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:131
+#: ../js/ui/status/network.js:293 ../js/ui/status/network.js:727
 msgid "Connect"
 msgstr "সংযোগ কৰক"

@ -609,6 +619,9 @@ msgstr "বেতাঁৰ নেটৱাৰ্কৰ দ্বাৰা প্

 #: ../js/ui/components/networkAgent.js:312
 #, javascript-format
+#| msgid ""
+#| "Passwords or encryption keys are required to access the wireless network "
+#| "'%s'."
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
@ -646,6 +659,7 @@ msgstr "মবাইল ব্ৰডবেণ্ড নেটৱাৰ্ক প

 #: ../js/ui/components/networkAgent.js:339
 #, javascript-format
+#| msgid "A password is required to connect to '%s'."
 msgid "A password is required to connect to “%s”."
 msgstr "“%s” লে সংযোগ কৰিবলে এটা পাছৱাৰ্ডৰ প্ৰয়োজন।"

@ -694,35 +708,35 @@ msgid "Mute"
 msgstr "মোন কৰক"

 #. Translators: this is the word "Yesterday" followed by a time string. i.e. "Yesterday, 14:30"*/
-#: ../js/ui/components/telepathyClient.js:952
+#: ../js/ui/components/telepathyClient.js:941
 msgid "<b>Yesterday</b>, <b>%H:%M</b>"
 msgstr "<b>যোৱাকালী</b>, <b>%H:%M</b>"

 #. Translators: this is the week day name followed by a time string. i.e. "Monday, 14:30*/
-#: ../js/ui/components/telepathyClient.js:958
+#: ../js/ui/components/telepathyClient.js:947
 msgid "<b>%A</b>, <b>%H:%M</b>"
 msgstr "<b>%A</b>, <b>%H:%M</b>"

 #. Translators: this is the month name and day number followed by a time string. i.e. "May 25, 14:30"*/
-#: ../js/ui/components/telepathyClient.js:963
+#: ../js/ui/components/telepathyClient.js:952
 msgid "<b>%B</b> <b>%d</b>, <b>%H:%M</b>"
 msgstr "<b>%B</b> <b>%d</b>, <b>%H:%M</b>"

 #. Translators: this is the month name, day number, year number followed by a time string. i.e. "May 25 2012, 14:30"*/
-#: ../js/ui/components/telepathyClient.js:967
+#: ../js/ui/components/telepathyClient.js:956
 msgid "<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> "
 msgstr "<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> "

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:998
+#: ../js/ui/components/telepathyClient.js:987
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s এতিয়া %s হিচাপে জনাজাত"

 #. translators: argument is a room name like
 #. * room@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1090
 #, javascript-format
 msgid "Invitation to %s"
 msgstr "%s লে নিমন্ত্ৰণ"
@ -730,38 +744,38 @@ msgstr "%s লে নিমন্ত্ৰণ"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example. */
-#: ../js/ui/components/telepathyClient.js:1109
+#: ../js/ui/components/telepathyClient.js:1098
 #, javascript-format
 msgid "%s is inviting you to join %s"
 msgstr "%s এ আপোনাক %s ত অংশগ্ৰহণ কৰিবলে আমন্ত্ৰণ জনাইছে"

-#: ../js/ui/components/telepathyClient.js:1111
-#: ../js/ui/components/telepathyClient.js:1146
-#: ../js/ui/components/telepathyClient.js:1180
-#: ../js/ui/components/telepathyClient.js:1237
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1135
+#: ../js/ui/components/telepathyClient.js:1169
+#: ../js/ui/components/telepathyClient.js:1226
 msgid "Decline"
 msgstr "নাকচ কৰক"

-#: ../js/ui/components/telepathyClient.js:1117
-#: ../js/ui/components/telepathyClient.js:1186
-#: ../js/ui/components/telepathyClient.js:1242
+#: ../js/ui/components/telepathyClient.js:1106
+#: ../js/ui/components/telepathyClient.js:1175
+#: ../js/ui/components/telepathyClient.js:1231
 msgid "Accept"
 msgstr "গ্ৰহন কৰক"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1136
+#: ../js/ui/components/telepathyClient.js:1125
 #, javascript-format
 msgid "Video call from %s"
 msgstr "%s ৰ পৰা ভিডিঅ' কল"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1128
 #, javascript-format
 msgid "Call from %s"
 msgstr "%s ৰ পৰা কল"

 #. translators: this is a button label (verb), not a noun */
-#: ../js/ui/components/telepathyClient.js:1153
+#: ../js/ui/components/telepathyClient.js:1142
 msgid "Answer"
 msgstr "উত্তৰ দিয়ক"

@ -770,110 +784,110 @@ msgstr "উত্তৰ দিয়ক"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #. */
-#: ../js/ui/components/telepathyClient.js:1174
+#: ../js/ui/components/telepathyClient.js:1163
 #, javascript-format
 msgid "%s is sending you %s"
 msgstr "%s এ আপোনাক %s পঠাই আছে"

 #. To translators: The parameter is the contact's alias */
-#: ../js/ui/components/telepathyClient.js:1203
+#: ../js/ui/components/telepathyClient.js:1192
 #, javascript-format
 msgid "%s would like permission to see when you are online"
 msgstr "আপুনি কেতিয়া অনলাইন আছে চাবলে %s এ অনুমতি বিচাৰিব"

-#: ../js/ui/components/telepathyClient.js:1288
+#: ../js/ui/components/telepathyClient.js:1277
 msgid "Network error"
 msgstr "নেটৱাৰ্ক ত্ৰুটি"

-#: ../js/ui/components/telepathyClient.js:1290
+#: ../js/ui/components/telepathyClient.js:1279
 msgid "Authentication failed"
 msgstr "প্ৰমাণীকৰণ ব্যৰ্থ"

-#: ../js/ui/components/telepathyClient.js:1292
+#: ../js/ui/components/telepathyClient.js:1281
 msgid "Encryption error"
 msgstr "ইনক্ৰিপষণ ত্ৰুটি"

-#: ../js/ui/components/telepathyClient.js:1294
+#: ../js/ui/components/telepathyClient.js:1283
 msgid "Certificate not provided"
 msgstr "প্ৰমাণপত্ৰ প্ৰদান কৰা হোৱা নাই"

-#: ../js/ui/components/telepathyClient.js:1296
+#: ../js/ui/components/telepathyClient.js:1285
 msgid "Certificate untrusted"
 msgstr "প্ৰমাণপত্ৰক ভৰষা কৰিব নোৱাৰি"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1287
 msgid "Certificate expired"
 msgstr "প্ৰমাণপত্ৰৰ অৱসান ঘটিছে"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1289
 msgid "Certificate not activated"
 msgstr "প্ৰমাণপত্ৰ সক্ৰিয় কৰা হোৱা নাই"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1291
 msgid "Certificate hostname mismatch"
 msgstr "প্ৰমাণপত্ৰ হস্টনাম অমিল"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1293
 msgid "Certificate fingerprint mismatch"
 msgstr "প্ৰমাণপত্ৰ ফিংগাৰপ্ৰিন্ট অমিল"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1295
 msgid "Certificate self-signed"
 msgstr "প্ৰমাণপত্ৰ স্ব-স্বাক্ষৰীত"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1297
 msgid "Status is set to offline"
 msgstr "অৱস্থা অফলাইনলে সংহতি কৰা হৈছে"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1299
 msgid "Encryption is not available"
 msgstr "ইনক্ৰিপষণ উপলব্ধ নহয়"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1301
 msgid "Certificate is invalid"
 msgstr "প্ৰমাণপত্ৰ অবৈধ"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1303
 msgid "Connection has been refused"
 msgstr "সংযোগ নাকচ কৰা হৈছে"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1305
 msgid "Connection can't be established"
 msgstr "সংযোগ স্থাপন কৰিব নোৱাৰি"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1307
 msgid "Connection has been lost"
 msgstr "সংযোগ হেৰাইছে"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1309
 msgid "This account is already connected to the server"
 msgstr "এই একাওন্ট ইতিমধ্যে চাৰ্ভাৰৰ সৈতে সংযোগিত"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1311
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "সংযোগক একে সম্পদ ব্যৱহাৰ কৰি এটা নতুন সংযোগৰে প্ৰতিস্থাপন কৰা হৈছে"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1313
 msgid "The account already exists on the server"
 msgstr "একাওন্ট ইতিমধ্যে চাৰ্ভাৰত উপস্থিত"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1315
 msgid "Server is currently too busy to handle the connection"
 msgstr "চাৰ্ভাৰ সংযোগ ব্যৱস্থাপনা কৰিবলে বৰ্তমানে অতি ব্যস্ত"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1317
 msgid "Certificate has been revoked"
 msgstr "প্ৰমাণপত্ৰ প্ৰত্যাহাৰ কৰা হৈছে"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1319
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "প্ৰমাণপত্ৰয় এটা অসুৰক্ষিত চিফাৰ এলগৰিথম ব্যৱহাৰ কৰে অথবা ক্ৰিপ্টোগ্ৰাফিয়ভাৱে "
 "দুৰ্বল"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1321
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -882,22 +896,22 @@ msgstr ""
 "ক্ৰিপ্টোগ্ৰাফী "
 "লাইব্ৰেৰীয়ে প্ৰণয়ন কৰা সীমাসমূহত অতিক্ৰম কৰে"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1323
 msgid "Internal error"
 msgstr "অভ্যন্তৰীক ত্ৰুটি"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1333
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "%s ৰ সৈতে সংযোগ কৰিবলে অক্ষম"

-#: ../js/ui/components/telepathyClient.js:1349
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "View account"
 msgstr "একাওন্ট দৰ্শন কৰক"

-#: ../js/ui/components/telepathyClient.js:1381
+#: ../js/ui/components/telepathyClient.js:1370
 msgid "Unknown reason"
 msgstr "অজ্ঞাত কাৰণ"

@ -1044,6 +1058,7 @@ msgstr "ইনস্টল কৰক"

 #: ../js/ui/extensionDownloader.js:204
 #, javascript-format
+#| msgid "Download and install '%s' from extensions.gnome.org?"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "extensions.gnome.org ৰ পৰা  “%s” ক ডাউনল'ড আৰু ইনস্টল কৰিব নে?"

@ -1077,7 +1092,7 @@ msgstr "সামৰ্থবান কৰা আছে"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:523
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:470
 #: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "অসামৰ্থবান কৰা আছে"
@ -1102,43 +1117,43 @@ msgstr "উৎস দৰ্শন কৰক"
 msgid "Web Page"
 msgstr "ৱেব পৃষ্ঠা"

-#: ../js/ui/messageTray.js:1312
+#: ../js/ui/messageTray.js:1309
 msgid "Open"
 msgstr "খোলক"

-#: ../js/ui/messageTray.js:1319
+#: ../js/ui/messageTray.js:1316
 msgid "Remove"
 msgstr "আতৰাওক"

-#: ../js/ui/messageTray.js:1616
+#: ../js/ui/messageTray.js:1613
 msgid "Notifications"
 msgstr "অধিসূচনাসমূহ"

-#: ../js/ui/messageTray.js:1623
+#: ../js/ui/messageTray.js:1620
 msgid "Clear Messages"
 msgstr "বাৰ্তাসমূহ পৰিষ্কাৰ কৰক"

-#: ../js/ui/messageTray.js:1642
+#: ../js/ui/messageTray.js:1639
 msgid "Notification Settings"
 msgstr "অধিসূচনা সংহতিসমূহ"

-#: ../js/ui/messageTray.js:1695
+#: ../js/ui/messageTray.js:1692
 msgid "Tray Menu"
 msgstr "ট্ৰে মেনু"

-#: ../js/ui/messageTray.js:1912
+#: ../js/ui/messageTray.js:1909
 msgid "No Messages"
 msgstr "কোনো বাৰ্তা নাই"

-#: ../js/ui/messageTray.js:1950
+#: ../js/ui/messageTray.js:1947
 msgid "Message Tray"
 msgstr "বাৰ্তা ট্ৰে"

-#: ../js/ui/messageTray.js:2934
+#: ../js/ui/messageTray.js:2931
 msgid "System Information"
 msgstr "চিস্টেম তথ্য"

-#: ../js/ui/notificationDaemon.js:515 ../src/shell-app.c:399
+#: ../js/ui/notificationDaemon.js:515 ../src/shell-app.c:397
 msgctxt "program"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
@ -1176,7 +1191,7 @@ msgstr "প্ৰস্থান কৰক"
 msgid "Activities"
 msgstr "কাৰ্য্যসমূহ"

-#: ../js/ui/panel.js:905
+#: ../js/ui/panel.js:903
 msgid "Top Bar"
 msgstr "উপৰৰ বাৰ"

@ -1205,19 +1220,19 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d নতুন অধিসূচনা"
 msgstr[1] "%d নতুন অধিসূচনাসমূহ"

-#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:472 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "লক কৰক"

-#: ../js/ui/screenShield.js:707
+#: ../js/ui/screenShield.js:706
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME এ পৰ্দা লক কৰিব লাগিব"

-#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
+#: ../js/ui/screenShield.js:833 ../js/ui/screenShield.js:1300
 msgid "Unable to lock"
 msgstr "লক কৰিবলে অক্ষম"

-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Lock was blocked by an application"
 msgstr "লক কাৰ্য্য এটা এপ্লিকেচন দ্বাৰা প্ৰতিৰোধ কৰা হৈছিল"

@ -1297,31 +1312,26 @@ msgstr "উচ্চ কন্ট্ৰাস্ট"
 msgid "Large Text"
 msgstr "ডাঙৰ লিখনী"

-#: ../js/ui/status/bluetooth.js:48
+#: ../js/ui/status/bluetooth.js:45
 msgid "Bluetooth"
 msgstr "ব্লুটুথ"

-#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/network.js:134
-#: ../js/ui/status/network.js:1209 ../js/ui/status/rfkill.js:85
-#: ../js/ui/status/rfkill.js:105
+#: ../js/ui/status/bluetooth.js:47 ../js/ui/status/network.js:131
+#: ../js/ui/status/network.js:1081 ../js/ui/status/rfkill.js:48
 msgid "Turn Off"
 msgstr "বন্ধ কৰক"

-#: ../js/ui/status/bluetooth.js:53
+#: ../js/ui/status/bluetooth.js:50
 msgid "Bluetooth Settings"
 msgstr "ব্লুটুথ সংহতিসমূহ"

-#: ../js/ui/status/bluetooth.js:100
+#: ../js/ui/status/bluetooth.js:98
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d সংযুক্ত ডিভাইচ"
 msgstr[1] "%d সংযুক্ত ডিভাইচসমূহ"

-#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1232
-msgid "Not Connected"
-msgstr "সংযুক্ত নহয়"
-
 #: ../js/ui/status/brightness.js:44
 msgid "Brightness"
 msgstr "উজ্জ্বলতা"
@ -1330,136 +1340,103 @@ msgstr "উজ্জ্বলতা"
 msgid "Show Keyboard Layout"
 msgstr "কিবৰ্ড বিন্যাস দেখুৱাওক"

-#: ../js/ui/status/network.js:73
+#: ../js/ui/status/network.js:70
 msgid "<unknown>"
 msgstr "<unknown>"

-#: ../js/ui/status/network.js:223 ../js/ui/status/network.js:389
-#: ../js/ui/status/network.js:1230
+#: ../js/ui/status/network.js:220 ../js/ui/status/network.js:377
+#: ../js/ui/status/network.js:1102
 msgid "Off"
 msgstr "অফ"

 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu) */
-#: ../js/ui/status/network.js:395
+#: ../js/ui/status/network.js:383
 msgid "unmanaged"
 msgstr "অব্যৱস্থাপিত"

-#: ../js/ui/status/network.js:397
+#: ../js/ui/status/network.js:385
 msgid "disconnecting..."
 msgstr "বিচ্ছিনিত কৰা হৈছে..."

-#: ../js/ui/status/network.js:403 ../js/ui/status/network.js:1284
+#: ../js/ui/status/network.js:391 ../js/ui/status/network.js:1156
 msgid "connecting..."
 msgstr "সংযোগ কৰা হৈছে..."

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:406 ../js/ui/status/network.js:1287
+#: ../js/ui/status/network.js:394 ../js/ui/status/network.js:1159
 msgid "authentication required"
 msgstr "প্ৰমাণীকৰণৰ প্ৰয়োজন"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:414
+#: ../js/ui/status/network.js:402
 msgid "firmware missing"
 msgstr "ফাৰ্মৱেৰ সন্ধানহীন"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage */
-#: ../js/ui/status/network.js:418
+#: ../js/ui/status/network.js:406
 msgid "unavailable"
 msgstr "উপলব্ধ নাই"

-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1289
+#: ../js/ui/status/network.js:408 ../js/ui/status/network.js:1161
 msgid "connection failed"
 msgstr "সংযোগ ব্যৰ্থ"

-#: ../js/ui/status/network.js:436
-#| msgid "Wi-Fi Settings"
-msgid "Wired Settings"
-msgstr "তাঁৰযুক্ত সংহতিসমূহ"
-
-#: ../js/ui/status/network.js:477 ../js/ui/status/network.js:563
+#: ../js/ui/status/network.js:424 ../js/ui/status/network.js:510
+#| msgid "Mobile broadband"
 msgid "Mobile Broadband Settings"
 msgstr "মবাইল ব্ৰডবেণ্ড সংহতিসমূহ"

-#: ../js/ui/status/network.js:519 ../js/ui/status/network.js:1228
+#: ../js/ui/status/network.js:466 ../js/ui/status/network.js:1100
+#| msgid "hardware disabled"
 msgid "Hardware Disabled"
 msgstr "হাৰ্ডৱেৰ অসামৰ্থবান কৰা আছে"

-#: ../js/ui/status/network.js:578
-msgid "Use as Internet connection"
-msgstr "ইন্টাৰনেট সংযোগ ৰূপে ব্যৱহাৰ কৰক"
-
-#: ../js/ui/status/network.js:755
-#| msgid "Airplane Mode"
-msgid "Airplane Mode is On"
-msgstr "বিমান অৱস্থা অন আছে"
-
-#: ../js/ui/status/network.js:756
-msgid "Wi-Fi is disabled when airplane mode is on."
-msgstr "বিমান অৱস্থা অন থকা অৱস্থাত Wi-Fi অসামৰ্থবান থাকে।"
-
-#: ../js/ui/status/network.js:757
-#| msgid "Airplane Mode"
-msgid "Turn Off Airplane Mode"
-msgstr "বিমান অৱস্থা বন্ধ কৰক"
-
-#: ../js/ui/status/network.js:766
-#| msgid "Wi-Fi Settings"
-msgid "Wi-Fi is Off"
-msgstr "Wi-Fi অফ আছে"
-
-#: ../js/ui/status/network.js:767
-msgid "Wi-Fi needs to be turned on in order to connect to a network."
-msgstr "এটা নেটৱাৰ্কৰ সৈতে সংযোগ কৰিবলে Wi-Fi অন কৰিব লাগিব।"
-
-#: ../js/ui/status/network.js:768
-#| msgid "Turn On"
-msgid "Turn On Wi-Fi"
-msgstr "Wi-Fi অন কৰক"
-
-#: ../js/ui/status/network.js:793
+#: ../js/ui/status/network.js:692
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi নেটৱাৰ্কসমূহ"

-#: ../js/ui/status/network.js:795
+#: ../js/ui/status/network.js:694
 msgid "Select a network"
 msgstr "এটা নেটৱাৰ্ক বাছক"

-#: ../js/ui/status/network.js:824
+#: ../js/ui/status/network.js:718
 msgid "No Networks"
 msgstr "কোনো নেটৱাৰ্ক নাই"

-#: ../js/ui/status/network.js:845 ../js/ui/status/rfkill.js:103
-msgid "Use hardware switch to turn off"
-msgstr "বন্ধ কৰিবলে হাৰ্ডৱেৰ চুইচ ব্যৱহাৰ কৰক"
-
-#: ../js/ui/status/network.js:1115
+#: ../js/ui/status/network.js:987
 msgid "Select Network"
 msgstr "নেটৱাৰ্ক বাছক"

-#: ../js/ui/status/network.js:1121
+#: ../js/ui/status/network.js:993
+#| msgid "Settings"
 msgid "Wi-Fi Settings"
 msgstr "Wi-Fi সংহতিসমূহ"

-#: ../js/ui/status/network.js:1209
+#: ../js/ui/status/network.js:1081
 msgid "Turn On"
 msgstr "অন কৰক"

-#: ../js/ui/status/network.js:1352
+#: ../js/ui/status/network.js:1104
+#| msgid "Connect"
+msgid "Not Connected"
+msgstr "সংযুক্ত নহয়"
+
+#: ../js/ui/status/network.js:1224
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1495
+#: ../js/ui/status/network.js:1364
 msgid "Network Manager"
 msgstr "নেটৱাৰ্ক ব্যৱস্থাপক"

-#: ../js/ui/status/network.js:1534
+#: ../js/ui/status/network.js:1403
 msgid "Connection failed"
 msgstr "সংযোগ ব্যৰ্থ"

-#: ../js/ui/status/network.js:1535
+#: ../js/ui/status/network.js:1404
 msgid "Activation of network connection failed"
 msgstr "নেটৱাৰ্ক সংযোগ সক্ৰিয়কৰণ ব্যৰ্থ হল"

@ -1493,15 +1470,15 @@ msgstr "UPS"
 msgid "Battery"
 msgstr "বেটাৰি"

-#: ../js/ui/status/rfkill.js:82
+#: ../js/ui/status/rfkill.js:45
 msgid "Airplane Mode"
 msgstr "বিমান অৱস্থা"

-#: ../js/ui/status/rfkill.js:84
+#: ../js/ui/status/rfkill.js:47
 msgid "On"
 msgstr "অন"

-#: ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/rfkill.js:51
 msgid "Network Settings"
 msgstr "নেটৱাৰ্ক সংহতিসমূহ"

@ -1555,6 +1532,7 @@ msgstr "সন্ধান কৰক"

 #: ../js/ui/windowAttentionHandler.js:19
 #, javascript-format
+#| msgid "'%s' is ready"
 msgid "“%s” is ready"
 msgstr "“%s” প্ৰস্তুত"

@ -1622,8 +1600,9 @@ msgstr "লগিন পৰ্দাৰ বাবে এটা বিশেষ
 msgid "List possible modes"
 msgstr "সম্ভাব্য অৱস্থাসমূহ তালিকাভুক্ত কৰক"

-#: ../src/shell-app.c:642
+#: ../src/shell-app.c:640
 #, c-format
+#| msgid "Failed to launch '%s'"
 msgid "Failed to launch “%s”"
 msgstr "“%s” লঞ্চ কৰিবলে ব্যৰ্থ"

--- a/po/be.po
+++ b/po/be.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
--- 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/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/fur.po
+++ b/po/fur.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jasper St. Pierre	1afb04d1e4	overview: new transition	2014-01-31 17:57:57 -05:00
Jasper St. Pierre	51e63233ce	viewSelector: Move to a sync() model for deciding which page to show https://bugzilla.gnome.org/show_bug.cgi?id=722196	2014-01-31 17:57:57 -05:00
Jasper St. Pierre	a7d7f94892	screenShield: Don't hide windows until we've fully locked the shield Revert the commit that ties hasWindows to the session mode, as we need to do the "transition" manually. Instead, show/hide the sessionGroup ourselves. For optimization purposes, we also need to hide the window groups when in the overview. Ideally, these would be culled out by Clutter, but they are not from experimentation.	2014-01-31 17:57:57 -05:00
Jasper St. Pierre	427f516d45	layout: Replace SystemBackground with CSS on the systemGroup This merges the implementation of the noise texture on the lockScreenDialog and the startup animation -- they now just use the systemGroup.	2014-01-31 17:57:57 -05:00
Jasper St. Pierre	cbb88ffdbb	layout: Add sessionGroup / systemGroup to better-define layers In order to build a better transition animation from the lock screen, we need to split the world into layers, as per this reference: https://raw.github.com/gnome-design-team/gnome-mockups/master/system-lock-login-boot/system-layers2.png Everything that pertains to the user's session is in the "session group", which includes the window group, overview, message tray (for now), keyboard, OSDs, menus, etc. For implementation sake, we did not match this mockup exactly. The new layers look like this, from top to bottom: * Stage * Magnifier (clones the uiGroup) * uiGroup * overlayGroup * menuGroup * panelGroup * screenShieldGroup * sessionGroup * top_window_group * other boxes (trayBox, keyboardBox, etc.) * other groups (osdGroup, switcherPopupGroup, etc.) * overviewGroup * window_group * systemGroup The "session startup" animation now only zooms in the sessionGroup. The panel is now outside the session, as it needs to sit above the screen shield. This also means that it's not zoomed in as part of startup. I think this is OK. This also means that the lightboxes that the screen shield uses to fade out the screen have to go in a new group, above the panel. This is known as the overlayGroup, which has no relation to the old mutter group of the same name. We also change the screen shield to put the lockDialogGroup in the system group, and put the lockScreenGroup in the screenShieldGroup, which means that the layer stacking is correct. Note that we don't hide the session group in the lock screen yet, which is something I want to do. Since not a lot of items need to be in the uiGroup anymore, we've removed the Main.uiGroup fallback; others should use sessionGroup instead, when appropriate.	2014-01-31 17:57:57 -05:00
Jasper St. Pierre	71670bad3b	layout: Add different groups in the LayoutManager for discrete UI components This helps take cruft out of the uiGroup, and ensures that components remain stacked properly on top of each other. In the future, we'll use this group to ensure that grabs are ordered properly, as well.	2014-01-31 17:57:57 -05:00
Jasper St. Pierre	a2e4153fa0	background: Fix cancellable issues If we have the following sequence: cache.getImageContent({ filename: "foo", cancellable: cancellable1 }); cache.getImageContent({ filename: "foo", cancellable: cancellable2 }); cancellable1.cancel(); Then the second load will complete with "null" as its content, even though it was never cancelled, and we'll see a blank image. Meanwhile, since the second load simply appends to the list of callers for the second load, cancellable2 does absolutely nothing: cancelling it won't stop the load, and it will still receive onFinished handling. To prevent this from happening, give the actual load operation its own Gio.Cancellable, which is "ref-counted" -- only cancel it when all the other possible callers cancel. Additionally, clean up the large nested loops by splitting out duplicated code and other stuff. https://bugzilla.gnome.org/show_bug.cgi?id=722149	2014-01-31 17:57:57 -05:00