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
230 changed files with 27890 additions and 41562 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -28,8 +28,6 @@ data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
 data/org.gnome.shell.evolution.calendar.gschema.xml
 data/org.gnome.shell.evolution.calendar.gschema.valid
 data/org.gnome.Shell.PortalHelper.desktop
 data/org.gnome.Shell.PortalHelper.service
 docs/reference/*/*.args
 docs/reference/*/*.bak
 docs/reference/*/*.hierarchy
@@ -80,9 +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-portal-helper
+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
+		    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		       Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+     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
+		     END OF TERMS AND CONDITIONS
-
+
-            How to Apply These Terms to Your New Programs
+	    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
+    You should have received a copy of the GNU General Public License
-    with this program; if not, write to the Free Software Foundation, Inc.,
+    along with this program; if not, write to the Free Software
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    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/303
+++ b/303
@@ -1,306 +1,3 @@
 3.13.4
 ======
 * Handle portal login requests [Giovanni; #704416]
 * Scale fonts on wayland on hiDPI devices [Adel; #732537]
 * Fix default ibus candidate index labels [Rui; #702944]
 * Add gestures for various system actions [Carlos G.]
 * Add performance test script for the perf.gnome.org [Owen; #732350]
 * Use new restart framework to improve restart visuals [Owen; #733026]
 * Improve keynav in app folder popups [Carlos S.; #731477]
 * Fix truncation of app search results [Carlos S.; #732416]
 * Automatically update renamed desktop files in favorites [Kalev; #729429]
 * Misc. bug fixes and cleanups [Giovanni, Yosef, Owen, Bastien, Javier;
  #729823, #726401, #732301, #732348, #732349, #733498, #733540]
 Contributors:
  Giovanni Campagna, Adel Gadllah, Carlos Garnacho, Javier Hernández,
  Kalev Lember, Rui Matos, Florian Müllner, Bastien Nocera, Yosef Or Boczko,
  Carlos Soriano, Jasper St. Pierre, Owen W. Taylor
 Translations:
  Yuri Myasoedov [ru], Daniel Mustieles [es], Fran Diéguez [gl],
  Cheng-Chia Tseng [zh_TW], A S Alam [pa], Benjamin Steinwender [de],
  Enrico Nicoletto [pt_BR], MarMav [el], Yosef Or Boczko [he],
  Kjartan Maraas [nb]
 3.13.3
 ======
 * Don't allow closing windows with attached modals [Florian; #729886]
 * Fix self-restarting on OpenBSD [Antoine; #727763]
 * Improve behavior of window buttons with compositor menus [Florian; #731058]
 * Work around atspi-related performance regression [Alejandro; #730118]
 * Misc bug fixes and cleanups [Florian, Lan, Jasper, Christophe, Debarshi,
  Zeeshan; #728271, #726460, #703833, #731118, #731220, #695487, #730527,
  #728170, #731619, #731738, #731882, #731923]
 Contributors:
  Zeeshan Ali (Khattak), Christophe Fergeau, Adel Gadllah, Antoine Jacoutot,
  Ting-Wei Lan, Florian Müllner, Alejandro Piñeiro, Debarshi Ray,
  Carlos Soriano, Jasper St. Pierre, Wim Taymans, Rico Tzschichholz
 Translations:
  Philip Withnall [en_GB], Milo Casagrande [it], Aurimas Černius [lt],
  Enrico Nicoletto [pt_BR], Kjartan Maraas [nb], Balázs Meskó [hu],
  Muhammet Kara [tr], Daniel Mustieles [es], Yosef Or Boczko [he],
  Matej Urbančič [sl], Mattias Eriksson [sv]
 3.13.2
 ======
 * Make airplane mode menu insensitive in lock screen [Giovanni; #729224]
 * Don't always extend struts to the screen edge [Florian; #683819]
 * Fix keynav for alternatives in AltSwitcher [Florian; #727259]
 * Implement window menus in the shell [Jasper; #726352]
 * Support resource:/// URLs in GNOME_SHELL_JS envvar [Owen; #730409]
 * Fix switcher popups with keybindings containing Escape [Rui; #730739]
 * Update extension-prefs UI to follow GNOME 3 patterns [Florian; #730829]
 * Add support for fallback app menu in window decorations [Florian; #730752]
 * Fix keynav escaping open app folders [Florian; #726760]
 * Misc. bug fixes [Kalev, Florian, Owen; #729429, #728449, #730408, #730753,
  #730653]
 Contributors:
  Giovanni Campagna, Piotr Drąg, Kalev Lember, Rui Matos, Florian Müllner,
  Vadim Rutkovsky, Carlos Soriano, Jasper St. Pierre, Owen W. Taylor
 Translations:
  Ihar Hrachyshka [be], Giovanni Campagna [it], Carles Ferrando [ca@valencia],
  Daniel Mustieles [es], Aurimas Černius [lt], Enrico Nicoletto [pt_BR],
  Yosef Or Boczko [he], Marek Černocký [cs], Muhammet Kara [tr],
  Georges Neto [pt_BR], Andika Triwidada [id]
 3.13.1
 ======
 * Ensure the currently focused app icon is viewable [Rui; #726759]
 * Improve language in location menu [Zeeshan; #726498]
 * Improve HiDpi support [Cosimo; #726907]
 * Set accessible role for window previews [Alejandro; #726670]
 * Fix bad antialiasing on panel menu buttons [Carlos; #727336]
 * Don't hide location menu [Zeeshan; #727398]
 * Fix IM candidate window obscuring current text [Rui; #727579]
 * Don't always extend struts to the screen edge [Florian; #663690]
 * Add shortcuts for switching to the last workspace [Elad; #659288]
 * Show OSD window on all monitors [Adel; #722684]
 * Improve consistency of labels in network menu [Paul; #727163]
 * Fix zombie search providers showing up [Jasper; #728597]
 * Remove ConsoleKit support [Florian; #686626]
 * Fix region screenshots with open shell menus [Florian; #709126]
 * Support <shift>insert in text entries [Florian; #648318]
 * Improve app picker scrolling on touch [Jasper; #729064]
 * Don't make date button clickable when on current date [Carlos; #726724]
 * Tweak heuristic for hiding workspace switcher [Florian; #662457]
 * Add option to show in Software to app context menu [Matthias; #643043]
 * Misc. bug fixes and cleanups [Bastien, Florian, Giovanni, Adel, Vadim,
  Carlos; #727983, #727948, #728512, #728681, #728897, #727384, #728820,
  #715042, #728449, #728343]
 Contributors:
  Elad Alfassa, Zeeshan Ali (Khattak), Giovanni Campagna, Cosimo Cecchi,
  Matthias Clasen, Piotr Drąg, Adel Gadllah, Paul Lange, Rui Matos,
  Simon McVittie, Florian Müllner, Bastien Nocera, Alejandro Piñeiro,
  Vadim Rutkovsky, Carlos Soriano, Jasper St. Pierre
 Translations:
  Khaled Hosny [ar], Piotr Drąg [pl], Yosef Or Boczko [he],
  Antonio Fernandes C. Neto [pt_BR], Marek Černocký [cs], maria thukididu [el],
  Andika Triwidada [id], Daniel Mustieles [es], Changwoo Ryu [ko],
  Benjamin Steinwender [de], Sphinx Jiang [zh_CN],
  Inaki Larranaga Murgoitio [eu], Marcus Lundblad [sv], Aurimas Černius [lt],
  Stas Solovey [ru], Alexandre Franke [fr], Matej Urbančič [sl],
  Fran Diéguez [gl], Pau Iranzo [ca], Luca Ferretti [it], Milo Casagrande [it],
  Tiago S [pt], Victor Ibragimov [tg], Dirgita [id], Khoem Sokhem [km],
  Rūdolfs Mazurs [lv], Balázs Úr [hu], Ask H. Larsen [da], Ikuya Awashiro [ja],
  Wouter Bolsterlee [nl], Daniel Korostil [uk], Daniel Șerbănescu [ro],
  Enrico Nicoletto [pt_BR]
 3.12.0
 ======
 * gdm: Reset greeter when coming back to login screen [Jasper; #726989]
 Contributors:
  Jasper St. Pierre
 Translations:
  Daniel Martinez [an], Yuri Myasoedov [ru], Inaki Larranaga Murgoitio [eu],
  Abderrahim Kitouni [ar], Praveen Illa [te], Matej Urbančič [sl],
  Chao-Hsiung Liao [zh_HK, zh_TW], Frédéric Péters [fr],
  Мирослав Николић [sr, sr@latin], Ask H. Larsen [da], Kenneth Nielsen [da],
  Jiro Matsuzawa [ja], Dušan Kazik [sk]
 3.11.92
 =======
 * calendar: Grab key focus after changing day [Volker; #725606]
 * gdm: Don't load user list if disabled [Florian; #725905]
 * Don't show network-offline in the top bar [Jasper; #725340]
 * Improve radial shade effect of modal dialogs [Giovanni; #725830]
 * Fix broken suspend-on-idle functionality [Giovanni; #712706]
 * Close wifi selection dialog when device disappears [Giovanni; #723935]
 * Don't close chats when pressing Escape [Giovanni; #724178]
 * Improve smartcard support in login/lock screen [Ray; #726262, #726263]
 * Wake up screen when resuming from suspend [Giovanni; #726378]
 * Make bluetooth and location items insensitive when locked [Florian; #726319]
 * Don't show bluetooth icon when there is no adapter [Giovanni; #725057]
 * Make sure to keep the OSK on top of modal dialogs [Rui; #719451]
 * Misc. bug fixes and cleanups [Giovanni, Ray, Adel, Daniel, Jasper, Florian;
  #725832, #725958, #722149, #724977, #724798, #725020, #723976, #726119,
  #726238, #585500, #704844, #726323, #726322, #726120, #726414]
 Contributors:
  Giovanni Campagna, Daniel Drake, Adel Gadllah, Rui Matos, Florian Müllner,
  Volker Sobek, Jasper St. Pierre, Ray Strode
 Translations:
  Fabio Tomat [fur], Rafael Ferreira [pt_BR], Fran Diéguez [gl],
  Marek Černocký [cs], Baurzhan Muftakhidinov [kk], Andika Triwidada [id],
  A S Alam [pa], Rūdolfs Mazurs [lv], Wylmer Wang [zh_CN],
  Aurimas Černius [lt], Cheng-Chia Tseng [zh_TW], Stas Solovey [ru],
  Tiagosdot [pt], Benjamin Steinwender [de], Frédéric Peters [fr],
  Daniel Korostil [uk], Yaron Shahrabani [he], Ville-Pekka Vainio [fi],
  maria thukididu [el], Victor Ibragimov [tg], Kjartan Maraas [nb],
  Gábor Kelemen [hu], Ask H. Larsen [da]
 3.11.91
 =======
 * Don't use network profile name in menu [Giovanni; #725586]
 * calendar: Make date label clickable to return to current date [Vit; #641366]
 * Misc. bug fixes [Florian, Zeeshan, Adel, Jasper, Dan, Volker; #724813,
  #724686, #725082, #724870, #724779, #725533]
 Contributors:
  Zeeshan Ali (Khattak), Giovanni Campagna, Piotr Drąg, Adel Gadllah,
  Florian Müllner, Volker Sobek, Vit Stanislav, Jasper St. Pierre, Dan Williams
 Translations:
  Victor Ibragimov [tg], Aurimas Černius [lt], Dimitris Spingos [el],
  Andika Triwidada [id], Rafael Ferreira [pt_BR], Daniel Mustieles [es],
  Baurzhan Muftakhidinov [kk], Marek Černocký [cs], Ihar Hrachyshka [be],
  eternalhui [zh_CN], Yosef Or Boczko [he], Fran Diéguez [gl],
  Khaled Hosny [ar], Ville-Pekka Vainio [fi], Piotr Drąg [pl],
  Kjartan Maraas [nb], Changwoo Ryu [ko]
 3.11.90
 =======
 * Stop showing two bluetooth entries [Giovanni; #709353]
 * Improve styling of login/lock screen [Reda; #723833]
 * Fix magnifier crosshairs [Magdalen; #723709]
 * Make NetworkManager support optional [Michael; #669495]
 * Make middle-click open a new instance [Florian; #695010]
 * Scale the UI on high resolution displays [Cosimo, Adel; #705410, #724607]
 * Remove notification counter on screen shield [Carlos; #709275]
 * Improve app picker transition [Carlos; #722331]
 * Add geolocation indicator to status menu [Zeeshan; #723684]
 * Improve timestamps in chat notifications [Carlos; #708031, #715158]
 * Improve network menus [Giovanni; #723570]
 * Add "VPN Setting" item to VPN submenu [Giovanni; #709167]
 * Improve appearance of disclosure arrows [Carlos; #720206]
 * Add GSetting key to disable version validation of extensions [Adel; #724683]
 * Delay auto-removing empty workspaces [Florian; #709064]
 * Offer offline updates in the shutdown dialog [Kalev; #722898]
 * Animate tile previews [Florian; #665758]
 * Misc. bug fixes and cleanups [Giovanni, Ryan, Debarshi, Florian; #709128,
  #722342, #723661, #724184, #724256, #724293, #724305, #722554, #724282,
  #724690, #722928]
 Contributors:
  Zeeshan Ali (Khattak), Magdalen Berns, Michael Biebl, Giovanni Campagna,
  Cosimo Cecchi, Adel Gadllah, Reda Lazri, Kalev Lember, Ryan Lortie,
  Florian Müllner, Debarshi Ray, Carlos Soriano, Jasper St. Pierre,
  Colin Walters
 Translations:
  Victor Ibragimov [tg], Daniel Mustieles [es], Khaled Hosny [ar],
  Enrico Nicoletto [pt_BR], Yosef Or Boczko [he], Fran Diéguez [gl],
  Marek Černocký [cs], Baurzhan Muftakhidinov [kk], Jorge Pérez Pérez [an],
  Kjartan Maraas [nb], David Lüder [de], Daniel Korostil [uk], ngoswami [as],
  Rafael Ferreira [pt_BR]
 3.11.5
 ======
 * Fix extension preference tool [Florian; #722334]
 * Fix keyboard activation of legacy tray icons [Giovanni; #721267]
 * Add radial background shade for modal dialogs [Giovanni; #669798]
 * Show attached modal windows in the overview [Giovanni; #650843]
 * Add support for desktop actions [Giovanni; #669603]
 * Indicate in system status when location service is used [Zeeshan; #709372]
 * Add support for extended app folder schema [Jasper; #723179]
 * Show status icon for wired network connections [Jasper; #708966]
 * Indicate airplane mode in network selection dialog [Giovanni; #709128]
 * Misc bug fixes and cleanups [Florian, Sebastian, Giovanni, Tim, Matt, Jasper;
  #722417, #722494, #722547, #722593, #722434, #722787, #722690, #722840,
  #722660, #722812, #723197, #722927, #723306, #723308, #723523, #709685,
  #723570]
 Contributors:
  Zeeshan Ali (Khattak), Magdalen Berns, Giovanni Campagna, William Jon McCann,
  Sebastian Keller, Tim Lunn, Florian Müllner, Carlos Soriano,
  Jasper St. Pierre, Rico Tzschichholz, Matt Watson
 Translations:
  Marek Černocký [cs], Mattias Põldaru [et], Tong Hui [zh_CN],
  Victor Ibragimov [tg], Enrico Nicoletto [pt_BR], Daniel Mustieles [es],
  Fran Diéguez [gl], Kjartan Maraas [nb], Nilamdyuti Goswami [as],
  Aurimas Černius [lt], Stas Solovey [ru], Yosef Or Boczko [he],
  Jorge Pérez Pérez [an], Dimitris Spingos [el], Baurzhan Muftakhidinov [kk],
  Chao-Hsiung Liao [zh_HK, zh_TW], Shankar Prasad [kn], Yaron Shahrabani [he],
  Andika Triwidada [id]
 3.11.4
 ======
 * Fix removal of workspacaes that are not at the end [Giovanni; #721417]
 * 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 == shell_version_id);
          name == version_validation_enabled_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.4],[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.4
+MUTTER_MIN_VERSION=3.11.1
 GTK_MIN_VERSION=3.7.9
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
@@ -105,13 +105,22 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
            libcanberra libcanberra-gtk3
            telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
            polkit-agent-1 >= $POLKIT_MIN_VERSION
-            gcr-base-3 >= $GCR_MIN_VERSION"
+            libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
            libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
            libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION"
 if test x$have_systemd = xyes; then
  SHARED_PCS="${SHARED_PCS} libsystemd-journal"
 fi
 PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
 PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION)
 PKG_CHECK_MODULES(MUTTER_WAYLAND, [libmutter-wayland >= $MUTTER_MIN_VERSION],
                 [MUTTER_WAYLAND_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter-wayland`
                  AC_SUBST(MUTTER_WAYLAND_TYPELIB_DIR)
                  have_mutter_wayland=yes],
                 [have_mutter_wayland=no])
 AM_CONDITIONAL(HAVE_MUTTER_WAYLAND, test $have_mutter_wayland != no)
 PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
@@ -173,38 +182,6 @@ if test "$langinfo_ok" = "yes"; then
            [Define if _NL_TIME_FIRST_WEEKDAY is available])
 fi
 AC_ARG_ENABLE(networkmanager,
             AS_HELP_STRING([--disable-networkmanager],
                            [disable NetworkManager support  @<:@default=auto@:>@]),,
              [enable_networkmanager=auto])
 if test "x$enable_networkmanager" != "xno"; then
   PKG_CHECK_MODULES(NETWORKMANAGER,
                     [libnm-glib
                     libnm-util >= $NETWORKMANAGER_MIN_VERSION
                     libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
                     libsecret-unstable],
                     [have_networkmanager=yes],
                     [have_networkmanager=no])
   GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
   GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
 else
   have_networkmanager="no  (disabled)"
 fi
 if test "x$have_networkmanager" = "xyes"; then
   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
   AC_SUBST([HAVE_NETWORKMANAGER], [1])
 else
   if test "x$enable_networkmanager" = "xyes"; then
      AC_MSG_ERROR([Couldn't find NetworkManager.])
   fi
   AC_SUBST([HAVE_NETWORKMANAGER], [0])
 fi
 AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()
@@ -223,14 +200,6 @@ fi
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
 GNOME_COMPILE_WARNINGS([error])
 case "$WARN_CFLAGS" in
    *-Werror*)
        WARN_CFLAGS="$WARN_CFLAGS -Wno-error=deprecated-declarations"
        ;;
 esac
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
@@ -254,15 +223,3 @@ AC_CONFIG_FILES([
  man/Makefile
 ])
 AC_OUTPUT
 echo "
 Build configuration:
       Prefix:                                 ${prefix}
       Source code location:                   ${srcdir}
       Compiler:                               ${CC}
       Compiler Warnings:                      $enable_compile_warnings
       Support for NetworkManager:             $have_networkmanager
       Support for GStreamer recording:        $build_recorder
 "
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,23 +1,9 @@
 CLEANFILES =
 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
 if HAVE_NETWORKMANAGER
 desktop_DATA += org.gnome.Shell.PortalHelper.desktop
 servicedir = $(datadir)/dbus-1/services
 service_DATA = org.gnome.Shell.PortalHelper.service
 CLEANFILES += \
 	org.gnome.Shell.PortalHelper.service \
 	org.gnome.Shell.PortalHelper.desktop
 endif
 %.service: %.service.in
 	$(AM_V_GEN) sed -e "s|@libexecdir[@]|$(libexecdir)|" \
 	    $< > $@ || rm $@
 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
@@ -106,11 +92,9 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(convert_DATA)					\
 	$(keys_in_files)				\
 	org.gnome.Shell.PortalHelper.desktop.in		\
 	org.gnome.Shell.PortalHelper.service.in		\
 	org.gnome.shell.gschema.xml.in.in
-CLEANFILES +=						\
+CLEANFILES =						\
 	gnome-shell.desktop.in				\
 	gnome-shell-wayland.desktop.in			\
 	gnome-shell-extension-prefs.in			\
--- a/data/gnome-shell-overrides.convert
+++ b/data/gnome-shell-overrides.convert
@@ -1,4 +1,5 @@
 [org.gnome.shell.overrides]
 attach-modal-dialogs = /desktop/gnome/shell/windows/attach_modal_dialogs
 button-layout = /desktop/gnome/shell/windows/button_layout
 edge-tiling = /desktop/gnome/shell/windows/edge_tiling
 workspaces-only-on-primary = /desktop/gnome/shell/windows/workspaces_only_on_primary
--- a/data/gnome-shell-wayland.desktop.in.in
+++ b/data/gnome-shell-wayland.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=GNOME Shell (wayland compositor)
 _Comment=Window management and application launching
-Exec=@bindir@/gnome-shell --wayland --display-server
+Exec=@bindir@/mutter-launch -- gnome-shell-wayland --wayland
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
 X-GNOME-Bugzilla-Component=general
--- a/data/org.gnome.Shell.PortalHelper.desktop.in
+++ b/data/org.gnome.Shell.PortalHelper.desktop.in
@@ -1,9 +0,0 @@
 [Desktop Entry]
 _Name=Captive Portal
 Type=Application
 Exec=gapplication launch org.gnome.Shell.PortalHelper
 DBusActivatable=true
 NoDisplay=true
 Icon=network-workgroup
 StartupNotify=true
 OnlyShowIn=GNOME;
--- a/data/org.gnome.Shell.PortalHelper.service.in
+++ b/data/org.gnome.Shell.PortalHelper.service.in
@@ -1,3 +0,0 @@
 [D-BUS Service]
 Name=org.gnome.Shell.PortalHelper
 Exec=@libexecdir@/gnome-shell-portal-helper
--- a/data/org.gnome.Shell.Screencast.xml
+++ b/data/org.gnome.Shell.Screencast.xml
@@ -38,6 +38,7 @@
    <method name="Screencast">
      <arg type="s" direction="in" name="file_template"/>
      <arg type="a{sv}" direction="in" name="options"/>
      <arg type="b" direction="in" name="flash"/>
      <arg type="b" direction="out" name="success"/>
      <arg type="s" direction="out" name="filename_used"/>
    </method>
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -13,37 +13,36 @@
    </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.
+        EnableExtension and DisableExtension DBus methods on org.gnome.Shell.
      </_description>
    </key>
    <key name="disable-extension-version-validation" type="b">
      <default>false</default>
      <_summary>Disables the validation of extension version compatibility</_summary>
      <_description>
        GNOME Shell will only load extensions that claim to support the current
        running version. Enabling this option will disable this check and try to
        load all extensions regardless of the versions they claim to support.
      </_description>
    </key>
    <key name="favorite-apps" type="as">
-      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop' ]</default>
+      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
      <_summary>List of desktop file IDs for favorite applications</_summary>
      <_description>
        The applications corresponding to these identifiers
        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>
+      <summary>App Picker View</summary>
-      <_description>
+      <description>
        Index of the currently selected view in the application picker.
-      </_description>
+      </description>
    </key>
    <key name="command-history" type="as">
      <default>[]</default>
@@ -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,42 +137,16 @@
    </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@">
    <key type="b" name="current-workspace-only">
      <default>false</default>
-      <_summary>Limit switcher to current workspace.</_summary>
+      <summary>Limit switcher to current workspace.</summary>
-      <_description>
+      <description>
 	If true, only applications that have windows on the current workspace are shown in the switcher.
 	Otherwise, all applications are included.
-      </_description>
+      </description>
    </key>
  </schema>
@@ -202,11 +169,11 @@
    </key>
    <key type="b" name="current-workspace-only">
      <default>true</default>
-      <_summary>Limit switcher to current workspace.</_summary>
+      <summary>Limit switcher to current workspace.</summary>
-      <_description>
+      <description>
 	If true, only windows from the current workspace are shown in the switcher.
 	Otherwise, all windows are included.
-      </_description>
+      </description>
    </key>
  </schema>
@@ -221,6 +188,15 @@
      </_description>
    </key>
    <key name="button-layout" type="s">
      <default>":close"</default>
      <_summary>Arrangement of buttons on the titlebar</_summary>
      <_description>
        This key overrides the key in org.gnome.desktop.wm.preferences when
        running GNOME Shell.
      </_description>
    </key>
    <key name="edge-tiling" type="b">
      <default>true</default>
      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -153,43 +153,18 @@ StScrollBar StButton#vhandle:active {
    -arrow-rise: 11px;
 }
 .popup-menu-boxpointer.fallback-app-menu {
    -arrow-border-radius: 4px;
    -arrow-background-color: #ededed;
    -arrow-border-width: 1px;
    -arrow-border-color: #a6a6a6;
    -arrow-base: 24px;
    -arrow-rise: 11px;
 }
 .popup-menu-boxpointer.fallback-app-menu.dark {
    -arrow-background-color: #3f4747;
    -arrow-border-color: #282b2b;
 }
 .popup-menu {
    min-width: 200px;
 }
-.popup-menu-arrow {
+.unicode-arrow {
-    width: 16px;
+    font-size: 120%;
    height: 16px;
 }
 .popup-submenu-menu-item:open {
    background-color: #333333;
 }
 .fallback-app-menu .popup-submenu-menu-item:open {
    background-color: #888888;
    color: white;
 }
 .fallback-app-menu.dark .popup-submenu-menu-item:open {
    background-color: #333333;
 }
 .popup-sub-menu {
    background-gradient-start: rgba(80,80,80,0.3);
    background-gradient-end: rgba(80,80,80,0.4);
@@ -197,20 +172,6 @@ StScrollBar StButton#vhandle:active {
    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
 }
 .fallback-app-menu .popup-sub-menu {
    background-gradient-start: #dddddd;
    background-gradient-end: #dfdfdf;
    background-gradient-direction: vertical;
    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.4);
 }
 .fallback-app-menu.dark .popup-sub-menu {
    background-gradient-start: #474747;
    background-gradient-end: #4b4b4b;
    background-gradient-direction: vertical;
    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
 }
 .popup-sub-menu:scrolled .popup-menu-item:ltr {
    padding-right: 0em;
 }
@@ -259,29 +220,7 @@ StScrollBar StButton#vhandle:active {
    color: #9f9f9f;
 }
-.fallback-app-menu .popup-menu-item {
+.popup-image-menu-item {
    color: #43484a;
 }
 .fallback-app-menu .popup-menu-item:active {
    color: white;
    background-color: #4689cd;
 }
 .fallback-app-menu .popup-menu-item:insensitive {
    color: gray;
 }
 .fallback-app-menu.dark .popup-menu-item {
    color: white;
 }
 .fallback-app-menu.dark .popup-menu-item:active {
    background-color: #445f7d;
 }
 .fallback-app-menu.dark .popup-menu-item:insensitive {
    color: #9f9f9f;
 }
 .popup-separator-menu-item {
@@ -293,15 +232,8 @@ StScrollBar StButton#vhandle:active {
    padding: 8px 0px;
 }
-.fallback-app-menu .popup-separator-menu-item {
+.popup-alternating-menu-item:alternate {
-    -gradient-start: #a0a2a3;
+    font-weight: bold;
    -gradient-end: #a0a2a3;
    -margin-horizontal: 0;
 }
 .fallback-app-menu.dark .popup-separator-menu-item {
    -gradient-start: #818584;
    -gradient-end: #818584;
 }
 .popup-status-menu-item {
@@ -357,20 +289,6 @@ StScrollBar StButton#vhandle:active {
    spacing: 10px;
 }
 .nm-dialog-airplane-box {
    spacing: 12px;
 }
 .nm-dialog-airplane-headline {
    font-size: 1.1em;
    font-weight: bold;
    text-align: center;
 }
 .nm-dialog-airplane-text {
    color: #999999;
 }
 .nm-dialog-header-icon {
    icon-size: 32px;
 }
@@ -403,14 +321,6 @@ StScrollBar StButton#vhandle:active {
    icon-size: 16px;
 }
 .no-networks-label {
    color: #999999;
 }
 .no-networks-box {
    spacing: 12px;
 }
 /* Buttons */
 .candidate-page-button,
