folders

appDisplay: Move from instanceof-testing to polymorphic duck typing
Instead of having _compareItems, _getItemId, etc. on the view to pull out info about items, use the AppIcon / FolderIcon items we create as a place to track this additional info. We now require that these items have a '.id' property for deduplication, and a '.name' property to sort by.
2013-12-16 13:28:14 -05:00 · 2013-12-16 13:28:14 -05:00
203 changed files with 24578 additions and 34204 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/41
+++ b/41
@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-                            Preamble
+			    Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@ -225,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.

-                            NO WARRANTY
+			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@ -303,16 +303,17 @@ the "copyright" line and a pointer to where the full notice is found.
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+

 Also add information on how to contact you by electronic and paper mail.

 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
--- a/233
+++ b/233
@ -1,236 +1,3 @@
-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]
-* Allow session mode to be specified in the environment [Ray; #720894]
-* Special-case launching of terminals [Debarshi; #695010]
-* Always show arrow if app switcher is scrollable [Jonh; #711467]
-* Implement new app folders system [Jasper; #722117]
-* Remove arrow from background menu [Tarun; #699608]
-* Misc bug fixes and cleanups [Giovanni, Andika, Florian, Ray; #721039,
-  #721439, #721507, #721629, #721868, #722210]
-
-Contributors:
-  Giovanni Campagna, Piotr Drąg, Tarun Kumar Joshi, Florian Müllner,
-  Debarshi Ray, Jasper St. Pierre, Ray Strode, Andika Triwidada, Jonh Wendell
-
-Translations:
-  Dušan Kazik [sk], Tong Hui [zh_CN], Benjamin Steinwender [de],
-  Matej Urbančič [sl], Jorge Pérez Pérez [an], Kjartan Maraas [nb],
-  Milo Casagrande [it], Rafael Ferreira [pt_BR], Marek Černocký [cs],
-  Daniel Mustieles [es], Adorilson Bezerra [pt_BR], Christian Kirbach [de],
-  Aurimas Černius [lt], Andika Triwidada [id], Baurzhan Muftakhidinov [kk],
-  Victor Ibragimov [tg], Yosef Or Boczko [he], Dimitris Spingos [el],
-  Fran Diéguez [gl]
-
-3.11.3
-======
-* Fix fade effect of desktop icons [Florian; #707671]
-* Fix issues with background management code [Jasper; #709313]
-* Use new Glib facilities for application search [Jasper; #711631]
-* Add focus indication to session menu button [Sebastien; #710539]
-* Fix hover tracking for StEntries [Jasper; #706749]
-* Fix reentrancy issue in message tray [Jasper; #711694]
-* Tone down zoom animation on login/unlock [Jasper; #712362]
-* Allow specifying monitor for OSD [Carlos; #712664]
-* Fix resetting prompt on user switch [Ray; #710456]
-* Stop using gnome-bluetooth-applet [Bastien; #719341]
-* Add support for EAP-FAST password requests [Dan; #719813]
-* Fix entry focus of chat notifications [Jasper; #709853]
-* Make window previews keyboard navigatable [Jasper; #644306]
-* Fix app switcher order with dialog windows [Florian; #719824]
-* Allow remote search providers without icons [Debarshi; #719965]
-* Fix various alignment issues in RTL locales [Yosef; #712638, #712596,
-  #712594, #712600, #712579]
-* Misc. bug fixes and cleanups [Jasper, Florian, Giovanni, Dan; #712727,
-  #712753, #719378, #719730, #719803, #710115, #720017, #719815, #719567,
-  #720298]
-
-Contributors:
-  Giovanni Campagna, Carlos Garnacho, Sebastien Lafargue, Tim Lunn,
-  Florian Müllner, Bastien Nocera, Yosef Or Boczko, Debarshi Ray,
-  Jasper St. Pierre, Ray Strode, Dan Williams
-
-Translations:
-  Kjartan Maraas [nb], Reinout van Schouwen [nl], Rafael Ferreira [pt_BR],
-  Mattias Põldaru [et], Emin Tufan Çetin [tr], Jiri Grönroos [fi],
-  Khaled Hosny [ar], Fran Diéguez [gl], Victor Ibragimov [tg],
-  Daniel Mustieles [es]
-
 3.11.2
 ======
 * Cache search result display actors [Jasper; #704912]
--- 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
@ -13,7 +13,9 @@
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
 *
 * Authors:
 *      Jasper St. Pierre <jstpierre@mecheye.net>
@ -41,8 +43,6 @@

 #define PLUGIN_API_VERSION 5

-#define EXTENSION_DISABLE_VERSION_CHECK_KEY "disable-extension-version-validation"
-
 typedef struct {
  GDBusProxy *proxy;
 } PluginData;
@ -833,16 +833,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 +852,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 +894,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 +912,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 +990,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.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.11.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -73,10 +73,10 @@ AS_IF([test x$enable_systemd != xno], [

 AC_MSG_RESULT($enable_systemd)

-CLUTTER_MIN_VERSION=1.15.90
+CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.13.1
+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()

@ -246,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@/mutter-launch -- 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
@ -13,21 +13,12 @@
    </key>
    <key name="enabled-extensions" type="as">
      <default>[]</default>
-      <_summary>UUIDs of extensions to enable</_summary>
+      <_summary>Uuids of extensions to enable</_summary>
      <_description>
-        GNOME Shell extensions have a UUID property; this key lists extensions
+        GNOME Shell extensions have a uuid property; this key lists extensions
        which should be loaded. Any extension that wants to be loaded needs
        to be in this list. You can also manipulate this list with the
-        EnableExtension and DisableExtension D-Bus methods on org.gnome.Shell.
-      </_description>
-    </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.
+        EnableExtension and DisableExtension DBus methods on org.gnome.Shell.
      </_description>
    </key>
    <key name="favorite-apps" type="as">
@ -38,6 +29,14 @@
        will be displayed in the favorites area.
      </_description>
    </key>
+    <key name="app-folder-categories" type="as">
+      <default>[ 'Utilities', 'Sundry' ]</default>
+      <_summary>List of categories that should be displayed as folders</_summary>
+      <_description>
+        Each category name in this list will be represented as folder in the
+        application view, rather than being displayed inline in the main view.
+      </_description>
+    </key>
    <key name="app-picker-view" type="u">
      <default>0</default>
      <summary>App Picker View</summary>
@ -55,10 +54,10 @@
    </key>
    <key name="always-show-log-out" type="b">
      <default>false</default>
-      <_summary>Always show the 'Log out' menu item in the user menu.</_summary>
+      <_summary>Always show the 'Log out' menuitem in the user menu.</_summary>
      <_description>
        This key overrides the automatic hiding of the 'Log out'
-        menu item in single-user, single-session situations.
+        menuitem in single-user, single-session situations.
      </_description>
    </key>
    <key name="remember-mount-password" type="b">
@ -74,7 +73,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/"
@ -126,11 +124,6 @@
        Keybinding to focus the active notification.
      </_description>
    </key>
-    <key name="pause-resume-tweens" type="as">
-      <default>[]</default>
-      <summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</summary>
-      <description></description>
-    </key>
  </schema>

  <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
@ -144,32 +137,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@">
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -157,9 +157,8 @@ StScrollBar StButton#vhandle:active {
    min-width: 200px;
 }

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

 .popup-submenu-menu-item:open {
@ -221,6 +220,9 @@ StScrollBar StButton#vhandle:active {
    color: #9f9f9f;
 }

+.popup-image-menu-item {
+}
+
 .popup-separator-menu-item {
    -gradient-height: 1px;
    -gradient-start: rgba(255,255,255,0.0);
@ -230,6 +232,10 @@ StScrollBar StButton#vhandle:active {
    padding: 8px 0px;
 }

+.popup-alternating-menu-item:alternate {
+    font-weight: bold;
+}
+
 .popup-status-menu-item {
    font-weight: normal;
    color: #999;
@ -283,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;
 }
@ -575,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;
@ -658,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,
@ -666,7 +663,7 @@ StScrollBar StButton#vhandle:active {
    color: white;
    background-color: #4c4c4c;
    border: none;
-    padding: 15px;
+    padding: 14px;
 }

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

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

 .dash-item-container > StButton {
@ -1145,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;
@ -1224,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;
@ -1285,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;
@ -1455,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);
@ -1636,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 {
@ -1662,7 +1656,6 @@ StScrollBar StButton#vhandle:active {
 .chat-meta-message {
    padding-left: 4px;
    font-size: 9pt;
-    font-weight: bold;
    color: #bbbbbb;
 }

@ -1752,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;
@ -1844,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 */
@ -1935,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,
@ -2021,6 +2001,10 @@ StScrollBar StButton#vhandle:active {
    icon-size: 48px;
 }

+.mount-password-reask {
+    color: red;
+}
+
 .show-processes-dialog,
 .mount-question-dialog {
    spacing: 24px;
@ -2316,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;
@ -2364,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;
@ -2393,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 {
@ -2491,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 {
@ -2625,5 +2624,4 @@ StScrollBar StButton#vhandle:active {

 .background-menu {
    -boxpointer-gap: 4px;
-    -arrow-rise: 0px;
 }
--- 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/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/batch.js
+++ b/js/gdm/batch.js
@ -13,7 +13,9 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
 */

 const Lang = imports.lang;
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -13,7 +13,9 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
 */

 const AccountsService = imports.gi.AccountsService;
@ -36,7 +38,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;
@ -455,6 +456,18 @@ const LoginDialog = new Lang.Class({
        this.actor.add_child(this._logoBin);
        this._updateLogo();

+        if (!this._userManager.is_loaded)
+            this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',
+                                                                  Lang.bind(this, function() {
+                                                                      if (this._userManager.is_loaded) {
+                                                                          this._loadUserList();
+                                                                          this._userManager.disconnect(this._userManagerLoadedId);
+                                                                          this._userManagerLoadedId = 0;
+                                                                      }
+                                                                  }));
+        else
+            this._loadUserList();
+
        this._userList.connect('activate',
                               Lang.bind(this, function(userList, item) {
                                   this._onUserListActivated(item);
@ -470,33 +483,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) {
-            this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',
-                                                                  Lang.bind(this, function() {
-                                                                      if (this._userManager.is_loaded) {
-                                                                          this._loadUserList();
-                                                                          this._userManager.disconnect(this._userManagerLoadedId);
-                                                                          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');
-        }
-    },
+   },

    _updateDisableUserList: function() {
        let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);
@ -539,12 +526,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 +627,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 +642,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 +701,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 +803,6 @@ const LoginDialog = new Lang.Class({
    },

    _showUserList: function() {
-        this._ensureUserListLoaded();
        this._authPrompt.hide();
        this._sessionMenuButton.close();
        this._setUserListExpanded(true);
@ -895,17 +846,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 +863,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
@ -15,6 +15,7 @@
    <file>misc/extensionUtils.js</file>
    <file>misc/fileUtils.js</file>
    <file>misc/gnomeSession.js</file>
+    <file>misc/hash.js</file>
    <file>misc/history.js</file>
    <file>misc/jsParse.js</file>
    <file>misc/loginManager.js</file>
@ -101,7 +102,6 @@

    <file>ui/status/accessibility.js</file>
    <file>ui/status/brightness.js</file>
-    <file>ui/status/location.js</file>
    <file>ui/status/keyboard.js</file>
    <file>ui/status/network.js</file>
    <file>ui/status/power.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/fileUtils.js
+++ b/js/misc/fileUtils.js
@ -5,6 +5,26 @@ const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Params = imports.misc.params;

+function listDirAsync(file, callback) {
+    let allFiles = [];
+    file.enumerate_children_async('standard::name,standard::type',
+                                  Gio.FileQueryInfoFlags.NONE,
+                                  GLib.PRIORITY_LOW, null, function (obj, res) {
+        let enumerator = obj.enumerate_children_finish(res);
+        function onNextFileComplete(obj, res) {
+            let files = obj.next_files_finish(res);
+            if (files.length) {
+                allFiles = allFiles.concat(files);
+                enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, onNextFileComplete);
+            } else {
+                enumerator.close(null);
+                callback(allFiles);
+            }
+        }
+        enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, onNextFileComplete);
+    });
+}
+
 function collectFromDatadirs(subdir, includeUserDir, processFile) {
    let dataDirs = GLib.get_system_data_dirs();
    if (includeUserDir)
--- a/js/misc/hash.js
+++ b/js/misc/hash.js
@ -0,0 +1,144 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+const System = imports.system;
+
+const Params = imports.misc.params;
+
+// This is an implementation of EcmaScript SameValue algorithm,
+// which returns true if two values are not observably distinguishable.
+// It was taken from http://wiki.ecmascript.org/doku.php?id=harmony:egal
+//
+// In the future, we may want to use the 'is' operator instead.
+function _sameValue(x, y) {
+    if (x === y) {
+        // 0 === -0, but they are not identical
+        return x !== 0 || 1 / x === 1 / y;
+    }
+
+    // NaN !== NaN, but they are identical.
+    // NaNs are the only non-reflexive value, i.e., if x !== x,
+    // then x is a NaN.
+    // isNaN is broken: it converts its argument to number, so
+    // isNaN("foo") => true
+    return x !== x && y !== y;
+}
+
+const _hashers = {
+    object: function(o) { return o ? System.addressOf(o) : 'null'; },
+    function: function(f) { return System.addressOf(f); },
+    string: function(s) { return s; },
+    number: function(n) { return String(n); },
+    undefined: function() { return 'undefined'; },
+};
+
+/* Map is meant to be similar in usage to ES6 Map, which is
+   described at http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets,
+   without requiring more than ES5 + Gjs extensions.
+
+   Known differences from other implementations:
+   Polyfills around the web usually implement HashMaps for
+   primitive values and reversed WeakMaps for object keys,
+   but we want real maps with real O(1) semantics in all cases,
+   and the easiest way is to have different hashers for different
+   types.
+
+   Known differences from the ES6 specification:
+   - Map is a Lang.Class, not a ES6 class, so inheritance,
+     prototype, sealing, etc. work differently.
+   - items(), keys() and values() don't return iterators,
+     they return actual arrays, so they incur a full copy everytime
+     they're called, and they don't see changes if you mutate
+     the table while iterating
+     (admittedly, the ES6 spec is a bit unclear on this, and
+     the reference code would just blow up)
+*/
+const Map = new Lang.Class({
+    Name: 'Map',
+
+    _init: function(iterable) {
+        this._pool = { };
+        this._size = 0;
+
+        if (iterable) {
+            for (let i = 0; i < iterable.length; i++) {
+                let [key, value] = iterable[i];
+                this.set(key, value);
+            }
+        }
+    },
+
+    _hashKey: function(key) {
+        let type = typeof(key);
+        return type + ':' + _hashers[type](key);
+    },
+
+    _internalGet: function(key) {
+        let hash = this._hashKey(key);
+        let node = this._pool[hash];
+
+        if (node && _sameValue(node.key, key))
+            return [true, node.value];
+        else
+            return [false, null];
+    },
+
+    get: function(key) {
+        return this._internalGet(key)[1];
+    },
+
+    has: function(key) {
+        return this._internalGet(key)[0];
+    },
+
+    set: function(key, value) {
+        let hash = this._hashKey(key);
+        let node = this._pool[hash];
+
+        if (node) {
+            node.key = key;
+            node.value = value;
+        } else {
+            this._pool[hash] = { key: key, value: value };
+            this._size++;
+        }
+    },
+
+    delete: function(key) {
+        let hash = this._hashKey(key);
+        let node = this._pool[hash];
+
+        if (node && _sameValue(node.key, key)) {
+            delete this._pool[hash];
+            this._size--;
+            return [node.key, node.value];
+        } else {
+            return [null, null];
+        }
+    },
+
+    keys: function() {
+        let pool = this._pool;
+        return Object.getOwnPropertyNames(pool).map(function(hash) {
+            return pool[hash].key;
+        });
+    },
+
+    values: function() {
+        let pool = this._pool;
+        return Object.getOwnPropertyNames(pool).map(function(hash) {
+            return pool[hash].value;
+        });
+    },
+
+    items: function() {
+        let pool = this._pool;
+        return Object.getOwnPropertyNames(pool).map(function(hash) {
+            return [pool[hash].key, pool[hash].value];
+        });
+    },
+
+    size: function() {
+        return this._size;
+    },
+});
--- 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
@ -89,7 +89,7 @@ function spawnApp(argv) {
        let app = Gio.AppInfo.create_from_commandline(argv.join(' '), null,
                                                      Gio.AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION);

-        let context = global.create_app_launch_context(0, -1);
+        let context = global.create_app_launch_context();
        app.launch([], context);
    } catch(err) {
        _handleSpawnError(argv[0], err);
@ -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:
@ -153,7 +153,7 @@ function trySpawnCommandLine(command_line) {
 }

 function _handleSpawnError(command, err) {
-    let title = _("Execution of “%s” failed:").format(command);
+    let title = _("Execution of '%s' failed:").format(command);
    Main.notifyError(title, err.message);
 }

--- 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,
@ -305,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');
        }
    },

@ -431,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;
    }
 });
@ -460,10 +460,9 @@ const AppSwitcher = new Lang.Class({
            appIcon.cachedWindows = allWindows.filter(function(w) {
                return windowTracker.get_window_app (w) == appIcon.app;
            });
-            if (appIcon.cachedWindows.length > 0)
+            if (workspace == null || appIcon.cachedWindows.length > 0) {
                this._addIcon(appIcon);
-            else if (workspace == null)
-                throw new Error('%s appears to be running, but doesn\'t have any windows'.format(appIcon.app.get_name()));
+            }
        }

        this._curApp = -1;
@ -479,13 +478,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);
@ -496,22 +494,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++) {
@ -519,11 +514,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) {
@ -557,7 +550,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);
    },
@ -657,19 +649,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,48 +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)
-        return [];
-    return categoriesStr.split(';');
-}
-
-function _listsIntersect(a, b) {
-    for (let itemA of a)
-        if (b.indexOf(itemA) >= 0)
-            return true;
-    return false;
-}
-
-function _getFolderName(folder) {
-    let name = folder.get_string('name');
-
-    if (folder.get_boolean('translate')) {
-        let keyfile = new GLib.KeyFile();
-        let path = 'desktop-directories/' + name;
-
-        try {
-            keyfile.load_from_data_dirs(path, GLib.KeyFileFlags.NONE);
-            name = keyfile.get_locale_string('Desktop Entry', 'Name', null);
-        } catch(e) {
-            return name;
-        }
-    }
-
-    return name;
-}
-
-function clamp(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-}
-
 const BaseAppView = new Lang.Class({
    Name: 'BaseAppView',
    Abstract: true,
@ -101,9 +64,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,25 +71,12 @@ const BaseAppView = new Lang.Class({
        this._allItems = [];
    },

-    _keyFocusIn: function(actor) {
-        // Nothing by default
-    },
-
    removeAll: function() {
        this._grid.destroyAll();
        this._items = {};
        this._allItems = [];
    },

-    _redisplay: function() {
-        this.removeAll();
-        this._loadApps();
-    },
-
-    getAllItems: function() {
-        return this._allItems;
-    },
-
    addItem: function(icon) {
        let id = icon.id;
        if (this._items[id] !== undefined)
@ -139,12 +86,10 @@ const BaseAppView = new Lang.Class({
        this._items[id] = icon;
    },

-    _compareItems: function(a, b) {
-        return a.name.localeCompare(b.name);
-    },
-
    loadGrid: function() {
-        this._allItems.sort(this._compareItems);
+        this._allItems.sort(Lang.bind(this, function(a, b) {
+            return a.name.localeCompare(b.name);
+        }));
        this._allItems.forEach(Lang.bind(this, function(item) {
            this._grid.addItem(item);
        }));
@ -260,8 +205,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'
                             });
        }
    }
@ -364,76 +308,6 @@ const AllView = new Lang.Class({
                    this._keyPressEventId = 0;
                }
            }));
-
-        this._redisplayWorkId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._redisplay));
-
-        Shell.AppSystem.get_default().connect('installed-changed', Lang.bind(this, function() {
-            Main.queueDeferredWork(this._redisplayWorkId);
-        }));
-        this._folderSettings = new Gio.Settings({ schema: 'org.gnome.desktop.app-folders' });
-        this._folderSettings.connect('changed::folder-children', Lang.bind(this, function() {
-            Main.queueDeferredWork(this._redisplayWorkId);
-        }));
-    },
-
-    removeAll: function() {
-        this.folderIcons = [];
-        this.parent();
-    },
-
-    _itemNameChanged: function(item) {
-        // If an item's name changed, we can pluck it out of where it's
-        // supposed to be and reinsert it where it's sorted.
-        let oldIdx = this._allItems.indexOf(item);
-        this._allItems.splice(oldIdx, 1);
-        let newIdx = Util.insertSorted(this._allItems, item, this._compareItems);
-
-        this._grid.removeItem(item);
-        this._grid.addItem(item, newIdx);
-    },
-
-    _refilterApps: function() {
-        this._allItems.forEach(function(icon) {
-            if (icon instanceof AppIcon)
-                icon.actor.visible = true;
-        });
-
-        this.folderIcons.forEach(Lang.bind(this, function(folder) {
-            let folderApps = folder.getAppIds();
-            folderApps.forEach(Lang.bind(this, function(appId) {
-                let appIcon = this._items[appId];
-                appIcon.actor.visible = false;
-            }));
-        }));
-    },
-
-    _loadApps: function() {
-        let apps = Gio.AppInfo.get_all().filter(function(appInfo) {
-            return appInfo.should_show();
-        }).map(function(app) {
-            return app.get_id();
-        });
-
-        let appSys = Shell.AppSystem.get_default();
-
-        let folders = this._folderSettings.get_strv('folder-children');
-        folders.forEach(Lang.bind(this, function(id) {
-            let path = this._folderSettings.path + 'folders/' + id + '/';
-            let icon = new FolderIcon(id, path, this);
-            icon.connect('name-changed', Lang.bind(this, this._itemNameChanged));
-            icon.connect('apps-changed', Lang.bind(this, this._refilterApps));
-            this.addItem(icon);
-            this.folderIcons.push(icon);
-        }));
-
-        apps.forEach(Lang.bind(this, function(appId) {
-            let app = appSys.lookup_app(appId);
-            let icon = new AppIcon(app);
-            this.addItem(icon);
-        }));
-
-        this.loadGrid();
-        this._refilterApps();
    },

    getCurrentPageY: function() {
@ -441,8 +315,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 +348,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 +402,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;
    },

@ -557,6 +429,11 @@ const AllView = new Lang.Class({
        return Clutter.EVENT_PROPAGATE;
    },

+    removeAll: function() {
+        this.folderIcons = [];
+        this.parent();
+    },
+
    addFolderPopup: function(popup) {
        this._stack.add_actor(popup.actor);
        popup.connect('open-state-changed', Lang.bind(this,
@ -569,7 +446,7 @@ const AllView = new Lang.Class({
            }));
    },

-    _keyFocusIn: function(icon) {
+    _ensureIconVisible: function(icon) {
        let itemPage = this._grid.getItemPage(icon);
        this.goToPage(itemPage);
    },
@ -651,18 +528,17 @@ const FrequentView = new Lang.Class({
        this._noFrequentAppsLabel.hide();

        this._usage = Shell.AppUsage.get_default();
-
-        this.actor.connect('notify::mapped', Lang.bind(this, function() {
-            if (this.actor.mapped)
-                this._redisplay();
-        }));
    },

    hasUsefulData: function() {
        return this._usage.get_most_used("").length >= MIN_FREQUENT_APPS_COUNT;
    },

-    _loadApps: function() {
+    removeAll: function() {
+        this._grid.destroyAll();
+    },
+
+    loadApps: function() {
        let mostUsed = this._usage.get_most_used ("");
        let hasUsefulData = this.hasUsefulData();
        this._noFrequentAppsLabel.visible = !hasUsefulData;
@ -740,6 +616,16 @@ const AppDisplay = new Lang.Class({
    Name: 'AppDisplay',

    _init: function() {
+        Shell.AppSystem.get_default().connect('installed-changed', Lang.bind(this, function() {
+            Main.queueDeferredWork(this._allAppsWorkId);
+        }));
+        Main.overview.connect('showing', Lang.bind(this, function() {
+            Main.queueDeferredWork(this._frequentAppsWorkId);
+        }));
+        this._softwareSettings = new Gio.Settings({ schema: 'org.gnome.software' });
+        this._softwareSettings.connect('changed::app-folders', Lang.bind(this, function() {
+            Main.queueDeferredWork(this._frequentAppsWorkId);
+        }));
        this._privacySettings = new Gio.Settings({ schema: 'org.gnome.desktop.privacy' });
        this._privacySettings.connect('changed::remember-app-usage',
                                      Lang.bind(this, this._updateFrequentVisibility));
@ -768,7 +654,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 });
@ -793,15 +679,22 @@ const AppDisplay = new Lang.Class({
            initialView = Views.ALL;
        this._showView(initialView);
        this._updateFrequentVisibility();
+
+        // We need a dummy actor to catch the keyboard focus if the
+        // user Ctrl-Alt-Tabs here before the deferred work creates
+        // our real contents
+        this._focusDummy = new St.Bin({ can_focus: true });
+        this._viewStack.add_actor(this._focusDummy);
+
+        this._allAppsWorkId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._redisplayAllApps));
+        this._frequentAppsWorkId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._redisplayFrequentApps));
    },

    _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
@ -828,6 +721,54 @@ const AppDisplay = new Lang.Class({
            this._showView(Views.ALL);
    },

+    _redisplay: function() {
+        this._redisplayFrequentApps();
+        this._redisplayAllApps();
+    },
+
+    _redisplayFrequentApps: function() {
+        let view = this._views[Views.FREQUENT].view;
+
+        view.removeAll();
+        view.loadApps();
+    },
+
+    _redisplayAllApps: function() {
+        let view = this._views[Views.ALL].view;
+
+        view.removeAll();
+
+        let apps = Gio.AppInfo.get_all();
+
+        let folders = this._softwareSettings.get_value('app-folders').deep_unpack();
+        for (let id in folders) {
+            let folderApps = folders[id];
+            let icon = new FolderIcon(id, id, folderApps, view);
+            view.addItem(icon);
+            view.folderIcons.push(icon);
+        }
+
+        let appSys = Shell.AppSystem.get_default();
+        apps.forEach(Lang.bind(this, function(appInfo) {
+            if (!appInfo.should_show())
+                return;
+
+            let app = appSys.lookup_app(appInfo.get_id());
+            let icon = new AppIcon(app);
+            view.addItem(icon);
+        }));
+
+        view.loadGrid();
+
+        if (this._focusDummy) {
+            let focused = this._focusDummy.has_key_focus();
+            this._focusDummy.destroy();
+            this._focusDummy = null;
+            if (focused)
+                this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        }
+    },
+
    selectApp: function(id) {
        this._showView(Views.ALL);
        this._views[Views.ALL].view.selectApp(id);
@ -940,27 +881,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;
@ -1032,12 +966,11 @@ const FolderView = new Lang.Class({
 const FolderIcon = new Lang.Class({
    Name: 'FolderIcon',

-    _init: function(id, path, parentView) {
+    _init: function(id, name, apps, parentView) {
        this.id = id;
+        this.name = name;
        this._parentView = parentView;

-        this._folder = new Gio.Settings({ schema_id: 'org.gnome.desktop.app-folders.folder',
-                                          path: path });
        this.actor = new St.Button({ style_class: 'app-well-app app-folder',
                                     button_mask: St.ButtonMask.ONE,
                                     toggle_mode: true,
@ -1048,11 +981,22 @@ const FolderIcon = new Lang.Class({
        // whether we need to update arrow side, position etc.
        this._popupInvalidated = false;

-        this.icon = new IconGrid.BaseIcon('', { createIcon: Lang.bind(this, this._createIcon), setSizeManually: true });
+        this.icon = new IconGrid.BaseIcon(this.name,
+                                          { createIcon: Lang.bind(this, this._createIcon), setSizeManually: true });
        this.actor.set_child(this.icon.actor);
        this.actor.label_actor = this.icon.label;

        this.view = new FolderView();
+        let appSys = Shell.AppSystem.get_default();
+        apps.forEach(Lang.bind(this, function(appId) {
+            let app = appSys.lookup_app(appId + '.desktop');
+            if (!app)
+                return;
+
+            let icon = new AppIcon(app);
+            this.view.addItem(icon);
+        }));
+        this.view.loadGrid();

        this.actor.connect('clicked', Lang.bind(this,
            function() {
@ -1065,63 +1009,6 @@ const FolderIcon = new Lang.Class({
                if (!this.actor.mapped && this._popup)
                    this._popup.popdown();
            }));
-
-        this._folder.connect('changed', Lang.bind(this, this._redisplay));
-        this._redisplay();
-    },
-
-    getAppIds: function() {
-        return this.view.getAllItems().map(function(item) {
-            return item.id;
-        });
-    },
-
-    _updateName: function() {
-        let name = _getFolderName(this._folder);
-        if (this.name == name)
-            return;
-
-        this.name = name;
-        this.icon.label.text = this.name;
-        this.emit('name-changed');
-    },
-
-    _redisplay: function() {
-        this._updateName();
-
-        this.view.removeAll();
-
-        let excludedApps = this._folder.get_strv('excluded-apps');
-        let appSys = Shell.AppSystem.get_default();
-        let addAppId = (function addAppId(appId) {
-            if (excludedApps.indexOf(appId) >= 0)
-                return;
-
-            let app = appSys.lookup_app(appId);
-            if (!app)
-                return;
-
-            if (!app.get_app_info().should_show())
-                return;
-
-            let icon = new AppIcon(app);
-            this.view.addItem(icon);
-        }).bind(this);
-
-        let folderApps = this._folder.get_strv('apps');
-        folderApps.forEach(addAppId);
-
-        let folderCategories = this._folder.get_strv('categories');
-        Gio.AppInfo.get_all().forEach(function(appInfo) {
-            let appCategories = _getCategories(appInfo);
-            if (!_listsIntersect(folderCategories, appCategories))
-                return;
-
-            addAppId(appInfo.get_id());
-        });
-
-        this.view.loadGrid();
-        this.emit('apps-changed');
    },

    _createIcon: function(iconSize) {
@ -1200,7 +1087,6 @@ const FolderIcon = new Lang.Class({
        this._popupInvalidated = true;
    },
 });
-Signals.addSignalMethods(FolderIcon.prototype);

 const AppFolderPopup = new Lang.Class({
    Name: 'AppFolderPopup',
@ -1406,7 +1292,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 +1305,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();
        }
@ -1529,6 +1417,8 @@ const AppIconMenu = new Lang.Class({

        this._source = source;

+        this.connect('activate', Lang.bind(this, this._onActivate));
+
        this.actor.add_style_class_name('app-well-menu');

        // Chain our visibility and lifecycle to that of the source
@ -1545,7 +1435,7 @@ const AppIconMenu = new Lang.Class({
        this.removeAll();

        let windows = this._source.app.get_windows().filter(function(w) {
-            return !w.skip_taskbar;
+            return Shell.WindowTracker.is_window_interesting(w);
        });

        // Display the app windows menu items and the separator between windows
@ -1554,74 +1444,25 @@ const AppIconMenu = new Lang.Class({
        let separatorShown = windows.length > 0 && windows[0].get_workspace() != activeWorkspace;

        for (let i = 0; i < windows.length; i++) {
-            let window = windows[i];
-            if (!separatorShown && window.get_workspace() != activeWorkspace) {
+            if (!separatorShown && windows[i].get_workspace() != activeWorkspace) {
                this._appendSeparator();
                separatorShown = true;
            }
-            let item = this._appendMenuItem(window.title);
-            item.connect('activate', Lang.bind(this, function() {
-                this.emit('activate-window', window);
-            }));
+            let item = this._appendMenuItem(windows[i].title);
+            item._window = windows[i];
        }

        if (!this._source.app.is_window_backed()) {
-            this._appendSeparator();
-
-            this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
-            this._newWindowMenuItem.connect('activate', Lang.bind(this, function() {
-                this._source.app.open_new_window(-1);
-                this.emit('activate-window', null);
-            }));
-            this._appendSeparator();
-
-            let appInfo = this._source.app.get_app_info();
-            let actions = appInfo.list_actions();
-            for (let i = 0; i < actions.length; i++) {
-                let action = actions[i];
-                let item = this._appendMenuItem(appInfo.get_action_name(action));
-                item.connect('activate', Lang.bind(this, function(emitter, event) {
-                    this._source.app.launch_action(action, event.get_time(), -1);
-                    this.emit('activate-window', null);
-                }));
-            }
-            this._appendSeparator();
+            if (windows.length > 0)
+                this._appendSeparator();

            let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id());

-            if (isFavorite) {
-                let item = this._appendMenuItem(_("Remove from Favorites"));
-                item.connect('activate', Lang.bind(this, function() {
-                    let favs = AppFavorites.getAppFavorites();
-                    favs.removeFavorite(this._source.app.get_id());
-                }));
-            } else {
-                let item = this._appendMenuItem(_("Add to Favorites"));
-                item.connect('activate', Lang.bind(this, function() {
-                    let favs = AppFavorites.getAppFavorites();
-                    favs.addFavorite(this._source.app.get_id());
-                }));
-            }
+            this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
+            this._appendSeparator();

-            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();
-                        });
-                }));
-            }
+            this._toggleFavoriteMenuItem = this._appendMenuItem(isFavorite ? _("Remove from Favorites")
+                                                                : _("Add to Favorites"));
        }
    },

@ -1640,6 +1481,24 @@ const AppIconMenu = new Lang.Class({
    popup: function(activatingButton) {
        this._redisplay();
        this.open();
+    },
+
+    _onActivate: function (actor, child) {
+        if (child._window) {
+            let metaWindow = child._window;
+            this.emit('activate-window', metaWindow);
+        } else if (child == this._newWindowMenuItem) {
+            this._source.app.open_new_window(-1);
+            this.emit('activate-window', null);
+        } else if (child == this._toggleFavoriteMenuItem) {
+            let favs = AppFavorites.getAppFavorites();
+            let isFavorite = favs.isFavorite(this._source.app.get_id());
+            if (isFavorite)
+                favs.removeFavorite(this._source.app.get_id());
+            else
+                favs.addFavorite(this._source.app.get_id());
+        }
+        this.close();
    }
 });
 Signals.addSignalMethods(AppIconMenu.prototype);
--- a/js/ui/background.js
+++ b/js/ui/background.js
@ -132,25 +132,6 @@ const BackgroundCache = new Lang.Class({
        this._removeContent(this._images, content);
    },

-    _attachCallerToFileLoad: function(caller, fileLoad) {
-        fileLoad.callers.push(caller);
-
-        if (!caller.cancellable)
-            return;
-
-        caller.cancellable.connect(Lang.bind(this, function() {
-            let idx = fileLoad.callers.indexOf(caller);
-            fileLoad.callers.splice(idx, 1);
-
-            if (fileLoad.callers.length == 0) {
-                fileLoad.cancellable.cancel();
-
-                let idx = this._pendingFileLoads.indexOf(fileLoad);
-                this._pendingFileLoads.splice(idx, 1);
-            }
-        }));
-    },
-
    _loadImageContent: function(params) {
        params = Params.parse(params, { monitorIndex: 0,
                                        style: null,
@ -159,28 +140,27 @@ const BackgroundCache = new Lang.Class({
                                        cancellable: null,
                                        onFinished: null });

-        let caller = { monitorIndex: params.monitorIndex,
-                       effects: params.effects,
-                       cancellable: params.cancellable,
-                       onFinished: params.onFinished };
-
        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);
+            if (this._pendingFileLoads[i].filename == params.filename &&
+                this._pendingFileLoads[i].style == params.style) {
+                this._pendingFileLoads[i].callers.push({ shouldCopy: true,
+                                                         monitorIndex: params.monitorIndex,
+                                                         effects: params.effects,
+                                                         onFinished: params.onFinished });
                return;
            }
        }

-        let fileLoad = { filename: params.filename,
-                         style: params.style,
-                         cancellable: new Gio.Cancellable(),
-                         callers: [] };
-        this._attachCallerToFileLoad(caller, fileLoad);
+        this._pendingFileLoads.push({ filename: params.filename,
+                                      style: params.style,
+                                      callers: [{ shouldCopy: false,
+                                                  monitorIndex: params.monitorIndex,
+                                                  effects: params.effects,
+                                                  onFinished: params.onFinished }] });

-        let content = new Meta.Background({ meta_screen: global.screen });
+        let content = new Meta.Background({ meta_screen: global.screen,
+                                            monitor: params.monitorIndex,
+                                            effects: params.effects });

        content.load_file_async(params.filename,
                                params.style,
@ -191,26 +171,35 @@ const BackgroundCache = new Lang.Class({
                                                  content.load_file_finish(result);

                                                  this._monitorFile(params.filename);
+                                                  this._images.push(content);
                                              } catch(e) {
                                                  content = null;
                                              }

-                                              for (let i = 0; i < fileLoad.callers.length; i++) {
-                                                  let caller = fileLoad.callers[i];
-                                                  if (caller.onFinished) {
-                                                      let newContent;
+                                              for (let i = 0; i < this._pendingFileLoads.length; i++) {
+                                                  let pendingLoad = this._pendingFileLoads[i];
+                                                  if (pendingLoad.filename != params.filename ||
+                                                      pendingLoad.style != params.style)
+                                                      continue;

-                                                      if (content) {
-                                                          newContent = content.copy(caller.monitorIndex, caller.effects);
-                                                          this._images.push(newContent);
+                                                  for (let j = 0; j < pendingLoad.callers.length; j++) {
+                                                      if (pendingLoad.callers[j].onFinished) {
+                                                          let newContent;
+
+                                                          if (content && pendingLoad.callers[j].shouldCopy) {
+                                                              newContent = content.copy(pendingLoad.callers[j].monitorIndex,
+                                                                                        pendingLoad.callers[j].effects);
+                                                              this._images.push(newContent);
+                                                          } else {
+                                                              newContent = content;
+                                                          }
+
+                                                          pendingLoad.callers[j].onFinished(newContent);
                                                      }
-
-                                                      caller.onFinished(newContent);
                                                  }
-                                              }

-                                              let idx = this._pendingFileLoads.indexOf(fileLoad);
-                                              this._pendingFileLoads.splice(idx, 1);
+                                                  this._pendingFileLoads.splice(i, 1);
+                                              }
                                          }));
    },

@ -271,11 +260,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 +275,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 +375,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 +521,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) {
@ -580,7 +565,7 @@ const Background = new Lang.Class({
    _load: function () {
        this._cache = getBackgroundCache();

-        this._loadPattern();
+        this._loadPattern(this._cache);

        this._style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
        if (this._style == GDesktopEnums.BackgroundStyle.NONE) {
@ -748,31 +733,29 @@ const BackgroundManager = new Lang.Class({
        }
    },

-    _updateBackground: function() {
+    _updateBackground: function(background) {
        let newBackground = this._createBackground();
-        newBackground.vignetteSharpness = this.background.vignetteSharpness;
-        newBackground.brightness = this.background.brightness;
-        newBackground.visible = this.background.visible;
+        newBackground.vignetteSharpness = background.vignetteSharpness;
+        newBackground.brightness = background.brightness;
+        newBackground.visible = background.visible;

        newBackground.loadedSignalId = newBackground.connect('loaded',
            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,
+                Tweener.addTween(background.actor,
                                 { opacity: 0,
                                   time: FADE_ANIMATION_TIME,
                                   transition: 'easeOutQuad',
                                   onComplete: Lang.bind(this, function() {
-                                       this.background.actor.destroy();
-                                       this.background = newBackground;
-                                       this._newBackground = null;
+                                       if (this._newBackground == newBackground) {
+                                           this.background = newBackground;
+                                           this._newBackground = null;
+                                       } else {
+                                           newBackground.actor.destroy();
+                                       }
+
+                                       background.actor.destroy();

                                       this.emit('changed');
                                   })
@ -800,7 +783,7 @@ const BackgroundManager = new Lang.Class({
        background.changeSignalId = background.connect('changed', Lang.bind(this, function() {
            background.disconnect(background.changeSignalId);
            background.changeSignalId = 0;
-            this._updateBackground();
+            this._updateBackground(background);
        }));

        background.actor.connect('destroy', Lang.bind(this, function() {
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@ -13,8 +13,8 @@ const BackgroundMenu = new Lang.Class({
    Name: 'BackgroundMenu',
    Extends: PopupMenu.PopupMenu,

-    _init: function(layoutManager) {
-        this.parent(layoutManager.dummyCursor, 0, St.Side.TOP);
+    _init: function(source, layoutManager) {
+        this.parent(source, 0, St.Side.TOP);

        this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@ -28,14 +28,17 @@ const BackgroundMenu = new Lang.Class({
 });

 function addBackgroundMenu(actor, layoutManager) {
+    let cursor = new St.Bin({ opacity: 0 });
+    layoutManager.uiGroup.add_actor(cursor);
+
    actor.reactive = true;
-    actor._backgroundMenu = new BackgroundMenu(layoutManager);
+    actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager);
    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
    actor._backgroundManager.addMenu(actor._backgroundMenu);

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

@ -56,8 +59,10 @@ function addBackgroundMenu(actor, layoutManager) {
    actor.add_action(clickAction);

    actor.connect('destroy', function() {
-        actor._backgroundMenu.destroy();
-        actor._backgroundMenu = null;
-        actor._backgroundManager = null;
-    });
+                      actor._backgroundMenu.destroy();
+                      actor._backgroundMenu = null;
+                      actor._backgroundManager = null;
+
+                      cursor.destroy();
+                  });
 }
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@ -287,40 +287,38 @@ const BoxPointer = new Lang.Class({
        let skipBottomLeft = false;
        let skipBottomRight = false;

-        if (rise) {
-            switch (this._arrowSide) {
-            case St.Side.TOP:
-                if (this._arrowOrigin == x1)
-                    skipTopLeft = true;
-                else if (this._arrowOrigin == x2)
-                    skipTopRight = true;
-                break;
+        switch (this._arrowSide) {
+        case St.Side.TOP:
+            if (this._arrowOrigin == x1)
+                skipTopLeft = true;
+            else if (this._arrowOrigin == x2)
+                skipTopRight = true;
+            break;

-            case St.Side.RIGHT:
-                if (this._arrowOrigin == y1)
-                    skipTopRight = true;
-                else if (this._arrowOrigin == y2)
-                    skipBottomRight = true;
-                break;
+        case St.Side.RIGHT:
+            if (this._arrowOrigin == y1)
+                skipTopRight = true;
+            else if (this._arrowOrigin == y2)
+                skipBottomRight = true;
+            break;

-            case St.Side.BOTTOM:
-                if (this._arrowOrigin == x1)
-                    skipBottomLeft = true;
-                else if (this._arrowOrigin == x2)
-                    skipBottomRight = true;
-                break;
+        case St.Side.BOTTOM:
+            if (this._arrowOrigin == x1)
+                skipBottomLeft = true;
+            else if (this._arrowOrigin == x2)
+                skipBottomRight = true;
+            break;

-            case St.Side.LEFT:
-                if (this._arrowOrigin == y1)
-                    skipTopLeft = true;
-                else if (this._arrowOrigin == y2)
-                    skipBottomLeft = true;
-                break;
-            }
+        case St.Side.LEFT:
+            if (this._arrowOrigin == y1)
+                skipTopLeft = true;
+            else if (this._arrowOrigin == y2)
+                skipBottomLeft = true;
+            break;
        }

        cr.moveTo(x1 + borderRadius, y1);
-        if (this._arrowSide == St.Side.TOP && rise) {
+        if (this._arrowSide == St.Side.TOP) {
            if (skipTopLeft) {
                cr.moveTo(x1, y2 - borderRadius);
                cr.lineTo(x1, y1 - rise);
@ -342,7 +340,7 @@ const BoxPointer = new Lang.Class({
                   3*Math.PI/2, Math.PI*2);
        }

-        if (this._arrowSide == St.Side.RIGHT && rise) {
+        if (this._arrowSide == St.Side.RIGHT) {
            if (skipTopRight) {
                cr.lineTo(x2 + rise, y1);
                cr.lineTo(x2 + rise, y1 + halfBase);
@ -363,7 +361,7 @@ const BoxPointer = new Lang.Class({
                   0, Math.PI/2);
        }

-        if (this._arrowSide == St.Side.BOTTOM && rise) {
+        if (this._arrowSide == St.Side.BOTTOM) {
            if (skipBottomLeft) {
                cr.lineTo(x1 + halfBase, y2);
                cr.lineTo(x1, y2 + rise);
@ -384,7 +382,7 @@ const BoxPointer = new Lang.Class({
                   Math.PI/2, Math.PI);
        }

-        if (this._arrowSide == St.Side.LEFT && rise) {
+        if (this._arrowSide == St.Side.LEFT) {
            if (skipTopLeft) {
                cr.lineTo(x1, y1 + halfBase);
                cr.lineTo(x1 - rise, y1);
--- 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/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@ -64,7 +64,7 @@ function startAppForMount(app, mount) {

    try {
        retval = app.launch(files, 
-                            global.create_app_launch_context(0, -1))
+                            global.create_app_launch_context())
    } catch (e) {
        log('Unable to launch the application ' + app.get_name()
            + ': ' + e.toString());
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@ -309,7 +309,7 @@ const NetworkSecretDialog = new Lang.Class({
            wirelessSetting = this._connection.get_setting_wireless();
            ssid = NetworkManager.utils_ssid_to_utf8(wirelessSetting.get_ssid());
            content.title = _("Authentication required by wireless network");
-            content.message = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
+            content.message = _("Passwords or encryption keys are required to access the wireless network '%s'.").format(ssid);
            this._getWirelessSecrets(content.secrets, wirelessSetting);
            break;
        case '802-3-ethernet':
@ -336,7 +336,7 @@ const NetworkSecretDialog = new Lang.Class({
        case 'cdma':
        case 'bluetooth':
            content.title = _("Mobile broadband network password");
-            content.message = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
+            content.message = _("A password is required to connect to '%s'.").format(connectionSetting.get_id());
            this._getMobileSecrets(content.secrets, connectionType);
            break;
        default:
@ -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'
@ -624,11 +621,7 @@ const ChatSource = new Lang.Class({
            this.notify();
    },

-    destroy: function(reason) {
-        if (this._destroyed)
-            return;
-
-        this._destroyed = true;
+    _channelClosed: function() {
        this._channel.disconnect(this._closedId);
        this._channel.disconnect(this._receivedId);
        this._channel.disconnect(this._pendingId);
@ -638,14 +631,7 @@ const ChatSource = new Lang.Class({
        this._contact.disconnect(this._notifyAvatarId);
        this._contact.disconnect(this._presenceChangedId);

-        if (this._timestampTimeoutId)
-            Mainloop.source_remove(this._timestampTimeoutId);
-
-        this.parent(reason);
-    },
-
-    _channelClosed: function() {
-        this.destroy(MessageTray.NotificationDestroyedReason.SOURCE_CLOSED);
+        this.destroy();
    },

    /* All messages are new messages for Telepathy sources */
@ -681,7 +667,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 +894,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 +910,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 +930,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 +965,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 +1036,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 +1206,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',
@ -1408,7 +1339,7 @@ const AccountNotification = new Lang.Class({
            let cmd = 'empathy-accounts --select-account=' +
                account.get_path_suffix();
            let app_info = Gio.app_info_create_from_commandline(cmd, null, 0);
-            app_info.launch([], global.create_app_launch_context(0, -1));
+            app_info.launch([], global.create_app_launch_context());
        }));

        this._enabledId = account.connect('notify::enabled',
@ -1426,12 +1357,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/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() {
@ -229,7 +211,7 @@ const DateMenuButton = new Lang.Class({
        let app = this._getCalendarApp();
        if (app.get_id() == 'evolution.desktop')
            app = Gio.DesktopAppInfo.new('evolution-calendar.desktop');
-        app.launch([], global.create_app_launch_context(0, -1));
+        app.launch([], global.create_app_launch_context());
    },

    _onOpenClocksActivate: function() {
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -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) {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -13,7 +13,9 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
 */

 const Lang = imports.lang;
@ -25,11 +27,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 +38,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 +73,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 +81,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 +102,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 +117,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 +145,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 +197,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 +216,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 +242,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 +262,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 +287,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 +301,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 +390,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 +421,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 +546,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 +558,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 +566,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/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@ -201,7 +201,7 @@ const InstallExtensionDialog = new Lang.Class({
                           default: true
                         }]);

-        let message = _("Download and install “%s” from extensions.gnome.org?").format(info.name);
+        let message = _("Download and install '%s' from extensions.gnome.org?").format(info.name);

        let box = new St.BoxLayout();
        this.contentLayout.add(box);
--- 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
@ -115,6 +115,9 @@ const CandidatePopup = new Lang.Class({
    Name: 'CandidatePopup',

    _init: function() {
+        this._cursor = new St.Bin({ opacity: 0 });
+        Main.uiGroup.add_actor(this._cursor);
+
        this._boxPointer = new BoxPointer.BoxPointer(St.Side.TOP);
        this._boxPointer.actor.visible = false;
        this._boxPointer.actor.style_class = 'candidate-popup-boxpointer';
@ -155,9 +158,10 @@ 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);
+                                 this._cursor.set_position(x, y);
+                                 this._cursor.set_size(w, h);
                                 if (this._boxPointer.actor.visible)
-                                     this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
+                                     this._boxPointer.setPosition(this._cursor, 0);
                             }));
        panelService.connect('update-preedit-text',
                             Lang.bind(this, function(ps, text, cursorPosition, visible) {
@ -249,7 +253,7 @@ const CandidatePopup = new Lang.Class({
                         this._candidateArea.actor.visible);

        if (isVisible) {
-            this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
+            this._boxPointer.setPosition(this._cursor, 0);
            this._boxPointer.show(BoxPointer.PopupAnimation.NONE);
            this._boxPointer.actor.raise_top();
        } else {
--- 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) {
@ -442,10 +433,6 @@ const IconGrid = new Lang.Class({
            this._grid.add_actor(item.actor);
    },

-    removeItem: function(item) {
-        this._grid.remove_child(item.actor);
-    },
-
    getItemAtIndex: function(index) {
        return this._grid.get_child_at_index(index);
    },
@ -541,7 +528,6 @@ const IconGrid = new Lang.Class({
        }
    }
 });
-Signals.addSignalMethods(IconGrid.prototype);

 const PaginatedIconGrid = new Lang.Class({
    Name: 'PaginatedIconGrid',
@ -645,10 +631,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;
@ -212,21 +213,12 @@ const LayoutManager = new Lang.Class({
        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);
-
        global.stage.remove_actor(global.top_window_group);
        this.uiGroup.add_actor(global.top_window_group);

@ -603,7 +595,7 @@ const LayoutManager = new Lang.Class({
            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();
@ -628,11 +620,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() {
@ -729,21 +720,6 @@ const LayoutManager = new Lang.Class({
        this._updateRegions();
    },

-    // setDummyCursorGeometry:
-    //
-    // The cursor dummy is a standard widget commonly used for popup
-    // menus and box pointers to track, as the box pointer API only
-    // tracks actors. If you want to pop up a menu based on where the
-    // user clicked, or where the text cursor is, the cursor dummy
-    // 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) {
-        this.dummyCursor.set_position(Math.round(x), Math.round(y));
-        this.dummyCursor.set_size(Math.round(w), Math.round(h));
-    },
-
    // addChrome:
    // @actor: an actor to add to the chrome
    // @params: (optional) additional params
@ -835,12 +811,13 @@ const LayoutManager = new Lang.Class({

        let actorData = Params.parse(params, defaultParams);
        actorData.actor = actor;
+        actorData.isToplevel = actor.get_parent() == this.uiGroup;
        actorData.visibleId = actor.connect('notify::visible',
                                            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));
+        actorData.parentSetId = actor.connect('parent-set',
+                                              Lang.bind(this, this._actorReparented));
        // Note that destroying actor will unset its parent, so we don't
        // need to connect to 'destroy' too.

@ -858,11 +835,22 @@ 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();
    },

+    _actorReparented: function(actor, oldParent) {
+        let newParent = actor.get_parent();
+        if (!newParent) {
+            this._untrackActor(actor);
+        } else {
+            let i = this._findActor(actor);
+            let actorData = this._trackedActors[i];
+            actorData.isToplevel = (newParent == this.uiGroup);
+        }
+    },
+
    _updateVisibility: function() {
        let windowsVisible = Main.sessionMode.hasWindows && !this._inOverview;

@ -873,6 +861,8 @@ const LayoutManager = new Lang.Class({
            let actorData = this._trackedActors[i], visible;
            if (!actorData.trackFullscreen)
                continue;
+            if (!actorData.isToplevel)
+                continue;

            if (!windowsVisible)
                visible = true;
@ -912,8 +902,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 +934,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 +1008,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;
                }

--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@ -5,67 +5,11 @@ const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;

 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 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);
-    },
-
-    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]);
-    }
-});

 /**
 * Lightbox:
@ -99,23 +43,15 @@ const Lightbox = new Lang.Class({
                                        width: null,
                                        height: null,
                                        fadeFactor: DEFAULT_FADE_FACTOR,
-                                        radialEffect: false,
                                      });

        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,
-                                                reactive: params.inhibitEvents });
-        else
-            this.actor = new St.Bin({ x: 0,
-                                      y: 0,
-                                      opacity: 0,
-                                      style_class: 'lightbox',
-                                      reactive: params.inhibitEvents });
+        this.actor = new St.Bin({ x: 0,
+                                  y: 0,
+                                  style_class: 'lightbox',
+                                  reactive: params.inhibitEvents });

        container.add_actor(this.actor);
        this.actor.raise_top();
@ -165,18 +101,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 +113,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 +126,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 +135,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; ' +
@ -672,13 +670,13 @@ const Extensions = new Lang.Class({
    _onViewSource: function (actor) {
        let extension = actor._extension;
        let uri = extension.dir.get_uri();
-        Gio.app_info_launch_default_for_uri(uri, global.create_app_launch_context(0, -1));
+        Gio.app_info_launch_default_for_uri(uri, global.create_app_launch_context());
        this._lookingGlass.close();
    },

    _onWebPage: function (actor) {
        let extension = actor._extension;
-        Gio.app_info_launch_default_for_uri(extension.metadata.url, global.create_app_launch_context(0, -1));
+        Gio.app_info_launch_default_for_uri(extension.metadata.url, global.create_app_launch_context());
        this._lookingGlass.close();
    },

@ -843,10 +841,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;
        }));

--- 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.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
@ -9,7 +9,6 @@ const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const GSystem = imports.gi.GSystem;

 const Components = imports.ui.components;
 const CtrlAltTab = imports.ui.ctrlAltTab;
@ -44,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;
@ -57,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;
@ -105,6 +103,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); });

@ -157,7 +158,7 @@ function _initializeUI() {
    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();
@ -190,6 +191,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");
@ -213,12 +216,6 @@ function _initializeUI() {
                              if (screenShield) {
                                  screenShield.lockIfWasLocked();
                              }
-                              if (LoginManager.haveSystemd() && sessionMode.currentMode === 'user') {
-                                  GSystem.log_structured_print('GNOME Shell started at ' + _startDate,
-                                                               ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
-                              } else {
-                                  log('GNOME Shell started at ' + _startDate);
-                              }
                          });
 }

@ -614,6 +611,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
@ -19,6 +19,7 @@ const BoxPointer = imports.ui.boxpointer;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const GnomeSession = imports.misc.gnomeSession;
 const GrabHelper = imports.ui.grabHelper;
+const Hash = imports.misc.hash;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const PointerWatcher = imports.ui.pointerWatcher;
@ -203,7 +204,7 @@ const URLHighlighter = new Lang.Class({
                if (url.indexOf(':') == -1)
                    url = 'http://' + url;

-                Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context(0, -1));
+                Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
                return Clutter.EVENT_STOP;
            }
            return Clutter.EVENT_PROPAGATE;
@ -1001,9 +1002,6 @@ const Notification = new Lang.Class({
            Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
                           Lang.bind(this,
                                     function() {
-                                         if (this._destroyed)
-                                             return false;
-
                                        if (this._canExpandContent()) {
                                            this._addBannerBody();
                                            this._table.add_style_class_name('multi-line-notification');
@ -1162,12 +1160,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 +1209,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 +1231,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 +1351,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;
@ -1915,7 +1899,7 @@ const MessageTray = new Lang.Class({
                              Shell.KeyBindingMode.OVERVIEW,
                              Lang.bind(this, this._expandActiveNotification));

-        this._sources = new Map();
+        this._sources = new Hash.Map();
        this._chatSummaryItemsCount = 0;

        this._trayDwellTimeoutId = 0;
@ -1952,7 +1936,7 @@ const MessageTray = new Lang.Class({
    },

    _updateNoMessagesLabel: function() {
-        this._noMessages.visible = this._sources.size == 0;
+        this._noMessages.visible = this._sources.size() == 0;
    },

    _sessionUpdated: function() {
@ -1987,7 +1971,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 +2011,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();
@ -2121,8 +2099,7 @@ const MessageTray = new Lang.Class({
    },

    _removeSource: function(source) {
-        let obj = this._sources.get(source);
-        this._sources.delete(source);
+        let [, obj] = this._sources.delete(source);
        let summaryItem = obj.summaryItem;

        if (source.isChat)
@ -2143,7 +2120,7 @@ const MessageTray = new Lang.Class({
    },

    getSources: function() {
-        return [k for (k of this._sources.keys())];
+        return this._sources.keys();
    },

    _onSourceEnableChanged: function(policy, source) {
@ -2317,7 +2294,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 +2329,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 +2381,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 +2442,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) {
@ -2671,12 +2642,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 +2764,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.uiGroup,
                                        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 });
@ -88,8 +89,7 @@ const ModalDialog = new Lang.Class({

        if (!this._shellReactive) {
            this._lightbox = new Lightbox.Lightbox(this._group,
-                                                   { inhibitEvents: true,
-                                                     radialEffect: true });
+                                                   { inhibitEvents: true });
            this._lightbox.highlight(this._backgroundBin);

            this._eventBlocker = new Clutter.Actor({ reactive: true });
--- 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
@ -66,24 +66,20 @@ const LevelBar = new Lang.Class({
        cr.arc(radius, h - radius, radius, 0.5 * Math.PI, Math.PI);
        cr.arc(radius, radius, radius, Math.PI, 1.5 * Math.PI);
        cr.fill();
-        cr.$dispose();
    }
 });

 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,6 +108,7 @@ const OsdWindow = new Lang.Class({
        Main.layoutManager.connect('monitors-changed',
                                   Lang.bind(this, this._monitorsChanged));
        this._monitorsChanged();
+
        Main.uiGroup.add_child(this.actor);
    },

@ -127,15 +124,13 @@ const OsdWindow = new Lang.Class({

    setLevel: function(level) {
        this._level.actor.visible = (level != undefined);
-        if (level != undefined) {
-            if (this.actor.visible)
-                Tweener.addTween(this._level,
-                                 { level: level,
-                                   time: LEVEL_ANIMATION_TIME,
-                                   transition: 'easeOutQuad' });
-            else
-                this._level.level = level;
-        }
+        if (this.actor.visible)
+            Tweener.addTween(this._level,
+                             { level: level,
+                               time: LEVEL_ANIMATION_TIME,
+                               transition: 'easeOutQuad' });
+        else
+            this._level.level = level;
    },

    show: function() {
@ -158,7 +153,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,16 +185,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];
+        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();
    },

@ -216,60 +214,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;
@ -132,7 +131,7 @@ const Overview = new Lang.Class({
        Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
        this._bgManagers = [];

-        this._desktopFade = new St.Widget();
+        this._desktopFade = new St.Bin();
        Main.layoutManager.overviewGroup.add_child(this._desktopFade);

        this._activationTime = 0;
@ -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.child)
+            this._desktopFade.child = this._getDesktopClone();

        this._desktopFade.opacity = 255;
        this._desktopFade.show();
--- 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 {
@ -830,31 +825,24 @@ const AggregateMenu = new Lang.Class({
        this._brightness = new imports.ui.status.brightness.Indicator();
        this._system = new imports.ui.status.system.Indicator();
        this._screencast = new imports.ui.status.screencast.Indicator();
-        this._location = new imports.ui.status.location.Indicator();

        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());
--- 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');
    },

@ -879,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() {
@ -894,7 +883,7 @@ const PopupSubMenu = new Lang.Class({
                               }
                             });
        } else {
-            this._arrow.rotation_angle_z = this.actor._arrowRotation + 90;
+            this._arrow.rotation_angle_z = 90;
        }
    },

@ -912,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() {
@ -928,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();
        }
    },
@ -1000,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/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@ -283,7 +283,7 @@ const RemoteSearchProvider = new Lang.Class({
        // the provider is not compatible with the new version of the interface, launch
        // the app itself but warn so we can catch the error in logs
        log('Search provider ' + this.appInfo.get_id() + ' does not implement LaunchSearch');
-        this.appInfo.launch([], global.create_app_launch_context(0, -1));
+        this.appInfo.launch([], global.create_app_launch_context());
    }
 });

--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -233,7 +233,7 @@ const RunDialog = new Lang.Class({
                    let file = Gio.file_new_for_path(path);
                    try {
                        Gio.app_info_launch_default_for_uri(file.get_uri(),
-                                                            global.create_app_launch_context(0, -1));
+                                                            global.create_app_launch_context());
                    } catch (e) {
                        // The exception from gjs contains an error string like:
                        //     Error invoking Gio.app_info_launch_default_for_uri: No application
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -17,6 +17,7 @@ const TweenerEquations = imports.tweener.equations;

 const Background = imports.ui.background;
 const GnomeSession = imports.misc.gnomeSession;
+const Hash = imports.misc.hash;
 const Layout = imports.ui.layout;
 const OVirt = imports.gdm.oVirt;
 const LoginManager = imports.misc.loginManager;
@ -114,7 +115,7 @@ const NotificationsBox = new Lang.Class({
        this.actor.add(this._musicBin);
        this.actor.add(this._scrollView, { x_fill: true, x_align: St.Align.START });

-        this._sources = new Map();
+        this._sources = new Hash.Map();
        Main.messageTray.getSources().forEach(Lang.bind(this, function(source) {
            this._sourceAdded(Main.messageTray, source, true);
        }));
@ -129,8 +130,9 @@ const NotificationsBox = new Lang.Class({
            this._sourceAddedId = 0;
        }

-        let items = this._sources.entries();
-        for (let [source, obj] of items) {
+        let items = this._sources.items();
+        for (let i = 0; i < items.length; i++) {
+            let [source, obj] = items[i];
            this._removeSource(source, obj);
        }

@ -301,7 +303,7 @@ const NotificationsBox = new Lang.Class({
                             });

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

@ -327,7 +329,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 +344,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 +382,6 @@ const NotificationsBox = new Lang.Class({
        this._sources.delete(source);
    },
 });
-Signals.addSignalMethods(NotificationsBox.prototype);

 const Arrow = new Lang.Class({
    Name: 'Arrow',
@ -414,7 +415,6 @@ const Arrow = new Lang.Class({
        cr.lineTo(w/2, thickness);
        cr.lineTo(w - thickness / 2, h - thickness / 2);
        cr.stroke();
-        cr.$dispose();
    },

    vfunc_style_changed: function() {
@ -537,7 +537,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);
                                       }));
@ -729,7 +729,7 @@ const ScreenShield = new Lang.Class({
        } else {
            this._inhibitSuspend();

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

@ -850,7 +850,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);
@ -1042,7 +1041,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();
        }

@ -1110,11 +1108,10 @@ const ScreenShield = new Lang.Class({
        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 +1152,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 +1159,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;
        }
--- a/js/ui/screencast.js
+++ b/js/ui/screencast.js
@ -6,6 +6,7 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;

+const Hash = imports.misc.hash;
 const Main = imports.ui.main;

 const ScreencastIface = '<node> \
@ -41,13 +42,13 @@ const ScreencastService = new Lang.Class({

        Gio.DBus.session.own_name('org.gnome.Shell.Screencast', Gio.BusNameOwnerFlags.REPLACE, null, null);

-        this._recorders = new Map();
+        this._recorders = new Hash.Map();

        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
    },

    get isRecording() {
-        return this._recorders.size > 0;
+        return this._recorders.size() > 0;
    },

    _ensureRecorderForSender: function(sender) {
@ -68,7 +69,8 @@ const ScreencastService = new Lang.Class({
        if (Main.sessionMode.allowScreencast)
            return;

-        this._recorders.clear();
+        for (let sender in this._recorders.keys())
+            this._recorders.delete(sender);
        this.emit('updated');
    },

--- 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();

@ -150,12 +148,12 @@ const SelectArea = new Lang.Class({
                                      y: 0 });
        Main.uiGroup.add_actor(this._group);

-        this._grabHelper = new GrabHelper.GrabHelper(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);
--- 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
@ -10,6 +10,7 @@ const Config = imports.misc.config;
 const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionDownloader = imports.ui.extensionDownloader;
 const ExtensionUtils = imports.misc.extensionUtils;
+const Hash = imports.misc.hash;
 const Main = imports.ui.main;
 const Screenshot = imports.ui.screenshot;
 const ViewSelector = imports.ui.viewSelector;
@ -69,7 +70,6 @@ const ScreenSaverIface = '<node> \
 <signal name="ActiveChanged"> \
    <arg name="new_value" type="b" /> \
 </signal> \
-<signal name="WakeUpScreen" /> \
 </interface> \
 </node>';

@ -83,8 +83,8 @@ const GnomeShell = new Lang.Class({
        this._extensionsService = new GnomeShellExtensions();
        this._screenshotService = new Screenshot.ScreenshotService();

-        this._grabbedAccelerators = new Map();
-        this._grabbers = new Map();
+        this._grabbedAccelerators = new Hash.Map();
+        this._grabbers = new Hash.Map();

        global.display.connect('accelerator-activated', Lang.bind(this,
            function(display, action, deviceid, timestamp) {
@ -141,7 +141,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) {
@ -223,8 +228,9 @@ const GnomeShell = new Lang.Class({
    },

    _onGrabberBusNameVanished: function(connection, name) {
-        let grabs = this._grabbedAccelerators.entries();
-        for (let [action, sender] of grabs) {
+        let grabs = this._grabbedAccelerators.items();
+        for (let i = 0; i < grabs.length; i++) {
+            let [action, sender] = grabs[i];
            if (sender == name)
                this._ungrabAccelerator(action);
        }
@ -367,10 +373,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 +407,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/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
@ -341,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,201 +0,0 @@
-// -*- 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,
-
-    _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._watchId = Gio.bus_watch_name(Gio.BusType.SYSTEM,
-                                           'org.freedesktop.GeoClue2',
-                                           0,
-                                           Lang.bind(this, this._connectToGeoclue),
-                                           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() {
-        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;
-
-        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);
-    },
-
-    _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;
-    }
-});
-
-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,22 +9,19 @@ 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 Hash = imports.misc.hash;
 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 = {
    INVALID: 'invalid',
-    WIRED: 'wired',
    WIRELESS: 'wireless',
    WWAN: 'wwan',
    VPN: 'vpn'
@ -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) {
@ -197,15 +176,15 @@ const NMConnectionSection = new Lang.Class({
    _init: function(client) {
        this._client = client;

-        this._connectionItems = new Map();
+        this._connectionItems = new Hash.Map();
        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));
    },
@ -215,9 +194,9 @@ const NMConnectionSection = new Lang.Class({
    },

    _sync: function() {
-        let nItems = this._connectionItems.size;
+        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,19 @@ const NMConnectionSection = new Lang.Class({
            this.item.label.text = '';
    },

-    _getMenuIcon: function() {
-        return this.getIndicatorIcon();
+    _getStatus: function() {
+        let values = this._connectionItems.values();
+        for (let i = 0; i < values.length; i++) {
+            let item = values[i];
+            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 +231,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 +245,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 +262,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,24 +293,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);
-    },
-
    destroy: function() {
        if (this._stateChangedId) {
            GObject.Object.prototype.disconnect.call(this._device, this._stateChangedId);
@ -345,7 +305,7 @@ const NMConnectionDevice = new Lang.Class({
        }
        if (this._activeConnectionChangedId) {
            GObject.Object.prototype.disconnect.call(this._device, this._activeConnectionChangedId);
-            this._activeConnectionChangedId = 0;
+            this._stateChangedId = 0;
        }

        this.parent();
@ -405,9 +365,8 @@ const NMConnectionDevice = new Lang.Class({
    },

    _sync: function() {
-        let nItems = this._connectionItems.size;
+        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 +378,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 +401,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';
@ -456,48 +415,6 @@ const NMConnectionDevice = new Lang.Class({
    },
 });

-const NMDeviceWired = new Lang.Class({
-    Name: 'NMDeviceWired',
-    Extends: NMConnectionDevice,
-    category: NMConnectionCategory.WIRED,
-
-    _init: function(client, device, settings) {
-        this.parent(client, device, settings);
-
-        this.item.menu.addMenuItem(createSettingsAction(_("Wired Settings"), device));
-    },
-
-    _hasCarrier: function() {
-        if (this._device instanceof NMClient.DeviceEthernet)
-            return this._device.carrier;
-        else
-            return true;
-    },
-
-    _sync: function() {
-        this.item.actor.visible = this._hasCarrier();
-        this.parent();
-    },
-
-    getIndicatorIcon: function() {
-        if (this._device.active_connection) {
-            let state = this._device.active_connection.state;
-
-            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
-            return 'network-wired-disconnected-symbolic';
-    }
-});
-
 const NMDeviceModem = new Lang.Class({
    Name: 'NMDeviceModem',
    Extends: NMConnectionDevice,
@ -560,20 +477,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 +512,33 @@ const NMDeviceBluetooth = new Lang.Class({
        this.item.menu.addMenuItem(createSettingsAction(_("Mobile Broadband Settings"), device));
    },

-    _getDescription: function() {
-        return this._device.name;
+    _autoConnect: function() {
+        // FIXME: DUN devices are configured like modems, so
+        // We need to spawn the mobile wizard
+        // but the network panel doesn't support bluetooth at the moment
+        // so we just create an empty connection and hope
+        // that this phone supports PAN
+
+        let connection = new NetworkManager.Connection();
+        this._client.add_and_activate_connection(connection, this._device, null, null);
+        return true;
    },

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

@ -685,13 +617,6 @@ const NMWirelessDialog = new Lang.Class({
        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();

@ -713,12 +638,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 +653,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 +674,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 +714,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 });

@ -887,11 +735,16 @@ const NMWirelessDialog = new Lang.Class({

    _connect: function() {
        let network = this._selectedNetwork;
+        let accessPoints = network.accessPoints;
        if (network.connections.length > 0) {
            let connection = network.connections[0];
-            this._client.activate_connection(connection, this._device, null, null);
+            for (let i = 0; i < accessPoints.length; i++) {
+                if (accessPoints[i].connection_valid(connection)) {
+                    this._client.activate_connection(connection, this._device, accessPoints[i].dbus_path, null);
+                    break;
+                }
+            }
        } else {
-            let accessPoints = network.accessPoints;
            if ((accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)
                || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
                // 802.1x-enabled APs require further configuration, so they're
@ -1063,7 +916,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 +931,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() {
@ -1170,10 +1023,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();
    },
@ -1247,12 +1096,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 +1115,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 +1144,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 +1213,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;
+        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';
    },
@ -1477,10 +1239,9 @@ const NMVPNSection = new Lang.Class({
    },

    setActiveConnections: function(vpnConnections) {
-        let connections = this._connectionItems.values();
-        for (let item of connections) {
+        this._connectionItems.values().forEach(function(item) {
            item.setActiveConnection(null);
-        }
+        });
        vpnConnections.forEach(Lang.bind(this, function(a) {
            let item = this._connectionItems.get(a._connection.get_uuid());
            item.setActiveConnection(a);
@ -1493,7 +1254,8 @@ const NMVPNSection = new Lang.Class({

    getIndicatorIcon: function() {
        let items = this._connectionItems.values();
-        for (let item of items) {
+        for (let i = 0; i < items.length; i++) {
+            let item = items[i];
            let icon = item.getIndicatorIcon();
            if (icon)
                return icon;
@ -1515,7 +1277,6 @@ const NMApplet = new Lang.Class({

        // Device types
        this._dtypes = { };
-        this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
        this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
        this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
        this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
@ -1523,7 +1284,6 @@ const NMApplet = new Lang.Class({

        // Connection types
        this._ctypes = { };
-        this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
        this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS;
        this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN;
        this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
@ -1546,15 +1306,6 @@ const NMApplet = new Lang.Class({
        this._tryLateInit();
    },

-    _createDeviceCategory: function() {
-        let category = {
-            section: new PopupMenu.PopupMenuSection(),
-            devices: [ ],
-        };
-        this.menu.addMenuItem(category.section);
-        return category;
-    },
-
    _tryLateInit: function() {
        if (!this._client || !this._settings)
            return;
@ -1570,9 +1321,17 @@ const NMApplet = new Lang.Class({
        this._nmDevices = [];
        this._devices = { };

-        this._devices.wired = this._createDeviceCategory();
-        this._devices.wireless = this._createDeviceCategory();
-        this._devices.wwan = this._createDeviceCategory();
+        this._devices.wireless = {
+            section: new PopupMenu.PopupMenuSection(),
+            devices: [ ],
+        };
+        this.menu.addMenuItem(this._devices.wireless.section);
+
+        this._devices.wwan = {
+            section: new PopupMenu.PopupMenuSection(),
+            devices: [ ],
+        };
+        this.menu.addMenuItem(this._devices.wwan.section);

        this._vpnSection = new NMVPNSection(this._client);
        this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
@ -1842,6 +1601,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 +1626,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,7 +2,6 @@

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

 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@ -13,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,
@ -69,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';
@ -82,26 +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);
    },

    _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/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@ -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;
    },

@ -251,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() {
@ -454,9 +452,10 @@ const SwitcherList = new Lang.Class({
                           time: POPUP_SCROLL_TIME,
                           transition: 'easeOutQuad',
                           onComplete: Lang.bind(this, function () {
-                                if (this._highlighted == 0)
+                                if (this._highlighted == 0) {
                                    this._scrollableLeft = false;
-                                this.actor.queue_relayout();
+                                    this.actor.queue_relayout();
+                                }
                           })
                          });
    },
@ -478,9 +477,10 @@ const SwitcherList = new Lang.Class({
                           time: POPUP_SCROLL_TIME,
                           transition: 'easeOutQuad',
                           onComplete: Lang.bind(this, function () {
-                                if (this._highlighted == this._items.length - 1)
+                                if (this._highlighted == this._items.length - 1) {
                                    this._scrollableRight = false;
-                                this.actor.queue_relayout();
+                                    this.actor.queue_relayout();
+                                }
                            })
                          });
    },
@ -515,7 +515,7 @@ const SwitcherList = new Lang.Class({
    _getPreferredWidth: function (actor, forHeight, alloc) {
        let [maxChildMin, maxChildNat] = this._maxChildWidth(forHeight);

-        let totalSpacing = Math.max(this._list.spacing * (this._items.length - 1), 0);
+        let totalSpacing = this._list.spacing * (this._items.length - 1);
        alloc.min_size = this._items.length * maxChildMin + totalSpacing;
        alloc.natural_size = alloc.min_size;
        this._minSize = alloc.min_size;
@ -545,7 +545,7 @@ const SwitcherList = new Lang.Class({
        let childHeight = box.y2 - box.y1;

        let [maxChildMin, maxChildNat] = this._maxChildWidth(childHeight);
-        let totalSpacing = Math.max(this._list.spacing * (this._items.length - 1), 0);
+        let totalSpacing = this._list.spacing * (this._items.length - 1);

        let childWidth = Math.floor(Math.max(0, box.x2 - box.x1 - totalSpacing) / this._items.length);

--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -187,6 +187,7 @@ const ViewSelector = new Lang.Class({
        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,7 +212,7 @@ 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,
@ -282,14 +283,6 @@ const ViewSelector = new Lang.Class({
            return Clutter.EVENT_STOP;
        } else if (this._shouldTriggerSearch(symbol)) {
            this.startSearch(event);
-        } else if (!this._searchActive) {
-            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;
    },
@ -383,11 +376,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);
@ -484,6 +475,13 @@ const ViewSelector = new Lang.Class({
            return ViewPage.SEARCH;
    },

+    setActivePage: function(page) {
+        if (page == ViewPage.WINDOWS)
+            this._showPage(this._workspacesPage);
+        else
+            this._showPage(this._appsPage);
+    },
+
    fadeIn: function() {
        let actor = this._activePage;
        Tweener.addTween(actor, { opacity: 255,
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@ -16,7 +16,7 @@ const WindowAttentionHandler = new Lang.Class({

    _getTitleAndBanner: function(app, window) {
        let title = app.get_name();
-        let banner = _("“%s” is ready").format(window.get_title());
+        let banner = _("'%s' is ready").format(window.get_title());
        return [title, banner]
    },

--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -82,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) {
@ -192,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));
@ -234,13 +232,12 @@ const WorkspaceTracker = new Lang.Class({

        let windows = global.get_window_actors();
        for (i = 0; i < windows.length; i++) {
-            let actor = windows[i];
-            let win = actor.get_meta_window();
+            let win = windows[i];

-            if (win.is_on_all_workspaces())
+            if (win.get_meta_window().is_on_all_workspaces())
                continue;

-            let workspaceIndex = win.get_workspace().index();
+            let workspaceIndex = win.get_workspace();
            emptyWorkspaces[workspaceIndex] = false;
        }

@ -251,7 +248,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--) {
@ -259,6 +262,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;
    },
@ -272,20 +280,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) {
@ -361,93 +367,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',

@ -478,8 +397,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('minimize', Lang.bind(this, this._minimizeWindow));
        this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
        this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
@ -489,8 +406,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,
@ -507,10 +422,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,
@ -611,9 +522,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));
@ -647,12 +555,6 @@ const WindowManager = new Lang.Class({
                                        Shell.KeyBindingMode.LOGIN_SCREEN,
                                        Lang.bind(this, this._startA11ySwitcher));

-        this.addKeybinding('pause-resume-tweens',
-                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                           Meta.KeyBindingFlags.NONE,
-                           Shell.KeyBindingMode.ALL,
-                           Lang.bind(this, this._toggleTweens));
-
        this.addKeybinding('open-application-menu',
                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                           Meta.KeyBindingFlags.NONE,
@ -840,13 +742,15 @@ const WindowManager = new Lang.Class({
        if (shouldDim && !window._dimmed) {
            window._dimmed = true;
            this._dimmedWindows.push(window);
-            this._dimWindow(window);
+            if (!Main.overview.visible)
+                this._dimWindow(window);
        } else if (!shouldDim && window._dimmed) {
            window._dimmed = false;
            this._dimmedWindows = this._dimmedWindows.filter(function(win) {
                                                                 return win != window;
                                                             });
-            this._undimWindow(window);
+            if (!Main.overview.visible)
+                this._undimWindow(window);
        }
    },

@ -1071,29 +975,25 @@ const WindowManager = new Lang.Class({
        wgroup.add_actor(switchData.movingWindowBin);

        for (let i = 0; i < windows.length; i++) {
-            let actor = windows[i];
-            let window = actor.get_meta_window();
+            let window = windows[i];

-            if (!window.showing_on_its_workspace())
+            if (!window.meta_window.showing_on_its_workspace())
                continue;

-            if (window.is_on_all_workspaces())
-                continue;
-
-            let record = { window: actor,
-                           parent: actor.get_parent() };
-
-            if (this._movingWindow && window == this._movingWindow) {
-                switchData.movingWindow = record;
+            if (this._movingWindow && window.meta_window == this._movingWindow) {
+                switchData.movingWindow = { window: window,
+                                            parent: window.get_parent() };
                switchData.windows.push(switchData.movingWindow);
-                actor.reparent(switchData.movingWindowBin);
-            } else if (window.get_workspace().index() == from) {
-                switchData.windows.push(record);
-                actor.reparent(switchData.outGroup);
-            } else if (window.get_workspace().index() == to) {
-                switchData.windows.push(record);
-                actor.reparent(switchData.inGroup);
-                actor.show();
+                window.reparent(switchData.movingWindowBin);
+            } else if (window.get_workspace() == from) {
+                switchData.windows.push({ window: window,
+                                          parent: window.get_parent() });
+                window.reparent(switchData.outGroup);
+            } else if (window.get_workspace() == to) {
+                switchData.windows.push({ window: window,
+                                          parent: window.get_parent() });
+                window.reparent(switchData.inGroup);
+                window.show();
            }
        }

@ -1147,18 +1047,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();
-    },
-
    _startAppSwitcher : function(display, screen, window, binding) {
        /* prevent a corner case where both popups show up at once */
        if (this._workspaceSwitcherPopup != null)
@ -1195,15 +1083,6 @@ const WindowManager = new Lang.Class({
        Main.panel.toggleAppMenu();
    },

-    _toggleTweens: function() {
-        this._tweensPaused = !this._tweensPaused;
-        const OrigTweener = imports.tweener.tweener;
-        if (this._tweensPaused)
-            OrigTweener.pauseAllTweens();
-        else
-            OrigTweener.resumeAllTweens();
-    },
-
    _showWorkspaceSwitcher : function(display, screen, window, binding) {
        if (!Main.sessionMode.hasWorkspaces)
            return;
@ -1215,10 +1094,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/workspace.js
+++ b/js/ui/workspace.js
@ -8,15 +8,12 @@ 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;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const Tweener = imports.ui.tweener;
-const WindowManager = imports.ui.windowManager;

 const WINDOW_DND_SIZE = 256;

@ -38,68 +35,6 @@ function _interpolate(start, end, step) {
    return start + (end - start) * step;
 }

-const WindowCloneLayout = new Lang.Class({
-    Name: 'WindowCloneLayout',
-    Extends: Clutter.LayoutManager,
-
-    _init: function(boundingBox) {
-        this.parent();
-
-        this._boundingBox = boundingBox;
-    },
-
-    get boundingBox() {
-        return this._boundingBox;
-    },
-
-    set boundingBox(b) {
-        this._boundingBox = b;
-        this.layout_changed();
-    },
-
-    _makeBoxForWindow: function(window) {
-        // We need to adjust the position of the actor because of the
-        // consequences of invisible borders -- in reality, the texture
-        // has an extra set of "padding" around it that we need to trim
-        // down.
-
-        // The outer rect (from which we compute the bounding box)
-        // paradoxically is the smaller rectangle, containing the positions
-        // of the visible frame. The input rect contains everything,
-        // including the invisible border padding.
-        let inputRect = window.get_input_rect();
-
-        let box = new Clutter.ActorBox();
-
-        box.set_origin(inputRect.x - this._boundingBox.x,
-                       inputRect.y - this._boundingBox.y);
-        box.set_size(inputRect.width, inputRect.height);
-
-        return box;
-    },
-
-    vfunc_get_preferred_height: function(container, forWidth) {
-        return [this._boundingBox.height, this._boundingBox.height];
-    },
-
-    vfunc_get_preferred_width: function(container, forHeight) {
-        return [this._boundingBox.width, this._boundingBox.width];
-    },
-
-    vfunc_allocate: function(container, box, flags) {
-        let clone = container.get_children().forEach(function (child) {
-            let realWindow;
-            if (child == container._delegate._windowClone)
-                realWindow = container._delegate.realWindow;
-            else
-                realWindow = child.source;
-
-            child.allocate(this._makeBoxForWindow(realWindow.meta_window),
-                           flags);
-        }, this);
-    },
-});
-
 const WindowClone = new Lang.Class({
    Name: 'WindowClone',

@ -109,7 +44,10 @@ const WindowClone = new Lang.Class({
        this.metaWindow._delegate = this;
        this._workspace = workspace;

-        this._windowClone = new Clutter.Clone({ source: realWindow.get_texture() });
+        let [borderX, borderY] = this._getInvisibleBorderPadding();
+        this._windowClone = new Clutter.Clone({ source: realWindow.get_texture(),
+                                                x: -borderX,
+                                                y: -borderY });
        // We expect this.actor to be used for all interaction rather than
        // this._windowClone; as the former is reactive and the latter
        // is not, this just works for most cases. However, for DND all
@ -117,14 +55,21 @@ const WindowClone = new Lang.Class({
        // To avoid this, we hide it from pick.
        Shell.util_set_hidden_from_pick(this._windowClone, true);

+        this.origX = realWindow.x + borderX;
+        this.origY = realWindow.y + borderY;
+
+        let outerRect = realWindow.meta_window.get_outer_rect();
+
        // The MetaShapedTexture that we clone has a size that includes
        // the invisible border; this is inconvenient; rather than trying
        // to compensate all over the place we insert a ClutterActor into
        // 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() });
+                                     x: this.origX,
+                                     y: this.origY,
+                                     width: outerRect.width,
+                                     height: outerRect.height });

        this.actor.add_child(this._windowClone);

@ -134,19 +79,10 @@ const WindowClone = new Lang.Class({
        this._dragSlot = [0, 0, 0, 0];
        this._stackAbove = null;

-        this._windowClone._updateId = this.metaWindow.connect('size-changed',
+        this._sizeChangedId = 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
-            // This will ensure that we never see it in the _disconnectSignals loop
-            this._windowClone.destroy();
-            this.destroy();
-        }));
-
-        this._updateAttachedDialogs();
-        this._computeBoundingBox();
-        this.actor.x = this._boundingBox.x;
-        this.actor.y = this._boundingBox.y;
+        this._realWindowDestroyId = this.realWindow.connect('destroy',
+            Lang.bind(this, this._disconnectRealWindowSignals));

        let clickAction = new Clutter.ClickAction();
        clickAction.connect('clicked', Lang.bind(this, this._onClicked));
@ -180,83 +116,6 @@ const WindowClone = new Lang.Class({
            return this._slot;
    },

-    deleteAll: function() {
-        // Delete all windows, starting from the bottom-most (most-modal) one
-
-        let windows = this.actor.get_children();
-        for (let i = windows.length - 1; i >= 1; i--) {
-            let realWindow = windows[i].source;
-            let metaWindow = realWindow.meta_window;
-
-            metaWindow.delete(global.get_current_time());
-        }
-
-        this.metaWindow.delete(global.get_current_time());
-    },
-
-    addAttachedDialog: function(win) {
-        this._doAddAttachedDialog(win, win.get_compositor_private());
-        this._computeBoundingBox();
-        this.emit('size-changed');
-    },
-
-    _doAddAttachedDialog: function(metaWin, realWin) {
-        let clone = new Clutter.Clone({ source: realWin });
-        clone._updateId = metaWin.connect('size-changed', Lang.bind(this, function() {
-            this._computeBoundingBox();
-            this.emit('size-changed');
-        }));
-        clone._destroyId = realWin.connect('destroy', Lang.bind(this, function() {
-            clone.destroy();
-
-            this._computeBoundingBox();
-            this.emit('size-changed');
-        }));
-        this.actor.add_child(clone);
-    },
-
-    _updateAttachedDialogs: function() {
-        let iter = Lang.bind(this, function(win) {
-            let actor = win.get_compositor_private();
-
-            if (!actor)
-                return false;
-            if (!win.is_attached_dialog())
-                return false;
-
-            this._doAddAttachedDialog(win, actor);
-            win.foreach_transient(iter);
-            return true;
-        });
-        this.metaWindow.foreach_transient(iter);
-    },
-
-    get boundingBox() {
-        return this._boundingBox;
-    },
-
-    getOriginalPosition: function() {
-        return [this._boundingBox.x, this._boundingBox.y];
-    },
-
-    _computeBoundingBox: function() {
-        let rect = this.metaWindow.get_outer_rect();
-
-        this.actor.get_children().forEach(function (child) {
-            let realWindow;
-            if (child == this._windowClone)
-                realWindow = this.realWindow;
-            else
-                realWindow = child.source;
-
-            let metaWindow = realWindow.meta_window;
-            rect = rect.union(metaWindow.get_outer_rect());
-        }, this);
-
-        this._boundingBox = rect;
-        this.actor.layout_manager.boundingBox = rect;
-    },
-
    // Find the actor just below us, respecting reparenting done
    // by DND code
    getActualStackAbove: function() {
@ -290,26 +149,44 @@ const WindowClone = new Lang.Class({
        this.actor.destroy();
    },

-    _disconnectSignals: function() {
-        this.actor.get_children().forEach(Lang.bind(this, function (child) {
-            let realWindow;
-            if (child == this._windowClone)
-                realWindow = this.realWindow;
-            else
-                realWindow = child.source;
+    _disconnectRealWindowSignals: function() {
+        if (this._sizeChangedId > 0)
+            this.realWindow.disconnect(this._sizeChangedId);
+        this._sizeChangedId = 0;

-            realWindow.meta_window.disconnect(child._updateId);
-            realWindow.disconnect(child._destroyId);
-        }));
+        if (this._realWindowDestroyId > 0)
+            this.realWindow.disconnect(this._realWindowDestroyId);
+        this._realWindowDestroyId = 0;
+    },
+
+    _getInvisibleBorderPadding: function() {
+        // We need to adjust the position of the actor because of the
+        // consequences of invisible borders -- in reality, the texture
+        // has an extra set of "padding" around it that we need to trim
+        // down.
+
+        // The outer rect paradoxically is the smaller rectangle,
+        // containing the positions of the visible frame. The input
+        // rect contains everything, including the invisible border
+        // padding.
+        let outerRect = this.metaWindow.get_outer_rect();
+        let inputRect = this.metaWindow.get_input_rect();
+        let [borderX, borderY] = [outerRect.x - inputRect.x,
+                                  outerRect.y - inputRect.y];
+
+        return [borderX, borderY];
    },

    _onRealWindowSizeChanged: function() {
-        this._computeBoundingBox();
+        let [borderX, borderY] = this._getInvisibleBorderPadding();
+        let outerRect = this.metaWindow.get_outer_rect();
+        this.actor.set_size(outerRect.width, outerRect.height);
+        this._windowClone.set_position(-borderX, -borderY);
        this.emit('size-changed');
    },

    _onDestroy: function() {
-        this._disconnectSignals();
+        this._disconnectRealWindowSignals();

        this.metaWindow._delegate = null;
        this.actor._delegate = null;
@ -427,7 +304,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) {
@ -578,7 +454,7 @@ const WindowOverlay = new Lang.Class({
                                                      Lang.bind(this,
                                                                this._onWindowAdded));

-        this._windowClone.deleteAll();
+        metaWindow.delete(global.get_current_time());
    },

    _windowCanClose: function() {
@ -594,12 +470,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 +545,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 +1294,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 +1305,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;
        }

@ -1450,29 +1321,9 @@ const Workspace = new Lang.Class({
        if (this._lookupIndex (metaWin) != -1)
            return;

-        if (!this._isMyWindow(win))
+        if (!this._isMyWindow(win) || !this._isOverviewWindow(win))
            return;

-        if (!this._isOverviewWindow(win)) {
-            if (metaWin.is_attached_dialog()) {
-                let parent = metaWin.get_transient_for();
-                while (parent.is_attached_dialog())
-                    parent = metaWin.get_transient_for();
-
-                let idx = this._lookupIndex (parent);
-                if (idx < 0) {
-                    // parent was not created yet, it will take care
-                    // of the dialog when created
-                    return;
-                }
-
-                let clone = this._windows[idx];
-                clone.addAttachedDialog(metaWin);
-            }
-
-            return;
-        }
-
        let [clone, overlay] = this._addWindowClone(win, false);

        if (win._overviewHint) {
@ -1560,11 +1411,9 @@ const Workspace = new Lang.Class({
                overlay.hide();

            if (clone.metaWindow.showing_on_its_workspace()) {
-                let [origX, origY] = clone.getOriginalPosition();
-
                Tweener.addTween(clone.actor,
-                                 { x: origX,
-                                   y: origY,
+                                 { x: clone.origX,
+                                   y: clone.origY,
                                   scale_x: 1.0,
                                   scale_y: 1.0,
                                   time: Overview.ANIMATION_TIME,
@ -1628,7 +1477,8 @@ const Workspace = new Lang.Class({

    // Tests if @win should be shown in the Overview
    _isOverviewWindow : function (win) {
-        return !win.get_meta_window().skip_taskbar;
+        let tracker = Shell.WindowTracker.get_default();
+        return tracker.is_window_interesting(win.get_meta_window());
    },

    // Create a clone of a (non-desktop) window and add it to the window list
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -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
@ -14,7 +14,6 @@ const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
-const WindowManager = imports.ui.windowManager;
 const Workspace = imports.ui.workspace;
 const WorkspacesView = imports.ui.workspacesView;

@ -33,49 +32,20 @@ const WORKSPACE_KEEP_ALIVE_TIME = 100;

 const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';

-/* A layout manager that requests size only for primary_actor, but then allocates
-   all using a fixed layout */
-const PrimaryActorLayout = new Lang.Class({
-    Name: 'PrimaryActorLayout',
-    Extends: Clutter.FixedLayout,
-
-    _init: function(primaryActor) {
-        this.parent();
-
-        this.primaryActor = primaryActor;
-    },
-
-    vfunc_get_preferred_width: function(forHeight) {
-        return this.primaryActor.get_preferred_width(forHeight);
-    },
-
-    vfunc_get_preferred_height: function(forWidth) {
-        return this.primaryActor.get_preferred_height(forWidth);
-    },
-});
-
 const WindowClone = new Lang.Class({
    Name: 'WindowClone',

    _init : function(realWindow) {
-        this.clone = new Clutter.Clone({ source: realWindow });
-
-        /* Can't use a Shell.GenericContainer because of DND and reparenting... */
-        this.actor = new Clutter.Actor({ layout_manager: new PrimaryActorLayout(this.clone),
+        this.actor = new Clutter.Clone({ source: realWindow.get_texture(),
                                         reactive: true });
        this.actor._delegate = this;
-        this.actor.add_child(this.clone);
        this.realWindow = realWindow;
        this.metaWindow = realWindow.meta_window;

-        this.clone._updateId = this.metaWindow.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
-            // This will ensure that we never see it in the _disconnectSignals loop
-            this.clone.destroy();
-            this.destroy();
-        }));
+        this._positionChangedId = this.realWindow.connect('position-changed',
+                                                          Lang.bind(this, this._onPositionChanged));
+        this._realWindowDestroyedId = this.realWindow.connect('destroy',
+                                                              Lang.bind(this, this._disconnectRealWindowSignals));
        this._onPositionChanged();

        this.actor.connect('button-release-event',
@ -91,21 +61,6 @@ const WindowClone = new Lang.Class({
        this._draggable.connect('drag-cancelled', Lang.bind(this, this._onDragCancelled));
        this._draggable.connect('drag-end', Lang.bind(this, this._onDragEnd));
        this.inDrag = false;
-
-        let iter = Lang.bind(this, function(win) {
-            let actor = win.get_compositor_private();
-
-            if (!actor)
-                return false;
-            if (!win.is_attached_dialog())
-                return false;
-
-            this._doAddAttachedDialog(win, actor);
-            win.foreach_transient(iter);
-
-            return true;
-        });
-        this.metaWindow.foreach_transient(iter);
    },

    // Find the actor just below us, respecting reparenting done
@ -143,46 +98,25 @@ const WindowClone = new Lang.Class({
        this.actor.destroy();
    },

-    addAttachedDialog: function(win) {
-        this._doAddAttachedDialog(win, win.get_compositor_private());
-    },
-
-    _doAddAttachedDialog: function(metaDialog, realDialog) {
-        let clone = new Clutter.Clone({ source: realDialog });
-        this._updateDialogPosition(realDialog, clone);
-
-        clone._updateId = metaDialog.connect('position-changed',
-                                             Lang.bind(this, this._updateDialogPosition, clone));
-        clone._destroyId = realDialog.connect('destroy', Lang.bind(this, function() {
-            clone.destroy();
-        }));
-        this.actor.add_child(clone);
-    },
-
-    _updateDialogPosition: function(realDialog, cloneDialog) {
-        let metaDialog = realDialog.meta_window;
-        let dialogRect = metaDialog.get_outer_rect();
-        let rect = this.metaWindow.get_outer_rect();
-
-        cloneDialog.set_position(dialogRect.x - rect.x, dialogRect.y - rect.y);
-    },
-
    _onPositionChanged: function() {
        let rect = this.metaWindow.get_outer_rect();
        this.actor.set_position(this.realWindow.x, this.realWindow.y);
    },

-    _disconnectSignals: function() {
-        this.actor.get_children().forEach(function(child) {
-            let realWindow = child.source;
+    _disconnectRealWindowSignals: function() {
+        if (this._positionChangedId != 0) {
+            this.realWindow.disconnect(this._positionChangedId);
+            this._positionChangedId = 0;
+        }

-            realWindow.meta_window.disconnect(child._updateId);
-            realWindow.disconnect(child._destroyId);
-        });
+        if (this._realWindowDestroyedId != 0) {
+            this.realWindow.disconnect(this._realWindowDestroyedId);
+            this._realWindowDestroyedId = 0;
+        }
    },

    _onDestroy: function() {
-        this._disconnectSignals();
+        this._disconnectRealWindowSignals();

        this.actor._delegate = null;

@ -386,15 +320,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;
        }

@ -411,26 +344,10 @@ const WorkspaceThumbnail = new Lang.Class({
        if (this._lookupIndex (metaWin) != -1)
            return;

-        if (!this._isMyWindow(win))
+        if (!this._isMyWindow(win) || !this._isOverviewWindow(win))
            return;

-        if (this._isOverviewWindow(win)) {
-            this._addWindowClone(win);
-        } else if (metaWin.is_attached_dialog()) {
-            let parent = metaWin.get_transient_for();
-            while (parent.is_attached_dialog())
-                parent = metaWin.get_transient_for();
-
-            let idx = this._lookupIndex (parent);
-            if (idx < 0) {
-                // parent was not created yet, it will take care
-                // of the dialog when created
-                return;
-            }
-
-            let clone = this._windows[idx];
-            clone.addAttachedDialog(metaWin);
-        }
+        let clone = this._addWindowClone(win);
    },

    _windowAdded : function(metaWorkspace, metaWin) {
@ -508,7 +425,8 @@ const WorkspaceThumbnail = new Lang.Class({

    // Tests if @win should be shown in the Overview
    _isOverviewWindow : function (win) {
-        return !win.get_meta_window().skip_taskbar &&
+        let tracker = Shell.WindowTracker.get_default();
+        return tracker.is_window_interesting(win.get_meta_window()) &&
               win.get_meta_window().showing_on_its_workspace();
    },

@ -805,25 +723,22 @@ 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)
@ -903,10 +818,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
@ -237,31 +237,28 @@ const WorkspacesView = new Lang.Class({
    },

    _updateWorkspaces: function() {
+        let oldNumWorkspaces = this._workspaces.length;
        let newNumWorkspaces = global.screen.n_workspaces;

        this.scrollAdjustment.upper = newNumWorkspaces;

-        let needsUpdate = false;
-        for (let j = 0; j < newNumWorkspaces; j++) {
-            let metaWorkspace = global.screen.get_workspace_by_index(j);
-            let workspace;
-
-            if (j >= this._workspaces.length) { /* added */
-                workspace = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
+        if (newNumWorkspaces > oldNumWorkspaces) {
+            for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
+                let metaWorkspace = global.screen.get_workspace_by_index(w);
+                let workspace = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
+                this._workspaces.push(workspace);
                this.actor.add_actor(workspace.actor);
-                this._workspaces[j] = workspace;
-            } else  {
-                workspace = this._workspaces[j];
-
-                if (workspace.metaWorkspace != metaWorkspace) { /* removed */
-                    workspace.destroy();
-                    this._workspaces.splice(j, 1);
-                } /* else kept */
            }
-        }

-        if (this._fullGeometry)
-            this._updateWorkspaceActors(false);
+            if (this._fullGeometry)
+                this._updateWorkspaceActors(false);
+        } else if (newNumWorkspaces < oldNumWorkspaces) {
+            let nRemoved = (newNumWorkspaces - oldNumWorkspaces);
+            let removed = this._workspaces.splice(oldNumWorkspaces, nRemoved);
+            removed.forEach(function(workspace) {
+                workspace.destroy();
+            });
+        }

        this._syncGeometry();
    },
@ -405,7 +402,7 @@ const WorkspacesDisplay = new Lang.Class({
        Main.overview.addAction(clickAction);
        this.actor.bind_property('mapped', clickAction, 'enabled', GObject.BindingFlags.SYNC_CREATE);

-        let panAction = new Clutter.PanAction({ threshold_trigger_edge: Clutter.GestureTriggerEdge.AFTER });
+        let panAction = new Clutter.PanAction();
        panAction.connect('pan', Lang.bind(this, this._onPan));
        panAction.connect('gesture-begin', Lang.bind(this, function() {
            for (let i = 0; i < this._workspacesViews.length; i++)
@ -413,6 +410,7 @@ const WorkspacesDisplay = new Lang.Class({
            return true;
        }));
        panAction.connect('gesture-cancel', Lang.bind(this, function() {
+            clickAction.release();
            for (let i = 0; i < this._workspacesViews.length; i++)
                this._workspacesViews[i].endSwipeScroll();
        }));
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@ -62,7 +62,7 @@ const XdndHandler = new Lang.Class({
            let cursorWindow = windows[windows.length - 1];

            // FIXME: more reliable way?
-            if (!cursorWindow.get_meta_window().is_override_redirect())
+            if (!cursorWindow.is_override_redirect())
                return;

            let constraint_position = new Clutter.BindConstraint({ coordinate : Clutter.BindCoordinate.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
--- a/po/an.po
+++ b/po/an.po
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
--- a/po/be.po
+++ b/po/be.po
--- a/po/ca.po
+++ b/po/ca.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/et.po
+++ b/po/et.po
@ -13,8 +13,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-01-14 01:18+0000\n"
-"PO-Revision-Date: 2014-01-14 13:33+0300\n"
+"POT-Creation-Date: 2013-11-22 21:44+0000\n"
+"PO-Revision-Date: 2013-11-18 13:56+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@ -68,14 +68,14 @@ msgstr ""
 "Lubab ligipääsu sisemistele silumise ja monitoorimise tööriistadele Alt-F2 "
 "dialoogi kaudu."

-msgid "UUIDs of extensions to enable"
+msgid "Uuids of extensions to enable"
 msgstr "Lubatavate laienduste UUID-d"

 msgid ""
-"GNOME Shell extensions have a UUID property; this key lists extensions which "
+"GNOME Shell extensions have a uuid property; this key lists extensions which "
 "should be loaded. Any extension that wants to be loaded needs to be in this "
 "list. You can also manipulate this list with the EnableExtension and "
-"DisableExtension D-Bus methods on org.gnome.Shell."
+"DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
 "GNOME Shelli laiendustel on UUID omadus; selles võtmes loetletud laiendused "
 "tuleks laadida. Seda loendit saab muuta kasutades EnableExtension ja "
@ -106,11 +106,11 @@ msgstr "Käsudialoogi (Alt-F2) ajalugu"
 msgid "History for the looking glass dialog"
 msgstr "Otsingudialoogi ajalugu"

-msgid "Always show the 'Log out' menu item in the user menu."
+msgid "Always show the 'Log out' menuitem in the user menu."
 msgstr "Kasutajamenüüs näidatakse alati 'Logi välja' menüükirjet."

 msgid ""
-"This key overrides the automatic hiding of the 'Log out' menu item in single-"
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
 "user, single-session situations."
 msgstr ""
 "See võti keelab automaatse 'Logi välja' menüükirje peitmise, kui arvutis on "
@ -1030,6 +1030,60 @@ msgid_plural "%d Connected Devices"
 msgstr[0] "%d ühendatud seade"
 msgstr[1] "%d ühendatud seadet"

+#, javascript-format
+msgid "Authorization request from %s"
+msgstr "Autoriseerimise päring seadmelt %s"
+
+#, javascript-format
+msgid "Device %s wants to pair with this computer"
+msgstr "Seade '%s' tahab selle arvutiga paarduda"
+
+msgid "Allow"
+msgstr "Luba"
+
+msgid "Deny"
+msgstr "Keela"
+
+#, javascript-format
+msgid "Device %s wants access to the service '%s'"
+msgstr "Seade %s soovib ligipääsu teenusele '%s'"
+
+msgid "Always grant access"
+msgstr "Luba alati"
+
+msgid "Grant this time only"
+msgstr "Luba ainult seekord"
+
+msgid "Reject"
+msgstr "Lükka tagasi"
+
+#. Translators: argument is the device short name */
+#, javascript-format
+msgid "Pairing confirmation for %s"
+msgstr "Paardumise kinnitus seadmele %s"
+
+#, javascript-format
+msgid ""
+"Please confirm whether the Passkey '%06d' matches the one on the device."
+msgstr "Palun kontrolli, kas parool '%06d' kattub seadme parooliga."
+
+#. Translators: this is the verb, not the noun */
+msgid "Matches"
+msgstr "Kattub"
+
+msgid "Does not match"
+msgstr "Ei kattu"
+
+#, javascript-format
+msgid "Pairing request for %s"
+msgstr "Seadmega %s paardumise päring"
+
+msgid "Please enter the PIN mentioned on the device."
+msgstr "Palun sisesta seadme poolt öeldav PIN-kood."
+
+msgid "OK"
+msgstr "Olgu"
+
 msgid "Brightness"
 msgstr "Heledus"

@ -1246,52 +1300,6 @@ msgstr "Parool ei saa olla tühi"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Kasutaja katkestas autentimisdialoogi"

-#~ msgid "Authorization request from %s"
-#~ msgstr "Autoriseerimise päring seadmelt %s"
-
-#~ msgid "Device %s wants to pair with this computer"
-#~ msgstr "Seade '%s' tahab selle arvutiga paarduda"
-
-#~ msgid "Allow"
-#~ msgstr "Luba"
-
-#~ msgid "Deny"
-#~ msgstr "Keela"
-
-#~ msgid "Device %s wants access to the service '%s'"
-#~ msgstr "Seade %s soovib ligipääsu teenusele '%s'"
-
-#~ msgid "Always grant access"
-#~ msgstr "Luba alati"
-
-#~ msgid "Grant this time only"
-#~ msgstr "Luba ainult seekord"
-
-#~ msgid "Reject"
-#~ msgstr "Lükka tagasi"
-
-#~ msgid "Pairing confirmation for %s"
-#~ msgstr "Paardumise kinnitus seadmele %s"
-
-#~ msgid ""
-#~ "Please confirm whether the Passkey '%06d' matches the one on the device."
-#~ msgstr "Palun kontrolli, kas parool '%06d' kattub seadme parooliga."
-
-#~ msgid "Matches"
-#~ msgstr "Kattub"
-
-#~ msgid "Does not match"
-#~ msgstr "Ei kattu"
-
-#~ msgid "Pairing request for %s"
-#~ msgstr "Seadmega %s paardumise päring"
-
-#~ msgid "Please enter the PIN mentioned on the device."
-#~ msgstr "Palun sisesta seadme poolt öeldav PIN-kood."
-
-#~ msgid "OK"
-#~ msgstr "Olgu"
-
 #~ msgid ""
 #~ "Sorry, no wisdom for you today:\n"
 #~ "%s"
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/Show More
+++ b/Show More