@@ -657,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;
@@ -740,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,
@@ -748,7 +663,7 @@ StScrollBar StButton#vhandle:active {
    color: white;
    background-color: #4c4c4c;
    border: none;
-    padding: 15px;
+    padding: 14px;
 }
 .system-menu-action:active {
@@ -1049,8 +964,6 @@ StScrollBar StButton#vhandle:active {
 .app-folder-icon {
    padding: 5px;
    spacing-rows: 5px;
    spacing-columns: 5px;
 }
 .dash-item-container > StButton {
@@ -1227,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;
@@ -1306,8 +1224,14 @@ StScrollBar StButton#vhandle:active {
    width: 0.3em;
 }
 #calendarPopup .calendar {
    padding: 10px;
 }
 .calendar {
    padding: .4em 1.75em .8em 1.75em;
    spacing-rows: 0px;
    spacing-columns: 0px;
 }
 .calendar-month-label {
@@ -1365,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;
@@ -1503,8 +1421,11 @@ StScrollBar StButton#vhandle:active {
    padding-right: 8pt;
 }
-/* Message Tray */
+.url-highlighter {
    link-color: #ccccff;
 }
 /* Message Tray */
 #message-tray {
    background: #2e3436 url(message-tray-background.png);
    background-repeat: repeat;
@@ -1527,11 +1448,8 @@ StScrollBar StButton#vhandle:active {
    color: #eeeeee;
 }
-.url-highlighter {
+.no-messages-label,
-    link-color: #ccccff;
+.no-networks-label {
 }
 .no-messages-label {
    color: #999999;
 }
@@ -1712,8 +1630,8 @@ StScrollBar StButton#vhandle:active {
    color: #888888;
 }
-.chat-empty-line {
+.chat-group-sent, .chat-group-meta {
-    font-size: 4px;
+    padding: 8px 0;
 }
 .chat-received {
@@ -1738,7 +1656,6 @@ StScrollBar StButton#vhandle:active {
 .chat-meta-message {
    padding-left: 4px;
    font-size: 9pt;
    font-weight: bold;
    color: #bbbbbb;
 }
@@ -1828,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;
@@ -1920,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 */
@@ -2011,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-right: 17px;
    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;
    text-align: right;
 }
 .end-session-dialog-logout-icon {
    border: 2px solid #8b8b8b;
    border-radius: 5px;
-    width: 48px;
+    width: 32px;
-    height: 48px;
+    height: 32px;
    background-size: contain;
 }
 .end-session-dialog-shutdown-icon {
    color: #bebebe;
-    width: 48px;
+    width: 32px;
-    height: 48px;
+    height: 32px;
 }
 .end-session-dialog-inhibitor-layout {
    spacing: 16px;
    max-height: 200px;
-    padding-right: 65px;
+    padding-right: 50px;
-    padding-left: 65px;
+    padding-left: 50px;
 }
 .end-session-dialog-session-list,
@@ -2092,16 +1996,15 @@ StScrollBar StButton#vhandle:active {
    font-size: 10pt;
 }
 /* Restart message */
 .restart-message {
    font-size: 14pt;
 }
 /* ShellMountOperation Dialogs */
 .shell-mount-operation-icon {
    icon-size: 48px;
 }
 .mount-password-reask {
    color: red;
 }
 .show-processes-dialog,
 .mount-question-dialog {
    spacing: 24px;
@@ -2397,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;
@@ -2445,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;
@@ -2474,13 +2388,12 @@ StScrollBar StButton#vhandle:active {
    color: #E8E8E8;
 }
-.login-dialog-username,
+.login-dialog-username {
 .user-widget-label {
    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 {
@@ -2572,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 {
@@ -2706,5 +2624,4 @@ StScrollBar StButton#vhandle:active {
 .background-menu {
    -boxpointer-gap: 4px;
    -arrow-rise: 0px;
 }
--- a/docs/reference/shell/Makefile.am
+++ b/docs/reference/shell/Makefile.am
@@ -66,7 +66,6 @@ IGNORE_HFILES=					\
 	gactionmuxer.h				\
 	gactionobservable.h			\
 	gactionobserver.h			\
 	shell-network-agent.h			\
 	shell-recorder-src.h
 if !BUILD_RECORDER
--- a/docs/reference/shell/shell-docs.sgml.in
+++ b/docs/reference/shell/shell-docs.sgml.in
@@ -50,6 +50,7 @@
    <xi:include href="xml/shell-wm.xml"/>
    <xi:include href="xml/shell-util.xml"/>
    <xi:include href="xml/shell-mount-operation.xml"/>
    <xi:include href="xml/shell-network-agent.xml"/>
    <xi:include href="xml/shell-polkit-authentication-agent.xml"/>
    <xi:include href="xml/shell-tp-client.xml"/>
  </chapter>
--- 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,14 +6,13 @@ 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" \
 	    -e "s|[@]sysconfdir@|$(sysconfdir)|g" \
               $< > $@
-js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate-dependencies $(srcdir)/js-resources.gresource.xml)
+js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/js-resources.gresource.xml)
 js-resources.h: js-resources.gresource.xml $(js_resource_files) misc/config.js
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate --c-name shell_js_resources $<
 js-resources.c: js-resources.gresource.xml $(js_resource_files) misc/config.js
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -23,11 +23,6 @@ const GnomeShellIface = '<node> \
 </interface> \
 </node>';
 const customCss = '.prefs-button { \
                       padding: 8px; \
                       border-radius: 20px; \
                   }';
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
 function stripPrefix(string, prefix) {
@@ -51,20 +46,22 @@ const Application = new Lang.Class({
        this._extensionPrefsModules = {};
        this._extensionIters = {};
        this._startupUuid = null;
-        this._loaded = false;
+    },
-        this._skipMainWindow = false;
+
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
+    _buildModel: function() {
        this._model = new Gtk.ListStore();
        this._model.set_column_types([GObject.TYPE_STRING, GObject.TYPE_STRING]);
    },
    _extensionAvailable: function(uuid) {
        let extension = ExtensionUtils.extensions[uuid];
        let checkVersion = !this._settings.get_boolean('disable-extension-version-validation');
        if (!extension)
            return false;
-        if (checkVersion && ExtensionUtils.isOutOfDate(extension))
+        if (ExtensionUtils.isOutOfDate(extension))
            return false;
        if (!extension.dir.get_child('prefs.js').query_exists(null))
@@ -73,6 +70,11 @@ const Application = new Lang.Class({
        return true;
    },
    _setExtensionInsensitive: function(layout, cell, model, iter, data) {
        let uuid = model.get_value(iter, 0);
        cell.set_sensitive(this._extensionAvailable(uuid));
    },
    _getExtensionPrefsModule: function(extension) {
        let uuid = extension.metadata.uuid;
@@ -102,23 +104,21 @@ const Application = new Lang.Class({
            widget = this._buildErrorUI(extension, e);
        }
-        let dialog = new Gtk.Dialog({ use_header_bar: true,
+        // Destroy the current prefs widget, if it exists
-                                      modal: true,
+        if (this._extensionPrefsBin.get_child())
-                                      title: extension.metadata.name });
+            this._extensionPrefsBin.get_child().destroy();
-        if (this._skipMainWindow) {
+        this._extensionPrefsBin.add(widget);
-            this.application.add_window(dialog);
+        this._extensionSelector.set_active_iter(this._extensionIters[uuid]);
-            if (this._window)
+    },
                this._window.destroy();
            this._window = dialog;
            this._window.window_position = Gtk.WindowPosition.CENTER;
        } else {
            dialog.transient_for = this._window;
        }
-        dialog.set_default_size(600, 400);
+    _extensionSelected: function() {
-        dialog.get_content_area().add(widget);
+        let [success, iter] = this._extensionSelector.get_active_iter();
-        dialog.show();
+        if (!success)
            return;
        let uuid = this._model.get_value(iter, 0);
        this._selectExtension(uuid);
    },
    _buildErrorUI: function(extension, exc) {
@@ -151,26 +151,48 @@ const Application = new Lang.Class({
    _buildUI: function(app) {
        this._window = new Gtk.ApplicationWindow({ application: app,
-                                                   window_position: Gtk.WindowPosition.CENTER });
+                                                   window_position: Gtk.WindowPosition.CENTER,
                                                   title: _("GNOME Shell Extension Preferences") });
-        this._window.set_size_request(800, 500);
+        this._window.set_size_request(600, 400);
-        this._titlebar = new Gtk.HeaderBar({ show_close_button: true,
+        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
-                                             title: _("GNOME Shell Extensions") });
+        this._window.add(vbox);
        this._window.set_titlebar(this._titlebar);
-        let scroll = new Gtk.ScrolledWindow({ hscrollbar_policy: Gtk.PolicyType.NEVER,
+        let toolbar = new Gtk.Toolbar();
-                                              shadow_type: Gtk.ShadowType.IN,
+        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_PRIMARY_TOOLBAR);
-                                              halign: Gtk.Align.CENTER,
+        vbox.add(toolbar);
-                                              margin: 18 });
+        let toolitem;
        this._window.add(scroll);
-        this._extensionSelector = new Gtk.ListBox({ selection_mode: Gtk.SelectionMode.NONE });
+        let label = new Gtk.Label({ label: '<b>' + _("Extension") + '</b>',
-        this._extensionSelector.set_sort_func(Lang.bind(this, this._sortList));
+                                    use_markup: true });
-        this._extensionSelector.set_header_func(Lang.bind(this, this._updateHeader));
+        toolitem = new Gtk.ToolItem({ child: label });
        toolbar.add(toolitem);
-        scroll.add(this._extensionSelector);
+        this._extensionSelector = new Gtk.ComboBox({ model: this._model,
                                                     margin_left: 8,
                                                     hexpand: true });
        this._extensionSelector.get_style_context().add_class(Gtk.STYLE_CLASS_RAISED);
        let renderer = new Gtk.CellRendererText();
        this._extensionSelector.pack_start(renderer, true);
        this._extensionSelector.add_attribute(renderer, 'text', 1);
        this._extensionSelector.set_cell_data_func(renderer, Lang.bind(this, this._setExtensionInsensitive));
        this._extensionSelector.connect('changed', Lang.bind(this, this._extensionSelected));
        toolitem = new Gtk.ToolItem({ child: this._extensionSelector });
        toolitem.set_expand(true);
        toolbar.add(toolitem);
        this._extensionPrefsBin = new Gtk.Frame();
        vbox.add(this._extensionPrefsBin);
        let label = new Gtk.Label({
            label: _("Select an extension to configure using the combobox above."),
            vexpand: true
        });
        this._extensionPrefsBin.add(label);
        this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
        this._shellProxy.connectSignal('ExtensionStatusChanged', Lang.bind(this, function(proxy, senderName, [uuid, state, error]) {
@@ -181,35 +203,6 @@ const Application = new Lang.Class({
        this._window.show_all();
    },
    _addCustomStyle: function() {
        let provider = new Gtk.CssProvider();
        try {
            provider.load_from_data(customCss, -1);
        } catch(e) {
            log('Failed to add application style');
            return;
        }
        let screen = this._window.window.get_screen();
        let priority = Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION;
        Gtk.StyleContext.add_provider_for_screen(screen, provider, priority);
    },
    _sortList: function(row1, row2) {
        let name1 = ExtensionUtils.extensions[row1.uuid].metadata.name;
        let name2 = ExtensionUtils.extensions[row2.uuid].metadata.name;
        return name1.localeCompare(name2);
    },
    _updateHeader: function(row, before) {
        if (!before || row.get_header())
            return;
        let sep = new Gtk.Separator({ orientation: Gtk.Orientation.HORIZONTAL });
        row.set_header(sep);
    },
    _scanExtensions: function() {
        let finder = new ExtensionUtils.ExtensionFinder();
        finder.connect('extension-found', Lang.bind(this, this._extensionFound));
@@ -218,24 +211,15 @@ const Application = new Lang.Class({
    },
    _extensionFound: function(finder, extension) {
-        let row = new ExtensionRow(extension.uuid);
+        let iter = this._model.append();
-
+        this._model.set(iter, [0, 1], [extension.uuid, extension.metadata.name]);
-        row.prefsButton.visible = this._extensionAvailable(row.uuid);
+        this._extensionIters[extension.uuid] = iter;
        row.prefsButton.connect('clicked', Lang.bind(this,
            function() {
                this._selectExtension(row.uuid);
            }));
        row.show_all();
        this._extensionSelector.add(row);
    },
    _extensionsLoaded: function() {
        if (this._startupUuid && this._extensionAvailable(this._startupUuid))
            this._selectExtension(this._startupUuid);
        this._startupUuid = null;
        this._skipMainWindow = false;
        this._loaded = true;
    },
    _onActivate: function() {
@@ -243,125 +227,29 @@ const Application = new Lang.Class({
    },
    _onStartup: function(app) {
        this._buildModel();
        this._buildUI(app);
        this._addCustomStyle();
        this._scanExtensions();
    },
    _onCommandLine: function(app, commandLine) {
        app.activate();
        let args = commandLine.get_arguments();
        if (args.length) {
            let uuid = args[0];
            this._skipMainWindow = true;
            // Strip off "extension:///" prefix which fakes a URI, if it exists
            uuid = stripPrefix(uuid, "extension:///");
            if (this._extensionAvailable(uuid))
                this._selectExtension(uuid);
            else if (!this._loaded)
                this._startupUuid = uuid;
            else
-                this._skipMainWindow = false;
+                this._startupUuid = uuid;
        }
        return 0;
    }
 });
 const ExtensionRow = new Lang.Class({
    Name: 'ExtensionRow',
    Extends: Gtk.ListBoxRow,
    _init: function(uuid) {
        this.parent();
        this.uuid = uuid;
        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
        this._settings.connect('changed::enabled-extensions', Lang.bind(this,
            function() {
                this._switch.state = this._isEnabled();
            }));
        this._buildUI();
    },
    _buildUI: function() {
        let extension = ExtensionUtils.extensions[this.uuid];
        let hbox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL,
                                 hexpand: true, margin: 12, spacing: 6 });
        this.add(hbox);
        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL,
                                 spacing: 6, hexpand: true });
        hbox.add(vbox);
        let name = GLib.markup_escape_text(extension.metadata.name, -1);
        let label = new Gtk.Label({ label: '<b>' + name + '</b>',
                                    use_markup: true,
                                    halign: Gtk.Align.START });
        vbox.add(label);
        let desc = extension.metadata.description.split('\n')[0];
        label = new Gtk.Label({ label: desc,
                                ellipsize: Pango.EllipsizeMode.END,
                                halign: Gtk.Align.START });
        vbox.add(label);
        let button = new Gtk.Button({ valign: Gtk.Align.CENTER,
                                      no_show_all: true });
        button.add(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
                                   icon_size: Gtk.IconSize.BUTTON,
                                   visible: true }));
        button.get_style_context().add_class('prefs-button');
        hbox.add(button);
        this.prefsButton = button;
        this._switch = new Gtk.Switch({ valign: Gtk.Align.CENTER,
                                        state: this._isEnabled() });
        this._switch.connect('notify::active', Lang.bind(this,
            function() {
                if (this._switch.active)
                    this._enable();
                else
                    this._disable();
            }));
        this._switch.connect('state-set', function() { return true; });
        hbox.add(this._switch);
    },
    _isEnabled: function() {
        let extensions = this._settings.get_strv('enabled-extensions');
        return extensions.indexOf(this.uuid) != -1;
    },
    _enable: function() {
        let extensions = this._settings.get_strv('enabled-extensions');
        if (extensions.indexOf(this.uuid) != -1)
            return;
        extensions.push(this.uuid);
        this._settings.set_strv('enabled-extensions', extensions);
    },
    _disable: function() {
        let extensions = this._settings.get_strv('enabled-extensions');
        let pos = extensions.indexOf(this.uuid);
        if (pos == -1)
            return;
        do {
            extensions.splice(pos, 1);
            pos = extensions.indexOf(this.uuid);
        } while (pos != -1);
        this._settings.set_strv('enabled-extensions', extensions);
    }
 });
 function initEnvironment() {
    // Monkey-patch in a "global" object that fakes some Shell utilities
    // that ExtensionUtils depends on.
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -450,7 +450,8 @@ const AuthPrompt = new Lang.Class({
            // respond to the request with the username
            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
        } else if (this._userVerifier.serviceIsForeground(GdmUtil.OVIRT_SERVICE_NAME) ||
-                   this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME)) {
+                   (this.smartcardDetected &&
                    this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME))) {
            // We don't need to know the username if the user preempted the login screen
            // with a smartcard or with preauthenticated oVirt credentials
            beginRequestType = BeginRequestType.DONT_PROVIDE_USERNAME;
--- a/js/gdm/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;
@@ -48,6 +49,8 @@ const _SCROLL_ANIMATION_TIME = 0.5;
 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
 const _LOGO_ICON_HEIGHT = 48;
 let _loginDialog = null;
 const UserListItem = new Lang.Class({
    Name: 'UserListItem',
@@ -382,7 +385,7 @@ const LoginDialog = new Lang.Class({
                                  Lang.bind(this, this._onTimedLoginRequested));
        }
-        this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA });
+        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
                               Lang.bind(this, this._updateBanner));
@@ -453,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);
@@ -468,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);
@@ -537,12 +526,9 @@ const LoginDialog = new Lang.Class({
            return;
        this._logoBin.destroy_all_children();
-        if (this._logoFileUri) {
+        if (this._logoFileUri)
            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
            this._logoBin.add_child(this._textureCache.load_uri_async(this._logoFileUri,
-                                                                      -1, _LOGO_ICON_HEIGHT,
+                                                                      -1, _LOGO_ICON_HEIGHT));
                                                                      scaleFactor));
        }
    },
    _updateLogo: function() {
@@ -641,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,
@@ -686,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 });
    },
@@ -746,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;
    },
@@ -849,7 +803,6 @@ const LoginDialog = new Lang.Class({
    },
    _showUserList: function() {
        this._ensureUserListLoaded();
        this._authPrompt.hide();
        this._sessionMenuButton.close();
        this._setUserListExpanded(true);
@@ -893,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);
@@ -913,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
@@ -128,7 +128,7 @@ const ShellUserVerifier = new Lang.Class({
        this._client = client;
-        this._settings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
+        this._settings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
        this._settings.connect('changed',
                               Lang.bind(this, this._updateDefaultService));
        this._updateDefaultService();
@@ -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>
@@ -25,9 +26,6 @@
    <file>misc/util.js</file>
    <file>perf/core.js</file>
    <file>perf/hwtest.js</file>
    <file>portalHelper/main.js</file>
    <file>ui/altTab.js</file>
    <file>ui/animation.js</file>
@@ -87,7 +85,6 @@
    <file>ui/userWidget.js</file>
    <file>ui/viewSelector.js</file>
    <file>ui/windowAttentionHandler.js</file>
    <file>ui/windowMenu.js</file>
    <file>ui/windowManager.js</file>
    <file>ui/workspace.js</file>
    <file>ui/workspaceSwitcherPopup.js</file>
@@ -105,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({
+const LoginManagerConsoleKit = new Lang.Class({
-    Name: 'LoginManagerDummy',
+    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
+        if (this._currentSession) {
-        // expect (at the time of writing: connect() and connectSignal()
+            callback (this._currentSession);
-        // methods), but just never calling the callback should be safer
+            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/perf/core.js
+++ b/js/perf/core.js
@@ -72,9 +72,6 @@ function run() {
    Scripting.defineScriptEvent("applicationsShowStart", "Starting to switch to applications view");
    Scripting.defineScriptEvent("applicationsShowDone", "Done switching to applications view");
    // Enable recording of timestamps for different points in the frame cycle
    global.frame_timestamps = true;
    Main.overview.connect('shown', function() {
                              Scripting.scriptEvent('overviewShowDone');
                          });
@@ -90,10 +87,7 @@ function run() {
            yield Scripting.destroyTestWindows();
            for (let k = 0; k < config.count; k++)
-                yield Scripting.createTestWindow({ width: config.width,
+                yield Scripting.createTestWindow(config.width, config.height, config.alpha, config.maximized);
                                                   height: config.height,
                                                   alpha: config.alpha,
                                                   maximized: config.maximized });
            yield Scripting.waitTestWindows();
            yield Scripting.sleep(1000);
--- a/js/perf/hwtest.js
+++ b/js/perf/hwtest.js
@@ -1,308 +0,0 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
 const Shell = imports.gi.Shell;
 let METRICS = {
    timeToDesktop:
    { description: "Time from starting graphical.target to desktop showing",
      units: "us" },
    overviewShowTime:
    { description: "Time to switch to overview view, first time",
      units: "us" },
    applicationsShowTime:
    { description: "Time to switch to applications view, first time",
      units: "us" },
    mainViewRedrawTime:
    { description: "Time to redraw the main view, full screen",
      units: "us" },
    overviewRedrawTime:
    { description: "Time to redraw the overview, full screen, 5 windows",
      units: "us" },
    applicationRedrawTime:
    { description: "Time to redraw frame with a maximized application update",
      units: "us" },
    geditStartTime:
    { description: "Time from gedit launch to window drawn",
      units: "us" },
 }
 function waitAndDraw(milliseconds) {
    let cb;
    let timeline = new Clutter.Timeline({ duration: milliseconds });
    timeline.start();
    timeline.connect('new-frame',
        function(timeline, frame) {
            global.stage.queue_redraw();
        });
    timeline.connect('completed',
        function() {
            timeline.stop();
            if (cb)
                cb();
        });
    return function(callback) {
        cb = callback;
    };
 }
 function waitSignal(object, signal) {
    let cb;
    let id = object.connect(signal, function() {
        object.disconnect(id);
        if (cb)
            cb();
    });
    return function(callback) {
        cb = callback;
    };
 }
 function extractBootTimestamp() {
    let sp = Gio.Subprocess.new(['journalctl', '-b',
                                 'MESSAGE_ID=7d4958e842da4a758f6c1cdc7b36dcc5',
                                 'UNIT=graphical.target',
                                 '-o',
                                 'json'],
                                Gio.SubprocessFlags.STDOUT_PIPE);
    let result = null;
    let datastream = Gio.DataInputStream.new(sp.get_stdout_pipe());
    while (true) {
        let [line, length] = datastream.read_line_utf8(null);
        if (line === null)
            break;
        let fields = JSON.parse(line);
        result = Number(fields['__MONOTONIC_TIMESTAMP']);
    }
    datastream.close(null);
    return result;
 }
 function run() {
    Scripting.defineScriptEvent("desktopShown", "Finished initial animation");
    Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview");
    Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing");
    Scripting.defineScriptEvent("applicationsShowStart", "Starting to switch to applications view");
    Scripting.defineScriptEvent("applicationsShowDone", "Done switching to applications view");
    Scripting.defineScriptEvent("mainViewDrawStart", "Drawing main view");
    Scripting.defineScriptEvent("mainViewDrawDone", "Ending timing main view drawing");
    Scripting.defineScriptEvent("overviewDrawStart", "Drawing overview");
    Scripting.defineScriptEvent("overviewDrawDone", "Ending timing overview drawing");
    Scripting.defineScriptEvent("redrawTestStart", "Drawing application window");
    Scripting.defineScriptEvent("redrawTestDone", "Ending timing application window drawing");
    Scripting.defineScriptEvent("collectTimings", "Accumulate frame timings from redraw tests");
    Scripting.defineScriptEvent("geditLaunch", "gedit application launch");
    Scripting.defineScriptEvent("geditFirstFrame", "first frame of gedit window drawn");
    yield Scripting.waitLeisure();
    Scripting.scriptEvent('desktopShown');
    Gtk.Settings.get_default().gtk_enable_animations = false;
    Scripting.scriptEvent('overviewShowStart');
    Main.overview.show();
    yield Scripting.waitLeisure();
    Scripting.scriptEvent('overviewShowDone');
    yield Scripting.sleep(1000);
    Scripting.scriptEvent('applicationsShowStart');
    Main.overview._dash.showAppsButton.checked = true;
    yield Scripting.waitLeisure();
    Scripting.scriptEvent('applicationsShowDone');
    yield Scripting.sleep(1000);
    Main.overview.hide();
    yield Scripting.waitLeisure();
    ////////////////////////////////////////
    // Tests of redraw speed
    ////////////////////////////////////////
    global.frame_timestamps = true;
    global.frame_finish_timestamp = true;
    for (let k = 0; k < 5; k++)
        yield Scripting.createTestWindow(640, 480,
                                         { maximized: true });
    yield Scripting.waitTestWindows();
    yield Scripting.sleep(1000);
    Scripting.scriptEvent('mainViewDrawStart');
    yield waitAndDraw(1000);
    Scripting.scriptEvent('mainViewDrawDone');
    Main.overview.show();
    Scripting.waitLeisure();
    yield Scripting.sleep(1500);
    Scripting.scriptEvent('overviewDrawStart');
    yield waitAndDraw(1000);
    Scripting.scriptEvent('overviewDrawDone');
    yield Scripting.destroyTestWindows();
    Main.overview.hide();
    yield Scripting.createTestWindow(640, 480,
                                     { maximized: true,
                                       redraws: true});
    yield Scripting.waitTestWindows();
    yield Scripting.sleep(1000);
    Scripting.scriptEvent('redrawTestStart');
    yield Scripting.sleep(1000);
    Scripting.scriptEvent('redrawTestDone');
    yield Scripting.sleep(1000);
    Scripting.scriptEvent('collectTimings');
    yield Scripting.destroyTestWindows();
    global.frame_timestamps = false;
    global.frame_finish_timestamp = false;
    yield Scripting.sleep(1000);
    ////////////////////////////////////////
    let appSys = Shell.AppSystem.get_default();
    let app = appSys.lookup_app('gedit.desktop');
    Scripting.scriptEvent('geditLaunch');
    app.activate();
    let windows = app.get_windows();
    if (windows.length > 0)
        throw new Error('gedit was already running');
    while (windows.length == 0) {
        yield waitSignal(global.display, 'window-created');
        windows = app.get_windows();
    }
    let actor = windows[0].get_compositor_private();
    yield waitSignal(actor, 'first-frame');
    Scripting.scriptEvent('geditFirstFrame');
    yield Scripting.sleep(1000);
    windows[0].delete(global.get_current_time());
    yield Scripting.sleep(1000);
    Gtk.Settings.get_default().gtk_enable_animations = true;
 }
 let overviewShowStart;
 let applicationsShowStart;
 let stagePaintStart;
 let redrawTiming;
 let redrawTimes = {};
 let geditLaunchTime;
 function script_desktopShown(time) {
    let bootTimestamp = extractBootTimestamp();
    METRICS.timeToDesktop.value = time - bootTimestamp;
 }
 function script_overviewShowStart(time) {
    overviewShowStart = time;
 }
 function script_overviewShowDone(time) {
    METRICS.overviewShowTime.value = time - overviewShowStart;
 }
 function script_applicationsShowStart(time) {
    applicationsShowStart = time;
 }
 function script_applicationsShowDone(time) {
    METRICS.applicationsShowTime.value = time - applicationsShowStart;
 }
 function script_mainViewDrawStart(time) {
    redrawTiming = 'mainView';
 }
 function script_mainViewDrawDone(time) {
    redrawTiming = null;
 }
 function script_overviewDrawStart(time) {
    redrawTiming = 'overview';
 }
 function script_overviewDrawDone(time) {
    redrawTiming = null;
 }
 function script_redrawTestStart(time) {
    redrawTiming = 'application';
 }
 function script_redrawTestDone(time) {
    redrawTiming = null;
 }
 function script_collectTimings(time) {
    for (let timing in redrawTimes) {
        let times = redrawTimes[timing];
        times.sort();
        let len = times.length;
        let median;
        if (len == 0)
            median = -1;
        else if (len % 2 == 1)
            median = times[(len - 1)/ 2];
        else
            median = Math.round((times[len / 2 - 1] + times[len / 2]) / 2);
        METRICS[timing + 'RedrawTime'].value = median;
    }
 }
 function script_geditLaunch(time) {
    geditLaunchTime = time;
 }
 function script_geditFirstFrame(time) {
    METRICS.geditStartTime.value = time - geditLaunchTime;
 }
 function clutter_stagePaintStart(time) {
    stagePaintStart = time;
 }
 function clutter_paintCompletedTimestamp(time) {
    if (redrawTiming != null && stagePaintStart != null) {
        if (!(redrawTiming in redrawTimes))
            redrawTimes[redrawTiming] = [];
        redrawTimes[redrawTiming].push(time - stagePaintStart);
    }
    stagePaintStart = null;
 }
--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -1,248 +0,0 @@
 const Format = imports.format;
 const Gettext = imports.gettext;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Pango = imports.gi.Pango;
 const Soup = imports.gi.Soup;
 const WebKit = imports.gi.WebKit2;
 const _ = Gettext.gettext;
 const Config = imports.misc.config;
 const PortalHelperResult = {
    CANCELLED: 0,
    COMPLETED: 1,
    RECHECK: 2
 };
 const INACTIVITY_TIMEOUT = 30000; //ms
 const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
 const HelperDBusInterface = '<node> \
 <interface name="org.gnome.Shell.PortalHelper"> \
 <method name="Authenticate"> \
    <arg type="o" direction="in" name="connection" /> \
    <arg type="s" direction="in" name="url" /> \
    <arg type="u" direction="in" name="timestamp" /> \
 </method> \
 <method name="Close"> \
    <arg type="o" direction="in" name="connection" /> \
 </method> \
 <method name="Refresh"> \
    <arg type="o" direction="in" name="connection" /> \
 </method> \
 <signal name="Done"> \
    <arg type="o" name="connection" /> \
    <arg type="u" name="result" /> \
 </signal> \
 </interface> \
 </node>';
 const PortalWindow = new Lang.Class({
    Name: 'PortalWindow',
    Extends: Gtk.ApplicationWindow,
    _init: function(application, url, timestamp, doneCallback) {
        this.parent({ application: application });
        if (url) {
            this._uri = new Soup.URI(uri);
        } else {
            url = 'http://www.gnome.org';
            this._uri = null;
            this._everSeenRedirect = false;
        }
        this._originalUrl = url;
        this._doneCallback = doneCallback;
        this._lastRecheck = 0;
        this._recheckAtExit = false;
        this._webView = new WebKit.WebView();
        this._webView.connect('decide-policy', Lang.bind(this, this._onDecidePolicy));
        this._webView.load_uri(url);
        this._webView.connect('notify::title', Lang.bind(this, this._syncTitle));
        this._syncTitle();
        this.add(this._webView);
        this._webView.show();
        this.maximize();
        this.present_with_time(timestamp);
    },
    _syncTitle: function() {
        let title = this._webView.title;
        if (title) {
            this.title = title;
        } else {
            // TRANSLATORS: this is the title of the wifi captive portal login
            // window, until we know the title of the actual login page
            this.title = _("Web Authentication Redirect");
        }
    },
    refresh: function() {
        this._everSeenRedirect = false;
        this._webView.load_uri(this._originalUrl);
    },
    vfunc_delete_event: function(event) {
        if (this._recheckAtExit)
            this._doneCallback(PortalHelperResult.RECHECK);
        else
            this._doneCallback(PortalHelperResult.CANCELLED);
        return false;
    },
    _onDecidePolicy: function(view, decision, type) {
        if (type == WebKit.PolicyDecisionType.NEW_WINDOW_ACTION) {
            decision.ignore();
            return true;
        }
        if (type != WebKit.PolicyDecisionType.NAVIGATION_ACTION)
            return false;
        let request = decision.get_request();
        let uri = new Soup.URI(request.get_uri());
        if (this._uri != null) {
            if (!uri.host_equal(uri, this._uri)) {
                // We *may* have finished here, but we don't know for
                // sure. Tell gnome-shell to run another connectivity check
                // (but ratelimit the checks, we don't want to spam
                // gnome.org for portals that have 10 or more internal
                // redirects - and unfortunately they exist)
                // If we hit the rate limit, we also queue a recheck
                // when the window is closed, just in case we miss the
                // final check and don't realize we're connected
                // This should not be a problem in the cancelled logic,
                // because if the user doesn't want to start the login,
                // we should not see any redirect at all, outside this._uri
                let now = GLib.get_monotonic_time();
                let shouldRecheck = (now - this._lastRecheck) >
                    CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT;
                if (shouldRecheck) {
                    this._lastRecheck = now;
                    this._recheckAtExit = false;
                    this._doneCallback(PortalHelperResult.RECHECK);
                } else {
                    this._recheckAtExit = true;
                }
            }
            // Update the URI, in case of chained redirects, so we still
            // think we're doing the login until gnome-shell kills us
            this._uri = uri;
        } else {
            if (uri.get_host() == 'www.gnome.org' && this._everSeenRedirect) {
                // Yay, we got to gnome!
                decision.ignore();
                this._doneCallback(PortalHelperResult.COMPLETED);
                return true;
            } else if (uri.get_host() != 'www.gnome.org') {
                this._everSeenRedirect = true;
            }
        }
        decision.use();
        return true;
    },
 });
 const WebPortalHelper = new Lang.Class({
    Name: 'WebPortalHelper',
    Extends: Gtk.Application,
    _init: function() {
        this.parent({ application_id: 'org.gnome.Shell.PortalHelper',
                      flags: Gio.ApplicationFlags.IS_SERVICE,
                      inactivity_timeout: 30000 });
        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(HelperDBusInterface, this);
        this._queue = [];
    },
    vfunc_dbus_register: function(connection, path) {
        this._dbusImpl.export(connection, path);
        this.parent(connection, path);
        return true;
    },
    vfunc_dbus_unregister: function(connection, path) {
        this._dbusImpl.unexport_from_connection(connection);
        this.parent(connection, path);
    },
    vfunc_activate: function() {
        // If launched manually (for example for testing), force a dummy authentication
        // session with the default url
        this.Authenticate('/org/gnome/dummy', '', 0);
    },
    Authenticate: function(connection, url, timestamp) {
        this._queue.push({ connection: connection, url: url, timestamp: timestamp });
        this._processQueue();
    },
    Close: function(connection) {
        for (let i = 0; i < this._queue.length; i++) {
            let obj = this._queue[i];
            if (obj.connection == connection) {
                if (obj.window)
                    obj.window.destroy();
                this._queue.splice(i, 1);
                break;
            }
        }
        this._processQueue();
    },
    Refresh: function(connection) {
        for (let i = 0; i < this._queue.length; i++) {
            let obj = this._queue[i];
            if (obj.connection == connection) {
                if (obj.window)
                    obj.window.refresh();
                break;
            }
        }
    },
    _processQueue: function() {
        if (this._queue.length == 0)
            return;
        let top = this._queue[0];
        if (top.window != null)
            return;
        top.window = new PortalWindow(this, top.uri, top.timestamp, Lang.bind(this, function(result) {
            this._dbusImpl.emit_signal('Done', new GLib.Variant('(ou)', [top.connection, result]));
        }));
    },
 });
 function initEnvironment() {
    String.prototype.format = Format.format;
 }
 function main(argv) {
    initEnvironment();
    Gettext.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
    Gettext.textdomain(Config.GETTEXT_PACKAGE);
    let app = new WebPortalHelper();
    return app.run(argv);
 }
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -24,7 +24,7 @@ const WINDOW_PREVIEW_SIZE = 128;
 const APP_ICON_SIZE = 96;
 const APP_ICON_SIZE_SMALL = 48;
-const baseIconSizes = [96, 64, 48, 32, 22];
+const iconSizes = [96, 64, 48, 32, 22];
 const AppIconMode = {
    THUMBNAIL_ONLY: 1,
@@ -167,8 +167,6 @@ const AppSwitcherPopup = new Lang.Class({
                this._select(this._selectedIndex, this._nextWindow());
            else if (keysym == Clutter.Up)
                this._select(this._selectedIndex, null, true);
            else
                return Clutter.EVENT_PROPAGATE;
        } else {
            if (keysym == Clutter.Left)
                this._select(this._previous());
@@ -176,11 +174,7 @@ const AppSwitcherPopup = new Lang.Class({
                this._select(this._next());
            else if (keysym == Clutter.Down)
                this._select(this._selectedIndex, 0);
            else
                return Clutter.EVENT_PROPAGATE;
        }
        return Clutter.EVENT_STOP;
    },
    _scrollHandler: function(direction) {
@@ -311,7 +305,6 @@ const AppSwitcherPopup = new Lang.Class({
            this._thumbnailTimeoutId = Mainloop.timeout_add (
                THUMBNAIL_POPUP_TIME,
                Lang.bind(this, this._timeoutPopupThumbnails));
            GLib.Source.set_name_by_id(this._thumbnailTimeoutId, '[gnome-shell] this._timeoutPopupThumbnails');
        }
    },
@@ -367,12 +360,12 @@ const WindowSwitcherPopup = new Lang.Class({
    _init: function(items) {
        this.parent(items);
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });
    },
    _getWindowList: function() {
        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
-        return global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
+        return global.display.get_tab_list(Meta.TabList.NORMAL, global.screen, workspace);
    },
    _createSwitcher: function() {
@@ -410,11 +403,7 @@ const WindowSwitcherPopup = new Lang.Class({
                this._select(this._previous());
            else if (keysym == Clutter.Right)
                this._select(this._next());
            else
                return Clutter.EVENT_PROPAGATE;
        }
        return Clutter.EVENT_STOP;
    },
    _finish: function() {
@@ -441,6 +430,7 @@ const AppIcon = new Lang.Class({
    set_size: function(size) {
        this.icon = this.app.create_icon_texture(size);
        this._iconBin.set_size(size, size);
        this._iconBin.child = this.icon;
    }
 });
@@ -456,10 +446,11 @@ const AppSwitcher = new Lang.Class({
        this._arrows = [];
        let windowTracker = Shell.WindowTracker.get_default();
-        let settings = new Gio.Settings({ schema_id: 'org.gnome.shell.app-switcher' });
+        let settings = new Gio.Settings({ schema: 'org.gnome.shell.app-switcher' });
        let workspace = settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace()
                                                                       : null;
-        let allWindows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
+        let allWindows = global.display.get_tab_list(Meta.TabList.NORMAL,
                                                     global.screen, workspace);
        // Construct the AppIcons, add to the popup
        for (let i = 0; i < apps.length; i++) {
@@ -469,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;
@@ -488,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);
@@ -505,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;
+        for(let i =  0; i < iconSizes.length; i++) {
-        let iconSizes = baseIconSizes.map(function(s) {
+                this._iconSize = iconSizes[i];
-            return s * scaleFactor;
+                height = iconSizes[i] + iconSpacing;
        });
        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;
                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++) {
@@ -528,11 +514,9 @@ const AppSwitcher = new Lang.Class({
                break;
            this.icons[i].set_size(this._iconSize);
        }
    },
-    _getPreferredHeight: function (actor, forWidth, alloc) {
+        alloc.min_size = height;
-        this._setIconSize();
+        alloc.natural_size = height;
        this.parent(actor, forWidth, alloc);
    },
    _allocate: function (actor, box, flags) {
@@ -566,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);
    },
@@ -666,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;
-
+        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height, scaleFactor,
                                                                            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
@@ -16,7 +16,6 @@ const Atk = imports.gi.Atk;
 const AppFavorites = imports.ui.appFavorites;
 const BoxPointer = imports.ui.boxpointer;
 const DND = imports.ui.dnd;
 const GrabHelper = imports.ui.grabHelper;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
@@ -42,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,
@@ -102,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;
@@ -112,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)
@@ -140,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);
        }));
@@ -261,8 +205,7 @@ const PageIndicators = new Lang.Class({
            Tweener.addTween(children[i],
                             { translation_x: 0,
                               time: INDICATORS_BASE_TIME + delay * i,
-                               transition: 'easeInOutQuad',
+                               transition: 'easeInOutQuad'
                               delay: VIEWS_SWITCH_ANIMATION_DELAY
                             });
        }
    }
@@ -365,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_id: '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() {
@@ -442,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)
@@ -475,12 +348,14 @@ const AllView = new Lang.Class({
        // longer than PAGE_SWITCH_TIME
        time = Math.min(time, PAGE_SWITCH_TIME);
-        this._currentPage = pageNumber;
+        if (pageNumber < this._grid.nPages() && pageNumber >= 0) {
-        Tweener.addTween(this._adjustment,
+            this._currentPage = pageNumber;
-                         { value: this._grid.getPageY(this._currentPage),
+            Tweener.addTween(this._adjustment,
-                           time: time,
+                             { value: this._grid.getPageY(this._currentPage),
-                           transition: 'easeOutQuad' });
+                               time: time,
-        this._pageIndicators.setCurrentPage(pageNumber);
+                               transition: 'easeOutQuad' });
            this._pageIndicators.setCurrentPage(pageNumber);
        }
    },
    _diffToPage: function (pageNumber) {
@@ -527,19 +402,15 @@ const AllView = new Lang.Class({
    _onPanEnd: function(action) {
         if (this._displayingPopup)
            return;
-
+        let diffCurrentPage = this._diffToPage(this._currentPage);
-        let pageHeight = this._grid.getPageHeight();
+        if (diffCurrentPage > this._scrollView.height * PAGE_SWITCH_TRESHOLD) {
-
+            if (action.get_velocity(0)[2] > 0)
-        // Calculate the scroll value we'd be at, which is our current
+                this.goToPage(this._currentPage - 1);
-        // scroll plus any velocity the user had when they released
+            else
-        // their finger.
+                this.goToPage(this._currentPage + 1);
-
+        } else {
-        let velocity = -action.get_velocity(0)[2];
+            this.goToPage(this._currentPage);
-        let endPanValue = this._adjustment.value + velocity;
+        }
        let closestPage = Math.round(endPanValue / pageHeight);
        this.goToPage(closestPage);
        this._panning = false;
    },
@@ -558,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,
@@ -570,7 +446,7 @@ const AllView = new Lang.Class({
            }));
    },
-    _keyFocusIn: function(icon) {
+    _ensureIconVisible: function(icon) {
        let itemPage = this._grid.getItemPage(icon);
        this.goToPage(itemPage);
    },
@@ -652,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;
@@ -741,7 +616,17 @@ const AppDisplay = new Lang.Class({
    Name: 'AppDisplay',
    _init: function() {
-        this._privacySettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.privacy' });
+        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));
@@ -769,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 });
@@ -794,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: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
-            let params = { time: VIEWS_SWITCH_TIME,
+                           opacity: (i == activeIndex) ? 255 : 0 };
                           opacity: (i == activeIndex) ? 255 : 0,
                           delay: (i == activeIndex) ? VIEWS_SWITCH_ANIMATION_DELAY : 0 };
            if (i == activeIndex)
                actor.visible = true;
            else
@@ -829,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);
@@ -941,28 +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: new Clutter.BinLayout(),
-        let icon = new St.Widget({ layout_manager: layout,
+                                   style_class: 'app-folder-icon',
-                                   style_class: 'app-folder-icon' });
+                                   width: size, height: size });
        layout.hookup_style(icon);
        let subSize = Math.floor(FOLDER_SUBICON_FRACTION * size);
-        let numItems = this._allItems.length;
+        let aligns = [ Clutter.ActorAlign.START, Clutter.ActorAlign.END ];
-        let rtl = icon.get_text_direction() == Clutter.TextDirection.RTL;
+        for (let i = 0; i < Math.min(this._allItems.length, 4); i++) {
-        for (let i = 0; i < 4; i++) {
+            let texture = this._allItems[i].app.create_icon_texture(subSize);
-            let bin;
+            let bin = new St.Bin({ child: texture,
-            if (i < numItems) {
+                                   x_expand: true, y_expand: true });
-                let texture = this._allItems[i].app.create_icon_texture(subSize);
+            bin.set_x_align(aligns[i % 2]);
-                bin = new St.Bin({ child: texture });
+            bin.set_y_align(aligns[Math.floor(i / 2)]);
-            } else {
+            icon.add_actor(bin);
                bin = new St.Bin({ width: subSize, height: subSize });
            }
            layout.pack(bin, rtl ? (i + 1) % 2 : i % 2, Math.floor(i / 2));
        }
        return icon;
@@ -1034,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,
@@ -1050,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() {
@@ -1067,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) {
@@ -1202,7 +1087,6 @@ const FolderIcon = new Lang.Class({
        this._popupInvalidated = true;
    },
 });
 Signals.addSignalMethods(FolderIcon.prototype);
 const AppFolderPopup = new Lang.Class({
    Name: 'AppFolderPopup',
@@ -1251,53 +1135,18 @@ const AppFolderPopup = new Lang.Class({
            function() {
                this.actor.destroy();
            }));
        this._grabHelper = new GrabHelper.GrabHelper(this.actor);
        this._grabHelper.addActor(Main.layoutManager.overviewGroup);
        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPress));
    },
    _onKeyPress: function(actor, event) {
-        if (global.stage.get_key_focus() != actor)
+        if (!this._isOpen)
            return Clutter.EVENT_PROPAGATE;
-        // Since we need to only grab focus on one item child when the user
+        if (event.get_key_symbol() != Clutter.KEY_Escape)
-        // actually press a key we don't use navigate_focus when opening
+            return Clutter.EVENT_PROPAGATE;
        // the popup.
        // Instead of that, grab the focus on the AppFolderPopup actor
        // and actually moves the focus to a child only when the user
        // actually press a key.
        // It should work with just grab_key_focus on the AppFolderPopup
        // actor, but since the arrow keys are not wrapping_around the focus
        // is not grabbed by a child when the widget that has the current focus
        // is the same that is requesting focus, so to make it works with arrow
        // keys we need to connect to the key-press-event and navigate_focus
        // when that happens using TAB_FORWARD or TAB_BACKWARD instead of arrow
        // keys
-        // Use TAB_FORWARD for down key and right key
+        this.popdown();
-        // and TAB_BACKWARD for up key and left key on ltr
+        return Clutter.EVENT_STOP;
        // languages
        let direction;
        let isLtr = Clutter.get_default_text_direction() == Clutter.TextDirection.LTR;
        switch (event.get_key_symbol()) {
            case Clutter.Down:
                direction = Gtk.DirectionType.TAB_FORWARD;
                break;
            case Clutter.Right:
                direction = isLtr ? Gtk.DirectionType.TAB_FORWARD :
                                    Gtk.DirectionType.TAB_BACKWARD;
                break;
            case Clutter.Up:
                direction = Gtk.DirectionType.TAB_BACKWARD;
                break;
            case Clutter.Left:
                direction = isLtr ? Gtk.DirectionType.TAB_BACKWARD :
                                    Gtk.DirectionType.TAB_FORWARD;
                break;
            default:
                return Clutter.EVENT_PROPAGATE;
        }
        return actor.navigate_focus(null, direction, false);
    },
    toggle: function() {
@@ -1311,18 +1160,15 @@ const AppFolderPopup = new Lang.Class({
        if (this._isOpen)
            return;
        this._isOpen = this._grabHelper.grab({ actor: this.actor,
                                               onUngrab: Lang.bind(this, this.popdown) });
        if (!this._isOpen)
            return;
        this.actor.show();
        this._boxPointer.setArrowActor(this._source.actor);
        this._boxPointer.show(BoxPointer.PopupAnimation.FADE |
                              BoxPointer.PopupAnimation.SLIDE);
        this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
        this._isOpen = true;
        this.emit('open-state-changed', true);
    },
@@ -1330,8 +1176,6 @@ const AppFolderPopup = new Lang.Class({
        if (!this._isOpen)
            return;
        this._grabHelper.ungrab({ actor: this.actor });
        this._boxPointer.hide(BoxPointer.PopupAnimation.FADE |
                              BoxPointer.PopupAnimation.SLIDE);
        this._isOpen = false;
@@ -1448,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;
@@ -1462,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();
        }
@@ -1571,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
@@ -1587,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
@@ -1596,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 && windows[i].get_workspace() != activeWorkspace) {
            if (!separatorShown && window.get_workspace() != activeWorkspace) {
                this._appendSeparator();
                separatorShown = true;
            }
-            let item = this._appendMenuItem(window.title);
+            let item = this._appendMenuItem(windows[i].title);
-            item.connect('activate', Lang.bind(this, function() {
+            item._window = windows[i];
                this.emit('activate-window', window);
            }));
        }
        if (!this._source.app.is_window_backed()) {
-            this._appendSeparator();
+            if (windows.length > 0)
-
+                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();
            let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id());
-            if (isFavorite) {
+            this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
-                let item = this._appendMenuItem(_("Remove from Favorites"));
+            this._appendSeparator();
                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());
                }));
            }
-            if (Shell.AppSystem.get_default().lookup_app('org.gnome.Software.desktop')) {
+            this._toggleFavoriteMenuItem = this._appendMenuItem(isFavorite ? _("Remove from Favorites")
-                this._appendSeparator();
+                                                                : _("Add to Favorites"));
                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();
                        });
                }));
            }
        }
    },
@@ -1682,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/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -6,26 +6,6 @@ const Signals = imports.signals;
 const Main = imports.ui.main;
 const RENAMED_DESKTOP_IDS = {
    'baobab.desktop': 'org.gnome.baobab.desktop',
    'cheese.desktop': 'org.gnome.Cheese.desktop',
    'dconf-editor.desktop': 'ca.desrt.dconf-editor.desktop',
    'file-roller.desktop': 'org.gnome.FileRoller.desktop',
    'gcalctool.desktop': 'gnome-calculator.desktop',
    'gedit.desktop': 'org.gnome.gedit.desktop',
    'glchess.desktop': 'gnome-chess.desktop',
    'gnome-clocks.desktop': 'org.gnome.clocks.desktop',
    'gnome-documents.desktop': 'org.gnome.Documents.desktop',
    'gnome-font-viewer.desktop': 'org.gnome.font-viewer.desktop',
    'gnome-photos.desktop': 'org.gnome.Photos.desktop',
    'gnome-screenshot.desktop': 'org.gnome.Screenshot.desktop',
    'gnome-software.desktop': 'org.gnome.Software.desktop',
    'gnome-weather.desktop': 'org.gnome.Weather.Application.desktop',
    'gnomine.desktop': 'gnome-mines.desktop',
    'nautilus.desktop': 'org.gnome.Nautilus.desktop',
    'polari.desktop': 'org.gnome.Polari.desktop',
 };
 const AppFavorites = new Lang.Class({
    Name: 'AppFavorites',
@@ -44,21 +24,6 @@ const AppFavorites = new Lang.Class({
    reload: function() {
        let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
        // Map old desktop file names to the current ones
        let updated = false;
        ids = ids.map(function (id) {
            let newId = RENAMED_DESKTOP_IDS[id];
            if (newId !== undefined) {
                updated = true;
                return newId;
            }
            return id;
        });
        // ... and write back the updated desktop file names
        if (updated)
            global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
        let appSys = Shell.AppSystem.get_default();
        let apps = ids.map(function (id) {
                return appSys.lookup_app(id);
--- 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 (this._pendingFileLoads[i].filename == params.filename &&
-
+                this._pendingFileLoads[i].style == params.style) {
-            if (fileLoad.filename == params.filename &&
+                this._pendingFileLoads[i].callers.push({ shouldCopy: true,
-                fileLoad.style == params.style) {
+                                                         monitorIndex: params.monitorIndex,
-                this._attachCallerToFileLoad(caller, fileLoad);
+                                                         effects: params.effects,
                                                         onFinished: params.onFinished });
                return;
            }
        }
-        let fileLoad = { filename: params.filename,
+        this._pendingFileLoads.push({ filename: params.filename,
-                         style: params.style,
+                                      style: params.style,
-                         cancellable: new Gio.Cancellable(),
+                                      callers: [{ shouldCopy: false,
-                         callers: [] };
+                                                  monitorIndex: params.monitorIndex,
-        this._attachCallerToFileLoad(caller, fileLoad);
+                                                  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++) {
+                                              for (let i = 0; i < this._pendingFileLoads.length; i++) {
-                                                  let caller = fileLoad.callers[i];
+                                                  let pendingLoad = this._pendingFileLoads[i];
-                                                  if (caller.onFinished) {
+                                                  if (pendingLoad.filename != params.filename ||
-                                                      let newContent;
+                                                      pendingLoad.style != params.style)
                                                      continue;
-                                                      if (content) {
+                                                  for (let j = 0; j < pendingLoad.callers.length; j++) {
-                                                          newContent = content.copy(caller.monitorIndex, caller.effects);
+                                                      if (pendingLoad.callers[j].onFinished) {
-                                                          this._images.push(newContent);
+                                                          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(i, 1);
-                                              this._pendingFileLoads.splice(idx, 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() {
@@ -448,7 +434,7 @@ const Background = new Lang.Class({
        let image = this._images[index];
        if (image.content)
-            this._cache.removeImageContent(image.content);
+            this._cache.removeImageContent(content);
        image.content = content;
        this._watchCacheFile(filename);
    },
@@ -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) {
@@ -659,10 +644,7 @@ const SystemBackground = new Lang.Class({
    },
    _onDestroy: function() {
-        let content = this.actor.content;
+        this._cache.removeImageContent(this.actor.content);
        if (content)
            this._cache.removeImageContent(content);
    },
 });
 Signals.addSignalMethods(SystemBackground.prototype);
@@ -728,7 +710,7 @@ const BackgroundManager = new Lang.Class({
                                        controlPosition: true,
                                        settingsSchema: BACKGROUND_SCHEMA });
-        this._settings = new Gio.Settings({ schema_id: params.settingsSchema });
+        this._settings = new Gio.Settings({ schema: params.settingsSchema });
        this._container = params.container;
        this._layoutManager = params.layoutManager;
        this._effects = params.effects;
@@ -751,31 +733,29 @@ const BackgroundManager = new Lang.Class({
        }
    },
-    _updateBackground: function() {
+    _updateBackground: function(background) {
        let newBackground = this._createBackground();
-        newBackground.vignetteSharpness = this.background.vignetteSharpness;
+        newBackground.vignetteSharpness = background.vignetteSharpness;
-        newBackground.brightness = this.background.brightness;
+        newBackground.brightness = background.brightness;
-        newBackground.visible = this.background.visible;
+        newBackground.visible = background.visible;
        newBackground.loadedSignalId = newBackground.connect('loaded',
            Lang.bind(this, function() {
                newBackground.disconnect(newBackground.loadedSignalId);
                newBackground.loadedSignalId = 0;
-
+                Tweener.addTween(background.actor,
                if (this._newBackground != newBackground) {
                    /* Not interesting, we queued another load */
                    newBackground.actor.destroy();
                    return;
                }
                Tweener.addTween(this.background.actor,
                                 { opacity: 0,
                                   time: FADE_ANIMATION_TIME,
                                   transition: 'easeOutQuad',
                                   onComplete: Lang.bind(this, function() {
-                                       this.background.actor.destroy();
+                                       if (this._newBackground == newBackground) {
-                                       this.background = newBackground;
+                                           this.background = newBackground;
-                                       this._newBackground = null;
+                                           this._newBackground = null;
                                       } else {
                                           newBackground.actor.destroy();
                                       }
                                       background.actor.destroy();
                                       this.emit('changed');
                                   })
@@ -803,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) {
+    _init: function(source, layoutManager) {
-        this.parent(layoutManager.dummyCursor, 0, St.Side.TOP);
+        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);
    }
@@ -55,14 +58,11 @@ function addBackgroundMenu(actor, layoutManager) {
    });
    actor.add_action(clickAction);
    let grabOpBeginId = global.display.connect('grab-op-begin', function () {
        clickAction.release();
    });
    actor.connect('destroy', function() {
-        actor._backgroundMenu.destroy();
+                      actor._backgroundMenu.destroy();
-        actor._backgroundMenu = null;
+                      actor._backgroundMenu = null;
-        actor._backgroundManager = null;
+                      actor._backgroundManager = null;
-        global.display.disconnect(grabOpBeginId);
+
-    });
+                      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) {
-            switch (this._arrowSide) {
+        case St.Side.TOP:
-            case St.Side.TOP:
+            if (this._arrowOrigin == x1)
-                if (this._arrowOrigin == x1)
+                skipTopLeft = true;
-                    skipTopLeft = true;
+            else if (this._arrowOrigin == x2)
-                else if (this._arrowOrigin == x2)
+                skipTopRight = true;
-                    skipTopRight = true;
+            break;
                break;
-            case St.Side.RIGHT:
+        case St.Side.RIGHT:
-                if (this._arrowOrigin == y1)
+            if (this._arrowOrigin == y1)
-                    skipTopRight = true;
+                skipTopRight = true;
-                else if (this._arrowOrigin == y2)
+            else if (this._arrowOrigin == y2)
-                    skipBottomRight = true;
+                skipBottomRight = true;
-                break;
+            break;
-            case St.Side.BOTTOM:
+        case St.Side.BOTTOM:
-                if (this._arrowOrigin == x1)
+            if (this._arrowOrigin == x1)
-                    skipBottomLeft = true;
+                skipBottomLeft = true;
-                else if (this._arrowOrigin == x2)
+            else if (this._arrowOrigin == x2)
-                    skipBottomRight = true;
+                skipBottomRight = true;
-                break;
+            break;
-            case St.Side.LEFT:
+        case St.Side.LEFT:
-                if (this._arrowOrigin == y1)
+            if (this._arrowOrigin == y1)
-                    skipTopLeft = true;
+                skipTopLeft = true;
-                else if (this._arrowOrigin == y2)
+            else if (this._arrowOrigin == y2)
-                    skipBottomLeft = true;
+                skipBottomLeft = true;
-                break;
+            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';
@@ -383,14 +380,14 @@ const Calendar = new Lang.Class({
    _init: function() {
        this._weekStart = Shell.util_get_week_start();
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.calendar' });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.calendar' });
        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
        // 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,11 +403,9 @@ 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',
-        this.actor = new St.Widget({ style_class: 'calendar',
+                                    reactive: true });
                                     layout_manager: new Clutter.TableLayout(),
                                     reactive: true });
        this.actor.connect('scroll-event',
                           Lang.bind(this, this._onScroll));
@@ -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();
    },
@@ -441,14 +434,13 @@ const Calendar = new Lang.Class({
    },
    _buildHeader: function() {
        let layout = this.actor.layout_manager;
        let offsetCols = this._useWeekdate ? 1 : 0;
        this.actor.destroy_all_children();
        // Top line of the calendar '<| September 2009 |>'
        this._topBox = new St.BoxLayout();
-        layout.pack(this._topBox, 0, 0);
+        this.actor.add(this._topBox,
-        layout.set_span(this._topBox, offsetCols + 7, 1);
+                       { row: 0, col: 0, col_span: offsetCols + 7 });
        this._backButton = new St.Button({ style_class: 'calendar-change-month-back',
                                           accessible_name: _("Previous month"),
@@ -480,12 +472,10 @@ const Calendar = new Lang.Class({
            let customDayAbbrev = _getCalendarDayAbbreviation(iter.getDay());
            let label = new St.Label({ style_class: 'calendar-day-base calendar-day-heading',
                                       text: customDayAbbrev });
-            let col;
+            this.actor.add(label,
-            if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
+                           { row: 1,
-                col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
+                             col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7,
-            else
+                             x_fill: false, x_align: St.Align.MIDDLE });
                col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
            layout.pack(label, col, 1);
            iter.setTime(iter.getTime() + MSECS_IN_DAY);
        }
@@ -558,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();
    },
@@ -604,7 +593,6 @@ const Calendar = new Lang.Class({
        beginDate.setTime(beginDate.getTime() - (weekPadding + daysToWeekStart) * MSECS_IN_DAY);
        let layout = this.actor.layout_manager;
        let iter = new Date(beginDate);
        let row = 2;
        // nRows here means 6 weeks + one header + one navbar
@@ -619,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);
@@ -652,19 +638,16 @@ const Calendar = new Lang.Class({
            button.style_class = styleClass;
            let offsetCols = this._useWeekdate ? 1 : 0;
-            let col;
+            this.actor.add(button,
-            if (rtl)
+                           { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7 });
                col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
            else
                col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
            layout.pack(button, col, row);
            this._buttons.push(button);
            if (this._useWeekdate && iter.getDay() == 4) {
                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
                                           style_class: 'calendar-day-base calendar-week-number'});
-                layout.pack(label, rtl ? 7 : 0, row);
+                this.actor.add(label,
                               { row: row, col: 0, y_align: St.Align.MIDDLE });
            }
            iter.setTime(iter.getTime() + MSECS_IN_DAY);
@@ -690,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');
        }));
@@ -707,12 +687,9 @@ const EventsList = new Lang.Class({
    Name: 'EventsList',
    _init: function() {
-        let layout = new Clutter.TableLayout();
+        this.actor = new St.Table({ style_class: 'events-table' });
        this.actor = new St.Widget({ style_class: 'events-table',
                                     layout_manager: layout });
        layout.hookup_style(this.actor);
        this._date = new Date();
-        this._desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
+        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
        this._desktopSettings.connect('changed', Lang.bind(this, this._update));
        this._weekStart = Shell.util_get_week_start();
    },
@@ -734,13 +711,9 @@ const EventsList = new Lang.Class({
        dayLabel.clutter_text.line_wrap = false;
        dayLabel.clutter_text.ellipsize = false;
-        let rtl = this.actor.get_text_direction() == Clutter.TextDirection.RTL;
+        this.actor.add(dayLabel, { row: index, col: 0,
-
+                                   x_expand: false, x_align: St.Align.END,
-        let layout = this.actor.layout_manager;
+                                   y_fill: false, y_align: St.Align.START });
        layout.pack(dayLabel, rtl ? 2 : 0, index);
        layout.child_set(dayLabel, { x_expand: false,
                                     x_align: Clutter.TableAlignment.END,
                                     y_align: Clutter.TableAlignment.START });
        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
        let timeString = _formatEventTime(event, clockFormat);
@@ -749,17 +722,18 @@ const EventsList = new Lang.Class({
        timeLabel.clutter_text.line_wrap = false;
        timeLabel.clutter_text.ellipsize = false;
-        layout.pack(timeLabel, 1, index);
+        this.actor.add(timeLabel, { row: index, col: 1,
-        layout.child_set(timeLabel, { x_expand: false,
+                                    x_expand: false, x_align: St.Align.MIDDLE,
-                                      y_align: Clutter.TableAlignment.START });
+                                    y_fill: false, y_align: St.Align.START });
        let titleLabel = new St.Label({ style_class: 'events-day-task',
                                        text: event.summary });
        titleLabel.clutter_text.line_wrap = true;
        titleLabel.clutter_text.ellipsize = false;
-        layout.pack(titleLabel, rtl ? 0 : 2, index);
+        this.actor.add(titleLabel, { row: index, col: 2,
-        layout.child_set(titleLabel, { x_expand: true });
+                                     x_expand: true, x_align: St.Align.START,
                                     y_fill: false, y_align: St.Align.START });
    },
    _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
@@ -768,10 +742,13 @@ const EventsList = new Lang.Class({
        if (events.length == 0 && !showNothingScheduled)
            return index;
-        let label = new St.Label({ style_class: 'events-day-header', text: header });
+        this.actor.add(new St.Label({ style_class: 'events-day-header', text: header }),
-        let layout = this.actor.layout_manager;
+                       { row: index, col: 0, col_span: 3,
-        layout.pack(label, 0, index);
+                         // In theory, x_expand should be true here, but x_expand
-        layout.child_set(label, { column_span: 3, x_expand: false });
+                         // is a property of the column for StTable, ie all day cells
                         // get it too
                         x_expand: false, x_align: St.Align.START,
                         y_fill: false, y_align: St.Align.START });
        index++;
        for (let n = 0; n < events.length; n++) {
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -23,7 +23,7 @@ const AutomountManager = new Lang.Class({
    Name: 'AutomountManager',
    _init: function() {
-        this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
+        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
        this._volumeQueue = [];
        this._session = new GnomeSession.SessionManager();
        this._session.connectSignal('InhibitorAdded',
@@ -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());
@@ -96,7 +96,7 @@ const ContentTypeDiscoverer = new Lang.Class({
    _init: function(callback) {
        this._callback = callback;
-        this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
+        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
    },
    guessContentTypes: function(mount) {
@@ -441,7 +441,7 @@ const AutorunTransientDispatcher = new Lang.Class({
    _init: function(manager) {
        this._manager = manager;
        this._sources = [];
-        this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
+        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
    },
    _getAutorunSettingForType: function(contentType) {
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -77,7 +77,6 @@ const NetworkSecretDialog = new Lang.Class({
                                          layout_manager: layout });
        layout.hookup_style(secretTable);
        let rtl = secretTable.get_text_direction() == Clutter.TextDirection.RTL;
        let initialFocusSet = false;
        let pos = 0;
        for (let i = 0; i < this._content.secrets.length; i++) {
@@ -117,15 +116,10 @@ const NetworkSecretDialog = new Lang.Class({
            } else
                secret.valid = true;
-            if (rtl) {
+            layout.pack(label, 0, pos);
                layout.pack(secret.entry, 0, pos);
                layout.pack(label, 1, pos);
            } else {
                layout.pack(label, 0, pos);
                layout.pack(secret.entry, 1, pos);
            }
            layout.child_set(label, { x_expand: false, y_fill: false,
                                      x_align: Clutter.TableAlignment.START });
            layout.pack(secret.entry, 1, pos);
            pos++;
            if (secret.password)
@@ -315,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':
@@ -342,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:
@@ -516,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);
@@ -554,16 +546,13 @@ const VPNRequestHandler = new Lang.Class({
                }
            }
        } catch(e) {
-            // No output is a valid case it means "both secrets are stored"
+            logError(e, 'error while reading VPN plugin output keyfile');
            if (data.length > 0) {
                logError(e, 'error while reading VPN plugin output keyfile');
-                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-                return;
+            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) {
+    _channelClosed: function() {
        if (this._destroyed)
            return;
        this._destroyed = true;
        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)
+        this.destroy();
            Mainloop.source_remove(this._timestampTimeoutId);
        this.parent(reason);
    },
    _channelClosed: function() {
        this.destroy(MessageTray.NotificationDestroyedReason.SOURCE_CLOSED);
    },
    /* 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() {
@@ -783,6 +768,7 @@ const ChatNotification = new Lang.Class({
        this._createScrollArea();
        this._lastGroup = null;
        this._lastGroupActor = null;
        // Keep track of the bottom position for the current adjustment and
        // force a scroll to the bottom if things change while we were at the
@@ -908,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._lastGroupActor = new St.BoxLayout({ style_class: style,
-            this.addActor(emptyLine);
+                                                      vertical: true });
            this.addActor(this._lastGroupActor);
        }
-        this._lastMessageBox = new St.BoxLayout({ vertical: false });
+        this._lastGroupActor.add(body, props.childProps);
        this._lastMessageBox.add(body, props.childProps);
        this.addActor(this._lastMessageBox);
        this.updated();
@@ -924,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();
@@ -946,77 +930,32 @@ const ChatNotification = new Lang.Class({
        let format;
-        let desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
+        // Show only the hour if date is on today
-        let clockFormat = desktopSettings.get_string(CLOCK_FORMAT_KEY);
+        if(daysAgo < 1){
-        let hasAmPm = date.toLocaleFormat('%p') != '';
+            format = "<b>%H:%M</b>";
        if (clockFormat == '24h' || !hasAmPm) {
            // 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");
            }
        } else {
            // 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");
            }
        }
        // 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);
    },
@@ -1026,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),
+        let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate),
-                                       style_class: 'chat-meta-message',
+                                       group: 'meta',
-                                       x_expand: true,
+                                       styles: ['chat-meta-message'],
-                                       y_expand: true,
+                                       childProps: { expand: true, x_fill: false,
-                                       x_align: Clutter.ActorAlign.END,
+                                                     x_align: St.Align.END },
-                                       y_align: Clutter.ActorAlign.END });
+                                       noTimestamp: true,
-
+                                       timestamp: lastMessageTime });
        this._lastMessageBox.add_actor(timeLabel);
        this._filterMessages();
@@ -1098,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);
        }
@@ -1269,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);
            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
        }
        else {
            iconBox.child = new St.Icon({ icon_name: 'avatar-default',
@@ -1403,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',
@@ -1421,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;
+                    this.update(this.title, this._getMessage(account.connection_error));
                    if (connectionError == Tp.error_get_dbus_name(Tp.Error.CANCELLED))
                        this.destroy();
                    else
                        this.update(this.title, this._getMessage(connectionError));
                }
            }));
    },
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -87,7 +87,7 @@ const CtrlAltTabManager = new Lang.Class({
        if (Main.sessionMode.hasWindows && !Main.overview.visible) {
            let screen = global.screen;
            let display = screen.get_display();
-            let windows = display.get_tab_list(Meta.TabList.DOCKS, screen.get_active_workspace ());
+            let windows = display.get_tab_list(Meta.TabList.DOCKS, screen, screen.get_active_workspace ());
            let windowTracker = Shell.WindowTracker.get_default();
            let textureCache = St.TextureCache.get_default();
            for (let i = 0; i < windows.length; i++) {
@@ -165,10 +165,6 @@ const CtrlAltTabPopup = new Lang.Class({
            this._select(this._previous());
        else if (keysym == Clutter.Right)
            this._select(this._next());
        else
            return Clutter.EVENT_PROPAGATE;
        return Clutter.EVENT_STOP;
    },
    _finish : function(time) {
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -381,8 +381,6 @@ const DashActor = new Lang.Class({
    }
 });
 const baseIconSizes = [ 16, 22, 24, 32, 48, 64 ];
 const Dash = new Lang.Class({
    Name: 'Dash',
@@ -582,7 +580,6 @@ const Dash = new Lang.Class({
                        this._showLabelTimeoutId = 0;
                        return GLib.SOURCE_REMOVE;
                    }));
                GLib.Source.set_name_by_id(this._showLabelTimeoutId, '[gnome-shell] item.showLabel');
                if (this._resetHoverTimeoutId > 0) {
                    Mainloop.source_remove(this._resetHoverTimeoutId);
                    this._resetHoverTimeoutId = 0;
@@ -600,7 +597,6 @@ const Dash = new Lang.Class({
                        this._resetHoverTimeoutId = 0;
                        return GLib.SOURCE_REMOVE;
                    }));
                GLib.Source.set_name_by_id(this._resetHoverTimeoutId, '[gnome-shell] this._labelShowing');
            }
        }
    },
@@ -636,24 +632,25 @@ const Dash = new Lang.Class({
        let minHeight, natHeight;
        // Enforce the current icon size during the size request
-        firstIcon.setIconSize(this.iconSize);
+        let [currentWidth, currentHeight] = firstIcon.icon.get_size();
        firstIcon.icon.set_size(this.iconSize, this.iconSize);
        [minHeight, natHeight] = firstButton.get_preferred_height(-1);
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        firstIcon.icon.set_size(currentWidth, currentHeight);
        let iconSizes = baseIconSizes.map(function(s) {
            return s * scaleFactor;
        });
        // Subtract icon padding and box spacing from the available height
-        availHeight -= iconChildren.length * (natHeight - this.iconSize * scaleFactor) +
+        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
@@ -18,7 +18,8 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Calendar = imports.ui.calendar;
-function _onVertSepRepaint(area) {
+function _onVertSepRepaint (area)
 {
    let cr = area.get_context();
    let themeNode = area.get_theme_node();
    let [width, height] = area.get_surface_size();
@@ -32,7 +33,7 @@ function _onVertSepRepaint(area) {
    cr.setLineWidth(stippleWidth);
    cr.stroke();
    cr.$dispose();
-}
+};
 const DateMenuButton = new Lang.Class({
    Name: 'DateMenuButton',
@@ -62,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
+        this._date = new St.Label({ style_class: 'datemenu-date-label',
-        // on the current date can be confusing. So don't make the button reactive
+                                    can_focus: true });
-        // until the selected date changes.
+        vbox.add(this._date);
        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._eventList = new Calendar.EventsList();
        this._calendar = new Calendar.Calendar();
@@ -84,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);
@@ -137,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();
@@ -203,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() {
@@ -219,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() {
@@ -228,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") }],
+                       label:  C_("button", "Restart & Install") }],
    unusedFutureButtonForTranslation: C_("button", "Install &amp; Power Off"),
    unusedFutureCheckBoxForTranslation: C_("checkbox", "Power off after updates are installed"),
    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,
+        let messageLayout = new St.BoxLayout({ vertical: true });
                                               style_class: 'end-session-dialog-layout' });
        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._fadeOutDialog();
+        this._stopTimer();
-            this._stopTimer();
+        this._dbusImpl.emit_signal(signal, null);
            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);
        }
    },
    _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) {
+                for (let prop in styleProps)
-                    let [found, length] = node.lookup_length(styleProps[prop], false);
+                    this[prop] = node.get_length(styleProps[prop]);
                    if (found)
                        this[prop] = length;
                }
            }));
        };
    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 (ExtensionUtils.isOutOfDate(extension)) {
    if (checkVersion && 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
@@ -32,11 +32,9 @@ const FocusCaretTracker = new Lang.Class({
    Name: 'FocusCaretTracker',
    _init: function() {
        Atspi.init();
        Atspi.set_timeout(250, 250);
        this._atspiListener = Atspi.EventListener.new(Lang.bind(this, this._onChanged));
        this._atspiInited = false;
        this._focusListenerRegistered = false;
        this._caretListenerRegistered = false;
    },
    _onChanged: function(event) {
@@ -46,50 +44,22 @@ const FocusCaretTracker = new Lang.Class({
            this.emit('caret-moved', event);
    },
    _initAtspi: function() {
        if (!this._atspiInited) {
            Atspi.init();
            Atspi.set_timeout(250, 250);
            this._atspiInited = true;
        }
    },
    registerFocusListener: function() {
-        if (this._focusListenerRegistered)
+        return this._atspiListener.register(STATECHANGED + ':focused') &&
-            return;
+               this._atspiListener.register(STATECHANGED + ':selected');
        this._initAtspi();
        this._atspiListener.register(STATECHANGED + ':focused');
        this._atspiListener.register(STATECHANGED + ':selected');
        this._focusListenerRegistered = true;
    },
    registerCaretListener: function() {
-        if (this._caretListenerRegistered)
+        return this._atspiListener.register(CARETMOVED);
            return;
        this._initAtspi();
        this._atspiListener.register(CARETMOVED);
        this._caretListenerRegistered = true;
    },
    deregisterFocusListener: function() {
-        if (!this._focusListenerRegistered)
+        return this._atspiListener.deregister(STATECHANGED + ':focused') &&
-            return;
+               this._atspiListener.deregister(STATECHANGED + ':selected');
        this._atspiListener.deregister(STATECHANGED + ':focused');
        this._atspiListener.deregister(STATECHANGED + ':selected');
        this._focusListenerRegistered = false;
    },
    deregisterCaretListener: function() {
-        if (!this._caretListenerRegistered)
+        return this._atspiListener.deregister(CARETMOVED);
            return;
        this._atspiListener.deregister(CARETMOVED);
        this._caretListenerRegistered = false;
    }
 });
 Signals.addSignalMethods(FocusCaretTracker.prototype);
--- a/js/ui/ibusCandidatePopup.js
+++ b/js/ui/ibusCandidatePopup.js
@@ -11,9 +11,6 @@ const Main = imports.ui.main;
 const MAX_CANDIDATES_PER_PAGE = 16;
 const DEFAULT_INDEX_LABELS = [ '1', '2', '3', '4', '5', '6', '7', '8',
                               '9', '0', 'a', 'b', 'c', 'd', 'e', 'f' ];
 const CandidateArea = new Lang.Class({
    Name: 'CandidateArea',
@@ -92,7 +89,7 @@ const CandidateArea = new Lang.Class({
            if (!visible)
                continue;
-            box._indexLabel.text = ((indexes && indexes[i]) ? indexes[i] : DEFAULT_INDEX_LABELS[i]);
+            box._indexLabel.text = ((indexes && indexes[i]) ? indexes[i] : '%x'.format(i + 1));
            box._candidateLabel.text = candidates[i];
        }
@@ -118,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';
@@ -158,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) {
@@ -252,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);
    },
@@ -522,6 +509,11 @@ const IconGrid = new Lang.Class({
            this._fixedHItemSize = Math.max(this._hItemSize - neededSpacePerItem, MIN_ICON_SIZE);
            this._fixedVItemSize = Math.max(this._vItemSize - neededSpacePerItem, MIN_ICON_SIZE);
            if (this._fixedHItemSize < MIN_ICON_SIZE)
                this._fixedHItemSize = MIN_ICON_SIZE;
            if (this._fixedVItemSize < MIN_ICON_SIZE)
                this._fixedVItemSize = MIN_ICON_SIZE;
            this._updateSpacingForSize(availWidth, availHeight);
        }
        let scale = Math.min(this._fixedHItemSize, this._fixedVItemSize) / Math.max(this._hItemSize, this._vItemSize);
@@ -530,13 +522,12 @@ const IconGrid = new Lang.Class({
    // Note that this is ICON_SIZE as used by BaseIcon, not elsewhere in IconGrid; it's a bit messed up
    _updateChildrenScale: function(scale) {
        let newIconSize = Math.floor(ICON_SIZE * scale);
        for (let i in this._items) {
            let newIconSize = Math.floor(ICON_SIZE * scale);
            this._items[i].icon.setIconSize(newIconSize);
        }
    }
 });
 Signals.addSignalMethods(IconGrid.prototype);
 const PaginatedIconGrid = new Lang.Class({
    Name: 'PaginatedIconGrid',
@@ -640,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
@@ -161,9 +161,9 @@ const Keyboard = new Lang.Class({
        this._timestamp = global.display.get_current_time_roundtrip();
-        this._keyboardSettings = new Gio.Settings({ schema_id: KEYBOARD_SCHEMA });
+        this._keyboardSettings = new Gio.Settings({ schema: KEYBOARD_SCHEMA });
        this._keyboardSettings.connect('changed', Lang.bind(this, this._settingsChanged));
-        this._a11yApplicationsSettings = new Gio.Settings({ schema_id: A11Y_APPLICATIONS_SCHEMA });
+        this._a11yApplicationsSettings = new Gio.Settings({ schema: A11Y_APPLICATIONS_SCHEMA });
        this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._settingsChanged));
        this._settingsChanged();
@@ -266,14 +266,12 @@ const Keyboard = new Lang.Class({
            return;
        }
-        if (!this._showIdleId) {
+        if (!this._showIdleId)
-          this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE,
+            this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE,
-                                           Lang.bind(this, function() {
+                                             Lang.bind(this, function() {
-                                               this.Show(time);
+                                                 this.Show(time);
-                                               return GLib.SOURCE_REMOVE;
+                                                 return GLib.SOURCE_REMOVE;
-                                           }));
+                                             }));
          GLib.Source.set_name_by_id(this._showIdleId, '[gnome-shell] this.Show');
        }
    },
    _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;
@@ -163,7 +164,7 @@ const LayoutManager = new Lang.Class({
        // Normally, the stage is always covered so Clutter doesn't need to clear
        // it; however it becomes visible during the startup animation
        // See the comment below for a longer explanation
-        global.stage.background_color = DEFAULT_BACKGROUND_COLOR;
+        global.stage.color = DEFAULT_BACKGROUND_COLOR;
        // Set up stage hierarchy to group all UI actors under one container.
        this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
@@ -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, visible: false });
        this.uiGroup.add_actor(this.dummyCursor);
        global.stage.remove_actor(global.top_window_group);
        this.uiGroup.add_actor(global.top_window_group);
@@ -597,15 +589,13 @@ const LayoutManager = new Lang.Class({
                                              reactive: true });
        this.addChrome(this._coverPane);
-        if (Meta.is_restart()) {
+        if (Main.sessionMode.isGreeter) {
            // On restart, we don't do an animation
        } else if (Main.sessionMode.isGreeter) {
            this.panelBox.translation_y = -this.panelBox.height;
        } else {
            this._updateBackgrounds();
            // We need to force an update of the regions now before we scale
-            // the UI group to get the correct allocation for the struts.
+            // the UI group to get the coorect allocation for the struts.
            this._updateRegions();
            this.trayBox.hide();
@@ -630,17 +620,14 @@ 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() {
-        if (Meta.is_restart())
+        if (Main.sessionMode.isGreeter)
            this._startupAnimationComplete();
        else if (Main.sessionMode.isGreeter)
            this._startupAnimationGreeter();
        else
            this._startupAnimationSession();
@@ -733,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
@@ -839,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',
+        actorData.parentSetId = actor.connect('parent-set',
-                                            Lang.bind(this, this._untrackActor));
+                                              Lang.bind(this, this._actorReparented));
        // Note that destroying actor will unset its parent, so we don't
        // need to connect to 'destroy' too.
@@ -862,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;
@@ -877,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;
@@ -916,8 +902,8 @@ const LayoutManager = new Lang.Class({
            return;
        if (!this._updateRegionIdle)
-            this._updateRegionIdle = Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
+            this._updateRegionIdle = Mainloop.idle_add(Lang.bind(this, this._updateRegions),
-                                                    Lang.bind(this, this._updateRegions));
+                                                       Meta.PRIORITY_BEFORE_REDRAW);
    },
    _getWindowActorsForWorkspace: function(workspace) {
@@ -948,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;
        }
@@ -1021,6 +1007,23 @@ const LayoutManager = new Lang.Class({
                else
                    continue;
                // Ensure that the strut rects goes all the way to the screen edge,
                // as this really what mutter expects.
                switch (side) {
                case Meta.Side.TOP:
                    y1 = 0;
                    break;
                case Meta.Side.BOTTOM:
                    y2 = global.screen_height;
                    break;
                case Meta.Side.LEFT:
                    x1 = 0;
                    break;
                case Meta.Side.RIGHT:
                    x2 = global.screen_width;
                    break;
                }
                let strutRect = new Meta.Rectangle({ x: x1, y: y1, width: x2 - x1, height: y2 - y1});
                let strut = new Meta.Strut({ rect: strutRect, side: side });
                struts.push(strut);
--- 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;
+        this.actor = new St.Bin({ x: 0,
-        if (params.radialEffect)
+                                  y: 0,
-            this.actor = new RadialShaderQuad({ x: 0,
+                                  style_class: 'lightbox',
-                                                y: 0,
+                                  reactive: params.inhibitEvents });
                                                reactive: params.inhibitEvents });
        else
            this.actor = new St.Bin({ x: 0,
                                      y: 0,
                                      opacity: 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) {
+        if (fadeInTime != 0) {
-            Tweener.addTween(this.actor,
+            this.shown = false;
-                             { brightness: VIGNETTE_BRIGHTNESS,
+            this.actor.opacity = 0;
                               vignetteSharpness: VIGNETTE_SHARPNESS,
                               time: fadeInTime,
                               transition: 'easeOutQuad',
                               onComplete: Lang.bind(this, function() {
                                   this.shown = true;
                                   this.emit('shown');
                               })
                             });
        } else {
            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) {
+        if (fadeOutTime != 0) {
            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 {
            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();
    },
@@ -797,7 +795,7 @@ const LookingGlass = new Lang.Class({
                                        reactive: true });
        this.actor.connect('key-press-event', Lang.bind(this, this._globalKeyPressEvent));
-        this._interfaceSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
+        this._interfaceSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
        this._interfaceSettings.connect('changed::monospace-font-name',
                                        Lang.bind(this, this._updateFont));
        this._updateFont();
@@ -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)
-            if (activate) {
+            this.startTrackingMouse();
-                Meta.disable_unredirect_for_screen(global.screen);
+        else
-                this.startTrackingMouse();
+            this.stopTrackingMouse();
            } else {
                Meta.enable_unredirect_for_screen(global.screen);
                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) {
-        this._appSettings = new Gio.Settings({ schema_id: APPLICATIONS_SCHEMA });
+        // Mag factor is accurate to two decimal places.
-        this._settings = new Gio.Settings({ schema_id: MAGNIFIER_SCHEMA });
+        let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
        if (aPref != 0.0)
            zoomRegion.setMagFactor(aPref, aPref);
-        if (zoomRegion) {
+        aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
-            // Mag factor is accurate to two decimal places.
+        if (aPref)
-            let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
+            zoomRegion.setScreenPosition(aPref);
            if (aPref != 0.0)
                zoomRegion.setMagFactor(aPref, aPref);
-            aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
+        zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
-            if (aPref)
+        zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
                zoomRegion.setScreenPosition(aPref);
-            zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
+        aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
-            zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
+        if (aPref)
            zoomRegion.setMouseTrackingMode(aPref);
-            aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
+        aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
-            if (aPref)
+        if (aPref)
-                zoomRegion.setMouseTrackingMode(aPref);
+            zoomRegion.setFocusTrackingMode(aPref);
-            aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
+        aPref = this._settings.get_enum(CARET_TRACKING_KEY);
-            if (aPref)
+        if (aPref)
-                zoomRegion.setFocusTrackingMode(aPref);
+            zoomRegion.setCaretTrackingMode(aPref);
-            aPref = this._settings.get_enum(CARET_TRACKING_KEY);
+        aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
-            if (aPref)
+        if (aPref)
-                zoomRegion.setCaretTrackingMode(aPref);
+            zoomRegion.setInvertLightness(aPref);
-            aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
+        aPref = this._settings.get_double(COLOR_SATURATION_KEY);
-            if (aPref)
+        if (aPref)
-                zoomRegion.setInvertLightness(aPref);
+            zoomRegion.setColorSaturation(aPref);
-            aPref = this._settings.get_double(COLOR_SATURATION_KEY);
+        let bc = {};
-            if (aPref)
+        bc.r = this._settings.get_double(BRIGHT_RED_KEY);
-                zoomRegion.setColorSaturation(aPref);
+        bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
        bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
        zoomRegion.setBrightness(bc);
-            let bc = {};
+        bc.r = this._settings.get_double(CONTRAST_RED_KEY);
-            bc.r = this._settings.get_double(BRIGHT_RED_KEY);
+        bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-            bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
+        bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-            bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
+        zoomRegion.setContrast(bc);
-            zoomRegion.setBrightness(bc);
+    },
-            bc.r = this._settings.get_double(CONTRAST_RED_KEY);
+    _settingsInit: function() {
-            bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
+        this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
-            bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
+        this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });
            zoomRegion.setContrast(bc);
        }
        this._appSettings.connect('changed::' + SHOW_KEY, Lang.bind(this, function() {
            let active = this._appSettings.get_boolean(SHOW_KEY);
            this.setActive(active);
        }));
        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;
+        let extents = component.get_extents(Atspi.CoordType.SCREEN);
-        try {
+        [this._xFocus, this._yFocus] = [extents.x, extents.y]
            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)];
        this._centerFromFocusPosition();
    },
@@ -737,14 +740,7 @@ const ZoomRegion = new Lang.Class({
        let text = event.source.get_text_iface();
        if (!text)
            return;
-        let extents;
+        let extents = text.get_character_extents(text.get_caret_offset(), 0);
        try {
            extents = text.get_character_extents(text.get_caret_offset(), 0);
        } catch(e) {
            log('Failed to read extents of text caret: ' + e.message);
            return;
        }
        [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();
+        if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.NONE)
    },
    _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
            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,
+        this._uiGroupClone = new Clutter.Clone({ source: Main.uiGroup });
                                                 clip_to_allocation: true });
        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
@@ -18,7 +18,6 @@ const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionDownloader = imports.ui.extensionDownloader;
 const Keyboard = imports.ui.keyboard;
 const MessageTray = imports.ui.messageTray;
 const ModalDialog = imports.ui.modalDialog;
 const OsdWindow = imports.ui.osdWindow;
 const Overview = imports.ui.overview;
 const Panel = imports.ui.panel;
@@ -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;
@@ -75,6 +73,7 @@ let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
 let _a11ySettings = null;
 let dynamicWorkspacesSchema = null;
 function _sessionUpdated() {
    _loadDefaultStylesheet();
@@ -104,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); });
@@ -111,6 +113,7 @@ function start() {
    sessionMode = new SessionMode.SessionMode();
    sessionMode.connect('updated', _sessionUpdated);
    _initializePrefs();
    _initializeUI();
    shellDBusService = new ShellDBus.GnomeShell();
@@ -119,6 +122,17 @@ function start() {
    _sessionUpdated();
 }
 function _initializePrefs() {
    let keys = new Gio.Settings({ schema: sessionMode.overridesSchema }).list_keys();
    for (let i = 0; i < keys.length; i++)
        Meta.prefs_override_preference_schema(keys[i], sessionMode.overridesSchema);
    if (keys.indexOf('dynamic-workspaces') > -1)
        dynamicWorkspacesSchema = sessionMode.overridesSchema;
    else
        dynamicWorkspacesSchema = 'org.gnome.mutter';
 }
 function _initializeUI() {
    // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
    // also initialize ShellAppSystem first.  ShellAppSystem
@@ -144,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();
@@ -161,23 +175,13 @@ function _initializeUI() {
    layoutManager.init();
    overview.init();
-    _a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
+    _a11ySettings = new Gio.Settings({ schema: A11Y_SCHEMA });
    global.display.connect('overlay-key', Lang.bind(overview, function () {
        if (!_a11ySettings.get_boolean (STICKY_KEYS_ENABLE))
            overview.toggle();
    }));
    global.display.connect('show-restart-message', function(display, message) {
        showRestartMessage(message);
        return true;
    });
    global.display.connect('restart', function() {
        global.reexec_self();
        return true;
    });
    // Provide the bus object for gnome-session to
    // initiate logouts.
    EndSessionDialog.init();
@@ -187,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");
@@ -210,17 +216,6 @@ function _initializeUI() {
                              if (screenShield) {
                                  screenShield.lockIfWasLocked();
                              }
                              if (LoginManager.haveSystemd() &&
                                  sessionMode.currentMode != 'gdm' &&
                                  sessionMode.currentMode != 'initial-setup') {
                                  // Do not import globally to not depend
                                  // on systemd on non-systemd systems.
                                  let GSystem = imports.gi.GSystem;
                                  GSystem.log_structured_print('GNOME Shell started at ' + _startDate,
                                                               ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
                              } else {
                                  log('GNOME Shell started at ' + _startDate);
                              }
                          });
 }
@@ -244,7 +239,8 @@ function _loadDefaultStylesheet() {
 * Returns: A file path that contains the theme CSS,
 *          null if using the default
 */
-function getThemeStylesheet() {
+function getThemeStylesheet()
 {
    return _cssStylesheet;
 }
@@ -255,7 +251,8 @@ function getThemeStylesheet() {
 *
 * Set the theme CSS file that the shell will load
 */
-function setThemeStylesheet(cssStylesheet) {
+function setThemeStylesheet(cssStylesheet)
 {
    _cssStylesheet = cssStylesheet;
 }
@@ -614,31 +611,5 @@ function queueDeferredWork(workId) {
            _deferredTimeoutId = 0;
            return GLib.SOURCE_REMOVE;
        });
        GLib.Source.set_name_by_id(_deferredTimeoutId, '[gnome-shell] _runAllDeferredWork');
    }
 }
 const RestartMessage = new Lang.Class({
    Name: 'RestartMessage',
    Extends: ModalDialog.ModalDialog,
    _init : function(message) {
        this.parent({ shellReactive: true,
                      styleClass: 'restart-message',
                      shouldFadeIn: false,
                      destroyOnClose: true });
        let label = new St.Label({ text: message });
        this.contentLayout.add(label, { x_fill: false,
                                        y_fill: false,
                                        x_align: St.Align.MIDDLE,
                                        y_align: St.Align.MIDDLE });
        this.buttonLayout.hide();
    }
 });
 function showRestartMessage(message) {
    let restartMessage = new RestartMessage(message);
    restartMessage.open();
 }
--- 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;
@@ -111,6 +112,7 @@ const FocusGrabber = new Lang.Class({
        if (this._focused)
            return;
        this._prevFocusedWindow = global.display.focus_window;
        this._prevKeyFocusActor = global.stage.get_key_focus();
        this._focusActorChangedId = global.stage.connect('notify::key-focus', Lang.bind(this, this._focusActorChanged));
@@ -202,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;
@@ -315,7 +317,7 @@ const NotificationGenericPolicy = new Lang.Class({
        this.id = 'generic';
-        this._masterSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.notifications' });
+        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
    },
@@ -365,8 +367,8 @@ const NotificationApplicationPolicy = new Lang.Class({
        this.id = id;
        this._canonicalId = this._canonicalizeId(id);
-        this._masterSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.notifications' });
+        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.notifications.application',
+        this._settings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications.application',
                                            path: '/org/gnome/desktop/notifications/application/' + this._canonicalId + '/' });
        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
@@ -503,6 +505,7 @@ const Notification = new Lang.Class({
        this.bannerBodyMarkup = false;
        this._bannerBodyAdded = false;
        this._titleFitsInBannerMode = true;
        this._titleDirection = Clutter.TextDirection.DEFAULT;
        this._spacing = 0;
        this._scrollPolicy = Gtk.PolicyType.AUTOMATIC;
        this._imageBin = null;
@@ -641,11 +644,10 @@ const Notification = new Lang.Class({
        title = title ? _fixMarkup(title.replace(/\n/g, ' '), false) : '';
        this._titleLabel.clutter_text.set_markup('<b>' + title + '</b>');
        let titleDirection;
        if (Pango.find_base_dir(title, -1) == Pango.Direction.RTL)
-            titleDirection = Clutter.TextDirection.RTL;
+            this._titleDirection = Clutter.TextDirection.RTL;
        else
-            titleDirection = Clutter.TextDirection.LTR;
+            this._titleDirection = Clutter.TextDirection.LTR;
        // Let the title's text direction control the overall direction
        // of the notification - in case where different scripts are used
@@ -653,7 +655,7 @@ const Notification = new Lang.Class({
        // arguably for action buttons as well. Labels other than the title
        // will be allocated at the available width, so that their alignment
        // is done correctly automatically.
-        this._table.set_text_direction(titleDirection);
+        this._table.set_text_direction(this._titleDirection);
        // Unless the notification has custom content, we save this.bannerBodyText
        // to add it to the content of the notification if the notification is
@@ -1000,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');
@@ -1161,12 +1160,32 @@ const SourceActor = new Lang.Class({
        }));
        this._actorDestroyed = false;
-        let scale_factor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        this._counterLabel = new St.Label({ x_align: Clutter.ActorAlign.CENTER,
-        this._iconBin = new St.Bin({ x_fill: true,
+                                            x_expand: true,
-                                     height: size * scale_factor,
+                                            y_align: Clutter.ActorAlign.CENTER,
-                                     width: size * scale_factor });
+                                            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();
@@ -1190,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();
@@ -1254,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;
@@ -1366,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;
@@ -1900,21 +1885,21 @@ const MessageTray = new Lang.Class({
        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
        Main.wm.addKeybinding('toggle-message-tray',
-                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
+                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                              Meta.KeyBindingFlags.NONE,
                              Shell.KeyBindingMode.NORMAL |
                              Shell.KeyBindingMode.MESSAGE_TRAY |
                              Shell.KeyBindingMode.OVERVIEW,
                              Lang.bind(this, this.toggleAndNavigate));
        Main.wm.addKeybinding('focus-active-notification',
-                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
+                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                              Meta.KeyBindingFlags.NONE,
                              Shell.KeyBindingMode.NORMAL |
                              Shell.KeyBindingMode.MESSAGE_TRAY |
                              Shell.KeyBindingMode.OVERVIEW,
                              Lang.bind(this, this._expandActiveNotification));
-        this._sources = new Map();
+        this._sources = new Hash.Map();
        this._chatSummaryItemsCount = 0;
        this._trayDwellTimeoutId = 0;
@@ -1951,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() {
@@ -1986,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 {
@@ -2027,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();
@@ -2120,8 +2099,7 @@ const MessageTray = new Lang.Class({
    },
    _removeSource: function(source) {
-        let obj = this._sources.get(source);
+        let [, obj] = this._sources.delete(source);
        this._sources.delete(source);
        let summaryItem = obj.summaryItem;
        if (source.isChat)
@@ -2142,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) {
@@ -2267,16 +2245,6 @@ const MessageTray = new Lang.Class({
            this._grabHelper.addActor(corner.actor);
    },
    _resetNotificationLeftTimeout: function() {
        this._useLongerNotificationLeftTimeout = false;
        if (this._notificationLeftTimeoutId) {
            Mainloop.source_remove(this._notificationLeftTimeoutId);
            this._notificationLeftTimeoutId = 0;
            this._notificationLeftMouseX = -1;
            this._notificationLeftMouseY = -1;
        }
    },
    _onNotificationHoverChanged: function() {
        if (this._notificationWidget.hover == this._notificationHovered)
            return;
@@ -2286,7 +2254,14 @@ const MessageTray = new Lang.Class({
            // No dwell inside notifications at the bottom of the screen
            this._cancelTrayDwell();
-            this._resetNotificationLeftTimeout();
+            this._useLongerNotificationLeftTimeout = false;
            if (this._notificationLeftTimeoutId) {
                Mainloop.source_remove(this._notificationLeftTimeoutId);
                this._notificationLeftTimeoutId = 0;
                this._notificationLeftMouseX = -1;
                this._notificationLeftMouseY = -1;
                return;
            }
            if (this._showNotificationMouseX >= 0) {
                let actorAtShowNotificationPosition =
@@ -2303,7 +2278,6 @@ const MessageTray = new Lang.Class({
                    return;
                }
            }
            this._pointerInNotification = true;
            this._updateState();
        } else {
@@ -2320,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');
        }
    },
@@ -2356,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;
@@ -2409,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) {
@@ -2470,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) {
@@ -2630,8 +2598,6 @@ const MessageTray = new Lang.Class({
        // the mouse is moving towards it or within it.
        this._lastSeenMouseX = x;
        this._lastSeenMouseY = y;
        this._resetNotificationLeftTimeout();
    },
    _updateShowingNotification: function() {
@@ -2676,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() {
@@ -2724,7 +2688,13 @@ const MessageTray = new Lang.Class({
            this._notificationUnfocusedId = 0;
        }
-        this._resetNotificationLeftTimeout();
+        this._useLongerNotificationLeftTimeout = false;
        if (this._notificationLeftTimeoutId) {
            Mainloop.source_remove(this._notificationLeftTimeoutId);
            this._notificationLeftTimeoutId = 0;
            this._notificationLeftMouseX = -1;
            this._notificationLeftMouseY = -1;
        }
        if (animate) {
            this._tween(this._notificationWidget, '_notificationState', State.HIDDEN,
@@ -2794,12 +2764,7 @@ const MessageTray = new Lang.Class({
                             { y: expandedY,
                               opacity: 255,
                               time: ANIMATION_TIME,
-                               transition: 'easeOutQuad',
+                               transition: 'easeOutQuad'
                               // HACK: Drive the state machine here better,
                               // instead of overwriting tweens
                               onComplete: Lang.bind(this, function() {
                                   this._notificationState = State.SHOWN;
                               }),
                             });
        }
    },
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -41,9 +41,9 @@ 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,
                                        shouldFadeOut: true,
                                        destroyOnClose: true });
        this.state = State.CLOSED;
@@ -51,14 +51,13 @@ const ModalDialog = new Lang.Class({
        this._keybindingMode = params.keybindingMode;
        this._shellReactive = params.shellReactive;
        this._shouldFadeIn = params.shouldFadeIn;
        this._shouldFadeOut = params.shouldFadeOut;
        this._destroyOnClose = params.destroyOnClose;
        this._group = new St.Widget({ visible: false,
                                      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 });
@@ -90,8 +89,7 @@ const ModalDialog = new Lang.Class({
        if (!this._shellReactive) {
            this._lightbox = new Lightbox.Lightbox(this._group,
-                                                   { inhibitEvents: true,
+                                                   { inhibitEvents: true });
                                                     radialEffect: true });
            this._lightbox.highlight(this._backgroundBin);
            this._eventBlocker = new Clutter.Actor({ reactive: true });
@@ -309,15 +307,6 @@ const ModalDialog = new Lang.Class({
        return true;
    },
    _closeComplete: function() {
        this.state = State.CLOSED;
        this._group.hide();
        this.emit('closed');
        if (this._destroyOnClose)
            this.destroy();
    },
    close: function(timestamp) {
        if (this.state == State.CLOSED || this.state == State.CLOSING)
            return;
@@ -326,16 +315,20 @@ const ModalDialog = new Lang.Class({
        this.popModal(timestamp);
        this._savedKeyFocus = null;
-        if (this._shouldFadeOut)
+        Tweener.addTween(this._group,
-            Tweener.addTween(this._group,
+                         { opacity: 0,
-                             { opacity: 0,
+                           time: OPEN_AND_CLOSE_TIME,
-                               time: OPEN_AND_CLOSE_TIME,
+                           transition: 'easeOutQuad',
-                               transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
-                               onComplete: Lang.bind(this,
+                               function() {
-                                                     this._closeComplete)
+                                   this.state = State.CLOSED;
-                             })
+                                   this._group.hide();
-        else
+                                   this.emit('closed');
-            this._closeComplete();
+
                                   if (this._destroyOnClose)
                                       this.destroy();
                               })
                         });
    },
    // Drop modal status without closing the dialog; this makes the
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -120,12 +120,15 @@ const FdoNotificationDaemon = new Lang.Class({
        this._nextNotificationId = 1;
        Shell.WindowTracker.get_default().connect('notify::focus-app', Lang.bind(this, this._onFocusAppChanged));
        Main.overview.connect('hidden', Lang.bind(this, this._onFocusAppChanged));
        this._trayManager = new Shell.TrayManager();
        this._trayIconAddedId = this._trayManager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
        this._trayIconRemovedId = this._trayManager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
        Shell.WindowTracker.get_default().connect('notify::focus-app',
            Lang.bind(this, this._onFocusAppChanged));
        Main.overview.connect('hidden',
            Lang.bind(this, this._onFocusAppChanged));
        this._trayManager.manage_screen(global.screen, Main.messageTray.actor);
    },
@@ -241,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,
+            Mainloop.idle_add(Lang.bind(this,
-                                            function () {
+                                        function () {
-                                                this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
+                                            this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
-                                                return GLib.SOURCE_REMOVE;
+                                            return GLib.SOURCE_REMOVE;
-                                            }));
+                                        }));
            GLib.Source.set_name_by_id(idle_id, '[gnome-shell] this._emitNotificationClosed');
            return invocation.return_value(GLib.Variant.new('(u)', [id]));
        }
@@ -689,12 +691,6 @@ const FdoNotificationDaemonSource = new Lang.Class({
    }
 });
 const PRIORITY_URGENCY_MAP = {
    low: MessageTray.Urgency.LOW,
    normal: MessageTray.Urgency.NORMAL,
    high: MessageTray.Urgency.HIGH,
    urgent: MessageTray.Urgency.CRITICAL
 };
 const GtkNotificationDaemonNotification = new Lang.Class({
    Name: 'GtkNotificationDaemonNotification',
@@ -708,20 +704,12 @@ const GtkNotificationDaemonNotification = new Lang.Class({
              "body": body,
              "icon": gicon,
              "urgent": urgent,
              "priority": priority,
              "buttons": buttons,
              "default-action": defaultAction,
              "default-action-target": defaultActionTarget } = notification;
-        if (priority) {
+        this.setUrgency(urgent.unpack() ? MessageTray.Urgency.CRITICAL
-            let urgency = PRIORITY_URGENCY_MAP[priority.unpack()];
+                                        : MessageTray.Urgency.NORMAL);
            this.setUrgency(urgency != undefined ? urgency : MessageTray.Urgency.NORMAL);
        } else if (urgent) {
            this.setUrgency(urgent.unpack() ? MessageTray.Urgency.CRITICAL
                            : MessageTray.Urgency.NORMAL);
        } else {
            this.setUrgency(MessageTray.Urgency.NORMAL);
        }
        if (buttons) {
            buttons.deep_unpack().forEach(Lang.bind(this, function(button) {
--- 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._currentMonitor = undefined;
-        this._monitorIndex = monitorIndex;
+        this.setMonitor (-1);
        let constraint = new Layout.MonitorConstraint({ index: monitorIndex });
        this.actor.add_constraint(constraint);
        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)
-            if (this.actor.visible)
+            Tweener.addTween(this._level,
-                Tweener.addTween(this._level,
+                             { level: level,
-                                 { level: level,
+                               time: LEVEL_ANIMATION_TIME,
-                                   time: LEVEL_ANIMATION_TIME,
+                               transition: 'easeOutQuad' });
-                                   transition: 'easeOutQuad' });
+        else
-            else
+            this._level.level = level;
                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,18 +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 (!monitor)
+
-            return; // we are about to be removed
+        if (this._currentMonitor >= 0)
            monitor = Main.layoutManager.monitors[this._currentMonitor];
        else
            monitor = Main.layoutManager.primaryMonitor;
        let scalew = monitor.width / 640.0;
        let scaleh = monitor.height / 480.0;
        let scale = Math.min(scalew, scaleh);
        this._popupSize = 110 * Math.max(1, scale);
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        this._icon.icon_size = this._popupSize / (2 * scaleFactor);
        this._box.translation_y = monitor.height / 4;
        this._icon.icon_size = this._popupSize / 2;
        this._box.style_changed();
    },
@@ -218,60 +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,
+        this._box.style = 'min-height: %dpx;'.format(Math.max(minWidth, minHeight));
-        // 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);
+    setMonitor: function(index) {
-    }
+        let constraint;
-});
+
-
+        if (index < 0)
-const OsdWindowManager = new Lang.Class({
+            index = -1;
-    Name: 'OsdWindowManager',
+        if (this._currentMonitor == index)
-
+            return;
-    _init: function() {
+
-        this._osdWindows = [];
+        if (index < 0)
-        Main.layoutManager.connect('monitors-changed',
+            constraint = new Layout.MonitorConstraint({ primary: true });
-                                    Lang.bind(this, this._monitorsChanged));
+        else
-        this._monitorsChanged();
+            constraint = new Layout.MonitorConstraint({ index: index });
-    },
+
-
+        this.actor.clear_constraints();
-    _monitorsChanged: function() {
+        this.actor.add_constraint(constraint);
-        for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
+        this._currentMonitor = index;
            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();
    }
 });
--- 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,
+                             { brightness: 0.8,
-                               vignetteSharpness: Lightbox.VIGNETTE_SHARPNESS,
+                               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;
@@ -425,6 +431,8 @@ const Overview = new Lang.Class({
        this.emit('windows-restacked', stackIndices);
    },
    //// Public methods ////
    beginItemDrag: function(source) {
        this.emit('item-drag-begin');
        this._inDrag = true;
@@ -453,6 +461,23 @@ const Overview = new Lang.Class({
        this._inDrag = false;
    },
    // show:
    //
    // Animates the overview visible and grabs mouse and keyboard input
    show: function() {
        if (this.isDummy)
            return;
        if (this._shown)
            return;
        this._shown = true;
        if (!this._syncGrab())
            return;
        Main.layoutManager.showOverview();
        this._animateVisible();
    },
    focusSearch: function() {
        this.show();
        this._searchEntry.grab_key_focus();
@@ -468,13 +493,8 @@ const Overview = new Lang.Class({
    },
    fadeOutDesktop: function() {
-        if (!this._desktopFade.get_n_children()) {
+        if (!this._desktopFade.child)
-            let clone = this._getDesktopClone();
+            this._desktopFade.child = this._getDesktopClone();
            if (!clone)
                return;
            this._desktopFade.add_child(clone);
        }
        this._desktopFade.opacity = 255;
        this._desktopFade.show();
@@ -485,6 +505,69 @@ const Overview = new Lang.Class({
                         });
    },
    _animateVisible: function() {
        if (this.visible || this.animationInProgress)
            return;
        this.visible = true;
        this.animationInProgress = true;
        this.visibleTarget = true;
        this._activationTime = Date.now() / 1000;
        Meta.disable_unredirect_for_screen(global.screen);
        this.viewSelector.show();
        this._stack.opacity = 0;
        Tweener.addTween(this._stack,
                         { opacity: 255,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
                           onComplete: this._showDone,
                           onCompleteScope: this
                         });
        this._shadeBackgrounds();
        this._coverPane.raise_top();
        this._coverPane.show();
        this.emit('showing');
    },
    // hide:
    //
    // Reverses the effect of show()
    hide: function() {
        if (this.isDummy)
            return;
        if (!this._shown)
            return;
        let event = Clutter.get_current_event();
        if (event) {
            let type = event.type();
            let button = (type == Clutter.EventType.BUTTON_PRESS ||
                          type == Clutter.EventType.BUTTON_RELEASE);
            let ctrl = (event.get_state() & Clutter.ModifierType.CONTROL_MASK) != 0;
            if (button && ctrl)
                return;
        }
        this._animateNotVisible();
        this._shown = false;
        this._syncGrab();
    },
    toggle: function() {
        if (this.isDummy)
            return;
        if (this.visible)
            this.hide();
        else
            this.show();
    },
    // Checks if the Activities button is currently sensitive to
    // clicks. The first call to this function within the
    // OVERVIEW_ACTIVATION_TIMEOUT time of the hot corner being
@@ -501,6 +584,8 @@ const Overview = new Lang.Class({
        return false;
    },
    //// Private methods ////
    _syncGrab: function() {
        // We delay grab changes during animation so that when removing the
        // overview we don't have a problem with the release of a press/release
@@ -530,92 +615,6 @@ const Overview = new Lang.Class({
        return true;
    },
    // show:
    //
    // Animates the overview visible and grabs mouse and keyboard input
    show: function() {
        if (this.isDummy)
            return;
        if (this._shown)
            return;
        this._shown = true;
        if (!this._syncGrab())
            return;
        Main.layoutManager.showOverview();
        this._animateVisible();
    },
    _animateVisible: function() {
        if (this.visible || this.animationInProgress)
            return;
        this.visible = true;
        this.animationInProgress = true;
        this.visibleTarget = true;
        this._activationTime = Date.now() / 1000;
        Meta.disable_unredirect_for_screen(global.screen);
        this.viewSelector.show();
        this._stack.opacity = 0;
        Tweener.addTween(this._stack,
                         { opacity: 255,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
                           onComplete: this._showDone,
                           onCompleteScope: this
                         });
        this._shadeBackgrounds();
        this._coverPane.raise_top();
        this._coverPane.show();
        this.emit('showing');
    },
    _showDone: function() {
        this.animationInProgress = false;
        this._desktopFade.hide();
        this._coverPane.hide();
        this.emit('shown');
        // Handle any calls to hide* while we were showing
        if (!this._shown)
            this._animateNotVisible();
        this._syncGrab();
        global.sync_pointer();
    },
    // hide:
    //
    // Reverses the effect of show()
    hide: function() {
        if (this.isDummy)
            return;
        if (!this._shown)
            return;
        let event = Clutter.get_current_event();
        if (event) {
            let type = event.type();
            let button = (type == Clutter.EventType.BUTTON_PRESS ||
                          type == Clutter.EventType.BUTTON_RELEASE);
            let ctrl = (event.get_state() & Clutter.ModifierType.CONTROL_MASK) != 0;
            if (button && ctrl)
                return;
        }
        this._animateNotVisible();
        this._shown = false;
        this._syncGrab();
    },
    _animateNotVisible: function() {
        if (!this.visible || this.animationInProgress)
            return;
@@ -640,6 +639,20 @@ const Overview = new Lang.Class({
        this.emit('hiding');
    },
    _showDone: function() {
        this.animationInProgress = false;
        this._desktopFade.hide();
        this._coverPane.hide();
        this.emit('shown');
        // Handle any calls to hide* while we were showing
        if (!this._shown)
            this._animateNotVisible();
        this._syncGrab();
        global.sync_pointer();
    },
    _hideDone: function() {
        // Re-enable unredirection
        Meta.enable_unredirect_for_screen(global.screen);
@@ -665,16 +678,6 @@ const Overview = new Lang.Class({
            this._fakePointerEvent();
            this._needsFakePointerEvent = false;
        }
    },
    toggle: function() {
        if (this.isDummy)
            return;
        if (this.visible)
            this.hide();
        else
            this.show();
    }
 });
 Signals.addSignalMethods(Overview.prototype);
--- 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
+        // actually used, e.g. there are windows on more than one
-        let alwaysZoomOut = this.actor.hover ||
+        let alwaysZoomOut = this.actor.hover || this._inDrag || !Meta.prefs_get_dynamic_workspaces() || global.screen.n_workspaces > 2;
                            this._inDrag ||
                            !Meta.prefs_get_dynamic_workspaces() ||
                            global.screen.n_workspaces > 2 ||
                            global.screen.get_active_workspace_index() != 0;
        if (!alwaysZoomOut) {
            let monitors = Main.layoutManager.monitors;
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -14,6 +14,7 @@ const St = imports.gi.St;
 const Signals = imports.signals;
 const Atk = imports.gi.Atk;
 const Animation = imports.ui.animation;
 const Config = imports.misc.config;
 const CtrlAltTab = imports.ui.ctrlAltTab;
@@ -212,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;
@@ -594,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;
    },
@@ -812,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();
            this._network = new imports.ui.status.network.NMApplet();
        } else {
            this._network = null;
        }
        if (Config.HAVE_BLUETOOTH) {
            this._bluetooth = new imports.ui.status.bluetooth.Indicator();
        } else {
@@ -829,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);
+        this._indicators.add_child(this._network.indicators);
        if (this._network) {
            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/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -41,7 +41,8 @@ const ButtonBox = new Lang.Class({
    },
    _getPreferredWidth: function(actor, forHeight, alloc) {
-        let child = actor.get_first_child();
+        let children = actor.get_children();
        let child = children.length > 0 ? children[0] : null;
        if (child) {
            [alloc.min_size, alloc.natural_size] = child.get_preferred_width(-1);
@@ -54,7 +55,8 @@ const ButtonBox = new Lang.Class({
    },
    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let child = actor.get_first_child();
+        let children = actor.get_children();
        let child = children.length > 0 ? children[0] : null;
        if (child) {
            [alloc.min_size, alloc.natural_size] = child.get_preferred_height(-1);
@@ -64,11 +66,13 @@ const ButtonBox = new Lang.Class({
    },
    _allocate: function(actor, box, flags) {
-        let child = actor.get_first_child();
+        let children = actor.get_children();
-        if (!child)
+        if (children.length == 0)
            return;
        let child = children[0];
        let [minWidth, natWidth] = child.get_preferred_width(-1);
        let [minHeight, natHeight] = child.get_preferred_height(-1);
        let availWidth = box.x2 - box.x1;
        let availHeight = box.y2 - box.y1;
--- 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,30 +45,28 @@ function isPopupMenuItemVisible(child) {
 /**
 * @side Side to which the arrow points.
 */
-function arrowIcon(side) {
+function unicodeArrow(side) {
-    let iconName;
+    let arrowChar;
    switch (side) {
        case St.Side.TOP:
-            iconName = 'pan-up-symbolic';
+            arrowChar = '\u25B4';
            break;
        case St.Side.RIGHT:
-            iconName = 'pan-end-symbolic';
+            arrowChar = '\u25B8';
            break;
        case St.Side.BOTTOM:
-            iconName = 'pan-down-symbolic';
+            arrowChar = '\u25BE';
            break;
        case St.Side.LEFT:
-            iconName = 'pan-start-symbolic';
+            arrowChar = '\u25C2';
            break;
    }
-    let arrow = new St.Icon({ style_class: 'popup-menu-arrow',
+    return new St.Label({ text: arrowChar,
-                              icon_name: iconName,
+                          style_class: 'unicode-arrow',
-                              accessible_role: Atk.Role.ARROW,
+                          accessible_role: Atk.Role.ARROW,
-                              y_expand: true,
+                          y_expand: true,
-                              y_align: Clutter.ActorAlign.CENTER });
+                          y_align: Clutter.ActorAlign.CENTER });
    return arrow;
 }
 const PopupBaseMenuItem = new Lang.Class({
@@ -113,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() {
@@ -195,9 +192,6 @@ const PopupBaseMenuItem = new Lang.Class({
    destroy: function() {
        this.actor.destroy();
    },
    _onDestroy: function() {
        this.emit('destroy');
    },
@@ -246,16 +240,8 @@ const PopupSeparatorMenuItem = new Lang.Class({
        this.actor.add(this.label);
        this.actor.label_actor = this.label;
        this.label.connect('notify::text',
                           Lang.bind(this, this._syncVisibility));
        this._syncVisibility();
        this._separator = new Separator.HorizontalSeparator({ style_class: 'popup-separator-menu-item' });
        this.actor.add(this._separator.actor, { expand: true });
    },
    _syncVisibility: function() {
        this.label.visible = this.label.text != '';
    }
 });
@@ -378,9 +364,9 @@ const PopupImageMenuItem = new Lang.Class({
        this.parent(params);
        this.label = new St.Label({ text: text });
-        this.actor.add_child(this.label);
+        this.addActor(this.label);
        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
-        this.actor.add_child(this._icon, { align: St.Align.END });
+        this.addActor(this._icon, { align: St.Align.END });
        this.setIcon(iconName);
    },
@@ -882,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() {
@@ -897,7 +883,7 @@ const PopupSubMenu = new Lang.Class({
                               }
                             });
        } else {
-            this._arrow.rotation_angle_z = this.actor._arrowRotation + 90;
+            this._arrow.rotation_angle_z = 90;
        }
    },
@@ -915,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() {
@@ -931,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();
        }
    },
@@ -1003,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
@@ -117,7 +117,7 @@ function loadRemoteSearchProviders(callback) {
        }
    }
-    let searchSettings = new Gio.Settings({ schema_id: Search.SEARCH_PROVIDERS_SCHEMA });
+    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
    if (searchSettings.get_boolean('disable-external')) {
        callback([]);
        return;
@@ -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
@@ -38,8 +38,8 @@ const RunDialog = new Lang.Class({
        this.parent({ styleClass: 'run-dialog',
                      destroyOnClose: false });
-        this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
+        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
-        this._terminalSettings = new Gio.Settings({ schema_id: TERMINAL_SCHEMA });
+        this._terminalSettings = new Gio.Settings({ schema: TERMINAL_SCHEMA });
        global.settings.connect('changed::development-tools', Lang.bind(this, function () {
            this._enableInternalCommands = global.settings.get_boolean('development-tools');
        }));
@@ -50,10 +50,14 @@ const RunDialog = new Lang.Class({
                                       Main.createLookingGlass().open();
                                   }),
-                                   'r': Lang.bind(this, this._restart),
+                                   'r': Lang.bind(this, function() {
                                       global.reexec_self();
                                   }),
                                   // Developer brain backwards compatibility
-                                   'restart': Lang.bind(this, this._restart),
+                                   'restart': Lang.bind(this, function() {
                                       global.reexec_self();
                                   }),
                                   'debugexit': Lang.bind(this, function() {
                                       Meta.quit(Meta.ExitCode.ERROR);
@@ -229,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
@@ -267,12 +271,6 @@ const RunDialog = new Lang.Class({
        }
    },
    _restart: function() {
        this._shouldFadeOut = false;
        this.close();
        Meta.restart(_("Restarting…"));
    },
    open: function() {
        this._history.lastItem();
        this._errorBox.hide();
--- 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();
+        let items = this._sources.items();
-        for (let [source, obj] of 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);
                                       }));
@@ -563,7 +563,7 @@ const ScreenShield = new Lang.Class({
                this._loginSession.connectSignal('Unlock', Lang.bind(this, function() { this.deactivate(false); }));
            }));
-        this._settings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
+        this._settings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
        this._isModal = false;
        this._hasLockScreen = false;
@@ -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;
@@ -68,13 +67,6 @@ const ScreenshotService = new Lang.Class({
        Gio.DBus.session.own_name('org.gnome.Shell.Screenshot', Gio.BusNameOwnerFlags.REPLACE, null, null);
    },
    _checkArea: function(x, y, width, height) {
        return x >= 0 && y >= 0 &&
               width > 0 && height > 0 &&
               x + width <= global.screen_width &&
               y + height <= global.screen_height;
    },
    _onScreenshotComplete: function(obj, result, area, filenameUsed, flash, invocation) {
        if (flash && result) {
            let flashspot = new Flashspot(area);
@@ -85,31 +77,13 @@ const ScreenshotService = new Lang.Class({
        invocation.return_value(retval);
    },
    _scaleArea: function(x, y, width, height) {
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        x *= scaleFactor;
        y *= scaleFactor;
        width *= scaleFactor;
        height *= scaleFactor;
        return [x, y, width, height];
    },
    _unscaleArea: function(x, y, width, height) {
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        x /= scaleFactor;
        y /= scaleFactor;
        width /= scaleFactor;
        height /= scaleFactor;
        return [x, y, width, height];
    },
    ScreenshotAreaAsync : function (params, invocation) {
        let [x, y, width, height, flash, filename, callback] = params;
-        [x, y, width, height] = this._scaleArea(x, y, width, height);
+        if (x < 0 || y < 0 ||
-        if (!this._checkArea(x, y, width, height)) {
+            width <= 0 || height <= 0 ||
-            invocation.return_error_literal(Gio.IOErrorEnum,
+            x + width > global.screen_width || y + height > global.screen_height) {
-                                            Gio.IOErrorEnum.CANCELLED,
+            invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
-                                            "Invalid params");
+                        "Invalid params");
            return;
        }
        let screenshot = new Shell.Screenshot();
@@ -140,9 +114,9 @@ const ScreenshotService = new Lang.Class({
        selectArea.connect('finished', Lang.bind(this,
            function(selectArea, areaRectangle) {
                if (areaRectangle) {
-                    let retRectangle = this._unscaleArea(areaRectangle.x, areaRectangle.y,
+                    let retval = GLib.Variant.new('(iiii)',
-                        areaRectangle.width, areaRectangle.height);
+                        [areaRectangle.x, areaRectangle.y,
-                    let retval = GLib.Variant.new('(iiii)', retRectangle);
+                         areaRectangle.width, areaRectangle.height]);
                    invocation.return_value(retval);
                } else {
                    invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
@@ -151,18 +125,9 @@ const ScreenshotService = new Lang.Class({
            }));
    },
-    FlashAreaAsync: function(params, invocation) {
+    FlashArea: function(x, y, width, height) {
        let [x, y, width, height] = params;
        [x, y, width, height] = this._scaleArea(x, y, width, height);
        if (!this._checkArea(x, y, width, height)) {
            invocation.return_error_literal(Gio.IOErrorEnum,
                                            Gio.IOErrorEnum.CANCELLED,
                                            "Invalid params");
            return;
        }
        let flashspot = new Flashspot({ x : x, y : y, width: width, height: height});
        flashspot.fire();
        invocation.return_value(null);
    }
 });
@@ -174,7 +139,6 @@ const SelectArea = new Lang.Class({
        this._startY = -1;
        this._lastX = 0;
        this._lastY = 0;
        this._result = null;
        this._initRubberbandColors();
@@ -184,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));
@@ -205,12 +169,10 @@ const SelectArea = new Lang.Class({
    },
    show: function() {
-        if (!this._grabHelper.grab({ actor: this._group,
+        if (!Main.pushModal(this._group) || this._group.visible)
                                     onUngrab: Lang.bind(this, this._onUngrab) }))
            return;
        global.screen.set_cursor(Meta.Cursor.CROSSHAIR);
        Main.uiGroup.set_child_above_sibling(this._group, null);
        this._group.visible = true;
    },
@@ -240,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;
@@ -261,28 +230,24 @@ const SelectArea = new Lang.Class({
    },
    _onButtonRelease: function(actor, event) {
-        this._result = this._getGeometry();
+        this._destroy(this._getGeometry(), true);
        Tweener.addTween(this._group,
                         { opacity: 0,
                           time: 0.2,
                           transition: 'easeOutQuad',
                           onComplete: Lang.bind(this,
                               function() {
                                   this._grabHelper.ungrab();
                               })
                         });
        return Clutter.EVENT_PROPAGATE;
    },
-    _onUngrab: function() {
+    _destroy: function(geometry, fade) {
-        global.screen.set_cursor(Meta.Cursor.DEFAULT);
+        Tweener.addTween(this._group,
-        this.emit('finished', this._result);
+                         { 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,
+                                   this.emit('finished', geometry);
-            function() {
+                               })
-                this._group.destroy();
+                         });
                return GLib.SOURCE_REMOVE;
            }));
    }
 });
 Signals.addSignalMethods(SelectArea.prototype);
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -7,7 +7,6 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 // This module provides functionality for driving the shell user interface
 // in an automated fashion. The primary current use case for this is
@@ -40,12 +39,11 @@ const Params = imports.misc.params;
 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;
@@ -79,7 +77,6 @@ const PerfHelperIface = '<node> \
    <arg type="i" direction="in" /> \
    <arg type="b" direction="in" /> \
    <arg type="b" direction="in" /> \
    <arg type="b" direction="in" /> \
 </method> \
 <method name="WaitWindows" /> \
 <method name="DestroyWindows" /> \
@@ -99,36 +96,11 @@ function _getPerfHelper() {
    return _perfHelper;
 }
 function _callRemote(obj, method, ...args) {
    let cb;
    let errcb;
    args.push(function(result, excp) {
                  if (excp) {
                      if (errcb)
                          errcb(excp);
                  } else {
                      if (cb)
                          cb();
                  }
             });
    method.apply(obj, args);
    return function(callback, error_callback) {
        cb = callback;
        errcb = error_callback;
    };
 }
 /**
 * createTestWindow:
- * @params: options for window creation.
+ * @width: width of window, in pixels
- *   width - width of window, in pixels (default 640)
+ * @height: height of window, in pixels
- *   height - height of window, in pixels (default 480)
+ * @alpha: whether the window should be alpha transparent
 *   alpha - whether the window should have an alpha channel (default false)
 *   maximized - whether the window should be created maximized (default false)
 *   redraws - whether the window should continually redraw itself (default false)
 * @maximized: whethe the window should be created maximized
 *
 * Creates a window using gnome-shell-perf-helper for testing purposes.
@@ -137,17 +109,19 @@ function _callRemote(obj, method, ...args) {
 * because of the normal X asynchronous mapping process, to actually wait
 * until the window has been mapped and exposed, use waitTestWindows().
 */
-function createTestWindow(width, height, params) {
+function createTestWindow(width, height, alpha, maximized) {
-    params = Params.parse(params, { width: 640,
+    let cb;
                                    height: 480,
                                    alpha: false,
                                    maximized: false,
                                    redraws: false });
    let perfHelper = _getPerfHelper();
-    return _callRemote(perfHelper, perfHelper.CreateWindowRemote,
+
-                       params.width, params.height,
+    perfHelper.CreateWindowRemote(width, height, alpha, maximized,
-                       params.alpha, params.maximized, params.redraws);
+                                  function(result, excp) {
                                      if (cb)
                                          cb();
                                  });
    return function(callback) {
        cb = callback;
    };
 }
 /**
@@ -157,8 +131,17 @@ function createTestWindow(width, height, params) {
 * created with createTestWindow have been mapped and exposed.
 */
 function waitTestWindows() {
    let cb;
    let perfHelper = _getPerfHelper();
-    return _callRemote(perfHelper, perfHelper.WaitWindowsRemote);
+
    perfHelper.WaitWindowsRemote(function(result, excp) {
                                     if (cb)
                                         cb();
                                 });
    return function(callback) {
        cb = callback;
    };
 }
 /**
@@ -171,8 +154,17 @@ function waitTestWindows() {
 * process because of normal X asynchronicity.
 */
 function destroyTestWindows() {
    let cb;
    let perfHelper = _getPerfHelper();
-    return _callRemote(perfHelper, perfHelper.DestroyWindowsRemote);
+
    perfHelper.DestroyWindowsRemote(function(result, excp) {
                                        if (cb)
                                            cb();
                                    });
    return function(callback) {
        cb = callback;
    };
 }
 /**
@@ -215,10 +207,6 @@ function _step(g, finish, onError) {
        let waitFunction = g.next();
        waitFunction(function() {
                         _step(g, finish, onError);
                     },
                     function(err) {
                         if (onError)
                             onError(err);
                     });
    } catch (err if err instanceof StopIteration) {
        if (finish)
@@ -317,8 +305,8 @@ function _collect(scriptModule, outputFile) {
        print ('------------------------------------------------------------');
        for (let i = 0; i < metrics.length; i++) {
            let metric = metrics[i];
-            print ('# ' + scriptModule.METRICS[metric].description);
+            print ('# ' + scriptModule.METRIC_DESCRIPTIONS[metric]);
-            print (metric + ': ' +  scriptModule.METRICS[metric].value + scriptModule.METRICS[metric].units);
+            print (metric + ': ' +  scriptModule.METRICS[metric]);
        }
        print ('------------------------------------------------------------');
    }
@@ -371,12 +359,7 @@ function runPerfScript(scriptModule, outputFile) {
    _step(g,
          function() {
-              try {
+              _collect(scriptModule, outputFile);
                  _collect(scriptModule, outputFile);
              } catch (err) {
                  log("Script failed: " + err + "\n" + err.stack);
                  Meta.exit(Meta.ExitCode.ERROR);
              }
              Meta.exit(Meta.ExitCode.SUCCESS);
          },
         function(err) {
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -31,7 +31,7 @@ const SearchSystem = new Lang.Class({
        this._registerProvider(new AppDisplay.AppSearchProvider());
-        this._searchSettings = new Gio.Settings({ schema_id: SEARCH_PROVIDERS_SCHEMA });
+        this._searchSettings = new Gio.Settings({ schema: SEARCH_PROVIDERS_SCHEMA });
        this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
        this._searchSettings.connect('changed::disable-external', Lang.bind(this, this._reloadRemoteProviders));
        this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));
@@ -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
@@ -465,14 +448,8 @@ const GridSearchResults = new Lang.Class({
    Name: 'GridSearchResults',
    Extends: SearchResultsBase,
-    _init: function(provider, parentContainer) {
+    _init: function(provider) {
        this.parent(provider);
        // We need to use the parent container to know how much results we can show.
        // None of the actors in this class can be used for that, since the main actor
        // goes hidden when no results are displayed, and then it lost its allocation.
        // Then on the next use of _getMaxDisplayedResults allocation is 0, en therefore
        // it doesn't show any result although we have some.
        this._parentContainer = parentContainer;
        this._grid = new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS,
                                             xAlign: St.Align.START });
@@ -483,9 +460,7 @@ const GridSearchResults = new Lang.Class({
    },
    _getMaxDisplayedResults: function() {
-        let parentThemeNode = this._parentContainer.get_theme_node();
+        return this._grid.columnsForWidth(this._bin.width) * this._grid.getRowLimit();
        let availableWidth = parentThemeNode.adjust_for_width(this._parentContainer.width);
        return this._grid.columnsForWidth(availableWidth) * this._grid.getRowLimit();
    },
    _renderResults: function(metas) {
@@ -585,7 +560,7 @@ const SearchResults = new Lang.Class({
        if (provider.appInfo)
            providerDisplay = new ListSearchResults(provider);
        else
-            providerDisplay = new GridSearchResults(provider, this._content);
+            providerDisplay = new GridSearchResults(provider);
        providerDisplay.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
        this._content.add(providerDisplay.actor);
@@ -640,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;
        }
@@ -681,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,14 +10,13 @@ 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 = {
    'restrictive': {
        parentMode: null,
        stylesheetName: 'gnome-shell.css',
        overridesSchema: 'org.gnome.shell.overrides',
        hasOverview: false,
        showCalendarEvents: false,
        allowSettings: false,
@@ -93,12 +92,8 @@ const _modes = {
        isLocked: false,
        isPrimary: true,
        unlockDialog: imports.ui.unlockDialog.UnlockDialog,
-        components: Config.HAVE_NETWORKMANAGER ?
+        components: ['networkAgent', 'polkitAgent', 'telepathyClient',
                    ['networkAgent', 'polkitAgent', 'telepathyClient',
                     'keyring', 'autorunManager', 'automountManager'] :
                    ['polkitAgent', 'telepathyClient',
                     'keyring', 'autorunManager', 'automountManager'],
        panel: {
            left: ['activities', 'appMenu'],
            center: ['dateMenu'],
@@ -139,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._grabbedAccelerators = new Hash.Map();
-        this._grabbers = new 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();
+        let grabs = this._grabbedAccelerators.items();
-        for (let [action, sender] of grabs) {
+        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();
+        app.launch(global.display.get_current_time_roundtrip(),
-        let timestamp = global.display.get_current_time_roundtrip();
+                   ['extension:///' + uuid], -1, null);
        info.launch_uris(['extension:///' + uuid],
                         global.create_app_launch_context(timestamp, -1));
    },
    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,11 +44,11 @@ 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);
-        this._a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
+        this._a11ySettings = new Gio.Settings({ schema: A11Y_SCHEMA });
        this._a11ySettings.connect('changed::' + KEY_ALWAYS_SHOW, Lang.bind(this, this._queueSyncMenuVisibility));
        let highContrast = this._buildHCItem();
@@ -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) {
@@ -118,7 +117,7 @@ const ATIndicator = new Lang.Class({
    },
    _buildItem: function(string, schema, key) {
-        let settings = new Gio.Settings({ schema_id: schema });
+        let settings = new Gio.Settings({ schema: schema });
        let widget = this._buildItemExtended(string,
            settings.get_boolean(key),
            settings.is_writable(key),
@@ -134,8 +133,8 @@ const ATIndicator = new Lang.Class({
    },
    _buildHCItem: function() {
-        let interfaceSettings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
+        let interfaceSettings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
-        let wmSettings = new Gio.Settings({ schema_id: WM_SCHEMA });
+        let wmSettings = new Gio.Settings({ schema: WM_SCHEMA });
        let gtkTheme = interfaceSettings.get_string(KEY_GTK_THEME);
        let iconTheme = interfaceSettings.get_string(KEY_ICON_THEME);
        let wmTheme = wmSettings.get_string(KEY_WM_THEME);
@@ -186,7 +185,7 @@ const ATIndicator = new Lang.Class({
    },
    _buildFontItem: function() {
-        let settings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
+        let settings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
        let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
        let initial_setting = (factor > 1.0);
--- 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);
+        let on = nDevices > 0;
-        this._indicator.visible = nDevices > 0;
+        this._indicator.visible = on;
-        this._item.actor.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
+        this._item.actor.visible = on;
-        if (nDevices > 0)
+        if (on)
            this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices", nDevices).format(nDevices);
        else
            this._item.status.text = _("Not Connected");
    },
 });
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -292,10 +292,6 @@ const InputSourcePopup = new Lang.Class({
            this._select(this._previous());
        else if (keysym == Clutter.Right)
            this._select(this._next());
        else
            return Clutter.EVENT_PROPAGATE;
        return Clutter.EVENT_STOP;
    },
    _finish : function() {
@@ -345,7 +341,7 @@ const InputSourceIndicator = new Lang.Class({
        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
        this._hbox.add_child(this._container);
-        this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this._hbox.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));
        this.actor.add_child(this._hbox);
        this.actor.add_style_class_name('panel-status-button');
@@ -365,18 +361,18 @@ const InputSourceIndicator = new Lang.Class({
        this._mruSources = [];
        this._keybindingAction =
            Main.wm.addKeybinding('switch-input-source',
-                                  new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
+                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
                                  Meta.KeyBindingFlags.REVERSES,
                                  Shell.KeyBindingMode.ALL,
                                  Lang.bind(this, this._switchInputSource));
        this._keybindingActionBackward =
            Main.wm.addKeybinding('switch-input-source-backward',
-                                  new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
+                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
                                  Meta.KeyBindingFlags.REVERSES |
-                                  Meta.KeyBindingFlags.IS_REVERSED,
+                                  Meta.KeyBindingFlags.REVERSED,
                                  Shell.KeyBindingMode.ALL,
                                  Lang.bind(this, this._switchInputSource));
-        this._settings = new Gio.Settings({ schema_id: DESKTOP_INPUT_SOURCES_SCHEMA });
+        this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
        this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
        this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -1,205 +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_id: 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;
            if (this._getMaxAccuracyLevel() != 0)
                this._settings.set_enum(MAX_ACCURACY_LEVEL, this._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
--- a/js/ui/status/rfkill.js
+++ b/js/ui/status/rfkill.js
@@ -2,9 +2,7 @@
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@@ -14,55 +12,11 @@ const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill';
 const RfkillManagerInterface = '<node> \
 <interface name="org.gnome.SettingsDaemon.Rfkill"> \
 <property name="AirplaneMode" type="b" access="readwrite" /> \
 <property name="HardwareAirplaneMode" type="b" access="read" /> \
 </interface> \
 </node>';
 const RfkillManagerProxy = Gio.DBusProxy.makeProxyWrapper(RfkillManagerInterface);
 const RfkillManager = new Lang.Class({
    Name: 'RfkillManager',
    _init: function() {
        this._proxy = new RfkillManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
                                             Lang.bind(this, function(proxy, error) {
                                                 if (error) {
                                                     log(error.message);
                                                     return;
                                                 }
                                                 this._proxy.connect('g-properties-changed',
                                                                     Lang.bind(this, this._changed));
                                                 this._changed();
                                             }));
    },
    get airplaneMode() {
        return this._proxy.AirplaneMode;
    },
    set airplaneMode(v) {
        this._proxy.AirplaneMode = v;
    },
    get hwAirplaneMode() {
        return this._proxy.HardwareAirplaneMode;
    },
    _changed: function() {
        this.emit('airplane-mode-changed');
    }
 });
 Signals.addSignalMethods(RfkillManager.prototype);
 var _manager;
 function getRfkillManager() {
    if (_manager != null)
        return _manager;
    _manager = new RfkillManager();
    return _manager;
 }
 const Indicator = new Lang.Class({
    Name: 'RfkillIndicator',
    Extends: PanelMenu.SystemIndicator,
@@ -70,8 +24,16 @@ const Indicator = new Lang.Class({
    _init: function() {
        this.parent();
-        this._manager = getRfkillManager();
+        this._proxy = new RfkillManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
-        this._manager.connect('airplane-mode-changed', Lang.bind(this, this._sync));
+                                             Lang.bind(this, function(proxy, error) {
                                                 if (error) {
                                                     log(error.message);
                                                     return;
                                                 }
                                                 this._proxy.connect('g-properties-changed',
                                                                     Lang.bind(this, this._sync));
                                                 this._sync();
                                             }));
        this._indicator = this._addIndicator();
        this._indicator.icon_name = 'airplane-mode-symbolic';
@@ -83,34 +45,16 @@ const Indicator = new Lang.Class({
        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Airplane Mode"), true);
        this._item.icon.icon_name = 'airplane-mode-symbolic';
        this._item.status.text = _("On");
-        this._offItem = this._item.menu.addAction(_("Turn Off"), Lang.bind(this, function() {
+        this._item.menu.addAction(_("Turn Off"), Lang.bind(this, function() {
-            this._manager.airplaneMode = false;
+            this._proxy.AirplaneMode = false;
        }));
        this._item.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');
        this.menu.addMenuItem(this._item);
        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
        this._sessionUpdated();
    },
    _sessionUpdated: function() {
        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
        this.menu.setSensitive(sensitive);
    },
    _sync: function() {
-        let airplaneMode = this._manager.airplaneMode;
+        let airplaneMode = this._proxy.AirplaneMode;
        let hwAirplaneMode = this._manager.hwAirplaneMode;
        let changed = (airplaneMode != this._indicator.visible) ||
            (hwAirplaneMode != this._offItem.actor.visible);
        this._indicator.visible = airplaneMode;
        this._item.actor.visible = airplaneMode;
        this._offItem.setSensitive(!hwAirplaneMode);
        if (hwAirplaneMode)
            this._offItem.label.text = _("Use hardware switch to turn off");
        else
            this._offItem.label.text = _("Turn Off");
    },
 });
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -56,10 +56,7 @@ const AltSwitcher = new Lang.Class({
        }
        if (this.actor.get_child() != childToShow) {
            let hasFocus = this.actor.contains(global.stage.get_key_focus());
            this.actor.set_child(childToShow);
            if (hasFocus)
                childToShow.grab_key_focus();
            // The actors might respond to hover, so
            // sync the pointer to make sure they update.
@@ -95,11 +92,11 @@ const Indicator = new Lang.Class({
    _init: function() {
        this.parent();
-        this._screenSaverSettings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
+        this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
-        this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
+        this._loginScreenSettings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
-        this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
+        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
-        this._privacySettings = new Gio.Settings({ schema_id: PRIVACY_SCHEMA });
+        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
-        this._orientationSettings = new Gio.Settings({ schema_id: 'org.gnome.settings-daemon.peripherals.touchscreen' });
+        this._orientationSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.peripherals.touchscreen' });
        this._session = new GnomeSession.SessionManager();
        this._loginManager = LoginManager.getLoginManager();
@@ -151,11 +148,11 @@ const Indicator = new Lang.Class({
        Gio.DBus.session.watch_name('org.gnome.SettingsDaemon.Orientation',
                                    Gio.BusNameWatcherFlags.NONE,
                                    Lang.bind(this, function() {
-                                        this._orientationExists = true;
+                                        this._orentationExists = true;
                                        this._updateOrientationLock();
                                    }),
                                    Lang.bind(this, function() {
-                                        this._orientationExists = false;
+                                        this._orentationExists = false;
                                        this._updateOrientationLock();
                                    }));
        this._updateOrientationLock();
--- 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;
    },
@@ -190,11 +189,10 @@ const SwitcherPopup = new Lang.Class({
        this._disableHover();
        if (this._keyPressHandler(keysym, backwards, action) != Clutter.EVENT_PROPAGATE)
            return Clutter.EVENT_STOP;
        if (keysym == Clutter.Escape)
            this.destroy();
        else
            this._keyPressHandler(keysym, backwards, action);
        return Clutter.EVENT_STOP;
    },
@@ -252,7 +250,6 @@ const SwitcherPopup = new Lang.Class({
            Mainloop.source_remove(this._motionTimeoutId);
        this._motionTimeoutId = Mainloop.timeout_add(DISABLE_HOVER_TIMEOUT, Lang.bind(this, this._mouseTimedOut));
        GLib.Source.set_name_by_id(this._motionTimeoutId, '[gnome-shell] this._mouseTimedOut');
    },
    _mouseTimedOut: function() {
@@ -455,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();
                                }
                           })
                          });
    },
@@ -479,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();
                                }
                            })
                          });
    },
@@ -516,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;
@@ -546,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/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -62,7 +62,7 @@ const UnlockDialog = new Lang.Class({
        this.allowCancel = false;
-        let screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
+        let screenSaverSettings = new Gio.Settings({ schema: 'org.gnome.desktop.screensaver' });
        if (screenSaverSettings.get_boolean('user-switch-enabled')) {
            let otherUserLabel = new St.Label({ text: _("Log in as another user"),
                                                style_class: 'login-dialog-not-listed-label' });
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -49,139 +49,6 @@ function getTermsForSearchString(searchString) {
    return terms;
 }
 const EDGE_THRESHOLD = 20;
 const DRAG_DISTANCE = 80;
 const EdgeDragAction = new Lang.Class({
    Name: 'EdgeDragAction',
    Extends: Clutter.GestureAction,
    _init : function(side) {
        this.parent();
        this._side = side;
        this.set_n_touch_points(1);
        global.display.connect('grab-op-begin', Lang.bind(this, function() {
            this.cancel();
        }));
    },
    _getMonitorRect : function (x, y) {
        let rect = new Meta.Rectangle({ x: x - 1, y: y - 1, width: 1, height: 1 });
        let monitorIndex = global.screen.get_monitor_index_for_rect(rect);
        return global.screen.get_monitor_geometry(monitorIndex);
    },
    vfunc_gesture_prepare : function(action, actor) {
        if (this.get_n_current_points() == 0)
            return false;
        let [x, y] = this.get_press_coords(0);
        let monitorRect = this._getMonitorRect(x, y);
        return ((this._side == St.Side.LEFT && x < monitorRect.x + EDGE_THRESHOLD) ||
                (this._side == St.Side.RIGHT && x > monitorRect.x + monitorRect.width - EDGE_THRESHOLD) ||
                (this._side == St.Side.TOP && y < monitorRect.y + EDGE_THRESHOLD) ||
                (this._side == St.Side.BOTTOM && y > monitorRect.y + monitorRect.height - EDGE_THRESHOLD));
    },
    vfunc_gesture_progress : function (action, actor) {
        let [startX, startY] = this.get_press_coords(0);
        let [x, y] = this.get_motion_coords(0);
        let offsetX = Math.abs (x - startX);
        let offsetY = Math.abs (y - startY);
        if (offsetX < EDGE_THRESHOLD && offsetY < EDGE_THRESHOLD)
            return true;
        if ((offsetX > offsetY &&
             (this._side == St.Side.TOP || this._side == St.Side.BOTTOM)) ||
            (offsetY > offsetX &&
             (this._side == St.Side.LEFT || this._side == St.Side.RIGHT))) {
            this.cancel();
            return false;
        }
        return true;
    },
    vfunc_gesture_end : function (action, actor) {
        let [startX, startY] = this.get_press_coords(0);
        let [x, y] = this.get_motion_coords(0);
        let monitorRect = this._getMonitorRect(startX, startY);
        if ((this._side == St.Side.TOP && y > monitorRect.y + DRAG_DISTANCE) ||
            (this._side == St.Side.BOTTOM && y < monitorRect.y + monitorRect.height - DRAG_DISTANCE) ||
            (this._side == St.Side.LEFT && x > monitorRect.x + DRAG_DISTANCE) ||
            (this._side == St.Side.RIGHT && x < monitorRect.x + monitorRect.width - DRAG_DISTANCE))
            this.emit('activated');
    }
 });
 Signals.addSignalMethods(EdgeDragAction.prototype);
 const ShowOverviewAction = new Lang.Class({
    Name: 'ShowOverviewAction',
    Extends: Clutter.GestureAction,
    _init : function() {
        this.parent();
        this.set_n_touch_points(3);
        global.display.connect('grab-op-begin', Lang.bind(this, function() {
            this.cancel();
        }));
    },
    vfunc_gesture_prepare : function(action, actor) {
        return this.get_n_current_points() == this.get_n_touch_points();
    },
    _getBoundingRect : function(motion) {
        let minX, minY, maxX, maxY;
        for (let i = 0; i < this.get_n_current_points(); i++) {
            let x, y;
            if (motion == true) {
                [x, y] = this.get_motion_coords(i);
            } else {
                [x, y] = this.get_press_coords(i);
            }
            if (i == 0) {
                minX = maxX = x;
                minY = maxY = y;
            } else {
                minX = Math.min(minX, x);
                minY = Math.min(minY, y);
                maxX = Math.max(maxX, x);
                maxY = Math.max(maxY, y);
            }
        }
        return new Meta.Rectangle({ x: minX,
                                    y: minY,
                                    width: maxX - minX,
                                    height: maxY - minY });
    },
    vfunc_gesture_begin : function(action, actor) {
        this._initialRect = this._getBoundingRect(false);
        return true;
    },
    vfunc_gesture_end : function(action, actor) {
        let rect = this._getBoundingRect(true);
        let oldArea = this._initialRect.width * this._initialRect.height;
        let newArea = rect.width * rect.height;
        let areaDiff = newArea / oldArea;
        this.emit('activated', areaDiff);
    }
 });
 Signals.addSignalMethods(ShowOverviewAction.prototype);
 const ViewSelector = new Lang.Class({
    Name: 'ViewSelector',
@@ -216,10 +83,10 @@ const ViewSelector = new Lang.Class({
                                                   icon_name: 'edit-find-symbolic' }));
        if (this._entry.get_text_direction() == Clutter.TextDirection.RTL)
            this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                            icon_name: 'edit-clear-symbolic-rtl' });
+                                            icon_name: 'edit-clear-rtl-symbolic' });
        else
            this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                            icon_name: 'edit-clear-symbolic-ltr' });
+                                            icon_name: 'edit-clear-symbolic' });
        this._iconClickedId = 0;
        this._capturedEventId = 0;
@@ -265,36 +132,19 @@ const ViewSelector = new Lang.Class({
            }));
        Main.wm.addKeybinding('toggle-application-view',
-                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
+                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                              Meta.KeyBindingFlags.NONE,
                              Shell.KeyBindingMode.NORMAL |
                              Shell.KeyBindingMode.OVERVIEW,
                              Lang.bind(this, this._toggleAppsPage));
        Main.wm.addKeybinding('toggle-overview',
-                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
+                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                              Meta.KeyBindingFlags.NONE,
                              Shell.KeyBindingMode.NORMAL |
                              Shell.KeyBindingMode.OVERVIEW,
                              Lang.bind(Main.overview, Main.overview.toggle));
        let gesture;
        gesture = new EdgeDragAction(St.Side.LEFT);
        gesture.connect('activated', Lang.bind(this, function() {
            if (Main.overview.visible)
                Main.overview.hide();
            else
                this.showApps();
        }));
        global.stage.add_action(gesture);
        gesture = new ShowOverviewAction();
        gesture.connect('activated', Lang.bind(this, function(action, areaDiff) {
            if (areaDiff < 0.7)
                Main.overview.show();
        }));
        global.stage.add_action(gesture);
    },
    _toggleAppsPage: function() {
@@ -337,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,
@@ -361,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,
@@ -432,14 +283,6 @@ const ViewSelector = new Lang.Class({
            return Clutter.EVENT_STOP;
        } else if (this._shouldTriggerSearch(symbol)) {
            this.startSearch(event);
        } else if (!this._searchActive && !global.stage.key_focus) {
            if (symbol == Clutter.Tab || symbol == Clutter.Down) {
                this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
                return Clutter.EVENT_STOP;
            } else if (symbol == Clutter.ISO_Left_Tab) {
                this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_BACKWARD, false);
                return Clutter.EVENT_STOP;
            }
        }
        return Clutter.EVENT_PROPAGATE;
    },
@@ -508,10 +351,7 @@ const ViewSelector = new Lang.Class({
    startSearch: function(event) {
        global.stage.set_key_focus(this._text);
-
+        this._text.event(event, true);
        let synthEvent = event.copy();
        synthEvent.set_source(this._text);
        this._text.event(synthEvent, true);
    },
    // the entry does not show the hint
@@ -536,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);
@@ -637,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
@@ -9,14 +9,12 @@ const Meta = imports.gi.Meta;
 const Pango = imports.gi.Pango;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const AltTab = imports.ui.altTab;
 const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
 const WindowMenu = imports.ui.windowMenu;
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 const WINDOW_ANIMATION_TIME = 0.25;
@@ -84,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) {
@@ -194,25 +191,17 @@ 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));
        global.screen.connect('restacked', Lang.bind(this, this._windowsRestacked));
-        this._workspaceSettings = this._getWorkspaceSettings();
+        this._workspaceSettings = new Gio.Settings({ schema: Main.dynamicWorkspacesSchema });
        this._workspaceSettings.connect('changed::dynamic-workspaces', Lang.bind(this, this._queueCheckWorkspaces));
        this._nWorkspacesChanged();
    },
    _getWorkspaceSettings: function() {
        let settings = global.get_overrides_settings();
        if (settings.list_keys().indexOf('dynamic-workspaces') > -1)
            return settings;
        return new Gio.Settings({ schema_id: 'org.gnome.mutter' });
    },
    _checkWorkspaces: function() {
        let i;
        let emptyWorkspaces = [];
@@ -243,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 = windows[i];
            let win = actor.get_meta_window();
-            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;
        }
@@ -260,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--) {
@@ -268,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;
    },
@@ -281,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) {
@@ -370,202 +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 WorkspaceSwitchAction = new Lang.Class({
    Name: 'WorkspaceSwitchAction',
    Extends: Clutter.GestureAction,
    _init : function() {
        this.parent();
        this.set_n_touch_points(4);
        global.display.connect('grab-op-begin', Lang.bind(this, function() {
            this.cancel();
        }));
    },
    vfunc_gesture_prepare : function(action, actor) {
        return this.get_n_current_points() == this.get_n_touch_points();
    },
    vfunc_gesture_end : function(action, actor) {
        const MOTION_THRESHOLD = 50;
        // Just check one touchpoint here
        let [startX, startY] = this.get_press_coords(0);
        let [x, y] = this.get_motion_coords(0);
        let offsetX = x - startX;
        let offsetY = y - startY;
        let direction;
        if (Math.abs(offsetX) < MOTION_THRESHOLD &&
            Math.abs(offsetY) < MOTION_THRESHOLD)
            return;
        if (Math.abs(offsetY) > Math.abs(offsetX)) {
            if (offsetY > 0)
                direction = Meta.MotionDirection.UP;
            else
                direction = Meta.MotionDirection.DOWN;
        } else {
            if (offsetX > 0)
                direction = Meta.MotionDirection.LEFT;
            else
                direction = Meta.MotionDirection.RIGHT;
        }
        this.emit('activated', direction);
    }
 });
 Signals.addSignalMethods(WorkspaceSwitchAction.prototype);
 const AppSwitchAction = new Lang.Class({
    Name: 'AppSwitchAction',
    Extends: Clutter.GestureAction,
    _init : function() {
        this.parent();
        this.set_n_touch_points(3);
        global.display.connect('grab-op-begin', Lang.bind(this, function() {
            this.cancel();
        }));
    },
    vfunc_gesture_prepare : function(action, actor) {
        return this.get_n_current_points() <= 4;
    },
    vfunc_gesture_begin : function(action, actor) {
        // in milliseconds
        const LONG_PRESS_TIMEOUT = 250;
        let nPoints = this.get_n_current_points();
        let event = this.get_last_event (nPoints - 1);
        if (nPoints == 3)
            this._longPressStartTime = event.get_time();
        else if (nPoints == 4) {
            // Check whether the 4th finger press happens after a 3-finger long press,
            // this only needs to be checked on the first 4th finger press
            if (this._longPressStartTime != null &&
                event.get_time() < this._longPressStartTime + LONG_PRESS_TIMEOUT)
                this.cancel();
            else {
                this._longPressStartTime = null;
                this.emit('activated');
            }
        }
        return this.get_n_current_points() <= 4;
    },
    vfunc_gesture_progress : function(action, actor) {
        const MOTION_THRESHOLD = 30;
        if (this.get_n_current_points() == 3) {
            for (let i = 0; i < this.get_n_current_points(); i++) {
                [startX, startY] = this.get_press_coords(i);
                [x, y] = this.get_motion_coords(i);
                if (Math.abs(x - startX) > MOTION_THRESHOLD ||
                    Math.abs(y - startY) > MOTION_THRESHOLD)
                    return false;
            }
        }
        return true;
    }
 });
 Signals.addSignalMethods(AppSwitchAction.prototype);
 const WindowManager = new Lang.Class({
    Name: 'WindowManager',
@@ -581,6 +382,8 @@ const WindowManager = new Lang.Class({
        this._dimmedWindows = [];
        this._animationBlockCount = 0;
        this._allowedKeybindings = {};
        this._switchData = null;
@@ -594,9 +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('show-window-menu', Lang.bind(this, this._showWindowMenu));
        this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
        this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
        this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
@@ -606,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,
@@ -624,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,
@@ -728,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));
@@ -764,14 +555,8 @@ const WindowManager = new Lang.Class({
                                        Shell.KeyBindingMode.LOGIN_SCREEN,
                                        Lang.bind(this, this._startA11ySwitcher));
        this.addKeybinding('pause-resume-tweens',
                           new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                           Meta.KeyBindingFlags.NONE,
                           Shell.KeyBindingMode.ALL,
                           Lang.bind(this, this._toggleTweens));
        this.addKeybinding('open-application-menu',
-                           new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
+                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                           Meta.KeyBindingFlags.NONE,
                           Shell.KeyBindingMode.NORMAL |
                           Shell.KeyBindingMode.TOPBAR_POPUP,
@@ -786,60 +571,11 @@ const WindowManager = new Lang.Class({
                this._dimWindow(this._dimmedWindows[i]);
        }));
        this._windowMenuManager = new WindowMenu.WindowMenuManager();
        if (Main.sessionMode.hasWorkspaces)
            this._workspaceTracker = new WorkspaceTracker(this);
        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
                                                false, -1, 1);
        let gesture = new WorkspaceSwitchAction();
        gesture.connect('activated', Lang.bind(this, function(action, direction) {
            let newWs = global.screen.get_active_workspace().get_neighbor(direction);
            this.actionMoveWorkspace(newWs);
        }));
        global.stage.add_action(gesture);
        gesture = new AppSwitchAction();
        gesture.connect('activated', Lang.bind(this, this._switchApp));
        global.stage.add_action(gesture);
    },
    _lookupIndex: function (windows, metaWindow) {
        for (let i = 0; i < windows.length; i++) {
            if (windows[i].metaWindow == metaWindow) {
                return i;
            }
        }
        return -1;
    },
    _switchApp : function () {
        let windows = global.get_window_actors().filter(Lang.bind(this, function(actor) {
            let win = actor.metaWindow;
            return (!win.is_override_redirect() &&
                    win.located_on_workspace(global.screen.get_active_workspace()));
        }));
        if (windows.length == 0)
            return;
        let focusWindow = global.display.focus_window;
        let nextWindow;
        if (focusWindow == null)
            nextWindow = windows[0].metaWindow;
        else {
            let index = this._lookupIndex (windows, focusWindow) + 1;
            if (index >= windows.length)
                index = 0;
            nextWindow = windows[index].metaWindow;
        }
        Main.activateWindow(nextWindow);
    },
    keepWorkspaceAlive: function(workspace, duration) {
@@ -870,8 +606,16 @@ const WindowManager = new Lang.Class({
        this._allowedKeybindings[name] = modes;
    },
    blockAnimations: function() {
        this._animationBlockCount++;
    },
    unblockAnimations: function() {
        this._animationBlockCount = Math.max(0, this._animationBlockCount - 1);
    },
    _shouldAnimate: function() {
-        return !Main.overview.visible;
+        return !(Main.overview.visible || this._animationBlockCount > 0);
    },
    _shouldAnimateActor: function(actor) {
@@ -998,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);
        }
    },
@@ -1060,7 +806,7 @@ const WindowManager = new Lang.Class({
            /* Scale the window from the center of the parent */
            this._checkDimming(actor.get_meta_window().get_transient_for());
            actor.set_scale(1.0, 0.0);
-            actor.set_pivot_point(0.5, 0.5);
+            actor.scale_gravity = Clutter.Gravity.CENTER;
            actor.show();
            this._mapping.push(actor);
@@ -1134,7 +880,7 @@ const WindowManager = new Lang.Class({
            this._checkDimming(parent, window);
            actor.set_scale(1.0, 1.0);
-            actor.set_pivot_point(0.5, 0.5);
+            actor.scale_gravity = Clutter.Gravity.CENTER;
            actor.show();
            actor._parentDestroyId = parent.connect('unmanaged', Lang.bind(this, function () {
@@ -1229,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 = windows[i];
            let window = actor.get_meta_window();
-            if (!window.showing_on_its_workspace())
+            if (!window.meta_window.showing_on_its_workspace())
                continue;
-            if (window.is_on_all_workspaces())
+            if (this._movingWindow && window.meta_window == this._movingWindow) {
-                continue;
+                switchData.movingWindow = { window: window,
-
+                                            parent: window.get_parent() };
            let record = { window: actor,
                           parent: actor.get_parent() };
            if (this._movingWindow && window == this._movingWindow) {
                switchData.movingWindow = record;
                switchData.windows.push(switchData.movingWindow);
-                actor.reparent(switchData.movingWindowBin);
+                window.reparent(switchData.movingWindowBin);
-            } else if (window.get_workspace().index() == from) {
+            } else if (window.get_workspace() == from) {
-                switchData.windows.push(record);
+                switchData.windows.push({ window: window,
-                actor.reparent(switchData.outGroup);
+                                          parent: window.get_parent() });
-            } else if (window.get_workspace().index() == to) {
+                window.reparent(switchData.outGroup);
-                switchData.windows.push(record);
+            } else if (window.get_workspace() == to) {
-                actor.reparent(switchData.inGroup);
+                switchData.windows.push({ window: window,
-                actor.show();
+                                          parent: window.get_parent() });
                window.reparent(switchData.inGroup);
                window.show();
            }
        }
@@ -1305,22 +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();
    },
    _showWindowMenu: function(shellwm, window, menu, rect) {
        this._windowMenuManager.showWindowMenuForWindow(window, menu, rect);
    },
    _startAppSwitcher : function(display, screen, window, binding) {
        /* prevent a corner case where both popups show up at once */
        if (this._workspaceSwitcherPopup != null)
@@ -1357,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;
@@ -1377,10 +1094,7 @@ const WindowManager = new Lang.Class({
        let newWs;
        let direction;
-        if (target == 'last') {
+        if (isNaN(target)) {
            direction = Meta.MotionDirection.DOWN;
            newWs = screen.get_workspace_by_index(screen.n_workspaces - 1);
        } else if (isNaN(target)) {
            direction = Meta.MotionDirection[target.toUpperCase()];
            newWs = screen.get_active_workspace().get_neighbor(direction);
        } else if (target > 0) {
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@@ -1,185 +0,0 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const RemoteMenu = imports.ui.remoteMenu;
 const WindowMenu = new Lang.Class({
    Name: 'WindowMenu',
    Extends: PopupMenu.PopupMenu,
    _init: function(window, sourceActor) {
        this.parent(sourceActor, 0, St.Side.TOP);
        this.actor.add_style_class_name('window-menu');
        Main.layoutManager.uiGroup.add_actor(this.actor);
        this.actor.hide();
        this._buildMenu(window);
    },
    _buildMenu: function(window) {
        let type = window.get_window_type();
        let item;
        item = this.addAction(_("Minimize"), Lang.bind(this, function(event) {
            window.minimize();
        }));
        if (!window.can_minimize())
            item.setSensitive(false);
        if (window.get_maximized()) {
            item = this.addAction(_("Unmaximize"), Lang.bind(this, function() {
                window.unmaximize(Meta.MaximizeFlags.BOTH);
            }));
        } else {
            item = this.addAction(_("Maximize"), Lang.bind(this, function() {
                window.maximize(Meta.MaximizeFlags.BOTH);
            }));
        }
        if (!window.can_maximize())
            item.setSensitive(false);
        item = this.addAction(_("Move"), Lang.bind(this, function(event) {
            window.begin_grab_op(Meta.GrabOp.KEYBOARD_MOVING, true, event.get_time());
        }));
        if (!window.allows_move())
            item.setSensitive(false);
        item = this.addAction(_("Resize"), Lang.bind(this, function(event) {
            window.begin_grab_op(Meta.GrabOp.KEYBOARD_RESIZING_UNKNOWN, true, event.get_time());
        }));
        if (!window.allows_resize())
            item.setSensitive(false);
        if (!window.titlebar_is_onscreen() && type != Meta.WindowType.DOCK && type != Meta.WindowType.DESKTOP) {
            this.addAction(_("Move Titlebar Onscreen"), Lang.bind(this, function(event) {
                window.shove_titlebar_onscreen();
            }));
        }
        item = this.addAction(_("Always on Top"), Lang.bind(this, function() {
            if (window.is_above())
                window.unmake_above();
            else
                window.make_above();
        }));
        if (window.is_above())
            item.setOrnament(PopupMenu.Ornament.DOT);
        if (window.get_maximized() ||
            type == Meta.WindowType.DOCK ||
            type == Meta.WindowType.DESKTOP ||
            type == Meta.WindowType.SPLASHSCREEN)
            item.setSensitive(false);
        if (Main.sessionMode.hasWorkspaces &&
            (!Meta.prefs_get_workspaces_only_on_primary() ||
             window.is_on_primary_monitor())) {
            let isSticky = window.is_on_all_workspaces();
            item = this.addAction(_("Always on Visible Workspace"), Lang.bind(this, function() {
                if (isSticky)
                    window.unstick();
                else
                    window.stick();
            }));
            if (isSticky)
                item.setOrnament(PopupMenu.Ornament.DOT);
            if (window.is_always_on_all_workspaces())
                item.setSensitive(false);
            let nWorkspaces = global.screen.n_workspaces;
            if (!isSticky) {
                let workspace = window.get_workspace();
                let idx = workspace.index();
                if (idx > 0) {
                    this.addAction(_("Move to Workspace Up"), Lang.bind(this, function(event) {
                        window.change_workspace(workspace.get_neighbor(Meta.MotionDirection.UP));
                    }));
                }
                if (idx < nWorkspaces) {
                     this.addAction(_("Move to Workspace Down"), Lang.bind(this, function(event) {
                        window.change_workspace(workspace.get_neighbor(Meta.MotionDirection.DOWN));
                    }));
                }
            }
        }
        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        item = this.addAction(_("Close"), Lang.bind(this, function(event) {
            window.delete(event.get_time());
        }));
        if (!window.can_close())
            item.setSensitive(false);
    }
 });
 const AppMenu = new Lang.Class({
    Name: 'AppMenu',
    Extends: RemoteMenu.RemoteMenu,
    _init: function(window, sourceActor) {
        let app = Shell.WindowTracker.get_default().get_window_app(window);
        this.parent(sourceActor, app.menu, app.action_group);
        this.actor.add_style_class_name('fallback-app-menu');
        let variant = window.get_gtk_theme_variant();
        if (variant)
            this.actor.add_style_class_name(variant);
        Main.layoutManager.uiGroup.add_actor(this.actor);
        this.actor.hide();
    }
 });
 const WindowMenuManager = new Lang.Class({
    Name: 'WindowMenuManager',
    _init: function() {
        this._manager = new PopupMenu.PopupMenuManager({ actor: Main.layoutManager.dummyCursor });
        this._sourceActor = new St.Widget({ reactive: true, visible: false });
        this._sourceActor.connect('button-press-event', Lang.bind(this,
            function() {
                this._manager.activeMenu.toggle();
            }));
        Main.uiGroup.add_actor(this._sourceActor);
    },
    showWindowMenuForWindow: function(window, type, rect) {
        let menuType = (type == Meta.WindowMenuType.WM) ? WindowMenu : AppMenu;
        let menu = new menuType(window, this._sourceActor);
        this._manager.addMenu(menu);
        menu.connect('activate', function() {
            window.check_alive(global.get_current_time());
        });
        this._sourceActor.set_size(rect.width, rect.height);
        this._sourceActor.set_position(rect.x, rect.y);
        this._sourceActor.show();
        menu.open(BoxPointer.PopupAnimation.NONE);
        menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
        menu.connect('open-state-changed', Lang.bind(this, function(menu_, isOpen) {
            if (isOpen)
                return;
            this._sourceActor.hide();
            menu.destroy();
        }));
    }
 });
--- 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_buffer_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,
+                                     x: this.origX,
-                                     layout_manager: new WindowCloneLayout() });
+                                     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() {
+        this._realWindowDestroyId = this.realWindow.connect('destroy',
-            // First destroy the clone and then destroy everything
+            Lang.bind(this, this._disconnectRealWindowSignals));
            // 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;
        let clickAction = new Clutter.ClickAction();
        clickAction.connect('clicked', Lang.bind(this, this._onClicked));
@@ -180,96 +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');
    },
    hasAttachedDialogs: function() {
        return this.actor.get_n_children() > 1;
    },
    _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;
    },
    get width() {
        return this._boundingBox.width;
    },
    get height() {
        return this._boundingBox.height;
    },
    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);
        // Convert from a MetaRectangle to a native JS object
        this._boundingBox = { x: rect.x, y: rect.y, width: rect.width, height: rect.height };
        this.actor.layout_manager.boundingBox = rect;
    },
    // Find the actor just below us, respecting reparenting done
    // by DND code
    getActualStackAbove: function() {
@@ -303,26 +149,44 @@ const WindowClone = new Lang.Class({
        this.actor.destroy();
    },
-    _disconnectSignals: function() {
+    _disconnectRealWindowSignals: function() {
-        this.actor.get_children().forEach(Lang.bind(this, function (child) {
+        if (this._sizeChangedId > 0)
-            let realWindow;
+            this.realWindow.disconnect(this._sizeChangedId);
-            if (child == this._windowClone)
+        this._sizeChangedId = 0;
                realWindow = this.realWindow;
            else
                realWindow = child.source;
-            realWindow.meta_window.disconnect(child._updateId);
+        if (this._realWindowDestroyId > 0)
-            realWindow.disconnect(child._destroyId);
+            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;
@@ -440,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) {
@@ -591,12 +454,11 @@ const WindowOverlay = new Lang.Class({
                                                      Lang.bind(this,
                                                                this._onWindowAdded));
-        this._windowClone.deleteAll();
+        metaWindow.delete(global.get_current_time());
    },
    _windowCanClose: function() {
-        return this._windowClone.metaWindow.can_close() &&
+        return this._windowClone.metaWindow.can_close();
               !this._windowClone.hasAttachedDialogs();
    },
    _onWindowAdded: function(workspace, win) {
@@ -608,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,
+            Mainloop.idle_add(Lang.bind(this,
-                                            function() {
+                                        function() {
-                                                this._windowClone.emit('selected');
+                                            this._windowClone.emit('selected');
-                                                return GLib.SOURCE_REMOVE;
+                                            return GLib.SOURCE_REMOVE;
-                                            }));
+                                        }));
            GLib.Source.set_name_by_id(id, '[gnome-shell] this._windowClone.emit');
        }
    },
@@ -684,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;
    },
@@ -841,7 +700,7 @@ const LayoutStrategy = new Lang.Class({
        // thumbnails is much more important to preserve than the width of
        // them, so two windows with equal height, but maybe differering
        // widths line up.
-        let ratio = window.height / this._monitor.height;
+        let ratio = window.actor.height / this._monitor.height;
        // The purpose of this manipulation here is to prevent windows
        // from getting too small. For something like a calculator window,
@@ -943,11 +802,11 @@ const LayoutStrategy = new Lang.Class({
                let window = row.windows[j];
                let s = scale * this._computeWindowScale(window) * row.additionalScale;
-                let cellWidth = window.width * s;
+                let cellWidth = window.actor.width * s;
-                let cellHeight = window.height * s;
+                let cellHeight = window.actor.height * s;
                s = Math.min(s, WINDOW_CLONE_MAXIMUM_SCALE);
-                let cloneWidth = window.width * s;
+                let cloneWidth = window.actor.width * s;
                let cloneX = x + (cellWidth - cloneWidth) / 2;
                let cloneY = row.y + row.height - cellHeight;
@@ -1001,7 +860,7 @@ const UnalignedLayoutStrategy = new Lang.Class({
        for (let i = 0; i < windows.length; i++) {
            let window = windows[i];
            let s = this._computeWindowScale(window);
-            totalWidth += window.width * s;
+            totalWidth += window.actor.width * s;
        }
        let idealRowWidth = totalWidth / numRows;
@@ -1014,8 +873,8 @@ const UnalignedLayoutStrategy = new Lang.Class({
            for (; windowIdx < windows.length; windowIdx++) {
                let window = windows[windowIdx];
                let s = this._computeWindowScale(window);
-                let width = window.width * s;
+                let width = window.actor.width * s;
-                let height = window.height * s;
+                let height = window.actor.height * s;
                row.fullHeight = Math.max(row.fullHeight, height);
                // either new width is < idealWidth or new width is nearer from idealWidth then oldWidth
@@ -1140,11 +999,6 @@ const Workspace = new Lang.Class({
        this._positionWindowsFlags = 0;
        this._positionWindowsId = 0;
        this.actor.connect('notify::mapped', Lang.bind(this, function() {
            if (this.actor.mapped)
                this._syncActualGeometry();
        }));
    },
    setFullGeometry: function(geom) {
@@ -1152,9 +1006,7 @@ const Workspace = new Lang.Class({
            return;
        this._fullGeometry = geom;
-
+        this._recalculateWindowPositions(WindowPositionFlags.NONE);
        if (this.actor.mapped)
            this._recalculateWindowPositions(WindowPositionFlags.NONE);
    },
    setActualGeometry: function(geom) {
@@ -1162,29 +1014,18 @@ const Workspace = new Lang.Class({
            return;
        this._actualGeometry = geom;
        this._actualGeometryDirty = true;
-        if (this.actor.mapped)
+        if (this._actualGeometryLater)
            this._syncActualGeometry();
    },
    _syncActualGeometry: function() {
        if (this._actualGeometryLater || !this._actualGeometryDirty)
            return;
        if (!this._actualGeometry)
            return;
        this._actualGeometryLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
            this._actualGeometryLater = 0;
            if (!this.actor.mapped)
                return false;
            let geom = this._actualGeometry;
            this._dropRect.set_position(geom.x, geom.y);
            this._dropRect.set_size(geom.width, geom.height);
            this._updateWindowPositions(Main.overview.animationInProgress ? WindowPositionFlags.ANIMATE : WindowPositionFlags.NONE);
            this._actualGeometryLater = 0;
            return false;
        }));
    },
@@ -1258,12 +1099,6 @@ const Workspace = new Lang.Class({
            return;
        }
        // We will reposition windows when enter again overview anyway.
        // In this way we avoid unwanted animations of windows repositioning while
        // animating overview
        if (this.leavingOverview)
            return;
        let initialPositioning = flags & WindowPositionFlags.INITIAL;
        let animate = flags & WindowPositionFlags.ANIMATE;
@@ -1459,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) {
@@ -1471,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,
+            Mainloop.idle_add(Lang.bind(this,
-                                            function () {
+                                        function () {
-                                                if (this.actor &&
+                                            if (this.actor &&
-                                                    metaWin.get_compositor_private() &&
+                                                metaWin.get_compositor_private() &&
-                                                    metaWin.get_workspace() == this.metaWorkspace)
+                                                metaWin.get_workspace() == this.metaWorkspace)
-                                                    this._doAddWindow(metaWin);
+                                                this._doAddWindow(metaWin);
-                                                return GLib.SOURCE_REMOVE;
+                                            return GLib.SOURCE_REMOVE;
-                                            }));
+                                        }));
            GLib.Source.set_name_by_id(id, '[gnome-shell] this._doAddWindow');
            return;
        }
@@ -1488,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) {
@@ -1598,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,
+                                 { x: clone.origX,
-                                   y: origY,
+                                   y: clone.origY,
                                   scale_x: 1.0,
                                   scale_y: 1.0,
                                   time: Overview.ANIMATION_TIME,
@@ -1666,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 });
+        this.actor = new Clutter.Clone({ source: realWindow.get_texture(),
        /* Can't use a Shell.GenericContainer because of DND and reparenting... */
        this.actor = new Clutter.Actor({ layout_manager: new PrimaryActorLayout(this.clone),
                                         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',
+        this._positionChangedId = this.realWindow.connect('position-changed',
-                                                       Lang.bind(this, this._onPositionChanged));
+                                                          Lang.bind(this, this._onPositionChanged));
-        this.clone._destroyId = this.realWindow.connect('destroy', Lang.bind(this, function() {
+        this._realWindowDestroyedId = this.realWindow.connect('destroy',
-            // First destroy the clone and then destroy everything
+                                                              Lang.bind(this, this._disconnectRealWindowSignals));
            // This will ensure that we never see it in the _disconnectSignals loop
            this.clone.destroy();
            this.destroy();
        }));
        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() {
+    _disconnectRealWindowSignals: function() {
-        this.actor.get_children().forEach(function(child) {
+        if (this._positionChangedId != 0) {
-            let realWindow = child.source;
+            this.realWindow.disconnect(this._positionChangedId);
            this._positionChangedId = 0;
        }
-            realWindow.meta_window.disconnect(child._updateId);
+        if (this._realWindowDestroyedId != 0) {
-            realWindow.disconnect(child._destroyId);
+            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,
+            Mainloop.idle_add(Lang.bind(this,
-                                       function () {
+                                        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)) {
+        let clone = this._addWindowClone(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);
        }
    },
    _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();
    },
@@ -665,7 +583,7 @@ const ThumbnailsBox = new Lang.Class({
        Main.overview.connect('window-drag-cancelled',
                              Lang.bind(this, this._onDragCancelled));
-        this._settings = new Gio.Settings({ schema_id: OVERRIDE_SCHEMA });
+        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
        this._settings.connect('changed::dynamic-workspaces',
            Lang.bind(this, this._updateSwitcherVisibility));
    },
@@ -805,35 +723,28 @@ const ThumbnailsBox = new Lang.Class({
            [newWorkspaceIndex, this._dropPlaceholderPos] = [this._dropPlaceholderPos, -1];
            // Nab all the windows below us.
-            let windows = global.get_window_actors().filter(function(winActor) {
+            let windows = global.get_window_actors().filter(function(win) {
                // If the window is attached to an ancestor, we don't need/want to move it
-                let window = winActor.meta_window;
+                if (!!win.meta_window.get_transient_for())
                if (window.get_transient_for() != null)
                    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) {
+            windows.forEach(function(win) {
-                let window = winActor.meta_window;
+                win.meta_window.change_workspace_by_index(win.get_workspace() + 1, true);
                window.change_workspace_by_index(window.get_workspace().index() + 1, true);
            });
-            if (isWindow) {
+            if (isWindow)
                // ... and bam, a workspace, good as new.
                // Move the window to our monitor first if necessary.
                let thumbMonitor = this._thumbnails[newWorkspaceIndex].monitorIndex;
                if (source.metaWindow.get_monitor() != thumbMonitor)
                    source.metaWindow.move_to_monitor(thumbMonitor);
                source.metaWindow.change_workspace_by_index(newWorkspaceIndex, true);
-            } else if (source.shellWorkspaceLaunch) {
+            else if (source.shellWorkspaceLaunch) {
                source.shellWorkspaceLaunch({ workspace: newWorkspaceIndex,
                                              timestamp: time });
                // This new workspace will be automatically removed if the application fails
@@ -907,10 +818,7 @@ const ThumbnailsBox = new Lang.Class({
    },
    _workspacesChanged: function() {
-        let validThumbnails = this._thumbnails.filter(function(t) {
+        let oldNumWorkspaces = this._thumbnails.length;
            return t.state <= ThumbnailState.NORMAL;
        });
        let oldNumWorkspaces = validThumbnails.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
@@ -74,12 +74,12 @@ const WorkspacesViewBase = new Lang.Class({
    setFullGeometry: function(geom) {
        this._fullGeometry = geom;
-        this._syncFullGeometry();
+        this._syncGeometry();
    },
    setActualGeometry: function(geom) {
        this._actualGeometry = geom;
-        this._syncActualGeometry();
+        this._syncGeometry();
    },
 });
@@ -94,7 +94,7 @@ const WorkspacesView = new Lang.Class({
        this._scrolling = false; // swipe-scrolling
        this._animatingScroll = false; // programatically updating the adjustment
-        this._settings = new Gio.Settings({ schema_id: OVERRIDE_SCHEMA });
+        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
        this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
@@ -127,12 +127,9 @@ const WorkspacesView = new Lang.Class({
            this._workspaces[i].setReservedSlot(clone);
    },
-    _syncFullGeometry: function() {
+    _syncGeometry: function() {
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].setFullGeometry(this._fullGeometry);
    },
    _syncActualGeometry: function() {
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].setActualGeometry(this._actualGeometry);
    },
@@ -240,35 +237,30 @@ 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;
+        if (newNumWorkspaces > oldNumWorkspaces) {
-        for (let j = 0; j < newNumWorkspaces; j++) {
+            for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-            let metaWorkspace = global.screen.get_workspace_by_index(j);
+                let metaWorkspace = global.screen.get_workspace_by_index(w);
-            let workspace;
+                let workspace = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
-
+                this._workspaces.push(workspace);
            if (j >= this._workspaces.length) { /* added */
                workspace = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
                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);
        } else if (newNumWorkspaces < oldNumWorkspaces) {
            let nRemoved = (newNumWorkspaces - oldNumWorkspaces);
            let removed = this._workspaces.splice(oldNumWorkspaces, nRemoved);
            removed.forEach(function(workspace) {
                workspace.destroy();
            });
        }
-        if (this._fullGeometry) {
+        this._syncGeometry();
            this._updateWorkspaceActors(false);
            this._syncFullGeometry();
        }
        if (this._actualGeometry)
            this._syncActualGeometry();
    },
    _activeWorkspaceChanged: function(wm, from, to, direction) {
@@ -357,11 +349,8 @@ const ExtraWorkspaceView = new Lang.Class({
        this._workspace.setReservedSlot(clone);
    },
-    _syncFullGeometry: function() {
+    _syncGeometry: function() {
        this._workspace.setFullGeometry(this._fullGeometry);
    },
    _syncActualGeometry: function() {
        this._workspace.setActualGeometry(this._actualGeometry);
    },
@@ -413,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++)
@@ -421,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();
        }));
@@ -437,7 +427,7 @@ const WorkspacesDisplay = new Lang.Class({
        this._workspacesViews = [];
        this._primaryScrollAdjustment = null;
-        this._settings = new Gio.Settings({ schema_id: OVERRIDE_SCHEMA });
+        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
        this._settings.connect('changed::workspaces-only-on-primary',
                               Lang.bind(this,
                                         this._workspacesOnlyOnPrimaryChanged));
@@ -606,9 +596,8 @@ const WorkspacesDisplay = new Lang.Class({
            return;
        let [x, y] = this.actor.get_transformed_position();
-        let allocation = this.actor.allocation;
+        let width = this.actor.allocation.x2 - this.actor.allocation.x1;
-        let width = allocation.x2 - allocation.x1;
+        let height = this.actor.allocation.y2 - this.actor.allocation.y1;
        let height = allocation.y2 - allocation.y1;
        let primaryGeometry = { x: x, y: y, width: width, height: height };
        let monitors = Main.layoutManager.monitors;
--- 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/Show More
+++ b/Show More