messageTray: Remove an unused variable

messageTray: Add notification close button inside notification
And remove the old close button outside it.
2014-06-04 12:58:34 -04:00 · 2014-06-04 12:39:34 -04:00 · 2014-06-04 12:39:23 -04:00 · 2014-06-03 14:48:48 -04:00 · 2014-06-03 14:48:48 -04:00 · 2014-06-03 14:48:48 -04:00
129 changed files with 11684 additions and 18018 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -24,13 +24,10 @@ data/gnome-shell-wayland.desktop.in
 data/gnome-shell-extension-prefs.desktop
 data/gnome-shell-extension-prefs.desktop.in
 data/gschemas.compiled
-data/perf-background.xml
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
 data/org.gnome.shell.evolution.calendar.gschema.xml
 data/org.gnome.shell.evolution.calendar.gschema.valid
-data/org.gnome.Shell.PortalHelper.desktop
-data/org.gnome.Shell.PortalHelper.service
 docs/reference/*/*.args
 docs/reference/*/*.bak
 docs/reference/*/*.hierarchy
@@ -83,7 +80,6 @@ src/gnome-shell-extension-tool
 src/gnome-shell-hotplug-sniffer
 src/gnome-shell-perf-helper
 src/gnome-shell-perf-tool
-src/gnome-shell-portal-helper
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
 src/run-js-test
 src/test-recorder
--- a/100
+++ b/100
@@ -1,103 +1,3 @@
-3.13.91
-=======
-* Fix keynav into session menu on login screen [Florian; #735614]
-* Add gesture to summon message tray [Carlos G.; #735625]
-* Accept scrolls/swipes either way on the screen shield [Jasper; #734874]
-* Animate opening the app picker and improve app folder animations
-  [Carlos S.; #734726]
-* Animate app icons on launching a new window [Carlos S., Florian; #734726]
-* Show the on-screen keyboard when touch input is being used [David; #702015]
-* Misc. bug fixes [Bastien, Owen, Florian, Carlos G.; #735190, #735385,
-  #735608, #735681]
-
-Contributors:
-  Carlos Garnacho, David King, Kalev Lember, Florian Müllner, Bastien Nocera,
-  Carlos Soriano, Jasper St. Pierre, Owen W. Taylor
-
-Translations:
-  Fran Diéguez [gl], Sweta Kothari [gu], Manoj Kumar Giri [or],
-  Alain Lojewski [fr], Praveen Illa [te], Arash Mousavi [fa],
-  Andika Triwidada [id]
-
-3.13.90
-=======
-* Make use of GLSL optional [Adel; #733623]
-* Update on-screen-keyboard position on monitor changes [Cosimo; #733790]
-* Improve window manager animations [Giovanni; #732857]
-* Handle touch events [Carlos G.; #733633]
-* Try to not show "New Window" action for single-window apps
-  [Giovanni; #722554]
-* Fix overview exceeding screen size with many apps installed
-  [Carlos S.; #723496]
-* Add Software to default favorites [Mathieu; #734406]
-* Improve app picker <-> desktop transition [Carlos S.; #732901]
-* Remove <shift>-magic for switcher popups [Christophe; #732296]
-* Add a special background to use for performance testing [Owen; #734610]
-* Add support for default disabled search providers [Giovanni; #734110]
-* Fix portals that don't redirect properly [Giovanni; #733848]
-* Fix history trimming in chat notifications [Giovanni; #733899]
-* Try to use default calendar application [Florian; #722333]
-* Only show location menu when geolocation is in use [Zeeshan; #731122]
-* Misc. bug fixes and cleanups [Giovanni, Carlos G., Zeeshan, Carlos S.,
-  Cosimo; #711682, #733840, #734483, #734680, #733813, #735062]
-
-Contributors:
-  Zeeshan Ali (Khattak), Mathieu Bridon, Giovanni Campagna, Cosimo Cecchi,
-  Piotr Drąg, Christophe Fergeau, Adel Gadllah, Carlos Garnacho,
-  Florian Müllner, Carlos Soriano, Jasper St. Pierre, Olav Vitters,
-  Owen W. Taylor
-
-Translations:
-  Aurimas Černius [lt], MarMav [el], Inaki Larranaga Murgoitio [eu],
-  Reinout van Schouwen [nl], ngoswami [as], Fabio Tomat [fur],
-  Chao-Hsiung Liao [zh_HK, zh_TW]
-
-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]
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.13.91],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.13.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])
@@ -76,7 +76,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.15.90
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.13.91
+MUTTER_MIN_VERSION=3.13.2
 GTK_MIN_VERSION=3.7.9
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,24 +1,6 @@
-CLEANFILES =
-
 desktopdir=$(datadir)/applications
 desktop_DATA = gnome-shell.desktop gnome-shell-wayland.desktop  gnome-shell-extension-prefs.desktop

-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
 %.desktop.in:%.desktop.in.in
@@ -53,6 +35,7 @@ dist_theme_DATA =				\
 	theme/filter-selected-rtl.svg		\
 	theme/gnome-shell.css			\
 	theme/logged-in-indicator.svg		\
+	theme/menu-arrow-symbolic.svg		    \
 	theme/message-tray-background.png	\
 	theme/more-results.svg			\
 	theme/noise-texture.png			\
@@ -74,13 +57,6 @@ dist_theme_DATA =				\
 	theme/ws-switch-arrow-up.png		\
 	theme/ws-switch-arrow-down.png

-backgrounddir = $(pkgdatadir)
-background_DATA = perf-background.xml
-
-perf-background.xml: perf-background.xml.in
-	$(AM_V_GEN) sed -e "s|@datadir[@]|$(datadir)|" \
-	    $< > $@ || rm $@
-
 keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
 keys_in_files = 50-gnome-shell-system.xml.in
 keys_DATA = $(keys_in_files:.xml.in=.xml)
@@ -113,19 +89,15 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(convert_DATA)					\
 	$(keys_in_files)				\
-	perf-background.xml.in				\
-	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			\
 	$(desktop_DATA)					\
 	$(keys_DATA)					\
 	$(gsettings_SCHEMAS)				\
-	perf-background.xml				\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\
 	org.gnome.shell.gschema.xml.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/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
@@ -31,7 +31,7 @@
      </_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', 'org.gnome.Software.desktop' ]</default>
+      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop' ]</default>
      <_summary>List of desktop file IDs for favorite applications</_summary>
      <_description>
        The applications corresponding to these identifiers
@@ -40,10 +40,10 @@
    </key>
    <key name="app-picker-view" type="u">
      <default>0</default>
-      <_summary>App Picker View</_summary>
-      <_description>
+      <summary>App Picker View</summary>
+      <description>
        Index of the currently selected view in the application picker.
-      </_description>
+      </description>
    </key>
    <key name="command-history" type="as">
      <default>[]</default>
@@ -74,6 +74,7 @@
    <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/"
@@ -127,8 +128,8 @@
    </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>
+      <summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</summary>
+      <description></description>
    </key>
  </schema>

@@ -143,16 +144,42 @@
    </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>
-      <_description>
+      <summary>Limit switcher to current workspace.</summary>
+      <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>

@@ -175,11 +202,11 @@
    </key>
    <key type="b" name="current-workspace-only">
      <default>true</default>
-      <_summary>Limit switcher to current workspace.</_summary>
-      <_description>
+      <summary>Limit switcher to current workspace.</summary>
+      <description>
 	If true, only windows from the current workspace are shown in the switcher.
 	Otherwise, all windows are included.
-      </_description>
+      </description>
    </key>
  </schema>

--- a/data/perf-background.xml.in
+++ b/data/perf-background.xml.in
@@ -1,31 +0,0 @@
-<!-- With an animated background, performance will differ depending on whether
-     one layer or two layers are being blended together. This messes up our
-     benchmarks. We could just benchmark a single image, but since blended
-     images are present for much of the day with the GNOME default background,
-     we want to make sure that also performs well; for that reason we ship
-     an "animated" background that animates super-slowly to use during
-     performance tests; it will be in the blended state until 2030. -->
-<background>
-  <starttime>
-    <year>1990</year>
-    <month>1</month>
-    <day>1</day>
-    <hour>0</hour>
-    <minute>00</minute>
-    <second>00</second>
-  </starttime>
-
-<!-- One transition that takes 40 years -->
-<transition type="overlay">
-<duration>1261440000.0</duration>
-<from>@datadir@/backgrounds/gnome/adwaita-morning.jpg</from>
-<to>@datadir@/backgrounds/gnome/adwaita-day.jpg</to>
-</transition>
-
-<!-- A single slide doesn't work, so another slide for 1 minute after 40 years -->
-<static>
-<duration>60</duration>
-<file>/usr/share/backgrounds/gnome/Sandstone.jpg</file>
-</static>
-
-</background>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -45,7 +45,7 @@ stage {
 /* small bold */
 .dash-label,
 .window-caption,
-.switcher-list,
+.switcher-list, 
 .app-well-app > .overview-icon,
 .show-apps > .overview-icon,
 .grid-search-result .overview-icon {
@@ -414,10 +414,7 @@ StScrollBar StButton#vhandle:active {
 /* Buttons */

 .candidate-page-button,
-.notification-button,
-.notification-icon-button,
 .hotplug-notification-item,
-.hotplug-resident-eject-button,
 .modal-dialog-button,
 .app-view-control {
    border: 1px solid #8b8b8b;
@@ -431,17 +428,12 @@ StScrollBar StButton#vhandle:active {
 }

 .candidate-page-button:hover,
-.notification-button:hover,
-.notification-icon-button:hover,
 .hotplug-notification-item:hover,
-.hotplug-resident-eject-button:hover,
 .modal-dialog-button:hover {
    background-gradient-start: rgba(255, 255, 255, 0.3);
    background-gradient-end: rgba(255, 255, 255, 0.1);
 }

-.notification-button:focus,
-.notification-icon-button:focus,
 .hotplug-notification-item:focus,
 .modal-dialog-button:focus,
 .app-view-control:focus {
@@ -455,10 +447,7 @@ StScrollBar StButton#vhandle:active {

 .candidate-page-button:active,
 .candidate-page-button:pressed,
-.notification-button:active,
-.notification-icon-button:active,
 .hotplug-notification-item:active,
-.hotplug-resident-eject-button:active,
 .modal-dialog-button:active,
 .modal-dialog-button:pressed,
 .app-view-control:checked {
@@ -467,8 +456,6 @@ StScrollBar StButton#vhandle:active {
 }

 .candidate-page-button:insensitive,
-.notification-button:insensitive,
-.notification-icon-button:insensitive,
 .modal-dialog-button:insensitive {
    border-color: #666666;
    color: #9f9f9f;
@@ -478,9 +465,8 @@ StScrollBar StButton#vhandle:active {

 /* Common radii */

-.search-entry,
+#searchEntry,
 .modal-dialog-button,
-.notification-button,
 .hotplug-notification-item,
 .app-view-controls,
 #screenShieldNotifications {
@@ -500,7 +486,7 @@ StScrollBar StButton#vhandle:active {

 /* Entries */

-.search-entry,
+#searchEntry,
 .login-dialog StEntry,
 .notification StEntry,
 .modal-dialog StEntry {
@@ -512,7 +498,7 @@ StScrollBar StButton#vhandle:active {
    padding: 4px 12px;
 }

-.search-entry,
+#searchEntry,
 .login-dialog StEntry,
 .run-dialog-entry,
 .notification StEntry {
@@ -524,8 +510,8 @@ StScrollBar StButton#vhandle:active {
    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.6);
 }

-.search-entry:focus,
-.search-entry:hover,
+#searchEntry:focus,
+#searchEntry:hover,
 .login-dialog StEntry:focus,
 .notification StEntry:focus,
 .modal-dialog StEntry {
@@ -542,18 +528,18 @@ StScrollBar StButton#vhandle:active {
    border: 2px solid #3465a4;
 }

-.search-entry {
+#searchEntry {
    border-color: rgba(245,245,245,0.3);
    color: rgb(192, 192, 192);
    caret-color: rgb(192, 192, 192);
 }

-.search-entry:hover {
+#searchEntry:hover {
    color: rgb(128, 128, 128);
    caret-color: rgb(128, 128, 128);
 }

-.search-entry:focus {
+#searchEntry:focus {
    color: rgb(64, 64, 64);
    caret-color: rgb(64, 64, 64);
    font-weight: bold;
@@ -917,7 +903,7 @@ StScrollBar StButton#vhandle:active {

 /* Search Box */

-.search-entry {
+#searchEntry {
    width: 320px;
 }

@@ -926,8 +912,8 @@ StScrollBar StButton#vhandle:active {
    color: #c0c0c0;
 }

-.search-entry:hover .search-entry-icon,
-.search-entry:focus .search-entry-icon {
+#searchEntry:hover .search-entry-icon,
+#searchEntry:focus .search-entry-icon {
    color: #8d8f8a;
 }

@@ -1159,7 +1145,6 @@ StScrollBar StButton#vhandle:active {
 .show-apps:checked > .overview-icon,
 .show-apps:active > .overview-icon,
 .search-provider-icon:active,
-.grid-search-result:active .overview-icon,
 .list-search-result:active {
    background-gradient-start: rgba(255, 255, 255, .05);
    background-gradient-end: rgba(255, 255, 255, .15);
@@ -1536,36 +1521,69 @@ StScrollBar StButton#vhandle:active {
    color: #999999;
 }

-.notification {
-    border-radius: 10px 10px 0px 0px;
-    background: rgba(0,0,0,0.9);
-    padding: 8px 8px 4px 8px;
-    spacing-rows: 4px;
-    spacing-columns: 10px;
-}
-
 .notification, #notification-container {
    font-size: 11pt;
    width: 34em;
 }

-.notification.multi-line-notification {
-    padding-bottom: 8px;
+.notification-main-button,
+.notification-button {
+    background: rgba(0,0,0,0.9);
 }

-.notification-unexpanded {
-    /* We want to force the actor at a specific size, irrespective
-       of its minimum and preferred size, so we override both */
-    min-height: 36px;
-    height: 36px;
+.notification-main-button {
+    border-radius: 10px 10px 0px 0px;
 }

-/* We use row-span = 2 for the image cell, which prevents its height preferences to be
-   taken into account during allocation, so its height ends up being limited by the height
-   of the content in the other rows. To avoid showing a stretched image, we set the minimum
-   height of the table to be ICON_SIZE + IMAGE_SIZE + spacing-rows = 24 + 125 + 10 = 159 */
-.notification-with-image {
-    min-height: 159px;
+.notification-main-content {
+    padding: 8px;
+    spacing: 8px;
+}
+
+.notification-close-button {
+    padding: 8px;
+    border-radius: 4px;
+}
+
+.notification-action-area {
+    padding: 8px;
+}
+
+.notification-action-area,
+.notification-button {
+    border-top: 1px solid #666;
+}
+
+.notification-button {
+    padding: 8px 0px;
+    border-right: 1px solid #666;
+}
+
+.notification-main-button:hover,
+.notification-button:hover,
+.notification-close-button:hover {
+    background: rgba(100,100,100,0.9);
+}
+
+.notification-main-button:active,
+.notification-button:active {
+    background: rgba(255,255,255,0.1);
+}
+
+.notification-button:last-child {
+    border-right-width: 0px;
+}
+
+.notification-title-box {
+    spacing: 8px;
+}
+
+.notification-scrollview:ltr > StScrollBar {
+    padding-left: 6px;
+}
+
+.notification-scrollview:rtl > StScrollBar {
+    padding-right: 6px;
 }

 .summary-boxpointer {
@@ -1607,47 +1625,6 @@ StScrollBar StButton#vhandle:active {
    -st-vfade-offset: 24px;
 }

-.notification-scrollview:ltr > StScrollBar {
-    padding-left: 6px;
-}
-
-.notification-scrollview:rtl > StScrollBar {
-    padding-right: 6px;
-}
-
-.notification-body {
-    spacing: 5px;
-}
-
-.notification-actions {
-    padding-top: 18px;
-    spacing: 10px;
-}
-
-.notification-button {
-    -st-natural-width: 140px;
-    padding: 4px 4px 5px;
-}
-
-.notification-button:focus {
-    -st-natural-width: 138px;
-    padding: 3px 4px 4px;
-}
-
-.notification-icon-button {
-    border-radius: 5px;
-    padding: 5px;
-}
-
-.notification-icon-button:focus {
-    padding: 4px;
-}
-
-.notification-icon-button > StIcon {
-    icon-size: 16px;
-    padding: 8px;
-}
-
 .secondary-icon {
    icon-size: 1.09em;
 }
@@ -1670,45 +1647,6 @@ StScrollBar StButton#vhandle:active {
    padding: 2px 5px;
 }

-.hotplug-resident-box {
-    spacing: 8px;
-}
-
-.hotplug-resident-mount {
-    spacing: 8px;
-    border-radius: 4px;
-
-    color: #ccc;
-}
-
-.hotplug-resident-mount:hover {
-    background-gradient-direction: horizontal;
-    background-gradient-start: rgba(255, 255, 255, 0.1);
-    background-gradient-end: rgba(255, 255, 255, 0);
-
-    color: #fff;
-}
-
-.hotplug-resident-mount-label {
-    color: inherit;
-    padding-left: 6px;
-}
-
-.hotplug-resident-mount-icon {
-    icon-size: 24px;
-    padding-left: 6px;
-}
-
-.hotplug-resident-eject-icon {
-    icon-size: 16px;
-}
-
-.hotplug-resident-eject-button {
-    padding: 7px;
-    border-radius: 5px;
-    color: #ccc;
-}
-
 .chat-log-message {
    color: #888888;
 }
@@ -1748,7 +1686,11 @@ StScrollBar StButton#vhandle:active {
    padding-right: 4px;
 }

-.chat-notification-scrollview{
+.chat-notification-body-box {
+    spacing: 5px;
+}
+
+.chat-notification-scrollview {
    max-height: 22em;
 }

@@ -2093,11 +2035,6 @@ StScrollBar StButton#vhandle:active {
    font-size: 10pt;
 }

-/* Restart message */
-.restart-message {
-    font-size: 14pt;
-}
-
 /* ShellMountOperation Dialogs */
 .shell-mount-operation-icon {
    icon-size: 48px;
@@ -2672,8 +2609,7 @@ StScrollBar StButton#vhandle:active {
    padding-bottom: 0px;
 }

-#screenShieldNotifications .notification-button,
-#screenShieldNotifications .notification-icon-button {
+#screenShieldNotifications .notification-button {
    border: 1px rgba(255,255,255,0.5);
 }

--- a/data/theme/menu-arrow-symbolic.svg
+++ b/data/theme/menu-arrow-symbolic.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg3863"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menu-arrow.svg">
+  <defs
+     id="defs3865" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.836083"
+     inkscape:cx="-3.1641676"
+     inkscape:cy="11.823817"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="702"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="15.996443,16.922964"
+       id="guide3873" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="28.041217,3.1256134"
+       id="guide3875" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-0.80372916,24.469088"
+       id="guide3877" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3.0363102,34.649657"
+       id="guide3879" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="29.023553,28.577037"
+       id="guide3881" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3868">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-16)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 4,23 8,0 -4,5 z"
+       id="path3883"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
--- a/gnome-shell.doap
+++ b/gnome-shell.doap
@@ -27,9 +27,7 @@ its dependencies to build from tarballs.</description>
  <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell/" />
  <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=gnome-shell" />

-  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
-  <programming-language>JavaScript</programming-language>
-  <programming-language>C</programming-language>
+  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />

  <maintainer>
    <foaf:Person>
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -13,7 +13,7 @@ misc/config.js: misc/config.js.in Makefile
 	    -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
@@ -54,17 +54,15 @@ const Application = new Lang.Class({
        this._startupUuid = null;
        this._loaded = false;
        this._skipMainWindow = false;
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
    },

    _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))
@@ -280,7 +278,7 @@ const ExtensionRow = new Lang.Class({

        this.uuid = uuid;

-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.shell' });
        this._settings.connect('changed::enabled-extensions', Lang.bind(this,
            function() {
                this._switch.state = this._isEnabled();
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -382,7 +382,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));
@@ -926,8 +926,6 @@ const LoginDialog = new Lang.Class({
        this.actor.show();
        this.actor.opacity = 0;

-        Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOGIN_SCREEN });
-
        Tweener.addTween(this.actor,
                         { opacity: 255,
                           time: 1,
@@ -937,8 +935,7 @@ const LoginDialog = new Lang.Class({
    },

    close: function() {
-        Main.popModal(this.actor);
-        Main.ctrlAltTabManager.removeGroup(this.actor);
+        Main.ctrlAltTabManager.removeGroup(this.dialogLayout);
    },

    cancel: 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();
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -25,9 +25,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>
@@ -42,7 +39,6 @@
    <file>ui/dash.js</file>
    <file>ui/dateMenu.js</file>
    <file>ui/dnd.js</file>
-    <file>ui/edgeDragAction.js</file>
    <file>ui/endSessionDialog.js</file>
    <file>ui/environment.js</file>
    <file>ui/extensionDownloader.js</file>
--- 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,
-                                                   height: config.height,
-                                                   alpha: config.alpha,
-                                                   maximized: config.maximized });
+                yield Scripting.createTestWindow(config.width, config.height, config.alpha, 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('org.gnome.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(function(a, b) { return a - b });
-
-        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,247 +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) {
-            url = 'http://www.gnome.org';
-            this._originalUrlWasGnome = true;
-        } else {
-            this._originalUrlWasGnome = false;
-        }
-        this._uri = new Soup.URI(url);
-        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 (!uri.host_equal(this._uri) && this._originalUrlWasGnome) {
-            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;
-            }
-        }
-
-        // 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
-        // nmcheck.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;
-
-        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
@@ -151,13 +151,13 @@ const AppSwitcherPopup = new Lang.Class({
                                 this._items[this._selectedIndex].cachedWindows.length);
    },

-    _keyPressHandler: function(keysym, action) {
+    _keyPressHandler: function(keysym, backwards, action) {
        if (action == Meta.KeyBindingAction.SWITCH_GROUP) {
-            this._select(this._selectedIndex, this._nextWindow());
+            this._select(this._selectedIndex, backwards ? this._previousWindow() : this._nextWindow());
        } else if (action == Meta.KeyBindingAction.SWITCH_GROUP_BACKWARD) {
            this._select(this._selectedIndex, this._previousWindow());
        } else if (action == Meta.KeyBindingAction.SWITCH_APPLICATIONS) {
-            this._select(this._next());
+            this._select(backwards ? this._previous() : this._next());
        } else if (action == Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD) {
            this._select(this._previous());
        } else if (this._thumbnailsFocused) {
@@ -367,7 +367,7 @@ 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() {
@@ -400,9 +400,9 @@ const WindowSwitcherPopup = new Lang.Class({
            this._select(1);
    },

-    _keyPressHandler: function(keysym, action) {
+    _keyPressHandler: function(keysym, backwards, action) {
        if (action == Meta.KeyBindingAction.SWITCH_WINDOWS) {
-            this._select(this._next());
+            this._select(backwards ? this._previous() : this._next());
        } else if (action == Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD) {
            this._select(this._previous());
        } else {
@@ -456,7 +456,7 @@ 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);
--- 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;
@@ -34,9 +33,7 @@ const MIN_COLUMNS = 4;
 const MIN_ROWS = 4;

 const INACTIVE_GRID_OPACITY = 77;
-// This time needs to be less than IconGrid.EXTRA_SPACE_ANIMATION_TIME
-// to not clash with other animations
-const INACTIVE_GRID_OPACITY_ANIMATION_TIME = 0.24;
+const INACTIVE_GRID_OPACITY_ANIMATION_TIME = 0.40;
 const FOLDER_SUBICON_FRACTION = .4;

 const MIN_FREQUENT_APPS_COUNT = 3;
@@ -45,16 +42,6 @@ const INDICATORS_BASE_TIME = 0.25;
 const INDICATORS_ANIMATION_DELAY = 0.125;
 const INDICATORS_ANIMATION_MAX_TIME = 0.75;

-// Follow iconGrid animations approach and divide by 2 to animate out to
-// not annoy the user when the user wants to quit appDisplay.
-// Also, make sure we don't exceed iconGrid animation total time or
-// views switch time.
-const INDICATORS_BASE_TIME_OUT = 0.125;
-const INDICATORS_ANIMATION_DELAY_OUT = 0.0625;
-const INDICATORS_ANIMATION_MAX_TIME_OUT =
-    Math.min (VIEWS_SWITCH_TIME,
-              IconGrid.ANIMATION_TIME_OUT + IconGrid.ANIMATION_MAX_DELAY_OUT_FOR_ITEM);
-
 const PAGE_SWITCH_TIME = 0.3;

 const VIEWS_SWITCH_TIME = 0.4;
@@ -189,98 +176,26 @@ const BaseAppView = new Lang.Class({
                this.selectApp(id);
            }));
        }
-    },
-
-    _doSpringAnimation: function(animationDirection) {
-        this._grid.actor.opacity = 255;
-        this._grid.animateSpring(animationDirection,
-                                 Main.overview.getShowAppsButton());
-    },
-
-    animate: function(animationDirection, onComplete) {
-        if (animationDirection == IconGrid.AnimationDirection.IN) {
-            let toAnimate = this._grid.actor.connect('notify::allocation', Lang.bind(this,
-                function() {
-                    this._grid.actor.disconnect(toAnimate);
-                    // We need to hide the grid temporary to not flash it
-                    // for a frame
-                    this._grid.actor.opacity = 0;
-                    Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                                   Lang.bind(this, function() {
-                                       this._doSpringAnimation(animationDirection)
-                                  }));
-                }));
-        } else {
-            this._doSpringAnimation(animationDirection);
-        }
-
-        if (onComplete) {
-            let animationDoneId = this._grid.connect('animation-done', Lang.bind(this,
-                function () {
-                    this._grid.disconnect(animationDoneId);
-                    onComplete();
-            }));
-        }
-    },
-
-    animateSwitch: function(animationDirection) {
-        Tweener.removeTweens(this.actor);
-        Tweener.removeTweens(this._grid.actor);
-
-        let params = { time: VIEWS_SWITCH_TIME,
-                       transition: 'easeOutQuad' };
-        if (animationDirection == IconGrid.AnimationDirection.IN) {
-            this.actor.show();
-            params.opacity = 255;
-            params.delay = VIEWS_SWITCH_ANIMATION_DELAY;
-        } else {
-            params.opacity = 0;
-            params.delay = 0;
-            params.onComplete = Lang.bind(this, function() { this.actor.hide() });
-        }
-
-        Tweener.addTween(this._grid.actor, params);
    }
 });
 Signals.addSignalMethods(BaseAppView.prototype);

-const PageIndicatorsActor = new Lang.Class({
-    Name:'PageIndicatorsActor',
-    Extends: St.BoxLayout,
-
-    _init: function() {
-        this.parent({ style_class: 'page-indicators',
-                      vertical: true,
-                      x_expand: true, y_expand: true,
-                      x_align: Clutter.ActorAlign.END,
-                      y_align: Clutter.ActorAlign.CENTER,
-                      reactive: true,
-                      clip_to_allocation: true });
-    },
-
-    vfunc_get_preferred_height: function(forWidth) {
-        // We want to request the natural height of all our children as our
-        // natural height, so we chain up to St.BoxLayout, but we only request 0
-        // as minimum height, since it's not that important if some indicators
-        // are not shown
-        let [, natHeight] = this.parent(forWidth);
-        return [0, natHeight];
-    }
-});

 const PageIndicators = new Lang.Class({
    Name:'PageIndicators',

    _init: function() {
-        this.actor = new PageIndicatorsActor();
+        this.actor = new St.BoxLayout({ style_class: 'page-indicators',
+                                        vertical: true,
+                                        x_expand: true, y_expand: true,
+                                        x_align: Clutter.ActorAlign.END,
+                                        y_align: Clutter.ActorAlign.CENTER,
+                                        reactive: true });
        this._nPages = 0;
        this._currentPage = undefined;

        this.actor.connect('notify::mapped',
-                           Lang.bind(this, function() {
-                               this.animateIndicators(IconGrid.AnimationDirection.IN);
-                           })
-                          );
+                           Lang.bind(this, this._animateIndicators));
    },

    setNPages: function(nPages) {
@@ -321,7 +236,7 @@ const PageIndicators = new Lang.Class({
            children[i].set_checked(i == this._currentPage);
    },

-    animateIndicators: function(animationDirection) {
+    _animateIndicators: function() {
        if (!this.actor.mapped)
            return;

@@ -329,32 +244,24 @@ const PageIndicators = new Lang.Class({
        if (children.length == 0)
            return;

-        for (let i = 0; i < this._nPages; i++)
-            Tweener.removeTweens(children[i]);
-
        let offset;
        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
            offset = -children[0].width;
        else
            offset = children[0].width;

-        let isAnimationIn = animationDirection == IconGrid.AnimationDirection.IN;
-        let delay = isAnimationIn ? INDICATORS_ANIMATION_DELAY :
-                                    INDICATORS_ANIMATION_DELAY_OUT;
-        let baseTime = isAnimationIn ? INDICATORS_BASE_TIME : INDICATORS_BASE_TIME_OUT;
-        let totalAnimationTime = baseTime + delay * this._nPages;
-        let maxTime = isAnimationIn ? INDICATORS_ANIMATION_MAX_TIME :
-                                      INDICATORS_ANIMATION_MAX_TIME_OUT;
-        if (totalAnimationTime > maxTime)
-            delay -= (totalAnimationTime - maxTime) / this._nPages;
+        let delay = INDICATORS_ANIMATION_DELAY;
+        let totalAnimationTime = INDICATORS_BASE_TIME + INDICATORS_ANIMATION_DELAY * this._nPages;
+        if (totalAnimationTime > INDICATORS_ANIMATION_MAX_TIME)
+            delay -= (totalAnimationTime - INDICATORS_ANIMATION_MAX_TIME) / this._nPages;

        for (let i = 0; i < this._nPages; i++) {
-            children[i].translation_x = isAnimationIn ? offset : 0;
+            children[i].translation_x = offset;
            Tweener.addTween(children[i],
-                             { translation_x: isAnimationIn ? 0 : offset,
-                               time: baseTime + delay * i,
+                             { translation_x: 0,
+                               time: INDICATORS_BASE_TIME + delay * i,
                               transition: 'easeInOutQuad',
-                               delay: isAnimationIn ? VIEWS_SWITCH_ANIMATION_DELAY : 0
+                               delay: VIEWS_SWITCH_ANIMATION_DELAY
                             });
        }
    }
@@ -397,7 +304,7 @@ const AllView = new Lang.Class({
        this._stack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
        let box = new St.BoxLayout({ vertical: true });

-        this._grid.currentPage = 0;
+        this._currentPage = 0;
        this._stack.add_actor(this._grid.actor);
        this._eventBlocker = new St.Widget({ x_expand: true, y_expand: true });
        this._stack.add_actor(this._eventBlocker);
@@ -463,7 +370,7 @@ const AllView = new Lang.Class({
        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 = new Gio.Settings({ schema: 'org.gnome.desktop.app-folders' });
        this._folderSettings.connect('changed::folder-children', Lang.bind(this, function() {
            Main.queueDeferredWork(this._redisplayWorkId);
        }));
@@ -529,52 +436,14 @@ const AllView = new Lang.Class({
        this._refilterApps();
    },

-    // Overriden from BaseAppView
-    animate: function (animationDirection, onComplete) {
-        if (animationDirection == IconGrid.AnimationDirection.OUT &&
-            this._displayingPopup && this._currentPopup) {
-            this._currentPopup.popdown();
-            let spaceClosedId = this._grid.connect('space-closed', Lang.bind(this,
-                function() {
-                    this._grid.disconnect(spaceClosedId);
-                    // Given that we can't call this.parent() inside the
-                    // signal handler, call again animate which will
-                    // call the parent given that popup is already
-                    // closed.
-                    this.animate(animationDirection, onComplete);
-                }));
-        } else {
-            this.parent(animationDirection, onComplete);
-            if (animationDirection == IconGrid.AnimationDirection.OUT)
-                this._pageIndicators.animateIndicators(animationDirection);
-        }
-    },
-
-    animateSwitch: function(animationDirection) {
-        this.parent(animationDirection);
-
-        if (this._currentPopup && this._displayingPopup &&
-            animationDirection == IconGrid.AnimationDirection.OUT)
-            Tweener.addTween(this._currentPopup.actor,
-                             { time: VIEWS_SWITCH_TIME,
-                               transition: 'easeOutQuad',
-                               opacity: 0,
-                               onComplete: function() {
-                                  this.opacity = 255;
-                               } });
-
-        if (animationDirection == IconGrid.AnimationDirection.OUT)
-            this._pageIndicators.animateIndicators(animationDirection);
-    },
-
    getCurrentPageY: function() {
-        return this._grid.getPageY(this._grid.currentPage);
+        return this._grid.getPageY(this._currentPage);
    },

    goToPage: function(pageNumber) {
        pageNumber = clamp(pageNumber, 0, this._grid.nPages() - 1);

-        if (this._grid.currentPage == pageNumber && this._displayingPopup && this._currentPopup)
+        if (this._currentPage == pageNumber && this._displayingPopup && this._currentPopup)
            return;
        if (this._displayingPopup && this._currentPopup)
            this._currentPopup.popdown();
@@ -594,7 +463,7 @@ const AllView = new Lang.Class({
        let time;
        // Only take the velocity into account on page changes, otherwise
        // return smoothly to the current page using the default velocity
-        if (this._grid.currentPage != pageNumber) {
+        if (this._currentPage != pageNumber) {
            let minVelocity = totalHeight / (PAGE_SWITCH_TIME * 1000);
            velocity = Math.max(minVelocity, velocity);
            time = (diffToPage / velocity) / 1000;
@@ -605,9 +474,9 @@ const AllView = new Lang.Class({
        // longer than PAGE_SWITCH_TIME
        time = Math.min(time, PAGE_SWITCH_TIME);

-        this._grid.currentPage = pageNumber;
+        this._currentPage = pageNumber;
        Tweener.addTween(this._adjustment,
-                         { value: this._grid.getPageY(this._grid.currentPage),
+                         { value: this._grid.getPageY(this._currentPage),
                           time: time,
                           transition: 'easeOutQuad' });
        this._pageIndicators.setCurrentPage(pageNumber);
@@ -636,9 +505,9 @@ const AllView = new Lang.Class({

        let direction = event.get_scroll_direction();
        if (direction == Clutter.ScrollDirection.UP)
-            this.goToPage(this._grid.currentPage - 1);
+            this.goToPage(this._currentPage - 1);
        else if (direction == Clutter.ScrollDirection.DOWN)
-            this.goToPage(this._grid.currentPage + 1);
+            this.goToPage(this._currentPage + 1);

        return Clutter.EVENT_STOP;
    },
@@ -678,10 +547,10 @@ const AllView = new Lang.Class({
            return Clutter.EVENT_STOP;

        if (event.get_key_symbol() == Clutter.Page_Up) {
-            this.goToPage(this._grid.currentPage - 1);
+            this.goToPage(this._currentPage - 1);
            return Clutter.EVENT_STOP;
        } else if (event.get_key_symbol() == Clutter.Page_Down) {
-            this.goToPage(this._grid.currentPage + 1);
+            this.goToPage(this._currentPage + 1);
            return Clutter.EVENT_STOP;
        }

@@ -742,7 +611,6 @@ const AllView = new Lang.Class({

        if (this._availWidth != availWidth || this._availHeight != availHeight || oldNPages != this._grid.nPages()) {
            this._adjustment.value = 0;
-            this._grid.currentPage = 0;
            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
                function() {
                    this._pageIndicators.setNPages(this._grid.nPages());
@@ -872,7 +740,7 @@ const AppDisplay = new Lang.Class({
    Name: 'AppDisplay',

    _init: function() {
-        this._privacySettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.privacy' });
+        this._privacySettings = new Gio.Settings({ schema: 'org.gnome.desktop.privacy' });
        this._privacySettings.connect('changed::remember-app-usage',
                                      Lang.bind(this, this._updateFrequentVisibility));

@@ -904,19 +772,6 @@ const AppDisplay = new Lang.Class({
        let layout = new ControlsBoxLayout({ homogeneous: true });
        this._controls = new St.Widget({ style_class: 'app-view-controls',
                                         layout_manager: layout });
-        this._controls.connect('notify::mapped', Lang.bind(this,
-            function() {
-                // controls are faded either with their parent or
-                // explicitly in animate(); we can't know how they'll be
-                // shown next, so make sure to restore their opacity
-                // when they are hidden
-                if (this._controls.mapped)
-                  return;
-
-                Tweener.removeTweens(this._controls);
-                this._controls.opacity = 255;
-            }));
-
        layout.hookup_style(this._controls);
        this.actor.add_actor(new St.Bin({ child: this._controls }));

@@ -940,39 +795,23 @@ const AppDisplay = new Lang.Class({
        this._updateFrequentVisibility();
    },

-    animate: function(animationDirection, onComplete) {
-        let currentView = this._views[global.settings.get_uint('app-picker-view')].view;
-
-        // Animate controls opacity using iconGrid animation time, since
-        // it will be the time the AllView or FrequentView takes to show
-        // it entirely.
-        let finalOpacity;
-        if (animationDirection == IconGrid.AnimationDirection.IN) {
-            this._controls.opacity = 0;
-            finalOpacity = 255;
-        } else {
-            finalOpacity = 0
-        }
-
-        Tweener.addTween(this._controls,
-                         { time: IconGrid.ANIMATION_TIME_IN,
-                           transition: 'easeInOutQuad',
-                           opacity: finalOpacity,
-                          });
-
-        currentView.animate(animationDirection, onComplete);
-    },
-
    _showView: function(activeIndex) {
        for (let i = 0; i < this._views.length; i++) {
+            let actor = this._views[i].view.actor;
+
+            let params = { time: VIEWS_SWITCH_TIME,
+                           opacity: (i == activeIndex) ? 255 : 0,
+                           delay: (i == activeIndex) ? VIEWS_SWITCH_ANIMATION_DELAY : 0 };
+            if (i == activeIndex)
+                actor.visible = true;
+            else
+                params.onComplete = function() { actor.hide(); };
+            Tweener.addTween(actor, params);
+
            if (i == activeIndex)
                this._views[i].control.add_style_pseudo_class('checked');
            else
                this._views[i].control.remove_style_pseudo_class('checked');
-
-            let animationDirection = i == activeIndex ? IconGrid.AnimationDirection.IN :
-                                                        IconGrid.AnimationDirection.OUT;
-            this._views[i].view.animateSwitch(animationDirection);
        }
    },

@@ -1054,6 +893,26 @@ const AppSearchProvider = new Lang.Class({
        this.getInitialResultSet(terms, callback, cancellable);
    },

+    activateResult: function(result) {
+        let app = this._appSys.lookup_app(result);
+        let event = Clutter.get_current_event();
+        let modifiers = event ? event.get_state() : 0;
+        let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK;
+
+        if (openNewWindow)
+            app.open_new_window(-1);
+        else
+            app.activate();
+    },
+
+    dragActivateResult: function(id, params) {
+        params = Params.parse(params, { workspace: -1,
+                                        timestamp: 0 });
+
+        let app = this._appSys.lookup_app(id);
+        app.open_new_window(workspace);
+    },
+
    createResultObject: function (resultMeta) {
        let app = this._appSys.lookup_app(resultMeta['id']);
        return new AppIcon(app);
@@ -1085,20 +944,14 @@ const FolderView = new Lang.Class({
        Util.ensureActorVisibleInScrollView(this.actor, actor);
    },

-    // Overriden from BaseAppView
-    animate: function(animationDirection) {
-        this._grid.animatePulse(animationDirection);
-    },
-
    createFolderIcon: function(size) {
-        let layout = new Clutter.GridLayout();
+        let layout = new Clutter.TableLayout();
        let icon = new St.Widget({ layout_manager: layout,
                                   style_class: 'app-folder-icon' });
        layout.hookup_style(icon);
        let subSize = Math.floor(FOLDER_SUBICON_FRACTION * size);

        let numItems = this._allItems.length;
-        let rtl = icon.get_text_direction() == Clutter.TextDirection.RTL;
        for (let i = 0; i < 4; i++) {
            let bin;
            if (i < numItems) {
@@ -1107,7 +960,7 @@ const FolderView = new Lang.Class({
            } else {
                bin = new St.Bin({ width: subSize, height: subSize });
            }
-            layout.attach(bin, rtl ? (i + 1) % 2 : i % 2, Math.floor(i / 2), 1, 1);
+            layout.pack(bin, i % 2, Math.floor(i / 2));
        }

        return icon;
@@ -1396,53 +1249,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
-        // actually press a key we don't use navigate_focus when opening
-        // 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
+        if (event.get_key_symbol() != Clutter.KEY_Escape)
+            return Clutter.EVENT_PROPAGATE;

-        // Use TAB_FORWARD for down key and right key
-        // and TAB_BACKWARD for up key and left key on ltr
-        // 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);
+        this.popdown();
+        return Clutter.EVENT_STOP;
    },

    toggle: function() {
@@ -1456,27 +1274,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);
-        // We need to hide the icons of the view until the boxpointer animation
-        // is completed so we can animate the icons after as we like without
-        // showing them while boxpointer is animating.
-        this._view.actor.opacity = 0;
        this._boxPointer.show(BoxPointer.PopupAnimation.FADE |
-                              BoxPointer.PopupAnimation.SLIDE,
-                              Lang.bind(this,
-            function() {
-                this._view.actor.opacity = 255;
-                this._view.animate(IconGrid.AnimationDirection.IN);
-            }));
+                              BoxPointer.PopupAnimation.SLIDE);

+        this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+
+        this._isOpen = true;
        this.emit('open-state-changed', true);
    },

@@ -1484,8 +1290,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;
@@ -1536,9 +1340,7 @@ const AppIcon = new Lang.Class({

        this.actor.label_actor = this.icon.label;

-        this.actor.connect('leave-event', Lang.bind(this, this._onLeaveEvent));
        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
-        this.actor.connect('touch-event', Lang.bind(this, this._onTouchEvent));
        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
        this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));

@@ -1594,26 +1396,17 @@ const AppIcon = new Lang.Class({
            this.actor.remove_style_class_name('running');
    },

-    _setPopupTimeout: function() {
-        this._removeMenuTimeout();
-        this._menuTimeoutId = Mainloop.timeout_add(MENU_POPUP_TIMEOUT,
-            Lang.bind(this, function() {
-                this._menuTimeoutId = 0;
-                this.popupMenu();
-                return GLib.SOURCE_REMOVE;
-            }));
-        GLib.Source.set_name_by_id(this._menuTimeoutId, '[gnome-shell] this.popupMenu');
-    },
-
-    _onLeaveEvent: function(actor, event) {
-        this.actor.fake_release();
-        this._removeMenuTimeout();
-    },
-
    _onButtonPress: function(actor, event) {
        let button = event.get_button();
        if (button == 1) {
-            this._setPopupTimeout();
+            this._removeMenuTimeout();
+            this._menuTimeoutId = Mainloop.timeout_add(MENU_POPUP_TIMEOUT,
+                Lang.bind(this, function() {
+                    this._menuTimeoutId = 0;
+                    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;
@@ -1621,16 +1414,16 @@ const AppIcon = new Lang.Class({
        return Clutter.EVENT_PROPAGATE;
    },

-    _onTouchEvent: function (actor, event) {
-        if (event.type() == Clutter.EventType.TOUCH_BEGIN)
-            this._setPopupTimeout();
-
-        return Clutter.EVENT_PROPAGATE;
-    },
-
    _onClicked: function(actor, button) {
        this._removeMenuTimeout();
-        this.activate(button);
+
+        if (button == 1) {
+            this._onActivate(Clutter.get_current_event());
+        } else if (button == 2) {
+            this.app.open_new_window(-1);
+            Main.overview.hide();
+        }
+        return false;
    },

    _onKeyboardPopupMenu: function() {
@@ -1684,28 +1477,19 @@ const AppIcon = new Lang.Class({
        this.emit('menu-state-changed', false);
    },

-    activate: function (button) {
-        let event = Clutter.get_current_event();
-        let modifiers = event ? event.get_state() : 0;
-        let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK &&
-                            this.app.state == Shell.AppState.RUNNING ||
-                            button && button == 2;
+    _onActivate: function (event) {
+        let modifiers = event.get_state();

-        if (this.app.state == Shell.AppState.STOPPED || openNewWindow)
-            this.animateLaunch();
-
-        if (openNewWindow)
+        if (modifiers & Clutter.ModifierType.CONTROL_MASK
+            && this.app.state == Shell.AppState.RUNNING) {
            this.app.open_new_window(-1);
-        else
+        } else {
            this.app.activate();
+        }

        Main.overview.hide();
    },

-    animateLaunch: function() {
-        this.icon.animateZoomOut();
-    },
-
    shellWorkspaceLaunch : function(params) {
        params = Params.parse(params, { workspace: -1,
                                        timestamp: 0 });
@@ -1784,17 +1568,12 @@ const AppIconMenu = new Lang.Class({
        if (!this._source.app.is_window_backed()) {
            this._appendSeparator();

-            if (this._source.app.can_open_new_window()) {
-                this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
-                this._newWindowMenuItem.connect('activate', Lang.bind(this, function() {
-                    if (this._source.app.state == Shell.AppState.STOPPED)
-                        this._source.animateLaunch();
-
-                    this._source.app.open_new_window(-1);
-                    this.emit('activate-window', null);
-                }));
-                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();
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -6,28 +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-contacts.desktop': 'org.gnome.Contacts.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',
-    'totem.desktop': 'org.gnome.Totem.desktop',
-};
-
 const AppFavorites = new Lang.Class({
    Name: 'AppFavorites',

@@ -46,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
@@ -311,8 +311,7 @@ const Background = new Lang.Class({
        params = Params.parse(params, { monitorIndex: 0,
                                        layoutManager: Main.layoutManager,
                                        effects: Meta.BackgroundEffects.NONE,
-                                        settings: null,
-                                        overrideImage: null });
+                                        settings: null });
        this.actor = new Meta.BackgroundGroup();
        this.actor._delegate = this;

@@ -320,7 +319,6 @@ const Background = new Lang.Class({
                                                   Lang.bind(this, this._destroy));

        this._settings = params.settings;
-        this._overrideImage = params.overrideImage;
        this._monitorIndex = params.monitorIndex;
        this._layoutManager = params.layoutManager;
        this._effects = params.effects;
@@ -450,7 +448,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);
    },
@@ -584,24 +582,19 @@ const Background = new Lang.Class({

        this._loadPattern();

-        let filename;
-        if (this._overrideImage != null) {
-            filename = this._overrideImage;
-            this._style = GDesktopEnums.BackgroundStyle.ZOOM; // Hardcode
-        } else {
-            this._style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
-            if (this._style == GDesktopEnums.BackgroundStyle.NONE) {
-                this._setLoaded();
-                return;
-            }
-
-            let uri = this._settings.get_string(PICTURE_URI_KEY);
-            if (GLib.uri_parse_scheme(uri) != null)
-                filename = Gio.File.new_for_uri(uri).get_path();
-            else
-                filename = uri;
+        this._style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
+        if (this._style == GDesktopEnums.BackgroundStyle.NONE) {
+            this._setLoaded();
+            return;
        }

+        let uri = this._settings.get_string(PICTURE_URI_KEY);
+        let filename;
+        if (GLib.uri_parse_scheme(uri) != null)
+            filename = Gio.File.new_for_uri(uri).get_path();
+        else
+            filename = uri;
+
        if (!filename) {
            this._setLoaded();
            return;
@@ -666,10 +659,7 @@ const SystemBackground = new Lang.Class({
    },

    _onDestroy: function() {
-        let content = this.actor.content;
-
-        if (content)
-            this._cache.removeImageContent(content);
+        this._cache.removeImageContent(this.actor.content);
    },
 });
 Signals.addSignalMethods(SystemBackground.prototype);
@@ -735,9 +725,7 @@ const BackgroundManager = new Lang.Class({
                                        controlPosition: true,
                                        settingsSchema: BACKGROUND_SCHEMA });

-        // Allow override the background image setting for performance testing
-        this._overrideImage = GLib.getenv('SHELL_BACKGROUND_IMAGE');
-        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;
@@ -798,8 +786,7 @@ const BackgroundManager = new Lang.Class({
        let background = new Background({ monitorIndex: this._monitorIndex,
                                          layoutManager: this._layoutManager,
                                          effects: this._effects,
-                                          settings: this._settings,
-                                          overrideImage: this._overrideImage });
+                                          settings: this._settings });
        this._container.add_child(background.actor);

        let monitor = this._layoutManager.monitors[this._monitorIndex];
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@@ -33,7 +33,8 @@ function addBackgroundMenu(actor, layoutManager) {
    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
    actor._backgroundManager.addMenu(actor._backgroundMenu);

-    function openMenu(x, y) {
+    function openMenu() {
+        let [x, y] = global.get_pointer();
        Main.layoutManager.setDummyCursorGeometry(x, y, 0, 0);
        actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
    }
@@ -41,32 +42,22 @@ function addBackgroundMenu(actor, layoutManager) {
    let clickAction = new Clutter.ClickAction();
    clickAction.connect('long-press', function(action, actor, state) {
        if (state == Clutter.LongPressState.QUERY)
-            return ((action.get_button() == 0 ||
-                     action.get_button() == 1) &&
-                    !actor._backgroundMenu.isOpen);
+            return action.get_button() == 1 && !actor._backgroundMenu.isOpen;
        if (state == Clutter.LongPressState.ACTIVATE) {
-            let [x, y] = action.get_coords();
-            openMenu(x, y);
+            openMenu();
            actor._backgroundManager.ignoreRelease();
        }
        return true;
    });
    clickAction.connect('clicked', function(action) {
-        if (action.get_button() == 3) {
-            let [x, y] = action.get_coords();
-            openMenu(x, y);
-        }
+        if (action.get_button() == 3)
+            openMenu();
    });
    actor.add_action(clickAction);

-    let grabOpBeginId = global.display.connect('grab-op-begin', function () {
-        clickAction.release();
-    });
-
    actor.connect('destroy', function() {
        actor._backgroundMenu.destroy();
        actor._backgroundMenu = null;
        actor._backgroundManager = null;
-        global.display.disconnect(grabOpBeginId);
    });
 }
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -383,7 +383,7 @@ 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);
@@ -409,7 +409,7 @@ const Calendar = new Lang.Class({
        this._shouldDateGrabFocus = false;

        this.actor = new St.Widget({ style_class: 'calendar',
-                                     layout_manager: new Clutter.GridLayout(),
+                                     layout_manager: new Clutter.TableLayout(),
                                     reactive: true });

        this.actor.connect('scroll-event',
@@ -447,7 +447,8 @@ const Calendar = new Lang.Class({

        // Top line of the calendar '<| September 2009 |>'
        this._topBox = new St.BoxLayout();
-        layout.attach(this._topBox, 0, 0, offsetCols + 7, 1);
+        layout.pack(this._topBox, 0, 0);
+        layout.set_span(this._topBox, offsetCols + 7, 1);

        this._backButton = new St.Button({ style_class: 'calendar-change-month-back',
                                           accessible_name: _("Previous month"),
@@ -479,12 +480,8 @@ 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;
-            if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
-                col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
-            else
-                col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
-            layout.attach(label, col, 1, 1, 1);
+            let col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
+            layout.pack(label, col, 1);
            iter.setTime(iter.getTime() + MSECS_IN_DAY);
        }

@@ -651,19 +648,15 @@ const Calendar = new Lang.Class({
            button.style_class = styleClass;

            let offsetCols = this._useWeekdate ? 1 : 0;
-            let col;
-            if (rtl)
-                col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
-            else
-                col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
-            layout.attach(button, col, row, 1, 1);
+            let 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.attach(label, rtl ? 7 : 0, row, 1, 1);
+                layout.pack(label, 0, row);
            }

            iter.setTime(iter.getTime() + MSECS_IN_DAY);
@@ -706,12 +699,12 @@ const EventsList = new Lang.Class({
    Name: 'EventsList',

    _init: function() {
-        let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
+        let layout = new Clutter.TableLayout();
        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();
    },
@@ -729,34 +722,34 @@ const EventsList = new Lang.Class({
            dayString = '';

        let dayLabel = new St.Label({ style_class: 'events-day-dayname',
-                                      text: dayString,
-                                      x_align: Clutter.ActorAlign.END,
-                                      y_align: Clutter.ActorAlign.START });
+                                      text: dayString });
        dayLabel.clutter_text.line_wrap = false;
        dayLabel.clutter_text.ellipsize = false;

-        let rtl = this.actor.get_text_direction() == Clutter.TextDirection.RTL;
-
        let layout = this.actor.layout_manager;
-        layout.attach(dayLabel, rtl ? 2 : 0, index, 1, 1);
+        layout.pack(dayLabel, 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);
        let timeLabel = new St.Label({ style_class: 'events-day-time',
-                                       text: timeString,
-                                       y_align: Clutter.ActorAlign.START });
+                                       text: timeString });
        timeLabel.clutter_text.line_wrap = false;
        timeLabel.clutter_text.ellipsize = false;

-        layout.attach(timeLabel, 1, index, 1, 1);
+        layout.pack(timeLabel, 1, index);
+        layout.child_set(timeLabel, { x_expand: false,
+                                      y_align: Clutter.TableAlignment.START });

        let titleLabel = new St.Label({ style_class: 'events-day-task',
-                                        text: event.summary,
-                                        x_expand: true });
+                                        text: event.summary });
        titleLabel.clutter_text.line_wrap = true;
        titleLabel.clutter_text.ellipsize = false;

-        layout.attach(titleLabel, rtl ? 0 : 2, index, 1, 1);
+        layout.pack(titleLabel, 2, index);
+        layout.child_set(titleLabel, { x_expand: true });
    },

    _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
@@ -767,7 +760,8 @@ const EventsList = new Lang.Class({

        let label = new St.Label({ style_class: 'events-day-header', text: header });
        let layout = this.actor.layout_manager;
-        layout.attach(label, 0, index, 3, 1);
+        layout.pack(label, 0, index);
+        layout.child_set(label, { column_span: 3, x_expand: false });
        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',
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -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) {
@@ -170,17 +170,6 @@ const AutorunManager = new Lang.Class({
        this._transDispatcher = new AutorunTransientDispatcher(this);
    },

-    _ensureResidentSource: function() {
-        if (this._residentSource)
-            return;
-
-        this._residentSource = new AutorunResidentSource(this);
-        let destroyId = this._residentSource.connect('destroy', Lang.bind(this, function() {
-            this._residentSource.disconnect(destroyId);
-            this._residentSource = null;
-        }));
-    },
-
    enable: function() {
        this._scanMounts();

@@ -189,17 +178,12 @@ const AutorunManager = new Lang.Class({
    },

    disable: function() {
-        if (this._residentSource)
-            this._residentSource.destroy();
        this._volumeMonitor.disconnect(this._mountAddedId);
        this._volumeMonitor.disconnect(this._mountRemovedId);
    },

    _processMount: function(mount, hotplug) {
        let discoverer = new ContentTypeDiscoverer(Lang.bind(this, function(mount, apps, contentTypes) {
-            this._ensureResidentSource();
-            this._residentSource.addMount(mount, apps);
-
            if (hotplug)
                this._transDispatcher.addMount(mount, apps, contentTypes);
        }));
@@ -224,8 +208,6 @@ const AutorunManager = new Lang.Class({

    _onMountRemoved: function(monitor, mount) {
        this._transDispatcher.removeMount(mount);
-        if (this._residentSource)
-            this._residentSource.removeMount(mount);
    },

    ejectMount: function(mount) {
@@ -288,160 +270,13 @@ const AutorunManager = new Lang.Class({
    },
 });

-const AutorunResidentSource = new Lang.Class({
-    Name: 'AutorunResidentSource',
-    Extends: MessageTray.Source,
-
-    _init: function(manager) {
-        this.parent(_("Removable Devices"), 'media-removable');
-        this.resident = true;
-
-        this._mounts = [];
-
-        this._manager = manager;
-        this._notification = new AutorunResidentNotification(this._manager, this);
-    },
-
-    _createPolicy: function() {
-        return new MessageTray.NotificationPolicy({ showInLockScreen: false });
-    },
-
-    buildRightClickMenu: function() {
-        return null;
-    },
-
-    addMount: function(mount, apps) {
-        if (!shouldAutorunMount(mount, false))
-            return;
-
-        let filtered = this._mounts.filter(function (element) {
-            return (element.mount == mount);
-        });
-
-        if (filtered.length != 0)
-            return;
-
-        let element = { mount: mount, apps: apps };
-        this._mounts.push(element);
-        this._redisplay();
-    },
-
-    removeMount: function(mount) {
-        this._mounts =
-            this._mounts.filter(function (element) {
-                return (element.mount != mount);
-            });
-
-        this._redisplay();
-    },
-
-    _redisplay: function() {
-        if (this._mounts.length == 0) {
-            this._notification.destroy();
-            this.destroy();
-
-            return;
-        }
-
-        this._notification.updateForMounts(this._mounts);
-
-        // add ourselves as a source, and push the notification
-        if (!Main.messageTray.contains(this)) {
-            Main.messageTray.add(this);
-            this.pushNotification(this._notification);
-        }
-    }
-});
-
-const AutorunResidentNotification = new Lang.Class({
-    Name: 'AutorunResidentNotification',
-    Extends: MessageTray.Notification,
-
-    _init: function(manager, source) {
-        this.parent(source, source.title, null, { customContent: true });
-
-        // set the notification as resident
-        this.setResident(true);
-
-        this._layout = new St.BoxLayout ({ style_class: 'hotplug-resident-box',
-                                           vertical: true });
-        this._manager = manager;
-
-        this.addActor(this._layout,
-                      { x_expand: true,
-                        x_fill: true });
-    },
-
-    updateForMounts: function(mounts) {
-        // remove all the layout content
-        this._layout.destroy_all_children();
-
-        for (let idx = 0; idx < mounts.length; idx++) {
-            let element = mounts[idx];
-
-            let actor = this._itemForMount(element.mount, element.apps);
-            this._layout.add(actor, { x_fill: true,
-                                      expand: true });
-        }
-    },
-
-    _itemForMount: function(mount, apps) {
-        let item = new St.BoxLayout();
-
-        // prepare the mount button content
-        let mountLayout = new St.BoxLayout();
-
-        let mountIcon = new St.Icon({ gicon: mount.get_icon(),
-                                      style_class: 'hotplug-resident-mount-icon' });
-        mountLayout.add_actor(mountIcon);
-
-        let labelBin = new St.Bin({ y_align: St.Align.MIDDLE });
-        let mountLabel =
-            new St.Label({ text: mount.get_name(),
-                           style_class: 'hotplug-resident-mount-label',
-                           track_hover: true,
-                           reactive: true });
-        labelBin.add_actor(mountLabel);
-        mountLayout.add_actor(labelBin);
-
-        let mountButton = new St.Button({ child: mountLayout,
-                                          x_align: St.Align.START,
-                                          x_fill: true,
-                                          style_class: 'hotplug-resident-mount',
-                                          button_mask: St.ButtonMask.ONE });
-        item.add(mountButton, { x_align: St.Align.START,
-                                expand: true });
-
-        let ejectIcon = 
-            new St.Icon({ icon_name: 'media-eject-symbolic',
-                          style_class: 'hotplug-resident-eject-icon' });
-
-        let ejectButton =
-            new St.Button({ style_class: 'hotplug-resident-eject-button',
-                            button_mask: St.ButtonMask.ONE,
-                            child: ejectIcon });
-        item.add(ejectButton, { x_align: St.Align.END });
-
-        // now connect signals
-        mountButton.connect('clicked', Lang.bind(this, function(actor, event) {
-            startAppForMount(apps[0], mount);
-        }));
-
-        ejectButton.connect('clicked', Lang.bind(this, function() {
-            this._manager.ejectMount(mount);
-        }));
-
-        return item;
-    },
-});
-
 const AutorunTransientDispatcher = new Lang.Class({
    Name: 'AutorunTransientDispatcher',

    _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) {
@@ -559,12 +394,12 @@ const AutorunTransientNotification = new Lang.Class({
    Extends: MessageTray.Notification,

    _init: function(manager, source) {
-        this.parent(source, source.title, null, { customContent: true });
+        this.parent(source, source.title);

        this._manager = manager;
        this._box = new St.BoxLayout({ style_class: 'hotplug-transient-box',
                                       vertical: true });
-        this.addActor(this._box);
+        this._bodyBin.child = this._box;

        this._mount = source.mount;

--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -80,46 +80,44 @@ const KeyringDialog = new Lang.Class({
    },

    _buildControlTable: function() {
-        let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
+        let layout = new Clutter.TableLayout();
        let table = new St.Widget({ style_class: 'keyring-dialog-control-table',
                                    layout_manager: layout });
        layout.hookup_style(table);
        let row = 0;

        if (this.prompt.password_visible) {
-            let label = new St.Label({ style_class: 'prompt-dialog-password-label',
-                                       x_align: Clutter.ActorAlign.START,
-                                       y_align: Clutter.ActorAlign.CENTER });
+            let label = new St.Label({ style_class: 'prompt-dialog-password-label' });
            label.set_text(_("Password:"));
            label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            layout.attach(label, 0, row, 1, 1);
+            layout.pack(label, 0, row);
+            layout.child_set(label, { x_expand: false, y_fill: false,
+                                      x_align: Clutter.TableAlignment.START });
            this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                                 text: '',
-                                                 can_focus: true,
-                                                 x_expand: true });
+                                                 can_focus: true });
            this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
            ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
            this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onPasswordActivate));
-            layout.attach(this._passwordEntry, 1, row, 1, 1);
+            layout.pack(this._passwordEntry, 1, row);
            row++;
        } else {
            this._passwordEntry = null;
        }

        if (this.prompt.confirm_visible) {
-            var label = new St.Label(({ style_class: 'prompt-dialog-password-label',
-                                        x_align: Clutter.ActorAlign.START,
-                                        y_align: Clutter.ActorAlign.CENTER }));
+            var label = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
            label.set_text(_("Type again:"));
-            layout.attach(label, 0, row, 1, 1);
+            layout.pack(label, 0, row);
+            layout.child_set(label, { x_expand: false, y_fill: false,
+                                      x_align: Clutter.TableAlignment.START });
            this._confirmEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                                text: '',
-                                                can_focus: true,
-                                                x_expand: true });
+                                                can_focus: true });
            this._confirmEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
            ShellEntry.addContextMenu(this._confirmEntry, { isPassword: true });
            this._confirmEntry.clutter_text.connect('activate', Lang.bind(this, this._onConfirmActivate));
-            layout.attach(this._confirmEntry, 1, row, 1, 1);
+            layout.pack(this._confirmEntry, 1, row);
            row++;
        } else {
            this._confirmEntry = null;
@@ -132,15 +130,15 @@ const KeyringDialog = new Lang.Class({
            let choice = new CheckBox.CheckBox();
            this.prompt.bind_property('choice-label', choice.getLabelActor(), 'text', GObject.BindingFlags.SYNC_CREATE);
            this.prompt.bind_property('choice-chosen', choice.actor, 'checked', GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
-            layout.attach(choice.actor, 1, row, 1, 1);
+            layout.pack(choice.actor, 1, row);
            row++;
        }

-        let warning = new St.Label({ style_class: 'prompt-dialog-error-label',
-                                     x_align: Clutter.ActorAlign.START });
+        let warning = new St.Label({ style_class: 'prompt-dialog-error-label' });
        warning.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        warning.clutter_text.line_wrap = true;
-        layout.attach(warning, 1, row, 1, 1);
+        layout.pack(warning, 1, row);
+        layout.child_set(warning, { x_fill: false, x_align: Clutter.TableAlignment.START });
        this.prompt.bind_property('warning-visible', warning, 'visible', GObject.BindingFlags.SYNC_CREATE);
        this.prompt.bind_property('warning', warning, 'text', GObject.BindingFlags.SYNC_CREATE);

--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -72,28 +72,24 @@ const NetworkSecretDialog = new Lang.Class({
                             expand: true });
        }

-        let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
+        let layout = new Clutter.TableLayout();
        let secretTable = new St.Widget({ style_class: 'network-dialog-secret-table',
                                          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++) {
            let secret = this._content.secrets[i];
            let label = new St.Label({ style_class: 'prompt-dialog-password-label',
-                                       text: secret.label,
-                                       x_align: Clutter.ActorAlign.START,
-                                       y_align: Clutter.ActorAlign.CENTER });
+                                       text: secret.label });
            label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;

            let reactive = secret.key != null;

            secret.entry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                          text: secret.value, can_focus: reactive,
-                                          reactive: reactive,
-                                          x_expand: true });
+                                          reactive: reactive });
            ShellEntry.addContextMenu(secret.entry,
                                      { isPassword: secret.password });

@@ -120,13 +116,10 @@ const NetworkSecretDialog = new Lang.Class({
            } else
                secret.valid = true;

-            if (rtl) {
-                layout.attach(secret.entry, 0, pos, 1, 1);
-                layout.attach(label, 1, pos, 1, 1);
-            } else {
-                layout.attach(label, 0, pos, 1, 1);
-                layout.attach(secret.entry, 1, pos, 1, 1);
-            }
+            layout.pack(label, 0, 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)
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -102,15 +102,6 @@ const TelepathyClient = new Lang.Class({
        this._tpClient.set_handle_channels_func(
            Lang.bind(this, this._handleChannels));

-        // Watch subscription requests and connection errors
-        this._subscriptionSource = null;
-        this._accountSource = null;
-
-        // Workaround for gjs not supporting GPtrArray in signals.
-        // See BGO bug #653941 for context.
-        this._tpClient.set_contact_list_changed_func(
-            Lang.bind(this, this._contactListChanged));
-
        // Allow other clients (such as Empathy) to pre-empt our channels if
        // needed
        this._tpClient.set_delegated_channels_callback(
@@ -124,17 +115,12 @@ const TelepathyClient = new Lang.Class({
            throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
        }

-        this._accountManagerValidityChangedId = this._accountManager.connect('account-validity-changed',
-                                                                             Lang.bind(this, this._accountValidityChanged));
-
        if (!this._accountManager.is_prepared(Tp.AccountManager.get_feature_quark_core()))
            this._accountManager.prepare_async(null, Lang.bind(this, this._accountManagerPrepared));
    },

    disable: function() {
        this._tpClient.unregister();
-        this._accountManager.disconnect(this._accountManagerValidityChangedId);
-        this._accountManagerValidityChangedId = 0;
    },

    _observeChannels: function(observer, account, conn, channels,
@@ -219,33 +205,6 @@ const TelepathyClient = new Lang.Class({
        }
    },

-    _displayRoomInvitation: function(conn, channel, dispatchOp, context) {
-        // We can only approve the rooms if we have been invited to it
-        let selfContact = channel.group_get_self_contact();
-        if (selfContact == null) {
-            context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
-                                        message: 'Not invited to the room' }));
-            return;
-        }
-
-        let [invited, inviter, reason, msg] = channel.group_get_local_pending_contact_info(selfContact);
-        if (!invited) {
-            context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
-                                        message: 'Not invited to the room' }));
-            return;
-        }
-
-        // FIXME: We don't have a 'chat room' icon (bgo #653737) use
-        // system-users for now as Empathy does.
-        let source = new ApproverSource(dispatchOp, _("Invitation"),
-                                        Gio.icon_new_for_string('system-users'));
-        Main.messageTray.add(source);
-
-        let notif = new RoomInviteNotification(source, dispatchOp, channel, inviter);
-        source.notify(notif);
-        context.accept();
-    },
-
    _approveChannels: function(approver, account, conn, channels,
                               dispatchOp, context) {
        let channel = channels[0];
@@ -259,10 +218,6 @@ const TelepathyClient = new Lang.Class({

        if (chanType == Tp.IFACE_CHANNEL_TYPE_TEXT)
            this._approveTextChannel(account, conn, channel, dispatchOp, context);
-        else if (chanType == Tp.IFACE_CHANNEL_TYPE_CALL)
-            this._approveCall(account, conn, channel, dispatchOp, context);
-        else if (chanType == Tp.IFACE_CHANNEL_TYPE_FILE_TRANSFER)
-            this._approveFileTransfer(account, conn, channel, dispatchOp, context);
        else
            context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
                                        message: 'Unsupported channel type' }));
@@ -283,45 +238,9 @@ const TelepathyClient = new Lang.Class({
                }}));

            context.accept();
-        } else {
-            this._displayRoomInvitation(conn, channel, dispatchOp, context);
        }
    },

-    _approveCall: function(account, conn, channel, dispatchOp, context) {
-        let isVideo = false;
-
-        let props = channel.borrow_immutable_properties();
-
-        if (props[Tp.PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO])
-          isVideo = true;
-
-        // We got the TpContact
-        let source = new ApproverSource(dispatchOp, _("Call"), isVideo ?
-                                        Gio.icon_new_for_string('camera-web') :
-                                        Gio.icon_new_for_string('audio-input-microphone'));
-        Main.messageTray.add(source);
-
-        let notif = new AudioVideoNotification(source, dispatchOp, channel,
-            channel.get_target_contact(), isVideo);
-        source.notify(notif);
-        context.accept();
-    },
-
-    _approveFileTransfer: function(account, conn, channel, dispatchOp, context) {
-        // Use the icon of the file being transferred
-        let gicon = Gio.content_type_get_icon(channel.get_mime_type());
-
-        // We got the TpContact
-        let source = new ApproverSource(dispatchOp, _("File Transfer"), gicon);
-        Main.messageTray.add(source);
-
-        let notif = new FileTransferNotification(source, dispatchOp, channel,
-            channel.get_target_contact());
-        source.notify(notif);
-        context.accept();
-    },
-
    _delegatedChannelsCb: function(client, channels) {
        // Nothing to do as we don't make a distinction between observed and
        // handled channels.
@@ -329,105 +248,7 @@ const TelepathyClient = new Lang.Class({

    _accountManagerPrepared: function(am, result) {
        am.prepare_finish(result);
-
-        let accounts = am.get_valid_accounts();
-        for (let i = 0; i < accounts.length; i++) {
-            this._accountValidityChanged(am, accounts[i], true);
-        }
    },
-
-    _accountValidityChanged: function(am, account, valid) {
-        if (!valid)
-            return;
-
-        // It would be better to connect to "status-changed" but we cannot.
-        // See discussion in https://bugzilla.gnome.org/show_bug.cgi?id=654159
-        account.connect("notify::connection-status",
-                        Lang.bind(this, this._accountConnectionStatusNotifyCb));
-
-        account.connect('notify::connection',
-                        Lang.bind(this, this._connectionChanged));
-        this._connectionChanged(account);
-    },
-
-    _connectionChanged: function(account) {
-        let conn = account.get_connection();
-        if (conn == null)
-            return;
-
-        this._tpClient.grab_contact_list_changed(conn);
-        if (conn.get_contact_list_state() == Tp.ContactListState.SUCCESS) {
-            this._contactListChanged(conn, conn.dup_contact_list(), []);
-        }
-    },
-
-    _contactListChanged: function(conn, added, removed) {
-        for (let i = 0; i < added.length; i++) {
-            let contact = added[i];
-
-            contact.connect('subscription-states-changed',
-                            Lang.bind(this, this._subscriptionStateChanged));
-            this._subscriptionStateChanged(contact);
-        }
-    },
-
-    _subscriptionStateChanged: function(contact) {
-        if (contact.get_publish_state() != Tp.SubscriptionState.ASK)
-            return;
-
-        /* Implicitly accept publish requests if contact is already subscribed */
-        if (contact.get_subscribe_state() == Tp.SubscriptionState.YES ||
-            contact.get_subscribe_state() == Tp.SubscriptionState.ASK) {
-
-            contact.authorize_publication_async(function(src, result) {
-                src.authorize_publication_finish(result)});
-
-            return;
-        }
-
-        /* Display notification to ask user to accept/reject request */
-        let source = this._ensureAppSource();
-
-        let notif = new SubscriptionRequestNotification(source, contact);
-        source.notify(notif);
-    },
-
-    _accountConnectionStatusNotifyCb: function(account) {
-        let connectionError = account.connection_error;
-
-        if (account.connection_status != Tp.ConnectionStatus.DISCONNECTED ||
-            connectionError == Tp.error_get_dbus_name(Tp.Error.CANCELLED)) {
-            return;
-        }
-
-        let notif = this._accountNotifications[account.get_object_path()];
-        if (notif)
-            return;
-
-        /* Display notification that account failed to connect */
-        let source = this._ensureAppSource();
-
-        notif = new AccountNotification(source, account, connectionError);
-        this._accountNotifications[account.get_object_path()] = notif;
-        notif.connect('destroy', Lang.bind(this, function() {
-            delete this._accountNotifications[account.get_object_path()];
-        }));
-        source.notify(notif);
-    },
-
-    _ensureAppSource: function() {
-        if (this._appSource == null) {
-            this._appSource = new MessageTray.Source(_("Chat"), 'empathy');
-            this._appSource.policy = new MessageTray.NotificationApplicationPolicy('empathy');
-
-            Main.messageTray.add(this._appSource);
-            this._appSource.connect('destroy', Lang.bind(this, function () {
-                this._appSource = null;
-            }));
-        }
-
-        return this._appSource;
-    }
 });

 const ChatSource = new Lang.Class({
@@ -545,7 +366,7 @@ const ChatSource = new Lang.Class({

    _updateAvatarIcon: function() {
        this.iconUpdated();
-        this._notification.update(this._notification.title, null, { customContent: true });
+        this._notification.update(this._notification.title);
    },

    open: function() {
@@ -737,7 +558,7 @@ const ChatSource = new Lang.Class({

        title = GLib.markup_escape_text(this.title, -1);

-        this._notification.update(this._notification.title, null, { customContent: true, secondaryGIcon: this.getSecondaryIcon() });
+        this._notification.update(this._notification.title, null, { secondaryGIcon: this.getSecondaryIcon() });

        if (message)
            msg += ' <i>(' + GLib.markup_escape_text(message, -1) + ')</i>';
@@ -764,8 +585,7 @@ const ChatNotification = new Lang.Class({
    Extends: MessageTray.Notification,

    _init: function(source) {
-        this.parent(source, source.title, null, { customContent: true, secondaryGIcon: source.getSecondaryIcon() });
-        this.setResident(true);
+        this.parent(source, source.title, null, { secondaryGIcon: source.getSecondaryIcon() });

        this._responseEntry = new St.Entry({ style_class: 'chat-response',
                                             can_focus: true });
@@ -781,15 +601,17 @@ const ChatNotification = new Lang.Class({
            this.emit('unfocused');
        }));

-        this._createScrollArea();
        this._lastGroup = null;

+        this._bodyBox = new St.BoxLayout({ style_class: 'chat-notification-body-box' });
+        this._bodyBin.child = this._bodyBox;
+
        // 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
        // bottom
-        this._oldMaxScrollValue = this._scrollArea.vscroll.adjustment.value;
-        this._scrollArea.add_style_class_name('chat-notification-scrollview');
-        this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
+        this._oldMaxScrollValue = this._bodyScrollArea.vscroll.adjustment.value;
+        this._bodyScrollArea.add_style_class_name('chat-notification-scrollview');
+        this._bodyScrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
            if (adjustment.value == this._oldMaxScrollValue)
                this.scrollTo(St.Side.BOTTOM);
            this._oldMaxScrollValue = Math.max(adjustment.lower, adjustment.upper - adjustment.page_size);
@@ -826,8 +648,7 @@ const ChatNotification = new Lang.Class({
        }

        if (message.direction == NotificationDirection.RECEIVED) {
-            this.update(this.source.title, messageBody, { customContent: true,
-                                                          bannerMarkup: true });
+            this.update(this.source.title, messageBody, { bannerMarkup: true });
        }

        let group = (message.direction == NotificationDirection.RECEIVED ?
@@ -863,6 +684,13 @@ const ChatNotification = new Lang.Class({
            for (let i = 0; i < expired.length; i++)
                expired[i].actor.destroy();
        }
+
+        let groups = this._bodyBox.get_children();
+        for (let i = 0; i < groups.length; i++) {
+            let group = groups[i];
+            if (group.get_n_children() == 0)
+                group.destroy();
+        }
    },

    /**
@@ -889,9 +717,9 @@ const ChatNotification = new Lang.Class({
        if (this._timestampTimeoutId)
            Mainloop.source_remove(this._timestampTimeoutId);

-        let highlighter = new MessageTray.URLHighlighter(props.body,
-                                                         true,  // line wrap?
-                                                         true); // allow markup?
+        let highlighter = new MessageTray.URLHighlighter();
+        highlighter.actor.clutter_text.line_wrap = true;
+        highlighter.setMarkup(props.body, true);

        let body = highlighter.actor;

@@ -903,20 +731,15 @@ const ChatNotification = new Lang.Class({
        if (group != this._lastGroup) {
            this._lastGroup = group;
            let emptyLine = new St.Label({ style_class: 'chat-empty-line' });
-            this.addActor(emptyLine);
-            this._history.unshift({ actor: emptyLine, time: timestamp,
-                                    realMessage: false });
+            this._bodyBox.add_child(emptyLine);
        }

-        let lineBox = new St.BoxLayout({ vertical: false });
-        lineBox.add(body, props.childProps);
-        this.addActor(lineBox);
-        this._lastMessageBox = lineBox;
-
-        this.updated();
+        this._lastMessageBox = new St.BoxLayout({ vertical: false });
+        this._lastMessageBox.add(body, props.childProps);
+        this._bodyBox.add_child(this._lastMessageBox);

        let timestamp = props.timestamp;
-        this._history.unshift({ actor: lineBox, time: timestamp,
+        this._history.unshift({ actor: body, time: timestamp,
                                realMessage: group != 'meta' });

        if (!props.noTimestamp) {
@@ -942,7 +765,7 @@ const ChatNotification = new Lang.Class({

        let format;

-        let desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
+        let desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
        let clockFormat = desktopSettings.get_string(CLOCK_FORMAT_KEY);
        let hasAmPm = date.toLocaleFormat('%p') != '';

@@ -1048,7 +871,7 @@ const ChatNotification = new Lang.Class({
                                   group: 'meta',
                                   styles: ['chat-meta-message'] });

-        this.update(newAlias, null, { customContent: true });
+        this.update(newAlias);

        this._filterMessages();
    },
@@ -1101,359 +924,4 @@ const ChatNotification = new Lang.Class({
    }
 });

-const ApproverSource = new Lang.Class({
-    Name: 'ApproverSource',
-    Extends: MessageTray.Source,
-
-    _init: function(dispatchOp, text, gicon) {
-        this._gicon = gicon;
-
-        this.parent(text);
-
-        this._dispatchOp = dispatchOp;
-
-        // Destroy the source if the channel dispatch operation is invalidated
-        // as we can't approve any more.
-        this._invalidId = dispatchOp.connect('invalidated',
-                                             Lang.bind(this, function(domain, code, msg) {
-            this.destroy();
-        }));
-    },
-
-    _createPolicy: function() {
-        return new MessageTray.NotificationApplicationPolicy('empathy');
-    },
-
-    destroy: function() {
-        if (this._invalidId != 0) {
-            this._dispatchOp.disconnect(this._invalidId);
-            this._invalidId = 0;
-        }
-
-        this.parent();
-    },
-
-    getIcon: function() {
-        return this._gicon;
-    }
-});
-
-const RoomInviteNotification = new Lang.Class({
-    Name: 'RoomInviteNotification',
-    Extends: MessageTray.Notification,
-
-    _init: function(source, dispatchOp, channel, inviter) {
-        this.parent(source,
-                    /* translators: argument is a room name like
-                     * room@jabber.org for example. */
-                    _("Invitation to %s").format(channel.get_identifier()),
-                    null,
-                    { customContent: true });
-        this.setResident(true);
-
-        /* translators: first argument is the name of a contact and the second
-         * one the name of a room. "Alice is inviting you to join room@jabber.org
-         * for example. */
-        this.addBody(_("%s is inviting you to join %s").format(inviter.get_alias(), channel.get_identifier()));
-
-        this.addAction(_("Decline"), Lang.bind(this, function() {
-            dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
-                src.leave_channels_finish(result);
-            });
-            this.destroy();
-        }));
-        this.addAction(_("Accept"), Lang.bind(this, function() {
-            dispatchOp.handle_with_time_async('', global.get_current_time(), function(src, result) {
-                src.handle_with_time_finish(result);
-            });
-            this.destroy();
-        }));
-    }
-});
-
-// Audio Video
-const AudioVideoNotification = new Lang.Class({
-    Name: 'AudioVideoNotification',
-    Extends: MessageTray.Notification,
-
-    _init: function(source, dispatchOp, channel, contact, isVideo) {
-        let title = '';
-
-        if (isVideo)
-             /* translators: argument is a contact name like Alice for example. */
-            title = _("Video call from %s").format(contact.get_alias());
-        else
-             /* translators: argument is a contact name like Alice for example. */
-            title = _("Call from %s").format(contact.get_alias());
-
-        this.parent(source, title, null, { customContent: true });
-        this.setResident(true);
-
-        this.setUrgency(MessageTray.Urgency.CRITICAL);
-
-        this.addAction(_("Decline"), Lang.bind(this, function() {
-            dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
-                src.leave_channels_finish(result);
-            });
-            this.destroy();
-        }));
-        /* translators: this is a button label (verb), not a noun */
-        this.addAction(_("Answer"), Lang.bind(this, function() {
-            dispatchOp.handle_with_time_async('', global.get_current_time(), function(src, result) {
-                src.handle_with_time_finish(result);
-            });
-            this.destroy();
-        }));
-    }
-});
-
-// File Transfer
-const FileTransferNotification = new Lang.Class({
-    Name: 'FileTransferNotification',
-    Extends: MessageTray.Notification,
-
-    _init: function(source, dispatchOp, channel, contact) {
-        this.parent(source,
-                    /* To translators: The first parameter is
-                     * the contact's alias and the second one is the
-                     * file name. The string will be something
-                     * like: "Alice is sending you test.ogg"
-                     */
-                    _("%s is sending you %s").format(contact.get_alias(),
-                                                     channel.get_filename()),
-                    null,
-                    { customContent: true });
-        this.setResident(true);
-
-        this.addAction(_("Decline"), Lang.bind(this, function() {
-            dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
-                src.leave_channels_finish(result);
-            });
-            this.destroy();
-        }));
-        this.addAction(_("Accept"), Lang.bind(this, function() {
-            dispatchOp.handle_with_time_async('', global.get_current_time(), function(src, result) {
-                src.handle_with_time_finish(result);
-            });
-            this.destroy();
-        }));
-    }
-});
-
-// Subscription request
-const SubscriptionRequestNotification = new Lang.Class({
-    Name: 'SubscriptionRequestNotification',
-    Extends: MessageTray.Notification,
-
-    _init: function(source, contact) {
-        this.parent(source,
-                    /* To translators: The parameter is the contact's alias */
-                    _("%s would like permission to see when you are online").format(contact.get_alias()),
-                    null, { customContent: true });
-
-        this._contact = contact;
-        this._connection = contact.get_connection();
-
-        let layout = new St.BoxLayout({ vertical: false });
-
-        // Display avatar
-        let iconBox = new St.Bin({ style_class: 'avatar-box' });
-        iconBox._size = 48;
-
-        let textureCache = St.TextureCache.get_default();
-        let file = contact.get_avatar_file();
-
-        if (file) {
-            let uri = file.get_uri();
-            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
-        }
-        else {
-            iconBox.child = new St.Icon({ icon_name: 'avatar-default',
-                                          icon_size: iconBox._size });
-        }
-
-        layout.add(iconBox);
-
-        // subscription request message
-        let label = new St.Label({ style_class: 'subscription-message',
-                                   text: contact.get_publish_request() });
-
-        layout.add(label);
-
-        this.addActor(layout);
-
-        this.addAction(_("Decline"), Lang.bind(this, function() {
-            contact.remove_async(function(src, result) {
-                src.remove_finish(result);
-            });
-        }));
-        this.addAction(_("Accept"), Lang.bind(this, function() {
-            // Authorize the contact and request to see his status as well
-            contact.authorize_publication_async(function(src, result) {
-                src.authorize_publication_finish(result);
-            });
-
-            contact.request_subscription_async('', function(src, result) {
-                src.request_subscription_finish(result);
-            });
-        }));
-
-        this._changedId = contact.connect('subscription-states-changed',
-            Lang.bind(this, this._subscriptionStatesChangedCb));
-        this._invalidatedId = this._connection.connect('invalidated',
-            Lang.bind(this, this.destroy));
-    },
-
-    destroy: function() {
-        if (this._changedId != 0) {
-            this._contact.disconnect(this._changedId);
-            this._changedId = 0;
-        }
-
-        if (this._invalidatedId != 0) {
-            this._connection.disconnect(this._invalidatedId);
-            this._invalidatedId = 0;
-        }
-
-        this.parent();
-    },
-
-    _subscriptionStatesChangedCb: function(contact, subscribe, publish, msg) {
-        // Destroy the notification if the subscription request has been
-        // answered
-        if (publish != Tp.SubscriptionState.ASK)
-            this.destroy();
-    }
-});
-
-// Messages from empathy/libempathy/empathy-utils.c
-// create_errors_to_message_hash()
-
-/* Translator note: these should be the same messages that are
- * used in Empathy, so just copy and paste from there. */
-let _connectionErrorMessages = {};
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.NETWORK_ERROR)]
-  = _("Network error");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.AUTHENTICATION_FAILED)]
-  = _("Authentication failed");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ENCRYPTION_ERROR)]
-  = _("Encryption error");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_NOT_PROVIDED)]
-  = _("Certificate not provided");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_UNTRUSTED)]
-  = _("Certificate untrusted");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_EXPIRED)]
-  = _("Certificate expired");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_NOT_ACTIVATED)]
-  = _("Certificate not activated");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_HOSTNAME_MISMATCH)]
-  = _("Certificate hostname mismatch");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_FINGERPRINT_MISMATCH)]
-  = _("Certificate fingerprint mismatch");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_SELF_SIGNED)]
-  = _("Certificate self-signed");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CANCELLED)]
-  = _("Status is set to offline");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ENCRYPTION_NOT_AVAILABLE)]
-  = _("Encryption is not available");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INVALID)]
-  = _("Certificate is invalid");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REFUSED)]
-  = _("Connection has been refused");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_FAILED)]
-  = _("Connection can't be established");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_LOST)]
-  = _("Connection has been lost");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ALREADY_CONNECTED)]
-  = _("This account is already connected to the server");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REPLACED)]
-  = _("Connection has been replaced by a new connection using the same resource");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.REGISTRATION_EXISTS)]
-  = _("The account already exists on the server");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.SERVICE_BUSY)]
-  = _("Server is currently too busy to handle the connection");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_REVOKED)]
-  = _("Certificate has been revoked");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INSECURE)]
-  = _("Certificate uses an insecure cipher algorithm or is cryptographically weak");
-_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_LIMIT_EXCEEDED)]
-  = _("The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library");
-_connectionErrorMessages['org.freedesktop.DBus.Error.NoReply']
-  = _("Internal error");
-
-const AccountNotification = new Lang.Class({
-    Name: 'AccountNotification',
-    Extends: MessageTray.Notification,
-
-    _init: function(source, account, connectionError) {
-        this.parent(source,
-                    /* translators: argument is the account name, like
-                     * name@jabber.org for example. */
-                    _("Unable to connect to %s").format(account.get_display_name()),
-                    this._getMessage(connectionError));
-
-        this._account = account;
-
-        this.addAction(_("View account"), Lang.bind(this, function() {
-            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));
-        }));
-
-        this._enabledId = account.connect('notify::enabled',
-                                          Lang.bind(this, function() {
-                                              if (!account.is_enabled())
-                                                  this.destroy();
-                                          }));
-
-        this._invalidatedId = account.connect('invalidated',
-                                              Lang.bind(this, this.destroy));
-
-        this._connectionStatusId = account.connect('notify::connection-status',
-            Lang.bind(this, function() {
-                let status = account.connection_status;
-                if (status == Tp.ConnectionStatus.CONNECTED) {
-                    this.destroy();
-                } else if (status == Tp.ConnectionStatus.DISCONNECTED) {
-                    let connectionError = account.connection_error;
-
-                    if (connectionError == Tp.error_get_dbus_name(Tp.Error.CANCELLED))
-                        this.destroy();
-                    else
-                        this.update(this.title, this._getMessage(connectionError));
-                }
-            }));
-    },
-
-    _getMessage: function(connectionError) {
-        let message;
-        if (connectionError in _connectionErrorMessages) {
-            message = _connectionErrorMessages[connectionError];
-        } else {
-            message = _("Unknown reason");
-        }
-        return message;
-    },
-
-    destroy: function() {
-        if (this._enabledId != 0) {
-            this._account.disconnect(this._enabledId);
-            this._enabledId = 0;
-        }
-
-        if (this._invalidatedId != 0) {
-            this._account.disconnect(this._invalidatedId);
-            this._invalidatedId = 0;
-        }
-
-        if (this._connectionStatusId != 0) {
-            this._account.disconnect(this._connectionStatusId);
-            this._connectionStatusId = 0;
-        }
-
-        this.parent();
-    }
-});
 const Component = TelepathyClient;
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -156,11 +156,11 @@ const CtrlAltTabPopup = new Lang.Class({
        this._select(this._selectedIndex);
    },

-    _keyPressHandler: function(keysym, action) {
+    _keyPressHandler: function(keysym, backwards, action) {
        if (action == Meta.KeyBindingAction.SWITCH_PANELS)
-            this._select(this._next());
+            this._select(backwards ? this._previous() : this._next());
        else if (action == Meta.KeyBindingAction.SWITCH_PANELS_BACKWARD)
-            this._select(this._previous());
+            this._select(backwards ? this._next() : this._previous());
        else if (keysym == Clutter.Left)
            this._select(this._previous());
        else if (keysym == Clutter.Right)
--- 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',
@@ -211,13 +212,10 @@ const DateMenuButton = new Lang.Class({
            return this._calendarApp;

        let apps = Gio.AppInfo.get_recommended_for_type('text/calendar');
-        if (apps && (apps.length > 0)) {
-            let app = Gio.AppInfo.get_default_for_type('text/calendar', false);
-            let defaultInRecommended = apps.some(function(a) { return a.equal(app); });
-            this._calendarApp = defaultInRecommended ? app : apps[0];
-        } else {
+        if (apps && (apps.length > 0))
+            this._calendarApp = apps[0];
+        else
            this._calendarApp = null;
-        }
        return this._calendarApp;
    },

--- a/js/ui/edgeDragAction.js
+++ b/js/ui/edgeDragAction.js
@@ -1,78 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-const Signals = imports.signals;
-const Meta = imports.gi.Meta;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-
-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);
--- a/js/ui/focusCaretTracker.js
+++ b/js/ui/focusCaretTracker.js
@@ -32,9 +32,11 @@ 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;
    },
@@ -46,20 +48,12 @@ 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._initAtspi();
-
+        // Ignore the return value, we get an exception if they fail
+        // And they should never fail
        this._atspiListener.register(STATECHANGED + ':focused');
        this._atspiListener.register(STATECHANGED + ':selected');
        this._focusListenerRegistered = true;
@@ -69,8 +63,6 @@ const FocusCaretTracker = new Lang.Class({
        if (this._caretListenerRegistered)
            return;

-        this._initAtspi();
-
        this._atspiListener.register(CARETMOVED);
        this._caretListenerRegistered = true;
    },
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -56,7 +56,7 @@ const GrabHelper = new Lang.Class({
        this._grabStack = [];

        this._actors = [];
-        this._ignoreUntilRelease = false;
+        this._ignoreRelease = false;

        this._modalCount = 0;
    },
@@ -215,7 +215,7 @@ const GrabHelper = new Lang.Class({

        _popGrabHelper(this);

-        this._ignoreUntilRelease = false;
+        this._ignoreRelease = false;

        Main.popModal(this._owner);
        global.sync_pointer();
@@ -228,7 +228,7 @@ const GrabHelper = new Lang.Class({
    // like the ComboBoxMenu that go away on press, but need to eat
    // the next release event.
    ignoreRelease: function() {
-        this._ignoreUntilRelease = true;
+        this._ignoreRelease = true;
    },

    // ungrab:
@@ -283,22 +283,12 @@ const GrabHelper = new Lang.Class({
            return Clutter.EVENT_STOP;
        }

-        let motion = type == Clutter.EventType.MOTION;
        let press = type == Clutter.EventType.BUTTON_PRESS;
        let release = type == Clutter.EventType.BUTTON_RELEASE;
        let button = press || release;

-        let touchUpdate = type == Clutter.EventType.TOUCH_UPDATE;
-        let touchBegin = type == Clutter.EventType.TOUCH_BEGIN;
-        let touchEnd = type == Clutter.EventType.TOUCH_END;
-        let touch = touchUpdate || touchBegin || touchEnd;
-
-        if (touch && !global.display.is_pointer_emulating_sequence (event.get_event_sequence()))
-            return Clutter.EVENT_PROPAGATE;
-
-        if (this._ignoreUntilRelease && (motion || release || touch)) {
-            if (release || touchEnd)
-                this._ignoreUntilRelease = false;
+        if (release && this._ignoreRelease) {
+            this._ignoreRelease = false;
            return Clutter.EVENT_STOP;
        }

@@ -308,12 +298,11 @@ const GrabHelper = new Lang.Class({
        if (Main.keyboard.shouldTakeEvent(event))
            return Clutter.EVENT_PROPAGATE;

-        if (button || touchBegin) {
-            // If we have a press event, ignore the next
-            // motion/release events.
-            if (press || touchBegin)
-                this._ignoreUntilRelease = true;
-
+        if (button) {
+            // If we have a press event, ignore the next event,
+            // which should be a release event.
+            if (press)
+                this._ignoreRelease = true;
            let i = this._actorInGrabStack(event.get_source()) + 1;
            this.ungrab({ actor: this._grabStack[i].actor, isUser: true });
            return Clutter.EVENT_STOP;
--- 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];
        }

--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -10,29 +10,12 @@ const St = imports.gi.St;
 const Lang = imports.lang;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
-const Main = imports.ui.main;

 const ICON_SIZE = 96;
 const MIN_ICON_SIZE = 16;

 const EXTRA_SPACE_ANIMATION_TIME = 0.25;

-const ANIMATION_TIME_IN = 0.350;
-const ANIMATION_TIME_OUT = 1/2 * ANIMATION_TIME_IN;
-const ANIMATION_MAX_DELAY_FOR_ITEM = 2/3 * ANIMATION_TIME_IN;
-const ANIMATION_MAX_DELAY_OUT_FOR_ITEM = 2/3 * ANIMATION_TIME_OUT;
-const ANIMATION_FADE_IN_TIME_FOR_ITEM = 1/4 * ANIMATION_TIME_IN;
-
-const ANIMATION_BOUNCE_ICON_SCALE = 1.1;
-
-const AnimationDirection = {
-    IN: 0,
-    OUT: 1
-};
-
-const APPICON_ANIMATION_OUT_SCALE = 3;
-const APPICON_ANIMATION_OUT_TIME = 0.25;
-
 const BaseIcon = new Lang.Class({
    Name: 'BaseIcon',

@@ -190,55 +173,9 @@ const BaseIcon = new Lang.Class({

    _onIconThemeChanged: function() {
        this._createIconTexture(this.iconSize);
-    },
-
-    animateZoomOut: function() {
-        // Animate only the child instead of the entire actor, so the
-        // styles like hover and running are not applied while
-        // animating.
-        zoomOutActor(this.actor.child);
    }
 });

-function clamp(value, min, max) {
-    return Math.max(Math.min(value, max), min);
-};
-
-function zoomOutActor(actor) {
-    let actorClone = new Clutter.Clone({ source: actor,
-                                         reactive: false });
-    let [width, height] = actor.get_transformed_size();
-    let [x, y] = actor.get_transformed_position();
-    actorClone.set_size(width, height);
-    actorClone.set_position(x, y);
-    actorClone.opacity = 255;
-    actorClone.set_pivot_point(0.5, 0.5);
-
-    Main.uiGroup.add_actor(actorClone);
-
-    // Avoid monitor edges to not zoom outside the current monitor
-    let monitor = Main.layoutManager.findMonitorForActor(actor);
-    let scaledWidth = width * APPICON_ANIMATION_OUT_SCALE;
-    let scaledHeight = height * APPICON_ANIMATION_OUT_SCALE;
-    let scaledX = x - (scaledWidth - width) / 2;
-    let scaledY = y - (scaledHeight - height) / 2;
-    let containedX = clamp(scaledX, monitor.x, monitor.x + monitor.width - scaledWidth);
-    let containedY = clamp(scaledY, monitor.y, monitor.y + monitor.height - scaledHeight);
-
-    Tweener.addTween(actorClone,
-                     { time: APPICON_ANIMATION_OUT_TIME,
-                       scale_x: APPICON_ANIMATION_OUT_SCALE,
-                       scale_y: APPICON_ANIMATION_OUT_SCALE,
-                       translation_x: containedX - scaledX,
-                       translation_y: containedY - scaledY,
-                       opacity: 0,
-                       transition: 'easeOutQuad',
-                       onComplete: function() {
-                           actorClone.destroy();
-                       }
-                    });
-}
-
 const IconGrid = new Lang.Class({
    Name: 'IconGrid',

@@ -401,207 +338,15 @@ const IconGrid = new Lang.Class({
        }
    },

-    /**
-     * Intended to be override by subclasses if they need a different
-     * set of items to be animated.
-     */
-    _getChildrenToAnimate: function() {
-        return this._getVisibleChildren();
-    },
-
-    _animationDone: function() {
-        this._animating = false;
-        this.emit('animation-done');
-    },
-
-    animatePulse: function(animationDirection) {
-        if (animationDirection != AnimationDirection.IN)
-            throw new Error("Pulse animation only implements 'in' animation direction");
-
-        if (this._animating)
-            return;
-
-        this._animating = true;
-
-        let actors = this._getChildrenToAnimate();
-        if (actors.length == 0) {
-            this._animationDone();
-            return;
-        }
-
-        for (let index = 0; index < actors.length; index++) {
-            let actor = actors[index];
-            actor.opacity = 0;
-            actor.reactive = false;
-
-            let delay = index / actors.length * ANIMATION_MAX_DELAY_FOR_ITEM;
-            let [originalX, originalY] = actor.get_transformed_position();
-            let [originalWidth, originalHeight,,] = this._getAllocatedChildSizeAndSpacing(actor);
-
-            let actorClone = new Clutter.Clone({ source: actor });
-            Main.uiGroup.add_actor(actorClone);
-
-            actorClone.set_position(originalX, originalY);
-            actorClone.set_scale(0, 0);
-            actorClone.set_pivot_point(0.5, 0.5);
-            actorClone.set_size(originalWidth, originalHeight);
-
-            let bounceUpTime = ANIMATION_TIME_IN / 4;
-            // Defeat onComplete anonymous function closure
-            let isLastItem = index == actors.length - 1;
-            Tweener.addTween(actorClone,
-                            { time: bounceUpTime,
-                              transition: 'easeInOutQuad',
-                              delay: delay,
-                              scale_x: ANIMATION_BOUNCE_ICON_SCALE,
-                              scale_y: ANIMATION_BOUNCE_ICON_SCALE,
-                              onComplete: Lang.bind(this, function() {
-                                  Tweener.addTween(actorClone,
-                                                   { time: ANIMATION_TIME_IN - bounceUpTime,
-                                                     transition: 'easeInOutQuad',
-                                                     scale_x: 1,
-                                                     scale_y: 1,
-                                                     onComplete: Lang.bind(this, function() {
-                                                        if (isLastItem)
-                                                            this._animationDone();
-
-                                                        actor.opacity = 255;
-                                                        actor.reactive = true;
-                                                        actorClone.destroy();
-                                                    })
-                                                   });
-                              })
-                            });
-        }
-    },
-
-    animateSpring: function(animationDirection, sourceActor) {
-        if (this._animating)
-            return;
-
-        this._animating = true;
-
-        let actors = this._getChildrenToAnimate();
-        if (actors.length == 0) {
-            this._animationDone();
-            return;
-        }
-
-        let [sourceX, sourceY] = sourceActor.get_transformed_position();
-        let [sourceWidth, sourceHeight] = sourceActor.get_size();
-        // Get the center
-        let [sourceCenterX, sourceCenterY] = [sourceX + sourceWidth / 2, sourceY + sourceHeight / 2];
-        // Design decision, 1/2 of the source actor size.
-        let [sourceScaledWidth, sourceScaledHeight] = [sourceWidth / 2, sourceHeight / 2];
-
-        actors.forEach(function(actor) {
-            let [actorX, actorY] = actor._transformedPosition = actor.get_transformed_position();
-            let [x, y] = [actorX - sourceX, actorY - sourceY];
-            actor._distance = Math.sqrt(x * x + y * y);
-        });
-        let maxDist = actors.reduce(function(prev, cur) {
-            return Math.max(prev, cur._distance);
-        }, 0);
-        let minDist = actors.reduce(function(prev, cur) {
-            return Math.min(prev, cur._distance);
-        }, Infinity);
-        let normalization = maxDist - minDist;
-
-        for (let index = 0; index < actors.length; index++) {
-            let actor = actors[index];
-            actor.opacity = 0;
-            actor.reactive = false;
-
-            let actorClone = new Clutter.Clone({ source: actor });
-            Main.uiGroup.add_actor(actorClone);
-
-            let [width, height,,] = this._getAllocatedChildSizeAndSpacing(actor);
-            actorClone.set_size(width, height);
-            let scaleX = sourceScaledWidth / width;
-            let scaleY = sourceScaledHeight / height;
-            let [adjustedSourcePositionX, adjustedSourcePositionY] = [sourceCenterX - sourceScaledWidth / 2, sourceCenterY - sourceScaledHeight / 2];
-
-            // Defeat onComplete anonymous function closure
-            let isLastItem = index == actors.length - 1;
-
-            let movementParams, fadeParams;
-            if (animationDirection == AnimationDirection.IN) {
-                actorClone.opacity = 0;
-                actorClone.set_scale(scaleX, scaleY);
-
-                actorClone.set_position(adjustedSourcePositionX, adjustedSourcePositionY);
-
-                let delay = (1 - (actor._distance - minDist) / normalization) * ANIMATION_MAX_DELAY_FOR_ITEM;
-                let [finalX, finalY]  = actor._transformedPosition;
-                movementParams = { time: ANIMATION_TIME_IN,
-                                   transition: 'easeInOutQuad',
-                                   delay: delay,
-                                   x: finalX,
-                                   y: finalY,
-                                   scale_x: 1,
-                                   scale_y: 1,
-                                   onComplete: Lang.bind(this, function() {
-                                       if (isLastItem)
-                                           this._animationDone();
-
-                                       actor.opacity = 255;
-                                       actor.reactive = true;
-                                       actorClone.destroy();
-                                   })};
-                fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
-                               transition: 'easeInOutQuad',
-                               delay: delay,
-                               opacity: 255 };
-            } else {
-                let [startX, startY]  = actor._transformedPosition;
-                actorClone.set_position(startX, startY);
-
-                let delay = (actor._distance - minDist) / normalization * ANIMATION_MAX_DELAY_OUT_FOR_ITEM;
-                movementParams = { time: ANIMATION_TIME_OUT,
-                                   transition: 'easeInOutQuad',
-                                   delay: delay,
-                                   x: adjustedSourcePositionX,
-                                   y: adjustedSourcePositionY,
-                                   scale_x: scaleX,
-                                   scale_y: scaleY,
-                                   onComplete: Lang.bind(this, function() {
-                                       if (isLastItem) {
-                                           this._animationDone();
-                                           this._restoreItemsOpacity();
-                                       }
-                                       actorClone.destroy();
-                                   })};
-                fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
-                               transition: 'easeInOutQuad',
-                               delay: ANIMATION_TIME_OUT + delay - ANIMATION_FADE_IN_TIME_FOR_ITEM,
-                               opacity: 0 };
-            }
-
-
-            Tweener.addTween(actorClone, movementParams);
-            Tweener.addTween(actorClone, fadeParams);
-        }
-    },
-
-    _restoreItemsOpacity: function() {
-        for (let index = 0; index < this._items.length; index++) {
-            this._items[index].actor.opacity = 255;
-        }
-    },
-
-    _getAllocatedChildSizeAndSpacing: function(child) {
-        let [,, natWidth, natHeight] = child.get_preferred_size();
-        let width = Math.min(this._getHItemSize(), natWidth);
-        let xSpacing = Math.max(0, width - natWidth) / 2;
-        let height = Math.min(this._getVItemSize(), natHeight);
-        let ySpacing = Math.max(0, height - natHeight) / 2;
-        return [width, height, xSpacing, ySpacing];
-    },
-
    _calculateChildBox: function(child, x, y, box) {
+        let [childMinWidth, childMinHeight, childNaturalWidth, childNaturalHeight] =
+             child.get_preferred_size();
+
        /* Center the item in its allocation horizontally */
-        let [width, height, childXSpacing, childYSpacing] =
-            this._getAllocatedChildSizeAndSpacing(child);
+        let width = Math.min(this._getHItemSize(), childNaturalWidth);
+        let childXSpacing = Math.max(0, width - childNaturalWidth) / 2;
+        let height = Math.min(this._getVItemSize(), childNaturalHeight);
+        let childYSpacing = Math.max(0, height - childNaturalHeight) / 2;

        let childBox = new Clutter.ActorBox();
        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
@@ -777,17 +522,21 @@ 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);
        }
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                       Lang.bind(this, this._updateIconSizes));
+        let scale = Math.min(this._fixedHItemSize, this._fixedVItemSize) / Math.max(this._hItemSize, this._vItemSize);
+        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() { this._updateChildrenScale(scale); }));
    },

    // Note that this is ICON_SIZE as used by BaseIcon, not elsewhere in IconGrid; it's a bit messed up
-    _updateIconSizes: function() {
-        let scale = Math.min(this._fixedHItemSize, this._fixedVItemSize) / Math.max(this._hItemSize, this._vItemSize);
-        let newIconSize = Math.floor(ICON_SIZE * scale);
+    _updateChildrenScale: function(scale) {
        for (let i in this._items) {
+            let newIconSize = Math.floor(ICON_SIZE * scale);
            this._items[i].icon.setIconSize(newIconSize);
        }
    }
@@ -801,7 +550,6 @@ const PaginatedIconGrid = new Lang.Class({
    _init: function(params) {
        this.parent(params);
        this._nPages = 0;
-        this.currentPage = 0;
        this._rowsPerPage = 0;
        this._spaceBetweenPages = 0;
        this._childrenPerPage = 0;
@@ -865,15 +613,6 @@ const PaginatedIconGrid = new Lang.Class({
        }
    },

-    // Overriden from IconGrid
-    _getChildrenToAnimate: function() {
-        let children = this._getVisibleChildren();
-        let firstIndex = this._childrenPerPage * this.currentPage;
-        let lastIndex = firstIndex + this._childrenPerPage;
-
-        return children.slice(firstIndex, lastIndex);
-    },
-
    _computePages: function (availWidthPerPage, availHeightPerPage) {
        let [nColumns, usedWidth] = this._computeLayout(availWidthPerPage);
        let nRows;
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -23,12 +23,6 @@ const KEYBOARD_TYPE = 'keyboard-type';
 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';

-const CURSOR_BUS_NAME = 'org.gnome.SettingsDaemon.Cursor';
-const CURSOR_OBJECT_PATH = '/org/gnome/SettingsDaemon/Cursor';
-
-const CARIBOU_BUS_NAME = 'org.gnome.Caribou.Daemon';
-const CARIBOU_OBJECT_PATH = '/org/gnome/Caribou/Daemon';
-
 const CaribouKeyboardIface = '<node> \
 <interface name="org.gnome.Caribou.Keyboard"> \
 <method name="Show"> \
@@ -53,28 +47,13 @@ const CaribouKeyboardIface = '<node> \
 </interface> \
 </node>';

-const CaribouDaemonIface = '<node> \
-<interface name="org.gnome.Caribou.Daemon"> \
-<method name="Run" /> \
-<method name="Quit" /> \
-</interface> \
-</node>';
-
-const CursorManagerIface = '<node> \
-<interface name="org.gnome.SettingsDaemon.Cursor"> \
-<property name="ShowOSK" type="b" access="read" /> \
-</interface> \
-</node>';
-
-const CaribouDaemonProxy = Gio.DBusProxy.makeProxyWrapper(CaribouDaemonIface);
-const CursorManagerProxy = Gio.DBusProxy.makeProxyWrapper(CursorManagerIface);
-
 const Key = new Lang.Class({
    Name: 'Key',

    _init : function(key) {
        this._key = key;
-        this.actor = this._makeKey(key, GLib.markup_escape_text(key.label, -1));
+
+        this.actor = this._makeKey();

        this._extended_keys = this._key.get_extended_keys();
        this._extended_keyboard = null;
@@ -97,19 +76,20 @@ const Key = new Lang.Class({
        }
    },

-    _makeKey: function (key, label) {
+    _makeKey: function () {
+        let label = GLib.markup_escape_text(this._key.label, -1);
        let button = new St.Button ({ label: label,
                                      style_class: 'keyboard-key' });

        button.key_width = this._key.width;
        button.connect('button-press-event', Lang.bind(this,
            function () {
-                key.press();
+                this._key.press();
                return Clutter.EVENT_PROPAGATE;
            }));
        button.connect('button-release-event', Lang.bind(this,
            function () {
-                key.release();
+                this._key.release();
                return Clutter.EVENT_PROPAGATE;
            }));

@@ -132,9 +112,18 @@ const Key = new Lang.Class({
        for (let i = 0; i < this._extended_keys.length; ++i) {
            let extended_key = this._extended_keys[i];
            let label = this._getUnichar(extended_key);
-            let key = this._makeKey(extended_key, label);
-
+            let key = new St.Button({ label: label, style_class: 'keyboard-key' });
            key.extended_key = extended_key;
+            key.connect('button-press-event', Lang.bind(this,
+                function () {
+                    extended_key.press();
+                    return Clutter.EVENT_PROPAGATE;
+                }));
+            key.connect('button-release-event', Lang.bind(this,
+                function () {
+                    extended_key.release();
+                    return Clutter.EVENT_PROPAGATE;
+                }));
            this._extended_keyboard.add(key);
        }
        this._boxPointer.bin.add_actor(this._extended_keyboard);
@@ -172,33 +161,11 @@ const Keyboard = new Lang.Class({

        this._timestamp = global.display.get_current_time_roundtrip();

-        this._keyboardSettings = new Gio.Settings({ schema_id: KEYBOARD_SCHEMA });
-        this._keyboardSettings.connect('changed', Lang.bind(this, this._sync));
-        this._a11yApplicationsSettings = new Gio.Settings({ schema_id: A11Y_APPLICATIONS_SCHEMA });
-        this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._sync));
-        this._watchNameId = Gio.bus_watch_name(Gio.BusType.SESSION, CURSOR_BUS_NAME, 0,
-                                               Lang.bind(this, this._sync),
-                                               Lang.bind(this, this._sync));
-        this._daemonProxy = new CaribouDaemonProxy(Gio.DBus.session, CARIBOU_BUS_NAME,
-                                                   CARIBOU_OBJECT_PATH,
-                                                   Lang.bind(this, function(proxy, error) {
-                                                       if (error) {
-                                                           log(error.message);
-                                                           return;
-                                                       }
-                                                   }));
-        this._cursorProxy = new CursorManagerProxy(Gio.DBus.session, CURSOR_BUS_NAME,
-                                                   CURSOR_OBJECT_PATH,
-                                                   Lang.bind(this, function(proxy, error) {
-                                                       if (error) {
-                                                           log(error.message);
-                                                           return;
-                                                       }
-                                                       this._cursorProxy.connect('g-properties-changed',
-                                                                                 Lang.bind(this, this._sync));
-                                                       this._sync();
-                                                   }));
-        this._sync();
+        this._keyboardSettings = new Gio.Settings({ schema: KEYBOARD_SCHEMA });
+        this._keyboardSettings.connect('changed', Lang.bind(this, this._settingsChanged));
+        this._a11yApplicationsSettings = new Gio.Settings({ schema: A11Y_APPLICATIONS_SCHEMA });
+        this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._settingsChanged));
+        this._settingsChanged();

        this._showIdleId = 0;
        this._subkeysBoxPointer = null;
@@ -216,9 +183,8 @@ const Keyboard = new Lang.Class({
        this._redraw();
    },

-    _sync: function () {
-        this._enableKeyboard = this._a11yApplicationsSettings.get_boolean(SHOW_KEYBOARD) ||
-                               this._cursorProxy.ShowOSK;
+    _settingsChanged: function (settings, key) {
+        this._enableKeyboard = this._a11yApplicationsSettings.get_boolean(SHOW_KEYBOARD);
        if (!this._enableKeyboard && !this._keyboard)
            return;
        if (this._enableKeyboard && this._keyboard &&
@@ -248,22 +214,9 @@ const Keyboard = new Lang.Class({
        this.actor = null;

        this._destroySource();
-        this._daemonProxy.QuitRemote(function (result, error) {
-            if (error) {
-                log(error.message);
-                return;
-            }
-        });
    },

    _setupKeyboard: function() {
-        this._daemonProxy.RunRemote(function (result, error) {
-            if (error) {
-                log(error.message);
-                return;
-            }
-        });
-
        this.actor = new St.BoxLayout({ name: 'keyboard', vertical: true, reactive: true });
        Main.layoutManager.keyboardBox.add_actor(this.actor);
        Main.layoutManager.trackChrome(this.actor);
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -163,7 +163,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' });
@@ -224,7 +224,7 @@ const LayoutManager = new Lang.Class({

        // 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.dummyCursor = new St.Widget({ width: 0, height: 0 });
        this.uiGroup.add_actor(this.dummyCursor);

        global.stage.remove_actor(global.top_window_group);
@@ -408,12 +408,6 @@ const LayoutManager = new Lang.Class({
        }
    },

-    _updateKeyboardBox: function() {
-        this.keyboardBox.set_position(this.keyboardMonitor.x,
-                                      this.keyboardMonitor.y + this.keyboardMonitor.height);
-        this.keyboardBox.set_size(this.keyboardMonitor.width, -1);
-    },
-
    _updateBoxes: function() {
        this.screenShieldGroup.set_position(0, 0);
        this.screenShieldGroup.set_size(global.screen_width, global.screen_height);
@@ -423,8 +417,6 @@ const LayoutManager = new Lang.Class({

        if (this.keyboardIndex < 0)
            this.keyboardIndex = this.primaryIndex;
-        else
-            this._updateKeyboardBox();

        this.trayBox.set_position(this.bottomMonitor.x,
                                  this.bottomMonitor.y + this.bottomMonitor.height);
@@ -549,7 +541,9 @@ const LayoutManager = new Lang.Class({

    set keyboardIndex(v) {
        this._keyboardIndex = v;
-        this._updateKeyboardBox();
+        this.keyboardBox.set_position(this.keyboardMonitor.x,
+                                      this.keyboardMonitor.y + this.keyboardMonitor.height);
+        this.keyboardBox.set_size(this.keyboardMonitor.width, -1);
    },

    get keyboardIndex() {
@@ -603,9 +597,7 @@ const LayoutManager = new Lang.Class({
                                              reactive: true });
        this.addChrome(this._coverPane);

-        if (Meta.is_restart()) {
-            // On restart, we don't do an animation
-        } else if (Main.sessionMode.isGreeter) {
+        if (Main.sessionMode.isGreeter) {
            this.panelBox.translation_y = -this.panelBox.height;
        } else {
            this._updateBackgrounds();
@@ -644,9 +636,7 @@ const LayoutManager = new Lang.Class({
    },

    _startupAnimation: function() {
-        if (Meta.is_restart())
-            this._startupAnimationComplete();
-        else if (Main.sessionMode.isGreeter)
+        if (Main.sessionMode.isGreeter)
            this._startupAnimationGreeter();
        else
            this._startupAnimationSession();
@@ -1027,6 +1017,43 @@ 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. However skip this step
+                // in cases where this would render an entire monitor unusable.
+                switch (side) {
+                case Meta.Side.TOP:
+                    let hasMonitorsAbove = this.monitors.some(Lang.bind(this,
+                        function(mon) {
+                            return this._isAboveOrBelowPrimary(mon) &&
+                                   mon.y < primary.y;
+                        }));
+                    if (!hasMonitorsAbove)
+                        y1 = 0;
+                    break;
+                case Meta.Side.BOTTOM:
+                    if (this.primaryIndex == this.bottomIndex)
+                        y2 = global.screen_height;
+                    break;
+                case Meta.Side.LEFT:
+                    let hasMonitorsLeft = this.monitors.some(Lang.bind(this,
+                        function(mon) {
+                            return !this._isAboveOrBelowPrimary(mon) &&
+                                   mon.x < primary.x;
+                        }));
+                    if (!hasMonitorsLeft)
+                        x1 = 0;
+                    break;
+                case Meta.Side.RIGHT:
+                    let hasMonitorsRight = this.monitors.some(Lang.bind(this,
+                        function(mon) {
+                            return !this._isAboveOrBelowPrimary(mon) &&
+                                   mon.x > primary.x;
+                        }));
+                    if (!hasMonitorsRight)
+                        x2 = global.screen_width;
+                    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
@@ -105,8 +105,8 @@ const Lightbox = new Lang.Class({
        this._container = container;
        this._children = container.get_children();
        this._fadeFactor = params.fadeFactor;
-        this._radialEffect = Clutter.feature_available(Clutter.FeatureFlags.SHADERS_GLSL) && params.radialEffect;
-        if (this._radialEffect)
+        this._radialEffect = params.radialEffect;
+        if (params.radialEffect)
            this.actor = new RadialShaderQuad({ x: 0,
                                                y: 0,
                                                reactive: params.inhibitEvents });
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -797,7 +797,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();
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -441,8 +441,8 @@ const Magnifier = new Lang.Class({
    },

    _settingsInit: function(zoomRegion) {
-        this._appSettings = new Gio.Settings({ schema_id: APPLICATIONS_SCHEMA });
-        this._settings = new Gio.Settings({ schema_id: MAGNIFIER_SCHEMA });
+        this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
+        this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });

        if (zoomRegion) {
            // Mag factor is accurate to two decimal places.
--- 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;
@@ -75,6 +74,7 @@ let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
 let _a11ySettings = null;
+let dynamicWorkspacesSchema = null;

 function _sessionUpdated() {
    _loadDefaultStylesheet();
@@ -111,6 +111,7 @@ function start() {

    sessionMode = new SessionMode.SessionMode();
    sessionMode.connect('updated', _sessionUpdated);
+    _initializePrefs();
    _initializeUI();

    shellDBusService = new ShellDBus.GnomeShell();
@@ -119,6 +120,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
@@ -161,23 +173,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();
@@ -244,7 +246,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 +258,8 @@ function getThemeStylesheet() {
 *
 * Set the theme CSS file that the shell will load
 */
-function setThemeStylesheet(cssStylesheet) {
+function setThemeStylesheet(cssStylesheet)
+{
    _cssStylesheet = cssStylesheet;
 }

@@ -617,28 +621,3 @@ function queueDeferredWork(workId) {
        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
@@ -15,7 +15,6 @@ const Signals = imports.signals;
 const St = imports.gi.St;
 const Tp = imports.gi.TelepathyGLib;

-const EdgeDragAction = imports.ui.edgeDragAction;
 const BoxPointer = imports.ui.boxpointer;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const GnomeSession = imports.misc.gnomeSession;
@@ -234,6 +233,10 @@ const URLHighlighter = new Lang.Class({
        }));
    },

+    hasText: function() {
+        return !!this._text;
+    },
+
    setMarkup: function(text, allowMarkup) {
        text = text ? _fixMarkup(text, allowMarkup) : '';
        this._text = text;
@@ -316,7 +319,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));
    },

@@ -366,8 +369,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._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.notifications.application',
+        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
+        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));
@@ -440,24 +443,11 @@ const NotificationApplicationPolicy = new Lang.Class({
 // elements that were added to it or if the @banner text did not
 // fit fully in the banner mode. When the notification is expanded,
 // the @banner text from the top line is always removed. The complete
-// @banner text is added as the first element in the content section,
-// unless 'customContent' parameter with the value 'true' is specified
-// in @params.
+// @banner text is added to the notification by default. You can change
+// what is displayed by setting the child of this._bodyBin.
 //
-// Additional notification content can be added with addActor() and
-// addBody() methods. The notification content is put inside a
-// scrollview, so if it gets too tall, the notification will scroll
-// rather than continue to grow. In addition to this main content
-// area, there is also a single-row action area, which is not
-// scrolled and can contain a single actor. The action area can
-// be set by calling setActionArea() method. There is also a
-// convenience method addButton() for adding a button to the action
-// area.
-//
-// If @params contains a 'customContent' parameter with the value %true,
-// then @banner will not be shown in the body of the notification when the
-// notification is expanded and calls to update() will not clear the content
-// unless 'clear' parameter with value %true is explicitly specified.
+// You can also add buttons to the notification with addButton(),
+// and you can construct simple default buttons with addAction().
 //
 // By default, the icon shown is the same as the source's.
 // However, if @params contains a 'gicon' parameter, the passed in gicon
@@ -473,8 +463,6 @@ const NotificationApplicationPolicy = new Lang.Class({
 //
 // If @params contains a 'clear' parameter with the value %true, then
 // the content and the action area of the notification will be cleared.
-// The content area is also always cleared if 'customContent' is false
-// because it might contain the @banner that didn't fit in the banner mode.
 //
 // If @params contains 'soundName' or 'soundFile', the corresponding
 // event sound is played when the notification is shown (if the policy for
@@ -482,15 +470,12 @@ const NotificationApplicationPolicy = new Lang.Class({
 const Notification = new Lang.Class({
    Name: 'Notification',

-    ICON_SIZE: 24,
-
-    IMAGE_SIZE: 125,
+    ICON_SIZE: 32,

    _init: function(source, title, banner, params) {
        this.source = source;
        this.title = title;
        this.urgency = Urgency.NORMAL;
-        this.resident = false;
        // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
        this.isTransient = false;
        this.isMusic = false;
@@ -499,58 +484,89 @@ const Notification = new Lang.Class({
        this.focused = false;
        this.acknowledged = false;
        this._destroyed = false;
-        this._customContent = false;
-        this.bannerBodyText = null;
-        this.bannerBodyMarkup = false;
-        this._bannerBodyAdded = false;
-        this._titleFitsInBannerMode = true;
-        this._spacing = 0;
-        this._scrollPolicy = Gtk.PolicyType.AUTOMATIC;
-        this._imageBin = null;
        this._soundName = null;
        this._soundFile = null;
        this._soundPlayed = false;

-        this.actor = new St.Button({ accessible_role: Atk.Role.NOTIFICATION });
-        this.actor.add_style_class_name('notification-unexpanded');
+        // Let me draw you a picture. I am a bad artist:
+        //
+        //      ,. this._iconBin         ,. this._titleLabel
+        //      |        ,-- this._second|ryIconBin
+        // .----|--------|---------------|-----------.
+        // | .----. | .----.-------------------. | X |
+        // | |    | | |    |                   |-|----- this._titleBox
+        // | '....' | '....'...................' |   |
+        // |        |                            |   |- this._hbox
+        // |        |        this._bodyBin       |   |-.
+        // |________|____________________________|___| |- this.actor
+        // | this._actionArea                        |-'
+        // |_________________________________________|
+        // | this._buttonBox                         |
+        // |_________________________________________|
+
+        this.actor = new St.BoxLayout({ vertical: true,
+                                        style_class: 'notification',
+                                        accessible_role: Atk.Role.NOTIFICATION });
        this.actor._delegate = this;
-        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

-        this._table = new St.Table({ style_class: 'notification',
-                                     reactive: true });
-        this._table.connect('style-changed', Lang.bind(this, this._styleChanged));
-        this.actor.set_child(this._table);
+        this._mainButton = new St.Button({ style_class: 'notification-main-button',
+                                           can_focus: true,
+                                           x_fill: true, y_fill: true });
+        this._mainButton.connect('clicked', Lang.bind(this, this._onClicked));
+        this.actor.add_child(this._mainButton);

-        // The first line should have the title, followed by the
-        // banner text, but ellipsized if they won't both fit. We can't
-        // make St.Table or St.BoxLayout do this the way we want (don't
-        // show banner at all if title needs to be ellipsized), so we
-        // use Shell.GenericContainer.
-        this._bannerBox = new Shell.GenericContainer();
-        this._bannerBox.connect('get-preferred-width', Lang.bind(this, this._bannerBoxGetPreferredWidth));
-        this._bannerBox.connect('get-preferred-height', Lang.bind(this, this._bannerBoxGetPreferredHeight));
-        this._bannerBox.connect('allocate', Lang.bind(this, this._bannerBoxAllocate));
-        this._table.add(this._bannerBox, { row: 0,
-                                           col: 1,
-                                           col_span: 2,
-                                           x_expand: false,
-                                           y_expand: false,
-                                           y_fill: false });
+        // Separates the icon, title/body and close button
+        this._hbox = new St.BoxLayout({ style_class: 'notification-main-content' });
+        this._mainButton.child = this._hbox;

-        // This is an empty cell that overlaps with this._bannerBox cell to ensure
-        // that this._bannerBox cell expands horizontally, while not forcing the
-        // this._imageBin that is also in col: 2 to expand horizontally.
-        this._table.add(new St.Bin(), { row: 0,
-                                        col: 2,
-                                        y_expand: false,
-                                        y_fill: false });
+        this._iconBin = new St.Bin({ y_align: St.Align.START });
+        this._hbox.add_child(this._iconBin);

-        this._titleLabel = new St.Label();
-        this._bannerBox.add_actor(this._titleLabel);
-        this._bannerUrlHighlighter = new URLHighlighter();
-        this._bannerLabel = this._bannerUrlHighlighter.actor;
-        this._bannerBox.add_actor(this._bannerLabel);
+        this._titleBodyBox = new St.BoxLayout({ style_class: 'notification-title-body-box',
+                                                vertical: true });
+        this._titleBodyBox.set_x_expand(true);
+        this._hbox.add_child(this._titleBodyBox);
+
+        this._closeButton = new St.Button({ style_class: 'notification-close-button',
+                                            can_focus: true });
+        this._closeButton.set_y_align(Clutter.ActorAlign.START);
+        this._closeButton.set_y_expand(true);
+        this._closeButton.child = new St.Icon({ icon_name: 'window-close-symbolic', icon_size: 16 });
+        this._closeButton.connect('clicked', Lang.bind(this, this._onCloseClicked));
+        this._hbox.add_child(this._closeButton);
+
+        this._titleBox = new St.BoxLayout({ style_class: 'notification-title-box',
+                                            x_expand: true, x_align: Clutter.ActorAlign.START });
+        this._secondaryIconBin = new St.Bin();
+        this._titleBox.add_child(this._secondaryIconBin);
+        this._titleLabel = new St.Label({ x_expand: true });
+        this._titleBox.add_child(this._titleLabel);
+        this._titleBodyBox.add(this._titleBox);
+
+        this._bodyScrollArea = new St.ScrollView({ style_class: 'notification-scrollview',
+                                                   hscrollbar_policy: Gtk.PolicyType.NEVER });
+        this._titleBodyBox.add(this._bodyScrollArea);
+
+        this._bodyScrollable = new St.BoxLayout();
+        this._bodyScrollArea.add_actor(this._bodyScrollable);
+
+        this._bodyBin = new St.Bin();
+        this._bodyScrollable.add_actor(this._bodyBin);
+
+        // By default, this._bodyBin contains a URL highlighter. Subclasses
+        // can override this to provide custom content if they want to.
+        this._bodyUrlHighlighter = new URLHighlighter();
+        this._bodyBin.child = this._bodyUrlHighlighter.actor;
+
+        this._actionAreaBin = new St.Bin({ style_class: 'notification-action-area',
+                                           x_expand: true, y_expand: true });
+        this.actor.add_child(this._actionAreaBin);
+
+        this._buttonBox = new St.BoxLayout({ style_class: 'notification-button-box',
+                                             x_expand: true, y_expand: true });
+        global.focus_manager.add_group(this._buttonBox);
+        this.actor.add_child(this._buttonBox);

        // If called with only one argument we assume the caller
        // will call .update() later on. This is the case of
@@ -558,6 +574,31 @@ const Notification = new Lang.Class({
        // for new and updated notifications
        if (arguments.length != 1)
            this.update(title, banner, params);
+
+        this._sync();
+    },
+
+    _sync: function() {
+        this._actionAreaBin.visible = this.expanded && (this._actionArea != null);
+        this._buttonBox.visible = this.expanded && (this._buttonBox.get_n_children() > 0);
+
+        this._iconBin.visible = (this._icon != null && this._icon.visible);
+        this._secondaryIconBin.visible = (this._secondaryIcon != null);
+
+        if (this.expanded) {
+            this._titleLabel.clutter_text.line_wrap = true;
+            this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+            this._bodyUrlHighlighter.actor.clutter_text.line_wrap = true;
+            this._bodyUrlHighlighter.actor.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        } else {
+            this._titleLabel.clutter_text.line_wrap = false;
+            this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.END;
+            this._bodyUrlHighlighter.actor.clutter_text.line_wrap = false;
+            this._bodyUrlHighlighter.actor.clutter_text.ellipsize = Pango.EllipsizeMode.END;
+        }
+        this.enableScrolling(this.expanded);
+
+        this._bodyUrlHighlighter.actor.visible = this._bodyUrlHighlighter.hasText();
    },

    // update:
@@ -569,52 +610,31 @@ const Notification = new Lang.Class({
    // the title/banner. If @params.clear is %true, it will also
    // remove any additional actors/action buttons previously added.
    update: function(title, banner, params) {
-        params = Params.parse(params, { customContent: false,
-                                        gicon: null,
+        params = Params.parse(params, { gicon: null,
                                        secondaryGIcon: null,
                                        bannerMarkup: false,
                                        clear: false,
                                        soundName: null,
                                        soundFile: null });

-        this._customContent = params.customContent;
-
        let oldFocus = global.stage.key_focus;

-        if (this._icon && (params.gicon || params.clear)) {
-            this._icon.destroy();
-            this._icon = null;
-        }
-
-        if (this._secondaryIcon && (params.secondaryGIcon || params.clear)) {
-            this._secondaryIcon.destroy();
-            this._secondaryIcon = null;
-        }
-
-        // We always clear the content area if we don't have custom
-        // content because it might contain the @banner that didn't
-        // fit in the banner mode.
-        if (this._scrollArea && (!this._customContent || params.clear)) {
-            if (oldFocus && this._scrollArea.contains(oldFocus))
-                this.actor.grab_key_focus();
-
-            this._scrollArea.destroy();
-            this._scrollArea = null;
-            this._contentArea = null;
-        }
        if (this._actionArea && params.clear) {
            if (oldFocus && this._actionArea.contains(oldFocus))
                this.actor.grab_key_focus();

            this._actionArea.destroy();
            this._actionArea = null;
-            this._buttonBox = null;
        }
-        if (params.clear)
-            this.unsetImage();

-        if (!this._scrollArea && !this._actionArea && !this._imageBin)
-            this._table.remove_style_class_name('multi-line-notification');
+        if (params.clear) {
+            this._buttonBox.destroy_all_children();
+        }
+
+        if (this._icon && (params.gicon || params.clear)) {
+            this._icon.destroy();
+            this._icon = null;
+        }

        if (params.gicon) {
            this._icon = new St.Icon({ gicon: params.gicon,
@@ -623,19 +643,18 @@ const Notification = new Lang.Class({
            this._icon = this.source.createIcon(this.ICON_SIZE);
        }

-        if (this._icon) {
-            this._table.add(this._icon, { row: 0,
-                                          col: 0,
-                                          x_expand: false,
-                                          y_expand: false,
-                                          y_fill: false,
-                                          y_align: St.Align.START });
+        if (this._icon)
+            this._iconBin.child = this._icon;
+
+        if (this._secondaryIcon && (params.secondaryGIcon || params.clear)) {
+            this._secondaryIcon.destroy();
+            this._secondaryIcon = null;
        }

        if (params.secondaryGIcon) {
            this._secondaryIcon = new St.Icon({ gicon: params.secondaryGIcon,
                                                style_class: 'secondary-icon' });
-            this._bannerBox.add_actor(this._secondaryIcon);
+            this._secondaryIconBin.child = this._secondaryIcon;
        }

        this.title = title;
@@ -654,24 +673,9 @@ 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.actor.set_text_direction(titleDirection);

-        // Unless the notification has custom content, we save this.bannerBodyText
-        // to add it to the content of the notification if the notification is
-        // expandable due to other elements in its content area or due to the banner
-        // not fitting fully in the single-line mode.
-        this.bannerBodyText = this._customContent ? null : banner;
-        this.bannerBodyMarkup = params.bannerMarkup;
-        this._bannerBodyAdded = false;
-
-        banner = banner ? banner.replace(/\n/g, '  ') : '';
-
-        this._bannerUrlHighlighter.setMarkup(banner, params.bannerMarkup);
-        this._bannerLabel.queue_relayout();
-
-        // Add the bannerBody now if we know for sure we'll need it
-        if (this.bannerBodyText && this.bannerBodyText.indexOf('\n') > -1)
-            this._addBannerBody();
+        this._bodyUrlHighlighter.setMarkup(banner, params.bannerMarkup);

        if (this._soundName != params.soundName ||
            this._soundFile != params.soundFile) {
@@ -680,71 +684,18 @@ const Notification = new Lang.Class({
            this._soundPlayed = false;
        }

-        this.updated();
+        this._sync();
    },

    setIconVisible: function(visible) {
        this._icon.visible = visible;
+        this._sync();
    },

    enableScrolling: function(enableScrolling) {
-        this._scrollPolicy = enableScrolling ? Gtk.PolicyType.AUTOMATIC : Gtk.PolicyType.NEVER;
-        if (this._scrollArea) {
-            this._scrollArea.vscrollbar_policy = this._scrollPolicy;
-            this._scrollArea.enable_mouse_scrolling = enableScrolling;
-        }
-    },
-
-    _createScrollArea: function() {
-        this._table.add_style_class_name('multi-line-notification');
-        this._scrollArea = new St.ScrollView({ style_class: 'notification-scrollview',
-                                               vscrollbar_policy: this._scrollPolicy,
-                                               hscrollbar_policy: Gtk.PolicyType.NEVER,
-                                               visible: this.expanded });
-        this._table.add(this._scrollArea, { row: 1,
-                                            col: 2 });
-        this._updateLastColumnSettings();
-        this._contentArea = new St.BoxLayout({ style_class: 'notification-body',
-                                               vertical: true });
-        this._scrollArea.add_actor(this._contentArea);
-        // If we know the notification will be expandable, we need to add
-        // the banner text to the body as the first element.
-        this._addBannerBody();
-    },
-
-    // addActor:
-    // @actor: actor to add to the body of the notification
-    //
-    // Appends @actor to the notification's body
-    addActor: function(actor, style) {
-        if (!this._scrollArea) {
-            this._createScrollArea();
-        }
-
-        this._contentArea.add(actor, style ? style : {});
-        this.updated();
-    },
-
-    // addBody:
-    // @text: the text
-    // @markup: %true if @text contains pango markup
-    // @style: style to use when adding the actor containing the text
-    //
-    // Adds a multi-line label containing @text to the notification.
-    //
-    // Return value: the newly-added label
-    addBody: function(text, markup, style) {
-        let label = new URLHighlighter(text, true, markup);
-
-        this.addActor(label.actor, style);
-        return label.actor;
-    },
-
-    _addBannerBody: function() {
-        if (this.bannerBodyText && !this._bannerBodyAdded) {
-            this._bannerBodyAdded = true;
-            this.addBody(this.bannerBodyText, this.bannerBodyMarkup);
-        }
+        let scrollPolicy = enableScrolling ? Gtk.PolicyType.AUTOMATIC : Gtk.PolicyType.NEVER;
+        this._bodyScrollArea.vscrollbar_policy = scrollPolicy;
+        this._bodyScrollArea.enable_mouse_scrolling = enableScrolling;
    },

    // scrollTo:
@@ -752,112 +703,32 @@ const Notification = new Lang.Class({
    //
    // Scrolls the content area (if scrollable) to the indicated edge
    scrollTo: function(side) {
-        let adjustment = this._scrollArea.vscroll.adjustment;
+        let adjustment = this._bodyScrollArea.vscroll.adjustment;
        if (side == St.Side.TOP)
            adjustment.value = adjustment.lower;
        else if (side == St.Side.BOTTOM)
            adjustment.value = adjustment.upper;
    },

-    // setActionArea:
-    // @actor: the actor
-    // @props: (option) St.Table child properties
-    //
-    // Puts @actor into the action area of the notification, replacing
-    // the previous contents
-    setActionArea: function(actor, props) {
-        if (this._actionArea) {
-            this._actionArea.destroy();
-            this._actionArea = null;
-            if (this._buttonBox)
-                this._buttonBox = null;
-        } else {
-            this._addBannerBody();
-        }
-        this._actionArea = actor;
-        this._actionArea.visible = this.expanded;
-
-        if (!props)
-            props = {};
-        props.row = 2;
-        props.col = 2;
-
-        this._table.add_style_class_name('multi-line-notification');
-        this._table.add(this._actionArea, props);
-        this._updateLastColumnSettings();
-        this.updated();
-    },
-
-    _updateLastColumnSettings: function() {
-        if (this._scrollArea)
-            this._table.child_set(this._scrollArea, { col: this._imageBin ? 2 : 1,
-                                                      col_span: this._imageBin ? 1 : 2 });
+    setActionArea: function(actor) {
        if (this._actionArea)
-            this._table.child_set(this._actionArea, { col: this._imageBin ? 2 : 1,
-                                                      col_span: this._imageBin ? 1 : 2 });
-    },
+            this._actionArea.destroy();

-    setImage: function(image) {
-        this.unsetImage();
-
-        if (!image)
-            return;
-
-        this._imageBin = new St.Bin({ opacity: 230,
-                                      child: image,
-                                      visible: this.expanded });
-
-        this._table.add_style_class_name('multi-line-notification');
-        this._table.add_style_class_name('notification-with-image');
-        this._addBannerBody();
-        this._updateLastColumnSettings();
-        this._table.add(this._imageBin, { row: 1,
-                                          col: 1,
-                                          row_span: 2,
-                                          x_expand: false,
-                                          y_expand: false,
-                                          x_fill: false,
-                                          y_fill: false });
-    },
-
-    unsetImage: function() {
-        if (this._imageBin) {
-            this._table.remove_style_class_name('notification-with-image');
-            this._table.remove_actor(this._imageBin);
-            this._imageBin = null;
-            this._updateLastColumnSettings();
-            if (!this._scrollArea && !this._actionArea)
-                this._table.remove_style_class_name('multi-line-notification');
-        }
+        this._actionArea = actor;
+        this._actionAreaBin.child = actor;
+        this._sync();
    },

    addButton: function(button, callback) {
-        if (!this._buttonBox) {
-            let box = new St.BoxLayout({ style_class: 'notification-actions' });
-            this.setActionArea(box, { x_expand: false,
-                                      y_expand: false,
-                                      x_fill: false,
-                                      y_fill: false,
-                                      x_align: St.Align.END });
-            this._buttonBox = box;
-            global.focus_manager.add_group(this._buttonBox);
-        }
-
        this._buttonBox.add(button);
        button.connect('clicked', Lang.bind(this, function() {
            callback();

-            if (!this.resident) {
-                // We don't hide a resident notification when the user invokes one of its actions,
-                // because it is common for such notifications to update themselves with new
-                // information based on the action. We'd like to display the updated information
-                // in place, rather than pop-up a new notification.
-                this.emit('done-displaying');
-                this.destroy();
-            }
+            this.emit('done-displaying');
+            this.destroy();
        }));

-        this.updated();
+        this._sync();
        return button;
    },

@@ -870,8 +741,7 @@ const Notification = new Lang.Class({
    // the notification.
    addAction: function(label, callback) {
        let button = new St.Button({ style_class: 'notification-button',
-                                     label: label,
-                                     can_focus: true });
+                                     x_expand: true, label: label, can_focus: true });

        return this.addButton(button, callback);
    },
@@ -880,10 +750,6 @@ const Notification = new Lang.Class({
        this.urgency = urgency;
    },

-    setResident: function(resident) {
-        this.resident = resident;
-    },
-
    setTransient: function(isTransient) {
        this.isTransient = isTransient;
    },
@@ -911,113 +777,6 @@ const Notification = new Lang.Class({
        }
    },

-    _bannerBoxGetPreferredHeight: function(actor, forWidth, alloc) {
-        [alloc.min_size, alloc.natural_size] =
-            this._titleLabel.get_preferred_height(forWidth);
-    },
-
-    _bannerBoxAllocate: function(actor, box, flags) {
-        let availWidth = box.x2 - box.x1;
-
-        let [titleMinW, titleNatW] = this._titleLabel.get_preferred_width(-1);
-        let [titleMinH, titleNatH] = this._titleLabel.get_preferred_height(availWidth);
-        let [bannerMinW, bannerNatW] = this._bannerLabel.get_preferred_width(availWidth);
-
-        let rtl = (this._table.text_direction == Clutter.TextDirection.RTL);
-        let x = rtl ? availWidth : 0;
-
-        if (this._secondaryIcon) {
-            let [iconMinW, iconNatW] = this._secondaryIcon.get_preferred_width(-1);
-            let [iconMinH, iconNatH] = this._secondaryIcon.get_preferred_height(availWidth);
-
-            let secondaryIconBox = new Clutter.ActorBox();
-            let secondaryIconBoxW = Math.min(iconNatW, availWidth);
-
-            // allocate secondary icon box
-            if (rtl) {
-                secondaryIconBox.x1 = x - secondaryIconBoxW;
-                secondaryIconBox.x2 = x;
-                x = x - (secondaryIconBoxW + this._spacing);
-            } else {
-                secondaryIconBox.x1 = x;
-                secondaryIconBox.x2 = x + secondaryIconBoxW;
-                x = x + secondaryIconBoxW + this._spacing;
-            }
-            secondaryIconBox.y1 = 0;
-            // Using titleNatH ensures that the secondary icon is centered vertically
-            secondaryIconBox.y2 = titleNatH;
-
-            availWidth = availWidth - (secondaryIconBoxW + this._spacing);
-            this._secondaryIcon.allocate(secondaryIconBox, flags);
-        }
-
-        let titleBox = new Clutter.ActorBox();
-        let titleBoxW = Math.min(titleNatW, availWidth);
-        if (rtl) {
-            titleBox.x1 = availWidth - titleBoxW;
-            titleBox.x2 = availWidth;
-        } else {
-            titleBox.x1 = x;
-            titleBox.x2 = titleBox.x1 + titleBoxW;
-        }
-        titleBox.y1 = 0;
-        titleBox.y2 = titleNatH;
-        this._titleLabel.allocate(titleBox, flags);
-        this._titleFitsInBannerMode = (titleNatW <= availWidth);
-
-        let bannerFits = true;
-        if (titleBoxW + this._spacing > availWidth) {
-            this._bannerLabel.opacity = 0;
-            bannerFits = false;
-        } else {
-            let bannerBox = new Clutter.ActorBox();
-
-            if (rtl) {
-                bannerBox.x1 = 0;
-                bannerBox.x2 = titleBox.x1 - this._spacing;
-
-                bannerFits = (bannerBox.x2 - bannerNatW >= 0);
-            } else {
-                bannerBox.x1 = titleBox.x2 + this._spacing;
-                bannerBox.x2 = availWidth;
-
-                bannerFits = (bannerBox.x1 + bannerNatW <= availWidth);
-            }
-            bannerBox.y1 = 0;
-            bannerBox.y2 = titleNatH;
-            this._bannerLabel.allocate(bannerBox, flags);
-
-            // Make _bannerLabel visible if the entire notification
-            // fits on one line, or if the notification is currently
-            // unexpanded and only showing one line anyway.
-            if (!this.expanded || (bannerFits && this._table.row_count == 1))
-                this._bannerLabel.opacity = 255;
-        }
-
-        // If the banner doesn't fully fit in the banner box, we possibly need to add the
-        // banner to the body. We can't do that from here though since that will force a
-        // relayout, so we add it to the main loop.
-        if (!bannerFits && this._canExpandContent())
-            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');
-                                            this.updated();
-                                        }
-                                        return false;
-                                     }));
-    },
-
-    _canExpandContent: function() {
-        return (this.bannerBodyText && !this._bannerBodyAdded) ||
-               (!this._titleFitsInBannerMode && !this._table.has_style_class_name('multi-line-notification'));
-    },
-
    playSound: function() {
        if (this._soundPlayed)
            return;
@@ -1050,83 +809,27 @@ const Notification = new Lang.Class({
        }
    },

-    updated: function() {
-        if (this.expanded)
-            this.expand(false);
-    },
-
    expand: function(animate) {
        this.expanded = true;
-        this.actor.remove_style_class_name('notification-unexpanded');
-
-        // Show additional content that we keep hidden in banner mode
-        if (this._imageBin)
-            this._imageBin.show();
-        if (this._actionArea)
-            this._actionArea.show();
-        if (this._scrollArea)
-            this._scrollArea.show();
-
-        // The banner is never shown when the title did not fit, so this
-        // can be an if-else statement.
-        if (!this._titleFitsInBannerMode) {
-            // Remove ellipsization from the title label and make it wrap so that
-            // we show the full title when the notification is expanded.
-            this._titleLabel.clutter_text.line_wrap = true;
-            this._titleLabel.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-            this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        } else if (this._table.row_count > 1 && this._bannerLabel.opacity != 0) {
-            // We always hide the banner if the notification has additional content.
-            //
-            // We don't need to wrap the banner that doesn't fit the way we wrap the
-            // title that doesn't fit because we won't have a notification with
-            // row_count=1 that has a banner that doesn't fully fit. We'll either add
-            // that banner to the content of the notification in _bannerBoxAllocate()
-            // or the notification will have custom content.
-            if (animate)
-                Tweener.addTween(this._bannerLabel,
-                                 { opacity: 0,
-                                   time: ANIMATION_TIME,
-                                   transition: 'easeOutQuad' });
-            else
-                this._bannerLabel.opacity = 0;
-        }
-        this.emit('expanded');
+        this._sync();
    },

    collapseCompleted: function() {
        if (this._destroyed)
            return;
+
        this.expanded = false;
-
-        // Hide additional content that we keep hidden in banner mode
-        if (this._imageBin)
-            this._imageBin.hide();
-        if (this._actionArea)
-            this._actionArea.hide();
-        if (this._scrollArea)
-            this._scrollArea.hide();
-
-        // Make sure we don't line wrap the title, and ellipsize it instead.
-        this._titleLabel.clutter_text.line_wrap = false;
-        this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.END;
-
-        // Restore banner opacity in case the notification is shown in the
-        // banner mode again on update.
-        this._bannerLabel.opacity = 255;
-
-        // Restore height requisition
-        this.actor.add_style_class_name('notification-unexpanded');
+        this._sync();
    },

    _onClicked: function() {
        this.emit('clicked');
-        // We hide all types of notifications once the user clicks on them because the common
-        // outcome of clicking should be the relevant window being brought forward and the user's
-        // attention switching to the window.
        this.emit('done-displaying');
-        if (!this.resident)
-            this.destroy();
+        this.destroy();
+    },
+
+    _onCloseClicked: function() {
+        this.destroy();
    },

    _onDestroy: function() {
@@ -1294,7 +997,7 @@ const Source = new Lang.Class({
    },

    get indicatorCount() {
-        let notifications = this.notifications.filter(function(n) { return !n.isTransient && !n.resident; });
+        let notifications = this.notifications.filter(function(n) { return !n.isTransient; });
        return notifications.length;
    },

@@ -1307,7 +1010,7 @@ const Source = new Lang.Class({
    },

    get isClearable() {
-        return !this.trayIcon && !this.isChat && !this.resident;
+        return !this.trayIcon && !this.isChat;
    },

    countUpdated: function() {
@@ -1451,10 +1154,9 @@ const Source = new Lang.Class({
    open: function() {
    },

-    destroyNonResidentNotifications: function() {
+    destroyNotifications: function() {
        for (let i = this.notifications.length - 1; i >= 0; i--)
-            if (!this.notifications[i].resident)
-                this.notifications[i].destroy();
+            this.notifications[i].destroy();

        this.countUpdated();
    },
@@ -1786,6 +1488,9 @@ const MessageTray = new Lang.Class({
                                                   layout_manager: new Clutter.BinLayout() });
        this._notificationWidget.connect('key-release-event', Lang.bind(this, this._onNotificationKeyRelease));
        this._notificationWidget.connect('notify::hover', Lang.bind(this, this._onNotificationHoverChanged));
+        this._notificationWidget.connect('notify::height', Lang.bind(this, function() {
+            this._notificationWidget.translation_y = -this._notificationWidget.height;
+        }));

        this._notificationBin = new St.Bin({ y_expand: true });
        this._notificationBin.set_y_align(Clutter.ActorAlign.START);
@@ -1829,11 +1534,6 @@ const MessageTray = new Lang.Class({
        this._clickedSummaryItemMouseButton = -1;
        this._clickedSummaryItemAllocationChangedId = 0;

-        this._closeButton = Util.makeCloseButton();
-        this._closeButton.hide();
-        this._closeButton.connect('clicked', Lang.bind(this, this._closeNotification));
-        this._notificationWidget.add_actor(this._closeButton);
-
        this._userActiveWhileNotificationShown = false;

        this.idleMonitor = Meta.IdleMonitor.get_core();
@@ -1864,7 +1564,6 @@ const MessageTray = new Lang.Class({
        this._keyboardVisible = false;
        this._notificationState = State.HIDDEN;
        this._notificationTimeoutId = 0;
-        this._notificationExpandedId = 0;
        this._summaryBoxPointerState = State.HIDDEN;
        this._summaryBoxPointerTimeoutId = 0;
        this._desktopCloneState = State.HIDDEN;
@@ -1888,7 +1587,6 @@ const MessageTray = new Lang.Class({
        Main.layoutManager.trayBox.add_actor(this._notificationWidget);
        Main.layoutManager.trackChrome(this.actor);
        Main.layoutManager.trackChrome(this._notificationWidget);
-        Main.layoutManager.trackChrome(this._closeButton);

        global.screen.connect('in-fullscreen-changed', Lang.bind(this, this._updateState));
        Main.layoutManager.connect('hot-corners-changed', Lang.bind(this, this._hotCornersChanged));
@@ -1901,14 +1599,14 @@ 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 |
@@ -1934,10 +1632,6 @@ const MessageTray = new Lang.Class({

        this._messageTrayMenuButton = new MessageTrayMenuButton(this);
        this.actor.add_actor(this._messageTrayMenuButton.actor);
-
-        let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM);
-        gesture.connect('activated', Lang.bind(this, this.toggle));
-        global.stage.add_action(gesture);
    },

    close: function() {
@@ -2044,14 +1738,6 @@ const MessageTray = new Lang.Class({
        this._updateState();
    },

-    _closeNotification: function() {
-        if (this._notificationState == State.SHOWN) {
-            this._closeButton.hide();
-            this._notification.emit('done-displaying');
-            this._notification.destroy();
-        }
-    },
-
    contains: function(source) {
        return this._sources.has(source);
    },
@@ -2617,7 +2303,6 @@ const MessageTray = new Lang.Class({
        this._notificationBin.child = this._notification.actor;

        this._notificationWidget.opacity = 0;
-        this._notificationWidget.y = 0;
        this._notificationWidget.show();

        this._updateShowingNotification();
@@ -2652,23 +2337,16 @@ const MessageTray = new Lang.Class({
        // We tween all notifications to full opacity. This ensures that both new notifications and
        // notifications that might have been in the process of hiding get full opacity.
        //
-        // We tween any notification showing in the banner mode to the appropriate height
-        // (which is banner height or expanded height, depending on the notification state)
-        // This ensures that both new notifications and notifications in the banner mode that might
-        // have been in the process of hiding are shown with the correct height.
-        //
        // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
        // notification is being shown.

-        let tweenParams = { opacity: 255,
-                            y: -this._notificationWidget.height,
-                            time: ANIMATION_TIME,
-                            transition: 'easeOutQuad',
-                            onComplete: this._showNotificationCompleted,
-                            onCompleteScope: this
-                          };
-
-        this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
+        this._tween(this._notificationWidget, '_notificationState', State.SHOWN,
+                    { opacity: 255,
+                      time: ANIMATION_TIME,
+                      transition: 'easeOutQuad',
+                      onComplete: this._showNotificationCompleted,
+                      onCompleteScope: this
+                    });
   },

    _showNotificationCompleted: function() {
@@ -2716,10 +2394,6 @@ const MessageTray = new Lang.Class({
    _hideNotification: function(animate) {
        this._notificationFocusGrabber.ungrabFocus();

-        if (this._notificationExpandedId) {
-            this._notification.disconnect(this._notificationExpandedId);
-            this._notificationExpandedId = 0;
-        }
        if (this._notificationClickedId) {
            this._notification.disconnect(this._notificationClickedId);
            this._notificationClickedId = 0;
@@ -2733,8 +2407,7 @@ const MessageTray = new Lang.Class({

        if (animate) {
            this._tween(this._notificationWidget, '_notificationState', State.HIDDEN,
-                        { y: this.actor.height,
-                          opacity: 0,
+                        { opacity: 0,
                          time: ANIMATION_TIME,
                          transition: 'easeOutQuad',
                          onComplete: this._hideNotificationCompleted,
@@ -2742,7 +2415,6 @@ const MessageTray = new Lang.Class({
                        });
        } else {
            Tweener.removeTweens(this._notificationWidget);
-            this._notificationWidget.y = this.actor.height;
            this._notificationWidget.opacity = 0;
            this._notificationState = State.HIDDEN;
            this._hideNotificationCompleted();
@@ -2757,7 +2429,6 @@ const MessageTray = new Lang.Class({
        if (notification.isTransient)
            notification.destroy(NotificationDestroyedReason.EXPIRED);

-        this._closeButton.hide();
        this._pointerInNotification = false;
        this._notificationRemoved = false;
        this._notificationBin.child = null;
@@ -2772,10 +2443,6 @@ const MessageTray = new Lang.Class({
    },

    _expandNotification: function(autoExpanding) {
-        if (!this._notificationExpandedId)
-            this._notificationExpandedId =
-                this._notification.connect('expanded',
-                                           Lang.bind(this, this._onNotificationExpanded));
        // Don't animate changes in notifications that are auto-expanding.
        this._notification.expand(!autoExpanding);

@@ -2784,31 +2451,6 @@ const MessageTray = new Lang.Class({
            this._ensureNotificationFocused();
    },

-    _onNotificationExpanded: function() {
-        let expandedY = - this._notificationWidget.height;
-        this._closeButton.show();
-
-        // Don't animate the notification to its new position if it has shrunk:
-        // there will be a very visible "gap" that breaks the illusion.
-        if (this._notificationWidget.y < expandedY) {
-            this._notificationWidget.y = expandedY;
-        } else if (this._notification.y != expandedY) {
-            // Tween also opacity here, to override a possible tween that's
-            // currently hiding the notification.
-            Tweener.addTween(this._notificationWidget,
-                             { y: expandedY,
-                               opacity: 255,
-                               time: ANIMATION_TIME,
-                               transition: 'easeOutQuad',
-                               // HACK: Drive the state machine here better,
-                               // instead of overwriting tweens
-                               onComplete: Lang.bind(this, function() {
-                                   this._notificationState = State.SHOWN;
-                               }),
-                             });
-        }
-    },
-
    _ensureNotificationFocused: function() {
        this._notificationFocusGrabber.grabFocus();
    },
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -43,7 +43,6 @@ const ModalDialog = new Lang.Class({
                                        styleClass: null,
                                        keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL,
                                        shouldFadeIn: true,
-                                        shouldFadeOut: true,
                                        destroyOnClose: true });

        this.state = State.CLOSED;
@@ -51,7 +50,6 @@ 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,
@@ -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,
-                             { opacity: 0,
-                               time: OPEN_AND_CLOSE_TIME,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this,
-                                                     this._closeComplete)
-                             })
-        else
-            this._closeComplete();
+        Tweener.addTween(this._group,
+                         { opacity: 0,
+                           time: OPEN_AND_CLOSE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.state = State.CLOSED;
+                                   this._group.hide();
+                                   this.emit('closed');
+
+                                   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
@@ -91,21 +91,6 @@ const rewriteRules = {
    ]
 };

-const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
-    'bluetooth-applet': 'bluetooth',
-    'gnome-volume-control-applet': 'volume', // renamed to gnome-sound-applet
-                                             // when moved to control center
-    'gnome-sound-applet': 'volume',
-    'nm-applet': 'network',
-    'gnome-power-manager': 'battery',
-    'keyboard': 'keyboard',
-    'a11y-keyboard': 'a11y',
-    'kbd-scrolllock': 'keyboard',
-    'kbd-numlock': 'keyboard',
-    'kbd-capslock': 'keyboard',
-    'ibus-ui-gtk': 'keyboard'
-};
-
 const FdoNotificationDaemon = new Lang.Class({
    Name: 'FdoNotificationDaemon',

@@ -120,12 +105,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);
    },

@@ -331,13 +319,14 @@ const FdoNotificationDaemon = new Lang.Class({
    },

    _makeButton: function(id, label, useActionIcons) {
-        let button = new St.Button({ can_focus: true });
+        let button = new St.Button({ can_focus: true,
+                                     x_expand: true,
+                                     style_class: 'notification-button' });
        let iconName = id.endsWith('-symbolic') ? id : id + '-symbolic';
+
        if (useActionIcons && Gtk.IconTheme.get_default().has_icon(iconName)) {
-            button.add_style_class_name('notification-icon-button');
-            button.child = new St.Icon({ icon_name: iconName });
+            button.child = new St.Icon({ icon_name: iconName, icon_size: 16 });
        } else {
-            button.add_style_class_name('notification-button');
            button.label = label;
        }
        return button;
@@ -376,8 +365,6 @@ const FdoNotificationDaemon = new Lang.Class({
        let gicon = this._iconForNotificationData(icon, hints);
        let gimage = this._imageForNotificationData(hints);

-        let image = null;
-
        // If an icon is not specified, we use 'image-data' or 'image-path' hint for an icon
        // and don't show a large image. There are currently many applications that use
        // notify_notification_set_icon_from_pixbuf() from libnotify, which in turn sets
@@ -386,10 +373,7 @@ const FdoNotificationDaemon = new Lang.Class({
        // So the logic here does the right thing for this case. If both an icon and either
        // one of 'image-data' or 'image-path' are specified, we show both an icon and
        // a large image.
-        if (gicon && gimage)
-            image = new St.Icon({ gicon: gimage,
-                                  icon_size: notification.IMAGE_SIZE });
-        else if (!gicon && gimage)
+        if (!gicon && gimage)
            gicon = gimage;
        else if (!gicon)
            gicon = this._fallbackIconForNotificationData(hints);
@@ -399,7 +383,6 @@ const FdoNotificationDaemon = new Lang.Class({
                                             clear: true,
                                             soundFile: hints['sound-file'],
                                             soundName: hints['sound-name'] });
-        notification.setImage(image);

        let hasDefaultAction = false;

@@ -439,7 +422,6 @@ const FdoNotificationDaemon = new Lang.Class({
                notification.setUrgency(MessageTray.Urgency.CRITICAL);
                break;
        }
-        notification.setResident(hints.resident == true);
        // 'transient' is a reserved keyword in JS, so we have to retrieve the value
        // of the 'transient' hint with hints['transient'] rather than hints.transient
        notification.setTransient(hints['transient'] == true);
@@ -467,7 +449,6 @@ const FdoNotificationDaemon = new Lang.Class({
            'body-markup',
            // 'icon-multi',
            'icon-static',
-            'persistence',
            'sound',
        ];
    },
@@ -489,7 +470,7 @@ const FdoNotificationDaemon = new Lang.Class({
        for (let i = 0; i < this._sources.length; i++) {
            let source = this._sources[i];
            if (source.app == tracker.focus_app) {
-                source.destroyNonResidentNotifications();
+                source.destroyNotifications();
                return;
            }
        }
@@ -506,10 +487,6 @@ const FdoNotificationDaemon = new Lang.Class({
    },

    _onTrayIconAdded: function(o, icon) {
-        let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
-        if (STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass] !== undefined)
-            return;
-
        let source = this._getSource(icon.title || icon.wm_class || C_("program", "Unknown"), icon.pid, null, null, icon);
    },

@@ -581,7 +558,7 @@ const FdoNotificationDaemonSource = new Lang.Class({
            this.iconUpdated();

        let tracker = Shell.WindowTracker.get_default();
-        if (notification.resident && this.app && tracker.focus_app == this.app)
+        if (this.app && tracker.focus_app == this.app)
            this.pushNotification(notification);
        else
            this.notify(notification);
@@ -648,7 +625,7 @@ const FdoNotificationDaemonSource = new Lang.Class({

    open: function() {
        this.openApp();
-        this.destroyNonResidentNotifications();
+        this.destroyNotifications();
    },

    _lastNotificationRemoved: function() {
@@ -689,12 +666,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 +679,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) {
-            let urgency = PRIORITY_URGENCY_MAP[priority.unpack()];
-            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);
-        }
+        this.setUrgency(urgent.unpack() ? MessageTray.Urgency.CRITICAL
+                                        : MessageTray.Urgency.NORMAL);

        if (buttons) {
            buttons.deep_unpack().forEach(Lang.bind(this, function(button) {
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -242,7 +242,7 @@ const Overview = new Lang.Class({
                                        opacity: 0 });
        this._overview.add_actor(this._panelGhost);

-        this._searchEntry = new St.Entry({ style_class: 'search-entry',
+        this._searchEntry = new St.Entry({ name: 'searchEntry',
                                           /* Translators: this is the text displayed
                                              in the search entry when no search is
                                              active; it should not exceed ~30
@@ -425,6 +425,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 +455,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();
@@ -485,6 +504,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 +583,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 +614,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;
@@ -623,7 +621,7 @@ const Overview = new Lang.Class({
        this.animationInProgress = true;
        this.visibleTarget = false;

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

        // Make other elements fade out.
        Tweener.addTween(this._stack,
@@ -640,6 +638,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,20 +677,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();
-    },
-
-    getShowAppsButton: function() {
-        return this._dash.showAppsButton;
    }
 });
 Signals.addSignalMethods(Overview.prototype);
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -36,7 +36,7 @@ const SlideLayout = new Lang.Class({

    _init: function(params) {
        this._slideX = 1;
-        this._translationX = undefined;
+        this._translationX = 0;
        this._direction = SlideDirection.LEFT;

        this.parent(params);
@@ -118,6 +118,7 @@ const SlidingControl = new Lang.Class({
                                     style_class: 'overview-controls',
                                     clip_to_allocation: true });

+        Main.overview.connect('showing', Lang.bind(this, this._onOverviewShowing));
        Main.overview.connect('hiding', Lang.bind(this, this._onOverviewHiding));

        Main.overview.connect('item-drag-begin', Lang.bind(this, this._onDragBegin));
@@ -161,8 +162,7 @@ const SlidingControl = new Lang.Class({
        let translationEnd = 0;
        let translation = this._getTranslation();

-        let shouldShow = (this._getSlide() > 0);
-        if (shouldShow) {
+        if (this._visible) {
            translationStart = translation;
        } else {
            translationEnd = translation;
@@ -177,9 +177,14 @@ const SlidingControl = new Lang.Class({
                                        transition: 'easeOutQuad' });
    },

+    _onOverviewShowing: function() {
+        this._visible = true;
+        this.layout.slideX = this._getSlide();
+        this.layout.translationX = this._getTranslation();
+        this.slideIn();
+    },
+
    _onOverviewHiding: function() {
-        // We need to explicitly slideOut since showing pages
-        // doesn't imply sliding out, instead, hiding the overview does.
        this.slideOut();
    },

@@ -193,7 +198,7 @@ const SlidingControl = new Lang.Class({

    _onDragBegin: function() {
        this._inDrag = true;
-        this._updateTranslation();
+        this.layout.translationX = 0;
        this._updateSlide();
    },

@@ -218,6 +223,7 @@ const SlidingControl = new Lang.Class({

    slideIn: function() {
        this._visible = true;
+        this._updateTranslation();
        // we will update slideX and the translation from pageEmpty
    },

--- 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;
@@ -571,6 +572,7 @@ const ActivitiesButton = new Lang.Class({
        this.actor.label_actor = this._label;

        this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+        this.actor.connect_after('button-release-event', Lang.bind(this, this._onButtonRelease));
        this.actor.connect_after('key-release-event', Lang.bind(this, this._onKeyRelease));

        Main.overview.connect('showing', Lang.bind(this, function() {
@@ -599,21 +601,16 @@ const ActivitiesButton = new Lang.Class({
    },

    _onCapturedEvent: function(actor, event) {
-        if (event.type() == Clutter.EventType.BUTTON_PRESS ||
-            event.type() == Clutter.EventType.TOUCH_BEGIN) {
+        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
            if (!Main.overview.shouldToggleByCornerOrButton())
                return Clutter.EVENT_STOP;
        }
        return Clutter.EVENT_PROPAGATE;
    },

-    _onEvent: function(actor, event) {
-        this.parent(actor, event);
-
-        if (event.type() == Clutter.EventType.TOUCH_END ||
-            event.type() == Clutter.EventType.BUTTON_RELEASE)
-            Main.overview.toggle();
-
+    _onButtonRelease: function() {
+        Main.overview.toggle();
+        this.menu.close();
        return Clutter.EVENT_PROPAGATE;
    },

--- 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();
-        if (!child)
+        let children = actor.get_children();
+        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;
@@ -100,7 +104,8 @@ const Button = new Lang.Class({
                      accessible_name: nameText ? nameText : "",
                      accessible_role: Atk.Role.MENU });

-        this.actor.connect('event', Lang.bind(this, this._onEvent));
+        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
+        this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));
        this.actor.connect('notify::visible', Lang.bind(this, this._onVisibilityChanged));

        if (dontCreateMenu)
@@ -130,15 +135,34 @@ const Button = new Lang.Class({
        }
    },

-    _onEvent: function(actor, event) {
-        if (this.menu &&
-            (event.type() == Clutter.EventType.TOUCH_BEGIN ||
-             event.type() == Clutter.EventType.BUTTON_PRESS))
-            this.menu.toggle();
+    _onButtonPress: function(actor, event) {
+        if (!this.menu)
+            return Clutter.EVENT_PROPAGATE;

+        this.menu.toggle();
        return Clutter.EVENT_PROPAGATE;
    },

+    _onSourceKeyPress: function(actor, event) {
+        if (!this.menu)
+            return Clutter.EVENT_PROPAGATE;
+
+        let symbol = event.get_key_symbol();
+        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
+            this.menu.toggle();
+            return Clutter.EVENT_STOP;
+        } else if (symbol == Clutter.KEY_Escape && this.menu.isOpen) {
+            this.menu.close();
+            return Clutter.EVENT_STOP;
+        } else if (symbol == Clutter.KEY_Down) {
+            if (!this.menu.isOpen)
+                this.menu.toggle();
+            this.menu.actor.navigate_focus(this.actor, Gtk.DirectionType.DOWN, false);
+            return Clutter.EVENT_STOP;
+        } else
+            return Clutter.EVENT_PROPAGATE;
+    },
+
    _onVisibilityChanged: function() {
        if (!this.menu)
            return;
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
@@ -13,6 +15,7 @@ const GrabHelper = imports.ui.grabHelper;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Separator = imports.ui.separator;
+const Slider = imports.ui.slider;
 const Tweener = imports.ui.tweener;

 const Ornament = {
@@ -21,6 +24,17 @@ const Ornament = {
    CHECK: 2,
 };

+function _ensureStyle(actor) {
+    if (actor.get_children) {
+        let children = actor.get_children();
+        for (let i = 0; i < children.length; i++)
+            _ensureStyle(children[i]);
+    }
+
+    if (actor instanceof St.Widget)
+        actor.ensure_style();
+}
+
 function isPopupMenuItemVisible(child) {
    if (child._delegate instanceof PopupMenuSection)
        if (child._delegate.isEmpty())
@@ -32,28 +46,33 @@ function isPopupMenuItemVisible(child) {
 * @side Side to which the arrow points.
 */
 function arrowIcon(side) {
-    let iconName;
+    let rotation;
    switch (side) {
        case St.Side.TOP:
-            iconName = 'pan-up-symbolic';
+            rotation = 180;
            break;
        case St.Side.RIGHT:
-            iconName = 'pan-end-symbolic';
+            rotation = - 90;
            break;
        case St.Side.BOTTOM:
-            iconName = 'pan-down-symbolic';
+            rotation = 0;
            break;
        case St.Side.LEFT:
-            iconName = 'pan-start-symbolic';
+            rotation = 90;
            break;
    }

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

+    arrow.rotation_angle_z = rotation;
+
    return arrow;
 }

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

        if (this._activatable) {
            this.actor.connect('button-release-event', Lang.bind(this, this._onButtonReleaseEvent));
-            this.actor.connect('touch-event', Lang.bind(this, this._onTouchEvent));
            this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
        }
        if (params.reactive && params.hover)
@@ -119,14 +137,6 @@ const PopupBaseMenuItem = new Lang.Class({
        return Clutter.EVENT_STOP;
    },

-    _onTouchEvent: function (actor, event) {
-        if (event.type() == Clutter.EventType.TOUCH_END) {
-            this.activate(event);
-            return Clutter.EVENT_STOP;
-        }
-        return Clutter.EVENT_PROPAGATE;
-    },
-
    _onKeyPressEvent: function (actor, event) {
        let symbol = event.get_key_symbol();

@@ -373,9 +383,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);
    },
@@ -731,10 +741,6 @@ const PopupMenu = new Lang.Class({
        global.focus_manager.add_group(this.actor);
        this.actor.reactive = true;

-        if (this.sourceActor)
-            this._keyPressId = this.sourceActor.connect('key-press-event',
-                                                        Lang.bind(this, this._onKeyPress));
-
        this._openedSubMenu = null;
    },

@@ -745,40 +751,6 @@ const PopupMenu = new Lang.Class({
        this._openedSubMenu = submenu;
    },

-    _onKeyPress: function(actor, event) {
-        let navKey;
-        switch (this._boxPointer.arrowSide) {
-            case St.Side.TOP:
-                navKey = Clutter.KEY_Down;
-                break;
-            case St.Side.BOTTOM:
-                navKey = Clutter.KEY_Up;
-                break;
-            case St.Side.LEFT:
-                navKey = Clutter.KEY_Right;
-                break;
-            case St.Side.RIGHT:
-                navKey = Clutter.KEY_Left;
-                break;
-        }
-
-        let symbol = event.get_key_symbol();
-        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
-            this.toggle();
-            return Clutter.EVENT_STOP;
-        } else if (symbol == Clutter.KEY_Escape && this.isOpen) {
-            this.close();
-            return Clutter.EVENT_STOP;
-        } else if (symbol == navKey) {
-            if (!this.isOpen)
-                this.toggle();
-            this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-            return Clutter.EVENT_STOP;
-        } else
-            return Clutter.EVENT_PROPAGATE;
-    },
-
-
    setArrowOrigin: function(origin) {
        this._boxPointer.setArrowOrigin(origin);
    },
@@ -819,12 +791,6 @@ const PopupMenu = new Lang.Class({

        this.isOpen = false;
        this.emit('open-state-changed', false);
-    },
-
-    destroy: function() {
-        if (this._keyPressId)
-            this.sourceActor.disconnect(this._keyPressId);
-        this.parent();
    }
 });

--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -110,13 +110,6 @@ function loadRemoteSearchProviders(callback) {
            else
                remoteProvider = new RemoteSearchProvider(appInfo, busName, objectPath);

-            remoteProvider.defaultEnabled = true;
-            try {
-                remoteProvider.defaultEnabled = !keyfile.get_boolean(group, 'DefaultDisabled');
-            } catch(e) {
-                // ignore error
-            }
-
            objectPaths[objectPath] = remoteProvider;
            loadedProviders.push(remoteProvider);
        } catch(e) {
@@ -124,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;
@@ -139,14 +132,8 @@ function loadRemoteSearchProviders(callback) {

    loadedProviders = loadedProviders.filter(function(provider) {
        let appId = provider.appInfo.get_id();
-
-        if (provider.defaultEnabled) {
-            let disabled = searchSettings.get_strv('disabled');
-            return disabled.indexOf(appId) == -1;
-        } else {
-            let enabled = searchSettings.get_strv('enabled');
-            return enabled.indexOf(appId) != -1;
-        }
+        let disabled = searchSettings.get_strv('disabled');
+        return disabled.indexOf(appId) == -1;
    });

    loadedProviders.sort(function(providerA, providerB) {
--- 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._terminalSettings = new Gio.Settings({ schema_id: TERMINAL_SCHEMA });
+        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_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);
@@ -182,10 +186,6 @@ const RunDialog = new Lang.Class({
        let results = someResults.reduce(function(a, b) {
            return a.concat(b);
        }, []);
-
-        if (!results.length)
-            return null;
-
        let common = results.reduce(_getCommon, null);
        return common.substr(text.length);
    },
@@ -271,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
@@ -444,12 +444,14 @@ function clamp(value, min, max) {
 }

 /**
+ * To test screen shield, make sure to kill gnome-screensaver.
+ *
 * If you are setting org.gnome.desktop.session.idle-delay directly in dconf,
 * rather than through System Settings, you also need to set
 * org.gnome.settings-daemon.plugins.power.sleep-display-ac and
 * org.gnome.settings-daemon.plugins.power.sleep-display-battery to the same value.
 * This will ensure that the screen blanks at the right time when it fades out.
- * https://bugzilla.gnome.org/show_bug.cgi?id=668703 explains the dependency.
+ * https://bugzilla.gnome.org/show_bug.cgi?id=668703 explains the dependance.
 */
 const ScreenShield = new Lang.Class({
    Name: 'ScreenShield',
@@ -561,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;
@@ -687,10 +689,10 @@ const ScreenShield = new Lang.Class({
            return Clutter.EVENT_PROPAGATE;

        let delta = 0;
-        if (event.get_scroll_direction() == Clutter.ScrollDirection.SMOOTH)
-            delta = Math.abs(event.get_scroll_delta()[0]);
-        else
+        if (event.get_scroll_direction() == Clutter.ScrollDirection.UP)
            delta = 5;
+        else if (event.get_scroll_direction() == Clutter.ScrollDirection.SMOOTH)
+            delta = Math.max(0, event.get_scroll_delta()[0]);

        this._lockScreenScrollCounter += delta;

@@ -900,11 +902,17 @@ const ScreenShield = new Lang.Class({
    },

    showDialog: function() {
-        if (!this._becomeModal()) {
-            // In the login screen, this is a hard error. Fail-whale
-            log('Could not acquire modal grab for the login screen. Aborting login process.');
-            Meta.quit(Meta.ExitCode.ERROR);
-        }
+        // Ensure that the stage window is mapped, before taking a grab
+        // otherwise X errors out
+        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+            if (!this._becomeModal()) {
+                // In the login screen, this is a hard error. Fail-whale
+                log('Could not acquire modal grab for the login screen. Aborting login process.');
+                Meta.quit(Meta.ExitCode.ERROR);
+            }
+
+            return false;
+        }));

        this.actor.show();
        this._isGreeter = Main.sessionMode.isGreeter;
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -68,13 +68,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 +78,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 (!this._checkArea(x, y, width, height)) {
-            invocation.return_error_literal(Gio.IOErrorEnum,
-                                            Gio.IOErrorEnum.CANCELLED,
-                                            "Invalid params");
+        if (x < 0 || y < 0 ||
+            width <= 0 || height <= 0 ||
+            x + width > global.screen_width || y + height > global.screen_height) {
+            invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
+                        "Invalid params");
            return;
        }
        let screenshot = new Shell.Screenshot();
@@ -140,9 +115,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,
-                        areaRectangle.width, areaRectangle.height);
-                    let retval = GLib.Variant.new('(iiii)', retRectangle);
+                    let retval = GLib.Variant.new('(iiii)',
+                        [areaRectangle.x, areaRectangle.y,
+                         areaRectangle.width, areaRectangle.height]);
                    invocation.return_value(retval);
                } else {
                    invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
@@ -151,18 +126,9 @@ const ScreenshotService = new Lang.Class({
            }));
    },

-    FlashAreaAsync: function(params, invocation) {
-        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;
-        }
+    FlashArea: function(x, y, width, height) {
        let flashspot = new Flashspot({ x : x, y : y, width: width, height: height});
        flashspot.fire();
-        invocation.return_value(null);
    }
 });

--- 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
@@ -79,7 +78,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 +97,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 (default 640)
- *   height - height of window, in pixels (default 480)
- *   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)
+ * @width: width of window, in pixels
+ * @height: height of window, in pixels
+ * @alpha: whether the window should be alpha transparent
 * @maximized: whethe the window should be created maximized
 *
 * Creates a window using gnome-shell-perf-helper for testing purposes.
@@ -137,17 +110,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) {
-    params = Params.parse(params, { width: 640,
-                                    height: 480,
-                                    alpha: false,
-                                    maximized: false,
-                                    redraws: false });
-
+function createTestWindow(width, height, alpha, maximized) {
+    let cb;
    let perfHelper = _getPerfHelper();
-    return _callRemote(perfHelper, perfHelper.CreateWindowRemote,
-                       params.width, params.height,
-                       params.alpha, params.maximized, params.redraws);
+
+    perfHelper.CreateWindowRemote(width, height, alpha, maximized,
+                                  function(result, excp) {
+                                      if (cb)
+                                          cb();
+                                  });
+
+    return function(callback) {
+        cb = callback;
+    };
 }

 /**
@@ -157,8 +132,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 +155,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 +208,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 +306,8 @@ function _collect(scriptModule, outputFile) {
        print ('------------------------------------------------------------');
        for (let i = 0; i < metrics.length; i++) {
            let metric = metrics[i];
-            print ('# ' + scriptModule.METRICS[metric].description);
-            print (metric + ': ' +  scriptModule.METRICS[metric].value + scriptModule.METRICS[metric].units);
+            print ('# ' + scriptModule.METRIC_DESCRIPTIONS[metric]);
+            print (metric + ': ' +  scriptModule.METRICS[metric]);
        }
        print ('------------------------------------------------------------');
    }
@@ -371,12 +360,7 @@ function runPerfScript(scriptModule, outputFile) {

    _step(g,
          function() {
-              try {
-                  _collect(scriptModule, outputFile);
-              } catch (err) {
-                  log("Script failed: " + err + "\n" + err.stack);
-                  Meta.exit(Meta.ExitCode.ERROR);
-              }
+              _collect(scriptModule, outputFile);
              Meta.exit(Meta.ExitCode.SUCCESS);
          },
         function(err) {
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -6,7 +6,6 @@ const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Atk = imports.gi.Atk;

@@ -32,8 +31,7 @@ const SearchSystem = new Lang.Class({

        this._registerProvider(new AppDisplay.AppSearchProvider());

-        this._searchSettings = new Gio.Settings({ schema_id: SEARCH_PROVIDERS_SCHEMA });
-        this._searchSettings.connect('changed::enabled', Lang.bind(this, this._reloadRemoteProviders));
+        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));
@@ -165,6 +163,13 @@ const SearchResult = new Lang.Class({

    activate: function() {
        this.emit('activate', this.metaInfo.id);
+    },
+
+    setSelected: function(selected) {
+        if (selected)
+            this.actor.add_style_pseudo_class('selected');
+        else
+            this.actor.remove_style_pseudo_class('selected');
    }
 });
 Signals.addSignalMethods(SearchResult.prototype);
@@ -225,11 +230,59 @@ const GridSearchResult = new Lang.Class({

        this.actor.style_class = 'grid-search-result';

-        this.icon = new IconGrid.BaseIcon(this.metaInfo['name'],
-                                          { createIcon: this.metaInfo['createIcon'] });
-        let content = new St.Bin({ child: this.icon.actor });
-        this.actor.set_child(content);
-        this.actor.label_actor = this.icon.label;
+        let content = provider.createResultObject(metaInfo);
+        let dragSource = null;
+
+        if (content == null) {
+            let actor = new St.Bin();
+            let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
+                                             { createIcon: this.metaInfo['createIcon'] });
+            actor.set_child(icon.actor);
+            actor.label_actor = icon.label;
+            dragSource = icon.icon;
+            content = { actor: actor, icon: icon };
+        } else {
+            if (content._delegate && content._delegate.getDragActorSource)
+                dragSource = content._delegate.getDragActorSource();
+        }
+
+        this.actor.set_child(content.actor);
+        this.actor.label_actor = content.actor.label_actor;
+        this.icon = content.icon;
+
+        let draggable = DND.makeDraggable(this.actor);
+        draggable.connect('drag-begin',
+                          Lang.bind(this, function() {
+                              Main.overview.beginItemDrag(this);
+                          }));
+        draggable.connect('drag-cancelled',
+                          Lang.bind(this, function() {
+                              Main.overview.cancelledItemDrag(this);
+                          }));
+        draggable.connect('drag-end',
+                          Lang.bind(this, function() {
+                              Main.overview.endItemDrag(this);
+                          }));
+
+        if (!dragSource)
+            // not exactly right, but alignment problems are hard to notice
+            dragSource = content;
+        this._dragActorSource = dragSource;
+    },
+
+    getDragActorSource: function() {
+        return this._dragActorSource;
+    },
+
+    getDragActor: function() {
+        return this.metaInfo['createIcon'](Main.overview.dashIconSize);
+    },
+
+    shellWorkspaceLaunch: function(params) {
+        if (this.provider.dragActivateResult)
+            this.provider.dragActivateResult(this.metaInfo.id, params);
+        else
+            this.provider.activateResult(this.metaInfo.id, this.terms);
    }
 });

@@ -261,11 +314,7 @@ const SearchResultsBase = new Lang.Class({
        this._terms = [];
    },

-    _createResultDisplay: function(meta) {
-        if (this.provider.createResultObject)
-            return this.provider.createResultObject(meta);
-
-        return null;
+    _clearResultDisplay: function() {
    },

    clear: function() {
@@ -367,7 +416,6 @@ const ListSearchResults = new Lang.Class({
        this.providerIcon.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
        this.providerIcon.connect('clicked', Lang.bind(this,
            function() {
-                this.providerIcon.animateLaunch();
                provider.launchSearch(this._terms);
                Main.overview.toggle();
            }));
@@ -385,7 +433,7 @@ const ListSearchResults = new Lang.Class({
    },

    _setMoreIconVisible: function(visible) {
-        this.providerIcon.moreIcon.visible = visible;
+        this.providerIcon.moreIcon.visible = true;
    },

    _getMaxDisplayedResults: function() {
@@ -397,7 +445,7 @@ const ListSearchResults = new Lang.Class({
    },

    _createResultDisplay: function(meta) {
-        return this.parent(meta) || new ListSearchResult(this.provider, meta);
+        return new ListSearchResult(this.provider, meta);
    },

    _addItem: function(display) {
@@ -417,14 +465,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 });
@@ -435,9 +477,16 @@ const GridSearchResults = new Lang.Class({
    },

    _getMaxDisplayedResults: function() {
-        let parentThemeNode = this._parentContainer.get_theme_node();
-        let availableWidth = parentThemeNode.adjust_for_width(this._parentContainer.width);
-        return this._grid.columnsForWidth(availableWidth) * this._grid.getRowLimit();
+        return this._grid.columnsForWidth(this._bin.width) * this._grid.getRowLimit();
+    },
+
+    _renderResults: function(metas) {
+        for (let i = 0; i < metas.length; i++) {
+            let display = new GridSearchResult(this.provider, metas[i]);
+            display.connect('activate', Lang.bind(this, this._activateResult));
+            display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
+            this._grid.addItem(display);
+        }
    },

    _clearResultDisplay: function () {
@@ -445,7 +494,7 @@ const GridSearchResults = new Lang.Class({
    },

    _createResultDisplay: function(meta) {
-        return this.parent(meta) || new GridSearchResult(this.provider, meta);
+        return new GridSearchResult(this.provider, meta);
    },

    _addItem: function(display) {
@@ -528,7 +577,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);
@@ -581,8 +630,13 @@ const SearchResults = new Lang.Class({
        }

        if (newDefaultResult != this._defaultResult) {
-            this._setSelected(this._defaultResult, false);
-            this._setSelected(newDefaultResult, this._highlightDefault);
+            if (this._defaultResult)
+                this._defaultResult.setSelected(false);
+            if (newDefaultResult) {
+                newDefaultResult.setSelected(this._highlightDefault);
+                if (this._highlightDefault)
+                    Util.ensureActorVisibleInScrollView(this._scrollView, newDefaultResult.actor);
+            }

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

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

    navigateFocus: function(direction) {
@@ -634,18 +692,6 @@ const SearchResults = new Lang.Class({

        let from = this._defaultResult ? this._defaultResult.actor : null;
        this.actor.navigate_focus(from, direction, false);
-    },
-
-    _setSelected: function(result, selected) {
-        if (!result)
-            return;
-
-        if (selected) {
-            result.actor.add_style_pseudo_class('selected');
-            Util.ensureActorVisibleInScrollView(this._scrollView, result.actor);
-        } else {
-            result.actor.remove_style_pseudo_class('selected');
-        }
    }
 });

@@ -679,12 +725,5 @@ const ProviderIcon = new Lang.Class({
                                 gicon: provider.appInfo.get_icon() });
        this._content.add_actor(icon);
        this._content.add_actor(this.moreIcon);
-    },
-
-    animateLaunch: function() {
-        let appSys = Shell.AppSystem.get_default();
-        let app = appSys.lookup_app(this.provider.appInfo.get_id());
-        if (app.state == Shell.AppState.STOPPED)
-            IconGrid.zoomOutActor(this._content);
    }
 });
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -18,6 +18,7 @@ const _modes = {
    'restrictive': {
        parentMode: null,
        stylesheetName: 'gnome-shell.css',
+        overridesSchema: 'org.gnome.shell.overrides',
        hasOverview: false,
        showCalendarEvents: false,
        allowSettings: false,
--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@@ -24,7 +24,6 @@ const Slider = new Lang.Class({
                                          accessible_role: Atk.Role.SLIDER });
        this.actor.connect('repaint', Lang.bind(this, this._sliderRepaint));
        this.actor.connect('button-press-event', Lang.bind(this, this._startDragging));
-        this.actor.connect('touch-event', Lang.bind(this, this._touchDragging));
        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
        this.actor.connect('key-press-event', Lang.bind(this, this.onKeyPressEvent));

@@ -122,21 +121,11 @@ const Slider = new Lang.Class({
        this._dragging = true;

        let device = event.get_device();
-        let sequence = event.get_event_sequence();
-
-        if (sequence != null)
-            device.sequence_grab(sequence, this.actor);
-        else
-            device.grab(this.actor);
-
+        device.grab(this.actor);
        this._grabbedDevice = device;
-        this._grabbedSequence = sequence;
-
-        if (sequence == null) {
-            this._releaseId = this.actor.connect('button-release-event', Lang.bind(this, this._endDragging));
-            this._motionId = this.actor.connect('motion-event', Lang.bind(this, this._motionEvent));
-        }

+        this._releaseId = this.actor.connect('button-release-event', Lang.bind(this, this._endDragging));
+        this._motionId = this.actor.connect('motion-event', Lang.bind(this, this._motionEvent));
        let absX, absY;
        [absX, absY] = event.get_coords();
        this._moveHandle(absX, absY);
@@ -145,17 +134,10 @@ const Slider = new Lang.Class({

    _endDragging: function() {
        if (this._dragging) {
-            if (this._releaseId)
-                this.actor.disconnect(this._releaseId);
-            if (this._motionId)
-                this.actor.disconnect(this._motionId);
+            this.actor.disconnect(this._releaseId);
+            this.actor.disconnect(this._motionId);

-            if (this._grabbedSequence != null)
-                this._grabbedDevice.sequence_ungrab(this._grabbedSequence);
-            else
-                this._grabbedDevice.ungrab();
-
-            this._grabbedSequence = null;
+            this._grabbedDevice.ungrab();
            this._grabbedDevice = null;
            this._dragging = false;

@@ -164,24 +146,6 @@ const Slider = new Lang.Class({
        return Clutter.EVENT_STOP;
    },

-    _touchDragging: function(actor, event) {
-        let device = event.get_device();
-        let sequence = event.get_event_sequence();
-
-        if (!this._dragging &&
-            event.type() == Clutter.EventType.TOUCH_BEGIN) {
-            this.startDragging(event);
-            return Clutter.EVENT_STOP;
-        } else if (device.sequence_get_grabbed_actor(sequence) == actor) {
-            if (event.type() == Clutter.EventType.TOUCH_UPDATE)
-                return this._motionEvent(actor, event);
-            else if (event.type() == Clutter.EventType.TOUCH_END)
-                return this._endDragging();
-        }
-
-        return Clutter.EVENT_PROPAGATE;
-    },
-
    scroll: function(event) {
        let direction = event.get_scroll_direction();
        let delta;
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -48,7 +48,7 @@ const ATIndicator = new Lang.Class({

        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();
@@ -118,7 +118,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 +134,8 @@ const ATIndicator = new Lang.Class({
    },

    _buildHCItem: function() {
-        let interfaceSettings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
-        let wmSettings = new Gio.Settings({ schema_id: WM_SCHEMA });
+        let interfaceSettings = new Gio.Settings({ schema: DESKTOP_INTERFACE_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 +186,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/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -283,11 +283,11 @@ const InputSourcePopup = new Lang.Class({
        this._select(this._selectedIndex);
    },

-    _keyPressHandler: function(keysym, action) {
+    _keyPressHandler: function(keysym, backwards, action) {
        if (action == this._action)
-            this._select(this._next());
+            this._select(backwards ? this._previous() : this._next());
        else if (action == this._actionBackward)
-            this._select(this._previous());
+            this._select(backwards ? this._next() : this._previous());
        else if (keysym == Clutter.Left)
            this._select(this._previous());
        else if (keysym == Clutter.Right)
@@ -365,17 +365,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" }),
-                                  Meta.KeyBindingFlags.NONE,
+                                  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" }),
-                                  Meta.KeyBindingFlags.IS_REVERSED,
+                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
+                                  Meta.KeyBindingFlags.REVERSES |
+                                  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));

@@ -472,7 +473,8 @@ const InputSourceIndicator = new Lang.Class({

        let popup = new InputSourcePopup(this._mruSources, this._keybindingAction, this._keybindingActionBackward);
        let modifiers = binding.get_modifiers();
-        if (!popup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
+        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
+        if (!popup.show(backwards, binding.get_name(), binding.get_mask()))
            popup.destroy();
    },

--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -9,9 +9,8 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Shell = imports.gi.Shell;

-const LOCATION_SCHEMA = 'org.gnome.system.location';
+const LOCATION_SCHEMA = 'org.gnome.shell.location';
 const MAX_ACCURACY_LEVEL = 'max-accuracy-level';
-const ENABLED = 'enabled';

 var GeoclueIface = '<node> \
  <interface name="org.freedesktop.GeoClue2.Manager"> \
@@ -44,9 +43,7 @@ const Indicator = new Lang.Class({
    _init: function() {
        this.parent();

-        this._settings = new Gio.Settings({ schema_id: LOCATION_SCHEMA });
-        this._settings.connect('changed::' + ENABLED,
-                               Lang.bind(this, this._onMaxAccuracyLevelChanged));
+        this._settings = new Gio.Settings({ schema: LOCATION_SCHEMA });
        this._settings.connect('changed::' + MAX_ACCURACY_LEVEL,
                               Lang.bind(this, this._onMaxAccuracyLevelChanged));

@@ -96,12 +93,10 @@ const Indicator = new Lang.Class({
    _syncIndicator: function() {
        if (this._proxy == null) {
            this._indicator.visible = false;
-            this._item.actor.visible = false;
            return;
        }

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

@@ -128,6 +123,7 @@ const Indicator = new Lang.Class({
        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));
@@ -152,8 +148,10 @@ const Indicator = new Lang.Class({
    },

    _onOnOffAction: function() {
-        let enabled = this._settings.get_boolean(ENABLED);
-        this._settings.set_boolean(ENABLED, !enabled);
+        if (this._getMaxAccuracyLevel() == 0)
+            this._settings.set_enum(MAX_ACCURACY_LEVEL, this._availableAccuracyLevel);
+        else
+            this._settings.set_enum(MAX_ACCURACY_LEVEL, 0);
    },

    _onSessionUpdated: function() {
@@ -162,12 +160,12 @@ const Indicator = new Lang.Class({
    },

    _updateMenuLabels: function() {
-        if (this._settings.get_boolean(ENABLED)) {
-            this._item.status.text = this._indicator.visible ? _("In Use") : _("Enabled");
-            this._onOffAction.label.text = _("Disable");
-        } else {
+        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");
        }
    },

@@ -181,10 +179,7 @@ const Indicator = new Lang.Class({
    },

    _getMaxAccuracyLevel: function() {
-        if (this._settings.get_boolean(ENABLED))
-            return this._settings.get_enum(MAX_ACCURACY_LEVEL);
-        else
-            return 0;
+        return this._settings.get_enum(MAX_ACCURACY_LEVEL);
    },

    _notifyMaxAccuracyLevel: function() {
@@ -196,6 +191,8 @@ const Indicator = new Lang.Class({
        let unpacked = properties.deep_unpack();
        if ("InUse" in unpacked)
            this._syncIndicator();
+        if ("AvailableAccuracyLevel" in unpacked)
+            this._availableAccuracyLevel = this._proxy.AvailableAccuracyLevel;
    }
 });

--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -44,33 +44,6 @@ const NM80211Mode = NetworkManager['80211Mode'];
 const NM80211ApFlags = NetworkManager['80211ApFlags'];
 const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];

-const PortalHelperResult = {
-    CANCELLED: 0,
-    COMPLETED: 1,
-    RECHECK: 2
-};
-
-const PortalHelperIface = '<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 PortalHelperProxy = Gio.DBusProxy.makeProxyWrapper(PortalHelperIface);
-
 function ssidCompare(one, two) {
    if (!one || !two)
        return false;
@@ -234,23 +207,13 @@ const NMConnectionSection = new Lang.Class({
        this.item.menu.addMenuItem(this._labelSection);
        this.item.menu.addMenuItem(this._radioSection);

-        this._notifyConnectivityId = this._client.connect('notify::connectivity', Lang.bind(this, this._iconChanged));
+        this.connect('icon-changed', Lang.bind(this, this._sync));
    },

    destroy: function() {
-        if (this._notifyConnectivityId != 0) {
-            this._client.disconnect(this._notifyConnectivityId);
-            this._notifyConnectivityId = 0;
-        }
-
        this.item.destroy();
    },

-    _iconChanged: function() {
-        this._sync();
-        this.emit('icon-changed');
-    },
-
    _sync: function() {
        let nItems = this._connectionItems.size;

@@ -315,7 +278,7 @@ const NMConnectionSection = new Lang.Class({
            return;

        item.connect('icon-changed', Lang.bind(this, function() {
-            this._iconChanged();
+            this.emit('icon-changed');
        }));
        item.connect('activation-failed', Lang.bind(this, function(item, reason) {
            this.emit('activation-failed', reason);
@@ -560,7 +523,7 @@ const NMDeviceModem = new Lang.Class({
        if (this._mobileDevice) {
            this._operatorNameId = this._mobileDevice.connect('notify::operator-name', Lang.bind(this, this._sync));
            this._signalQualityId = this._mobileDevice.connect('notify::signal-quality', Lang.bind(this, function() {
-                this._iconChanged();
+                this.emit('icon-changed');
            }));
        }
    },
@@ -1182,16 +1145,10 @@ const NMDeviceWireless = new Lang.Class({
        this._wirelessHwEnabledChangedId = this._client.connect('notify::wireless-hardware-enabled', Lang.bind(this, this._sync));
        this._activeApChangedId = this._device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged));
        this._stateChangedId = this._device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));
-        this._notifyConnectivityId = this._client.connect('notify::connectivity', Lang.bind(this, this._iconChanged));

        this._sync();
    },

-    _iconChanged: function() {
-        this._sync();
-        this.emit('icon-changed');
-    },
-
    destroy: function() {
        if (this._activeApChangedId) {
            GObject.Object.prototype.disconnect.call(this._device, this._activeApChangedId);
@@ -1217,10 +1174,6 @@ const NMDeviceWireless = new Lang.Class({
            this._dialog.destroy();
            this._dialog = null;
        }
-        if (this._notifyConnectivityId) {
-            this._client.disconnect(this._notifyConnectivityId);
-            this._notifyConnectivityId = 0;
-        }

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

    _strengthChanged: function() {
-        this._iconChanged();
+        this.emit('icon-changed');
    },

    _activeApChanged: function() {
@@ -1608,7 +1561,6 @@ const NMApplet = new Lang.Class({

        this._activeConnections = [ ];
        this._connections = [ ];
-        this._connectivityQueue = [ ];

        this._mainConnection = null;
        this._mainConnectionIconChangedId = 0;
@@ -1637,7 +1589,6 @@ const NMApplet = new Lang.Class({
        this._client.connect('notify::primary-connection', Lang.bind(this, this._syncMainConnection));
        this._client.connect('notify::activating-connection', Lang.bind(this, this._syncMainConnection));
        this._client.connect('notify::active-connections', Lang.bind(this, this._syncVPNConnections));
-        this._client.connect('notify::connectivity', Lang.bind(this, this._syncConnectivity));
        this._client.connect('device-added', Lang.bind(this, this._deviceAdded));
        this._client.connect('device-removed', Lang.bind(this, this._deviceRemoved));
        this._settings.connect('new-connection', Lang.bind(this, this._newConnection));
@@ -1806,7 +1757,6 @@ const NMApplet = new Lang.Class({
        }

        this._updateIcon();
-        this._syncConnectivity();
    },

    _syncVPNConnections: function() {
@@ -1912,97 +1862,6 @@ const NMApplet = new Lang.Class({
    _syncNMState: function() {
        this.indicators.visible = this._client.manager_running;
        this.menu.actor.visible = this._client.networking_enabled;
-
-        this._syncConnectivity();
-    },
-
-    _flushConnectivityQueue: function() {
-        if (this._portalHelperProxy) {
-            for (let item of this._connectivityQueue)
-                this._portalHelperProxy.CloseRemote(item);
-        }
-
-        this._connectivityQueue = [];
-    },
-
-    _closeConnectivityCheck: function(path) {
-        let index = this._connectivityQueue.indexOf(path);
-
-        if (index >= 0) {
-            if (this._portalHelperProxy)
-                this._portalHelperProxy.CloseRemote(path);
-
-            this._connectivityQueue.splice(index, 1);
-        }
-    },
-
-    _portalHelperDone: function(proxy, emitter, parameters) {
-        let [path, result] = parameters;
-
-        if (result == PortalHelperResult.CANCELLED) {
-            // Keep the connection in the queue, so the user is not
-            // spammed with more logins until we next flush the queue,
-            // which will happen once he chooses a better connection
-            // or we get to full connectivity through other means
-        } else if (result == PortalHelperResult.COMPLETED) {
-            this._closeConnectivityCheck(path);
-            return;
-        } else if (result == PortalHelperResult.RECHECK) {
-            this._client.check_connectivity_async(null, Lang.bind(this, function(client, result) {
-                try {
-                    let state = client.check_connectivity_finish(result);
-                    if (state >= NetworkManager.ConnectivityState.FULL)
-                        this._closeConnectivityCheck(path);
-                } catch(e) { }
-            }));
-        } else {
-            log('Invalid result from portal helper: ' + result);
-        }
-    },
-
-    _syncConnectivity: function() {
-        if (this._mainConnection == null ||
-            this._mainConnection.state != NetworkManager.ActiveConnectionState.ACTIVATED) {
-            this._flushConnectivityQueue();
-            return;
-        }
-
-        let isPortal = this._client.connectivity == NetworkManager.ConnectivityState.PORTAL;
-        // For testing, allow interpreting any value != FULL as PORTAL, because
-        // LIMITED (no upstream route after the default gateway) is easy to obtain
-        // with a tethered phone
-        // NONE is also possible, with a connection configured to force no default route
-        // (but in general we should only prompt a portal if we know there is a portal)
-        if (GLib.getenv('GNOME_SHELL_CONNECTIVITY_TEST') != null)
-            isPortal = isPortal || this._client.connectivity < NetworkManager.ConnectivityState.FULL;
-        if (!isPortal)
-            return;
-
-        let path = this._mainConnection.get_path();
-        for (let item of this._connectivityQueue) {
-            if (item == path)
-                return;
-        }
-
-        let timestamp = global.get_current_time();
-        if (this._portalHelperProxy) {
-            this._portalHelperProxy.AuthenticateRemote(path, '', timestamp);
-        } else {
-            new PortalHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PortalHelper',
-                                  '/org/gnome/Shell/PortalHelper', Lang.bind(this, function (proxy, error) {
-                                      if (error) {
-                                          log('Error launching the portal helper: ' + error);
-                                          return;
-                                      }
-
-                                      this._portalHelperProxy = proxy;
-                                      proxy.connectSignal('Done', Lang.bind(this, this._portalHelperDone));
-
-                                      proxy.AuthenticateRemote(path, '', timestamp);
-                                  }));
-        }
-
-        this._connectivityQueue.push(path);
    },

    _updateIcon: function() {
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -95,11 +95,11 @@ const Indicator = new Lang.Class({
    _init: function() {
        this.parent();

-        this._screenSaverSettings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
-        this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
-        this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
-        this._privacySettings = new Gio.Settings({ schema_id: PRIVACY_SCHEMA });
-        this._orientationSettings = new Gio.Settings({ schema_id: 'org.gnome.settings-daemon.peripherals.touchscreen' });
+        this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
+        this._loginScreenSettings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
+        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
+        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
+        this._orientationSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.peripherals.touchscreen' });

        this._session = new GnomeSession.SessionManager();
        this._loginManager = LoginManager.getLoginManager();
@@ -151,11 +151,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
@@ -178,17 +178,19 @@ const SwitcherPopup = new Lang.Class({
        return mod(this._selectedIndex - 1, this._items.length);
    },

-    _keyPressHandler: function(keysym, action) {
+    _keyPressHandler: function(keysym, backwards, action) {
        throw new Error('Not implemented');
    },

    _keyPressEvent: function(actor, event) {
        let keysym = event.get_key_symbol();
-        let action = global.display.get_keybinding_action(event.get_key_code(), event.get_state());
+        let event_state = event.get_state();
+        let backwards = event_state & Clutter.ModifierType.SHIFT_MASK;
+        let action = global.display.get_keybinding_action(event.get_key_code(), event_state);

        this._disableHover();

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

        if (keysym == Clutter.Escape)
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@@ -53,10 +53,8 @@ function _wrapTweening(target, tweeningParameters) {
        }
    }

-    if (!Gtk.Settings.get_default().gtk_enable_animations) {
+    if (!Gtk.Settings.get_default().gtk_enable_animations)
        tweeningParameters['time'] = 0.000001;
-        tweeningParameters['delay'] = 0.000001;
-    }

    _addHandler(target, tweeningParameters, 'onComplete', _tweenCompleted);
 }
--- 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
@@ -19,8 +19,6 @@ const Search = imports.ui.search;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const WorkspacesView = imports.ui.workspacesView;
-const EdgeDragAction = imports.ui.edgeDragAction;
-const IconGrid = imports.ui.iconGrid;

 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';

@@ -51,74 +49,13 @@ function getTermsForSearchString(searchString) {
    return terms;
 }

-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',

    _init : function(searchEntry, showAppsButton) {
        this.actor = new Shell.Stack({ name: 'viewSelector' });

+        this._showAppsBlocked = false;
        this._showAppsButton = showAppsButton;
        this._showAppsButton.connect('notify::checked', Lang.bind(this, this._onShowAppsButtonToggled));

@@ -146,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;
@@ -181,91 +118,58 @@ const ViewSelector = new Lang.Class({
        this._stageKeyPressId = 0;
        Main.overview.connect('showing', Lang.bind(this,
            function () {
+                this._resetShowAppsButton();
                this._stageKeyPressId = global.stage.connect('key-press-event',
                                                             Lang.bind(this, this._onStageKeyPress));
            }));
        Main.overview.connect('hiding', Lang.bind(this,
            function () {
+                this._resetShowAppsButton();
                if (this._stageKeyPressId != 0) {
                    global.stage.disconnect(this._stageKeyPressId);
                    this._stageKeyPressId = 0;
                }
            }));
-        Main.overview.connect('shown', Lang.bind(this,
-            function() {
-                // If we were animating from the desktop view to the
-                // apps page the workspace page was visible, allowing
-                // the windows to animate, but now we no longer want to
-                // show it given that we are now on the apps page or
-                // search page.
-                if (this._activePage != this._workspacesPage)
-                    this._workspacesPage.opacity = 0;
-            }));

        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.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() {
-        this._showAppsButton.checked = !this._showAppsButton.checked;
        Main.overview.show();
+        this._showAppsButton.checked = !this._showAppsButton.checked;
    },

    showApps: function() {
-        this._showAppsButton.checked = true;
        Main.overview.show();
+        this._showAppsButton.checked = true;
    },

    show: function() {
        this.reset();
-        this._workspacesDisplay.show(this._showAppsButton.checked);
+
+        this._workspacesDisplay.show();
        this._activePage = null;
-        if (this._showAppsButton.checked)
-            this._showPage(this._appsPage);
-        else
-            this._showPage(this._workspacesPage);
+        this._showPage(this._workspacesPage);

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

-    animateFromOverview: function() {
-        // Make sure workspace page is fully visible to allow
-        // workspace.js do the animation of the windows
-        this._workspacesPage.opacity = 255;
-
-        this._workspacesDisplay.animateFromOverview(this._activePage != this._workspacesPage);
-
-        this._showAppsButton.checked = false;
+    zoomFromOverview: function() {
+        this._workspacesDisplay.zoomFromOverview();

        if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
            Main.overview.fadeInDesktop();
@@ -302,61 +206,21 @@ const ViewSelector = new Lang.Class({
        return page;
    },

-    _fadePageIn: function() {
-        Tweener.addTween(this._activePage,
-                         { opacity: 255,
-                           time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
-    },
-
-    _fadePageOut: function(page) {
-        let oldPage = page;
-        Tweener.addTween(page,
-                         { opacity: 0,
-                           time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this._animateIn(oldPage);
-                           })
-                         });
-    },
-
-    _animateIn: function(oldPage) {
+    _fadePageIn: function(oldPage) {
        if (oldPage)
            oldPage.hide();

        this.emit('page-empty');

        this._activePage.show();
-
-        if (this._activePage == this._appsPage && oldPage == this._workspacesPage) {
-            // Restore opacity, in case we animated via _fadePageOut
-            this._activePage.opacity = 255;
-            this.appDisplay.animate(IconGrid.AnimationDirection.IN);
-        } else {
-            this._fadePageIn();
-        }
+        Tweener.addTween(this._activePage,
+            { opacity: 255,
+              time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
+              transition: 'easeOutQuad'
+            });
    },

-    _animateOut: function(page) {
-        let oldPage = page;
-        if (page == this._appsPage &&
-            this._activePage == this._workspacesPage &&
-            !Main.overview.animationInProgress) {
-            this.appDisplay.animate(IconGrid.AnimationDirection.OUT, Lang.bind(this,
-                function() {
-                    this._animateIn(oldPage)
-                }));
-        } else {
-            this._fadePageOut(page);
-        }
-    },
-
-    _showPage: function(page) {
-        if (!Main.overview.visible)
-            return;
-
+    _showPage: function(page, noFade) {
        if (page == this._activePage)
            return;

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

-        if (oldPage)
-            this._animateOut(oldPage)
+        if (oldPage && !noFade)
+            Tweener.addTween(oldPage,
+                             { opacity: 0,
+                               time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
+                               transition: 'easeOutQuad',
+                               onComplete: Lang.bind(this,
+                                   function() {
+                                       this._fadePageIn(oldPage);
+                                   })
+                             });
        else
-            this._animateIn();
+            this._fadePageIn(oldPage);
    },

    _a11yFocusPage: function(page) {
@@ -376,10 +248,21 @@ const ViewSelector = new Lang.Class({
    },

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

+    _resetShowAppsButton: function() {
+        this._showAppsBlocked = true;
+        this._showAppsButton.checked = false;
+        this._showAppsBlocked = false;
+
+        this._showPage(this._workspacesPage, true);
+    },
+
    _onStageKeyPress: function(actor, event) {
        // Ignore events while anything but the overview has
        // pushed a modal (system modals, looking glass, ...)
@@ -402,10 +285,10 @@ const ViewSelector = new Lang.Class({
        } 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;
+                return true;
            } else if (symbol == Clutter.ISO_Left_Tab) {
                this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_BACKWARD, false);
-                return Clutter.EVENT_STOP;
+                return true;
            }
        }
        return Clutter.EVENT_PROPAGATE;
@@ -475,10 +358,7 @@ const ViewSelector = new Lang.Class({

    startSearch: function(event) {
        global.stage.set_key_focus(this._text);
-
-        let synthEvent = event.copy();
-        synthEvent.set_source(this._text);
-        this._text.event(synthEvent, true);
+        this._text.event(event, true);
    },

    // the entry does not show the hint
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -9,7 +9,6 @@ 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;
@@ -19,13 +18,6 @@ const Tweener = imports.ui.tweener;
 const WindowMenu = imports.ui.windowMenu;

 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
-const MAXIMIZE_WINDOW_ANIMATION_TIME = 0.15;
-const UNMAXIMIZE_WINDOW_ANIMATION_TIME = 0.15;
-const MINIMIZE_WINDOW_ANIMATION_TIME = 0.2;
-const SHOW_WINDOW_ANIMATION_TIME = 0.15;
-const DIALOG_SHOW_WINDOW_ANIMATION_TIME = 0.1;
-const DESTROY_WINDOW_ANIMATION_TIME = 0.15;
-const DIALOG_DESTROY_WINDOW_ANIMATION_TIME = 0.1;
 const WINDOW_ANIMATION_TIME = 0.25;
 const DIM_BRIGHTNESS = -0.3;
 const DIM_TIME = 0.500;
@@ -207,19 +199,12 @@ const WorkspaceTracker = new Lang.Class({
        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 = [];
@@ -464,115 +449,6 @@ const TilePreview = new Lang.Class({
    }
 });

-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',

@@ -772,13 +648,13 @@ const WindowManager = new Lang.Class({
                                        Lang.bind(this, this._startA11ySwitcher));

        this.addKeybinding('pause-resume-tweens',
-                           new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
+                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                           Meta.KeyBindingFlags.NONE,
                           Shell.KeyBindingMode.ALL,
                           Lang.bind(this, this._toggleTweens));

        this.addKeybinding('open-application-menu',
-                           new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
+                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                           Meta.KeyBindingFlags.NONE,
                           Shell.KeyBindingMode.NORMAL |
                           Shell.KeyBindingMode.TOPBAR_POPUP,
@@ -800,53 +676,6 @@ const WindowManager = new Lang.Class({

        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) {
@@ -881,12 +710,12 @@ const WindowManager = new Lang.Class({
        return !Main.overview.visible;
    },

-    _shouldAnimateActor: function(actor, types) {
+    _shouldAnimateActor: function(actor) {
        if (!this._shouldAnimate())
            return false;
-
-        let type = actor.meta_window.get_window_type();
-        return types.indexOf(type) >= 0;
+        let windowType = actor.meta_window.get_window_type();
+        return windowType == Meta.WindowType.NORMAL ||
+            windowType == Meta.WindowType.MODAL_DIALOG;
    },

    _removeEffect : function(list, actor) {
@@ -899,10 +728,7 @@ const WindowManager = new Lang.Class({
    },

    _minimizeWindow : function(shellwm, actor) {
-        let types = [Meta.WindowType.NORMAL,
-                     Meta.WindowType.MODAL_DIALOG,
-                     Meta.WindowType.DIALOG];
-        if (!this._shouldAnimateActor(actor, types)) {
+        if (!this._shouldAnimateActor(actor)) {
            shellwm.completed_minimize(actor);
            return;
        }
@@ -914,7 +740,7 @@ const WindowManager = new Lang.Class({
        if (actor.meta_window.is_monitor_sized()) {
            Tweener.addTween(actor,
                         { opacity: 0,
-                           time: MINIMIZE_WINDOW_ANIMATION_TIME,
+                           time: WINDOW_ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: this._minimizeWindowDone,
                           onCompleteScope: this,
@@ -946,8 +772,8 @@ const WindowManager = new Lang.Class({
                               scale_y: yScale,
                               x: xDest,
                               y: yDest,
-                               time: MINIMIZE_WINDOW_ANIMATION_TIME,
-                               transition: 'easeInExpo',
+                               time: WINDOW_ANIMATION_TIME,
+                               transition: 'easeOutQuad',
                               onComplete: this._minimizeWindowDone,
                               onCompleteScope: this,
                               onCompleteParams: [shellwm, actor],
@@ -963,7 +789,7 @@ const WindowManager = new Lang.Class({
            Tweener.removeTweens(actor);
            actor.set_scale(1.0, 1.0);
            actor.set_opacity(255);
-            actor.set_pivot_point(0, 0);
+            actor.move_anchor_point_from_gravity(Clutter.Gravity.NORTH_WEST);

            shellwm.completed_minimize(actor);
        }
@@ -1061,10 +887,7 @@ const WindowManager = new Lang.Class({
            actor._windowType = type;
        }));

-        let types = [Meta.WindowType.NORMAL,
-                     Meta.WindowType.DIALOG,
-                     Meta.WindowType.MODAL_DIALOG];
-        if (!this._shouldAnimateActor(actor, types)) {
+        if (!this._shouldAnimateActor(actor)) {
            shellwm.completed_map(actor);
            return;
        }
@@ -1072,23 +895,15 @@ const WindowManager = new Lang.Class({
        if (actor.meta_window.is_attached_dialog()) {
            /* Scale the window from the center of the parent */
            this._checkDimming(actor.get_meta_window().get_transient_for());
-        }
-
-        switch (actor._windowType) {
-        case Meta.WindowType.NORMAL:
-            actor.set_pivot_point(0.5, 1.0);
-            actor.scale_x = 0.01;
-            actor.scale_y = 0.05;
-            actor.opacity = 0;
+            actor.set_scale(1.0, 0.0);
+            actor.scale_gravity = Clutter.Gravity.CENTER;
            actor.show();
            this._mapping.push(actor);

            Tweener.addTween(actor,
-                             { opacity: 255,
-                               scale_x: 1,
-                               scale_y: 1,
-                               time: SHOW_WINDOW_ANIMATION_TIME,
-                               transition: 'easeOutExpo',
+                             { scale_y: 1,
+                               time: WINDOW_ANIMATION_TIME,
+                               transition: "easeOutQuad",
                               onComplete: this._mapWindowDone,
                               onCompleteScope: this,
                               onCompleteParams: [shellwm, actor],
@@ -1096,20 +911,15 @@ const WindowManager = new Lang.Class({
                               onOverwriteScope: this,
                               onOverwriteParams: [shellwm, actor]
                             });
-            break;
-        case Meta.WindowType.MODAL_DIALOG:
-        case Meta.WindowType.DIALOG:
-            actor.set_pivot_point(0.5, 0.5);
-            actor.scale_y = 0;
+        } else {
+            /* Fade window in */
            actor.opacity = 0;
            actor.show();
            this._mapping.push(actor);

            Tweener.addTween(actor,
                             { opacity: 255,
-                               scale_x: 1,
-                               scale_y: 1,
-                               time: DIALOG_SHOW_WINDOW_ANIMATION_TIME,
+                               time: WINDOW_ANIMATION_TIME,
                               transition: 'easeOutQuad',
                               onComplete: this._mapWindowDone,
                               onCompleteScope: this,
@@ -1118,10 +928,6 @@ const WindowManager = new Lang.Class({
                               onOverwriteScope: this,
                               onOverwriteParams: [shellwm, actor]
                             });
-            break;
-        default:
-            shellwm.completed_map(actor);
-            return;
        }
    },

@@ -1129,11 +935,7 @@ const WindowManager = new Lang.Class({
        if (this._removeEffect(this._mapping, actor)) {
            Tweener.removeTweens(actor);
            actor.opacity = 255;
-            actor.set_pivot_point(0, 0);
            actor.scale_y = 1;
-            actor.scale_x = 1;
-            actor.translation_y = 0;
-            actor.translation_x = 0;
            shellwm.completed_map(actor);
        }
    },
@@ -1156,51 +958,30 @@ const WindowManager = new Lang.Class({
                                                             });
        }

-        let types = [Meta.WindowType.NORMAL,
-                     Meta.WindowType.DIALOG,
-                     Meta.WindowType.MODAL_DIALOG];
-        if (!this._shouldAnimateActor(actor, types)) {
+        if (!this._shouldAnimateActor(actor)) {
            shellwm.completed_destroy(actor);
            return;
        }

-        switch (actor._windowType) {
-        case Meta.WindowType.NORMAL:
-            actor.set_pivot_point(0.5, 0.5);
-            this._destroying.push(actor);
+        this._destroying.push(actor);

-            Tweener.addTween(actor,
-                             { opacity: 0,
-                               scale_x: 0.8,
-                               scale_y: 0.8,
-                               time: DESTROY_WINDOW_ANIMATION_TIME,
-                               transition: 'easeOutQuad',
-                               onComplete: this._destroyWindowDone,
-                               onCompleteScope: this,
-                               onCompleteParams: [shellwm, actor],
-                               onOverwrite: this._destroyWindowDone,
-                               onOverwriteScope: this,
-                               onOverwriteParams: [shellwm, actor]
-                             });
-            break;
-        case Meta.WindowType.MODAL_DIALOG:
-        case Meta.WindowType.DIALOG:
-            actor.set_pivot_point(0.5, 0.5);
-            this._destroying.push(actor);
+        if (window.is_attached_dialog()) {
+            let parent = window.get_transient_for();
+            this._checkDimming(parent, window);

-            if (window.is_attached_dialog()) {
-                let parent = window.get_transient_for();
-                this._checkDimming(parent, window);
-                actor._parentDestroyId = parent.connect('unmanaged', Lang.bind(this, function () {
-                    Tweener.removeTweens(actor);
-                    this._destroyWindowDone(shellwm, actor);
-                }));
-            }
+            actor.set_scale(1.0, 1.0);
+            actor.scale_gravity = Clutter.Gravity.CENTER;
+            actor.show();
+
+            actor._parentDestroyId = parent.connect('unmanaged', Lang.bind(this, function () {
+                Tweener.removeTweens(actor);
+                this._destroyWindowDone(shellwm, actor);
+            }));

            Tweener.addTween(actor,
                             { scale_y: 0,
-                               time: DIALOG_DESTROY_WINDOW_ANIMATION_TIME,
-                               transition: 'easeOutQuad',
+                               time: WINDOW_ANIMATION_TIME,
+                               transition: "easeOutQuad",
                               onComplete: this._destroyWindowDone,
                               onCompleteScope: this,
                               onCompleteParams: [shellwm, actor],
@@ -1208,11 +989,9 @@ const WindowManager = new Lang.Class({
                               onOverwriteScope: this,
                               onOverwriteParams: [shellwm, actor]
                             });
-            break;
-        default:
-            shellwm.completed_destroy(actor);
            return;
        }
+        shellwm.completed_destroy(actor);
    },

    _destroyWindowDone : function(shellwm, actor) {
@@ -1385,7 +1164,9 @@ const WindowManager = new Lang.Class({

        let tabPopup = new AltTab.AppSwitcherPopup();

-        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
+        let modifiers = binding.get_modifiers();
+        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
+        if (!tabPopup.show(backwards, binding.get_name(), binding.get_mask()))
            tabPopup.destroy();
    },

@@ -1396,12 +1177,16 @@ const WindowManager = new Lang.Class({

        let tabPopup = new AltTab.WindowSwitcherPopup();

-        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
+        let modifiers = binding.get_modifiers();
+        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
+        if (!tabPopup.show(backwards, binding.get_name(), binding.get_mask()))
            tabPopup.destroy();
    },

    _startA11ySwitcher : function(display, screen, window, binding) {
-        Main.ctrlAltTabManager.popup(binding.is_reversed(), binding.get_name(), binding.get_mask());
+        let modifiers = binding.get_modifiers();
+        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
+        Main.ctrlAltTabManager.popup(backwards, binding.get_name(), binding.get_mask());
    },

    _toggleAppMenu : function(display, screen, window, event, binding) {
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -34,8 +34,6 @@ const DRAGGING_WINDOW_OPACITY = 100;
 const LAYOUT_SCALE_WEIGHT = 1;
 const LAYOUT_SPACE_WEIGHT = 0.1;

-const WINDOW_ANIMATION_MAX_NUMBER_BLENDING = 3;
-
 function _interpolate(start, end, step) {
    return start + (end - start) * step;
 }
@@ -69,7 +67,7 @@ const WindowCloneLayout = new Lang.Class({
        // 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 inputRect = window.get_input_rect();

        let box = new Clutter.ActorBox();

@@ -89,7 +87,7 @@ const WindowCloneLayout = new Lang.Class({
    },

    vfunc_allocate: function(container, box, flags) {
-        container.get_children().forEach(Lang.bind(this, function (child) {
+        let clone = container.get_children().forEach(function (child) {
            let realWindow;
            if (child == container._delegate._windowClone)
                realWindow = container._delegate.realWindow;
@@ -98,8 +96,8 @@ const WindowCloneLayout = new Lang.Class({

            child.allocate(this._makeBoxForWindow(realWindow.meta_window),
                           flags);
-        }));
-    }
+        }, this);
+    },
 });

 const WindowClone = new Lang.Class({
@@ -241,14 +239,6 @@ const WindowClone = new Lang.Class({
        return this._boundingBox;
    },

-    get width() {
-        return this._boundingBox.width;
-    },
-
-    get height() {
-        return this._boundingBox.height;
-    },
-
    getOriginalPosition: function() {
        return [this._boundingBox.x, this._boundingBox.y];
    },
@@ -267,8 +257,7 @@ const WindowClone = new Lang.Class({
            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._boundingBox = rect;
        this.actor.layout_manager.boundingBox = rect;
    },

@@ -519,7 +508,6 @@ const WindowOverlay = new Lang.Class({

        Tweener.removeTweens(button);
        Tweener.removeTweens(border);
-        Tweener.removeTweens(title);

        let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;

@@ -844,7 +832,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,
@@ -946,11 +934,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 cellHeight = window.height * s;
+                let cellWidth = window.actor.width * 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;
@@ -1004,7 +992,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;
@@ -1017,8 +1005,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 height = window.height * s;
+                let width = window.actor.width * 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
@@ -1143,11 +1131,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) {
@@ -1155,9 +1138,7 @@ const Workspace = new Lang.Class({
            return;

        this._fullGeometry = geom;
-
-        if (this.actor.mapped)
-            this._recalculateWindowPositions(WindowPositionFlags.NONE);
+        this._recalculateWindowPositions(WindowPositionFlags.NONE);
    },

    setActualGeometry: function(geom) {
@@ -1165,29 +1146,18 @@ const Workspace = new Lang.Class({
            return;

        this._actualGeometry = geom;
-        this._actualGeometryDirty = true;

-        if (this.actor.mapped)
-            this._syncActualGeometry();
-    },
-
-    _syncActualGeometry: function() {
-        if (this._actualGeometryLater || !this._actualGeometryDirty)
-            return;
-        if (!this._actualGeometry)
+        if (this._actualGeometryLater)
            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;
        }));
    },
@@ -1261,13 +1231,6 @@ const Workspace = new Lang.Class({
            return;
        }

-        // We will reposition windows anyway when enter again overview or when ending the windows
-        // animations whith fade animation.
-        // In this way we avoid unwanted animations of windows repositioning while
-        // animating overview.
-        if (this.leavingOverview || this._animatingWindowsFade)
-            return;
-
        let initialPositioning = flags & WindowPositionFlags.INITIAL;
        let animate = flags & WindowPositionFlags.ANIMATE;

@@ -1330,7 +1293,7 @@ const Workspace = new Lang.Class({
                                     });
                }

-                this._animateClone(clone, overlay, x, y, scale);
+                this._animateClone(clone, overlay, x, y, scale, initialPositioning);
            } else {
                // cancel any active tweens (otherwise they might override our changes)
                Tweener.removeTweens(clone.actor);
@@ -1359,7 +1322,7 @@ const Workspace = new Lang.Class({
        }
    },

-    _animateClone: function(clone, overlay, x, y, scale) {
+    _animateClone: function(clone, overlay, x, y, scale, initialPositioning) {
        Tweener.addTween(clone.actor,
                         { x: x,
                           y: y,
@@ -1417,6 +1380,10 @@ const Workspace = new Lang.Class({
        if (index == -1)
            return;

+        // Check if window still should be here
+        if (win && this._isMyWindow(win))
+            return;
+
        let clone = this._windows[index];

        this._windows.splice(index, 1);
@@ -1562,141 +1529,14 @@ const Workspace = new Lang.Class({
        return false;
    },

-    fadeToOverview: function() {
-        // We don't want to reposition windows while animating in this way.
-        this._animatingWindowsFade = true;
-        this._overviewShownId = Main.overview.connect('shown', Lang.bind(this,
-                                                                         this._doneShowingOverview));
-        if (this._windows.length == 0)
-            return;
-
-        if (this.metaWorkspace != null && this.metaWorkspace != global.screen.get_active_workspace())
-            return;
-
-        // Special case maximized windows, since it doesn't make sense
-        // to animate windows below in the stack
-        let topMaximizedWindow;
-        // It is ok to treat the case where there is no maximized
-        // window as if the bottom-most window was maximized given that
-        // it won't affect the result of the animation
-        for (topMaximizedWindow = this._windows.length - 1; topMaximizedWindow > 0; topMaximizedWindow--) {
-            let metaWindow = this._windows[topMaximizedWindow].metaWindow;
-            if (metaWindow.maximized_horizontally && metaWindow.maximized_vertically)
-                break;
-        }
-
-        let nTimeSlots = Math.min(WINDOW_ANIMATION_MAX_NUMBER_BLENDING + 1, this._windows.length - topMaximizedWindow);
-        let windowBaseTime = Overview.ANIMATION_TIME / nTimeSlots;
-
-        let topIndex = this._windows.length - 1;
-        for (let i = 0; i < this._windows.length; i++) {
-            if (i < topMaximizedWindow) {
-                // below top-most maximized window, don't animate
-                let overlay = this._windowOverlays[i];
-                if (overlay)
-                    overlay.hide();
-                this._windows[i].actor.opacity = 0;
-            } else {
-                let fromTop = topIndex - i;
-                let time;
-                if (fromTop < nTimeSlots) // animate top-most windows gradually
-                    time = windowBaseTime * (nTimeSlots - fromTop);
-                else
-                    time = windowBaseTime;
-
-                this._windows[i].actor.opacity = 255;
-                this._fadeWindow(i, time, 0);
-            }
-        }
-    },
-
-    fadeFromOverview: function() {
-        this.leavingOverview = true;
-        this._overviewHiddenId = Main.overview.connect('hidden', Lang.bind(this,
-                                                                           this._doneLeavingOverview));
-        if (this._windows.length == 0)
-            return;
-
-        for (let i = 0; i < this._windows.length; i++) {
-            let clone = this._windows[i];
-            Tweener.removeTweens(clone.actor);
-        }
-
-        if (this._repositionWindowsId > 0) {
-            Mainloop.source_remove(this._repositionWindowsId);
-            this._repositionWindowsId = 0;
-        }
-
-        if (this.metaWorkspace != null && this.metaWorkspace != global.screen.get_active_workspace())
-            return;
-
-        // Special case maximized windows, since it doesn't make sense
-        // to animate windows below in the stack
-        let topMaximizedWindow;
-        // It is ok to treat the case where there is no maximized
-        // window as if the bottom-most window was maximized given that
-        // it won't affect the result of the animation
-        for (topMaximizedWindow = this._windows.length - 1; topMaximizedWindow > 0; topMaximizedWindow--) {
-            let metaWindow = this._windows[topMaximizedWindow].metaWindow;
-            if (metaWindow.maximized_horizontally && metaWindow.maximized_vertically)
-                break;
-        }
-
-        let nTimeSlots = Math.min(WINDOW_ANIMATION_MAX_NUMBER_BLENDING + 1, this._windows.length - topMaximizedWindow);
-        let windowBaseTime = Overview.ANIMATION_TIME / nTimeSlots;
-
-        let topIndex = this._windows.length - 1;
-        for (let i = 0; i < this._windows.length; i++) {
-            if (i < topMaximizedWindow) {
-                // below top-most maximized window, don't animate
-                let overlay = this._windowOverlays[i];
-                if (overlay)
-                    overlay.hide();
-                this._windows[i].actor.opacity = 0;
-            } else {
-                let fromTop = topIndex - i;
-                let time;
-                if (fromTop < nTimeSlots) // animate top-most windows gradually
-                    time = windowBaseTime * (fromTop + 1);
-                else
-                    time = windowBaseTime * nTimeSlots;
-
-                this._windows[i].actor.opacity = 0;
-                this._fadeWindow(i, time, 255);
-            }
-        }
-    },
-
-    _fadeWindow: function(index, time, opacity) {
-        let clone = this._windows[index];
-        let overlay = this._windowOverlays[index];
-
-        if (overlay)
-            overlay.hide();
-
-        if (clone.metaWindow.showing_on_its_workspace()) {
-            let [origX, origY] = clone.getOriginalPosition();
-            clone.actor.scale_x = 1;
-            clone.actor.scale_y = 1;
-            clone.actor.x = origX;
-            clone.actor.y = origY;
-            Tweener.addTween(clone.actor,
-                             { time: time,
-                               opacity: opacity,
-                               transition: 'easeOutQuad'
-                             });
-        } else {
-            // The window is hidden
-            clone.actor.opacity = 0;
-        }
-    },
-
-    zoomToOverview: function() {
+    // Animate the full-screen to Overview transition.
+    zoomToOverview : function() {
        // Position and scale the windows.
        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE | WindowPositionFlags.INITIAL);
    },

-    zoomFromOverview: function() {
+    // Animates the return from Overview mode
+    zoomFromOverview : function() {
        let currentWorkspace = global.screen.get_active_workspace();

        this.leavingOverview = true;
@@ -1717,37 +1557,35 @@ const Workspace = new Lang.Class({
            return;

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

-    _zoomWindowFromOverview: function(index) {
-        let clone = this._windows[index];
-        let overlay = this._windowOverlays[index];
+            if (overlay)
+                overlay.hide();

-        if (overlay)
-            overlay.hide();
+            if (clone.metaWindow.showing_on_its_workspace()) {
+                let [origX, origY] = clone.getOriginalPosition();

-        if (clone.metaWindow.showing_on_its_workspace()) {
-            let [origX, origY] = clone.getOriginalPosition();
-            Tweener.addTween(clone.actor,
-                             { x: origX,
-                               y: origY,
-                               scale_x: 1.0,
-                               scale_y: 1.0,
-                               time: Overview.ANIMATION_TIME,
-                               opacity: 255,
-                               transition: 'easeOutQuad'
-                             });
-        } else {
-            // The window is hidden, make it shrink and fade it out
-            Tweener.addTween(clone.actor,
-                             { scale_x: 0,
-                               scale_y: 0,
-                               opacity: 0,
-                               time: Overview.ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
+                Tweener.addTween(clone.actor,
+                                 { x: origX,
+                                   y: origY,
+                                   scale_x: 1.0,
+                                   scale_y: 1.0,
+                                   time: Overview.ANIMATION_TIME,
+                                   opacity: 255,
+                                   transition: 'easeOutQuad'
+                                 });
+            } else {
+                // The window is hidden, make it shrink and fade it out
+                Tweener.addTween(clone.actor,
+                                 { scale_x: 0,
+                                   scale_y: 0,
+                                   opacity: 0,
+                                   time: Overview.ANIMATION_TIME,
+                                   transition: 'easeOutQuad'
+                                 });
+            }
        }
    },

@@ -1786,11 +1624,6 @@ const Workspace = new Lang.Class({
        this.leavingOverview = false;
    },

-    _doneShowingOverview: function() {
-        this._animatingWindowsFade = false;
-        this._recalculateWindowPositions(WindowPositionFlags.INITIAL);
-    },
-
    // Tests if @actor belongs to this workspaces and monitor
    _isMyWindow : function (actor) {
        let win = actor.meta_window;
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -367,6 +367,10 @@ const WorkspaceThumbnail = new Lang.Class({
        if (index == -1)
            return;

+        // Check if window still should be here
+        if (win && this._isMyWindow(win) && this._isOverviewWindow(win))
+            return;
+
        let clone = this._windows[index];
        this._windows.splice(index, 1);

@@ -661,7 +665,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));
    },
@@ -874,6 +878,9 @@ const ThumbnailsBox = new Lang.Class({
        for (let key in ThumbnailState)
            this._stateCounts[ThumbnailState[key]] = 0;

+        // The "porthole" is the portion of the screen that we show in the workspaces
+        this._porthole = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
+
        this.addThumbnails(0, global.screen.n_workspaces);

        this._updateSwitcherVisibility();
@@ -897,7 +904,6 @@ const ThumbnailsBox = new Lang.Class({
        for (let w = 0; w < this._thumbnails.length; w++)
            this._thumbnails[w].destroy();
        this._thumbnails = [];
-        this._porthole = null;
    },

    _workspacesChanged: function() {
@@ -928,7 +934,6 @@ const ThumbnailsBox = new Lang.Class({
    },

    addThumbnails: function(start, count) {
-        this._ensurePorthole();
        for (let k = start; k < start + count; k++) {
            let metaWorkspace = global.screen.get_workspace_by_index(k);
            let thumbnail = new WorkspaceThumbnail(metaWorkspace);
@@ -1116,7 +1121,9 @@ const ThumbnailsBox = new Lang.Class({
        // the size request to our children because we know how big they are and know
        // that the actors aren't depending on the virtual functions being called.

-        this._ensurePorthole();
+        if (this._thumbnails.length == 0)
+            return;
+
        let themeNode = this.actor.get_theme_node();

        let spacing = themeNode.get_length('spacing');
@@ -1128,7 +1135,8 @@ const ThumbnailsBox = new Lang.Class({
    },

    _getPreferredWidth: function(actor, forHeight, alloc) {
-        this._ensurePorthole();
+        if (this._thumbnails.length == 0)
+            return;

        let themeNode = this.actor.get_theme_node();

@@ -1146,13 +1154,6 @@ const ThumbnailsBox = new Lang.Class({
        alloc.natural_size = width;
    },

-    // The "porthole" is the portion of the screen that we show in the
-    // workspaces
-    _ensurePorthole: function() {
-        if (!this._porthole)
-            this._porthole = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
-    },
-
    _allocate: function(actor, box, flags) {
        let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);

--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -21,11 +21,6 @@ const WORKSPACE_SWITCH_TIME = 0.25;
 // Note that mutter has a compile-time limit of 36
 const MAX_WORKSPACES = 16;

-const AnimationType = {
-    ZOOM: 0,
-    FADE: 1
-};
-
 const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';

 const WorkspacesViewBase = new Lang.Class({
@@ -79,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();
    },
 });

@@ -99,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,
@@ -132,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);
    },
@@ -147,25 +139,17 @@ const WorkspacesView = new Lang.Class({
        return this._workspaces[active];
    },

-    animateToOverview: function(animationType) {
-        for (let w = 0; w < this._workspaces.length; w++) {
-            if (animationType == AnimationType.ZOOM)
-                this._workspaces[w].zoomToOverview();
-            else
-                this._workspaces[w].fadeToOverview();
-        }
+    zoomToOverview: function() {
+        for (let w = 0; w < this._workspaces.length; w++)
+            this._workspaces[w].zoomToOverview();
        this._updateWorkspaceActors(false);
    },

-    animateFromOverview: function(animationType) {
+    zoomFromOverview: function() {
        this.actor.remove_clip();

-        for (let w = 0; w < this._workspaces.length; w++) {
-            if (animationType == AnimationType.ZOOM)
-                this._workspaces[w].zoomFromOverview();
-            else
-                this._workspaces[w].fadeFromOverview();
-        }
+        for (let w = 0; w < this._workspaces.length; w++)
+            this._workspaces[w].zoomFromOverview();
    },

    syncStacking: function(stackIndices) {
@@ -276,12 +260,10 @@ const WorkspacesView = new Lang.Class({
            }
        }

-        if (this._fullGeometry) {
+        if (this._fullGeometry)
            this._updateWorkspaceActors(false);
-            this._syncFullGeometry();
-        }
-        if (this._actualGeometry)
-            this._syncActualGeometry();
+
+        this._syncGeometry();
    },

    _activeWorkspaceChanged: function(wm, from, to, direction) {
@@ -370,26 +352,17 @@ 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);
    },

-    animateToOverview: function(animationType) {
-        if (animationType == AnimationType.ZOOM)
-            this._workspace.zoomToOverview();
-        else
-            this._workspace.fadeToOverview();
+    zoomToOverview: function() {
+        this._workspace.zoomToOverview();
    },

-    animateFromOverview: function(animationType) {
-        if (animationType == AnimationType.ZOOM)
-            this._workspace.zoomFromOverview();
-        else
-            this._workspace.fadeFromOverview();
+    zoomFromOverview: function() {
+        this._workspace.zoomFromOverview();
    },

    syncStacking: function(stackIndices) {
@@ -456,7 +429,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));
@@ -481,16 +454,10 @@ const WorkspacesDisplay = new Lang.Class({
        return this._getPrimaryView().actor.navigate_focus(from, direction, false);
    },

-    show: function(fadeOnPrimary) {
+    show: function() {
        this._updateWorkspacesViews();
-        for (let i = 0; i < this._workspacesViews.length; i++) {
-            let animationType;
-            if (fadeOnPrimary && i == this._primaryIndex)
-                animationType = AnimationType.FADE;
-            else
-                animationType = AnimationType.ZOOM;
-            this._workspacesViews[i].animateToOverview(animationType);
-        }
+        for (let i = 0; i < this._workspacesViews.length; i++)
+            this._workspacesViews[i].zoomToOverview();

        this._restackedNotifyId =
            Main.overview.connect('windows-restacked',
@@ -499,15 +466,9 @@ const WorkspacesDisplay = new Lang.Class({
            this._scrollEventId = Main.overview.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
    },

-    animateFromOverview: function(fadeOnPrimary) {
-        for (let i = 0; i < this._workspacesViews.length; i++) {
-            let animationType;
-            if (fadeOnPrimary && i == this._primaryIndex)
-                animationType = AnimationType.FADE;
-            else
-                animationType = AnimationType.ZOOM;
-            this._workspacesViews[i].animateFromOverview(animationType);
-        }
+    zoomFromOverview: function() {
+        for (let i = 0; i < this._workspacesViews.length; i++)
+            this._workspacesViews[i].zoomFromOverview();
    },

    hide: function() {
@@ -637,9 +598,8 @@ const WorkspacesDisplay = new Lang.Class({
            return;

        let [x, y] = this.actor.get_transformed_position();
-        let allocation = this.actor.allocation;
-        let width = allocation.x2 - allocation.x1;
-        let height = allocation.y2 - allocation.y1;
+        let width = this.actor.allocation.x2 - this.actor.allocation.x1;
+        let height = this.actor.allocation.y2 - this.actor.allocation.y1;
        let primaryGeometry = { x: x, y: y, width: width, height: height };

        let monitors = Main.layoutManager.monitors;
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,13 +6,11 @@ data/gnome-shell.desktop.in.in
 data/gnome-shell-extension-prefs.desktop.in.in
 data/gnome-shell-wayland.desktop.in.in
 data/org.gnome.shell.gschema.xml.in.in
-data/org.gnome.Shell.PortalHelper.desktop.in
 js/extensionPrefs/main.js
 js/gdm/authPrompt.js
 js/gdm/loginDialog.js
 js/gdm/util.js
 js/misc/util.js
-js/portalHelper/main.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js
 js/ui/backgroundMenu.js
--- a/po/as.po
+++ b/po/as.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/fur.po
+++ b/po/fur.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/gu.po
+++ b/po/gu.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-07-25 19:35+0000\n"
-"PO-Revision-Date: 2014-07-25 22:53+0300\n"
+"POT-Creation-Date: 2014-06-02 19:26+0000\n"
+"PO-Revision-Date: 2014-06-02 23:35+0300\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -126,26 +126,18 @@ msgstr ""
 "srityje."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
-msgid "App Picker View"
-msgstr "Programos pasirinkimo vaizdas"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
-msgid "Index of the currently selected view in the application picker."
-msgstr "Šiuo metu pasirinkto vaizdo programų vaizde indeksas."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
 msgstr "Komandų (Alt-F2) dialogo retrospektyva"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
 msgid "History for the looking glass dialog"
 msgstr "Didinamojo stiklo dialogo retrospektyva"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "Visada rodyti naudotojo meniu punktą „Atsijungti“."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
@@ -153,13 +145,13 @@ msgstr ""
 "Šis raktas perrašo automatinį meniu punkto „Atsijungti“ slėpimą vieno "
 "naudotojo, vieno seanso situacijose."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
 "Ar atsiminti slaptažodį prijungiant šifruotas ar nutolusias failų sistemas"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid ""
 "The shell will request a password when an encrypted device or a remote "
 "filesystem is mounted. If the password can be saved for future use a "
@@ -171,77 +163,70 @@ msgstr ""
 "žymimasis langelis „Įsiminti slaptažodį“ bus rodomas. Šis raktas nustato "
 "numatytąją žymimojo langelio būseną."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Rodyti savaitės dienas kalendoriuje"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Jeigu reikšmė teigiama, kalendoriuje rodyti ISO savaičių datą."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Klavišų susiejimas, kuriuo atveriamas programų meniu"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Klavišų susiejimas, kuriuo atveriamas programų meniu."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Klavišų susiejimas, kuriuo atveriamas programų paleidimo vaizdas"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
 "Klavišų susiejimas, kuriuo atveriamas „Programų paleidimas“ veiklų "
 "apžvalgoje."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to open the overview"
 msgstr "Klavišų susiejimas, kuriuo atveriama apžvalga"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to open the Activities Overview."
 msgstr "Klavišų susiejimas, kuriuo atveriama veiklų apžvalga."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Klavišų susiejimas pranešimų juostos matomumui perjungti"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Klavišų susiejimas pranešimų juostos matomumui perjungti."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Keybinding to focus the active notification"
 msgstr "Klavišų susiejimas, kuriuo fokusuojamas aktyvus pranešimas"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to focus the active notification."
 msgstr "Klavišų susiejimas, kuriuo fokusuojamas aktyvus pranešimas."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
-msgid ""
-"Keybinding that pauses and resumes all running tweens, for debugging purposes"
-msgstr ""
-"Klavišų susiejimas, kuris sustabdo ir pratęsia visus veikiančius elementus, "
-"derinimui"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Which keyboard to use"
 msgstr "Kurią klaviatūrą naudoti"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "The type of keyboard to use."
 msgstr "Naudotinas klaviatūros tipas."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "The maximum accuracy level of location."
 msgstr "Didžiausias vietos tikslumo lygis."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid ""
 "Configures the maximum level of location accuracy applications are allowed "
 "to see. Valid options are 'off' (disable location tracking), 'country', "
@@ -257,23 +242,11 @@ msgstr ""
 "nustatyti naudotojo vietą pačios naudodamos tinklo išteklius (nors tai "
 "suteikia geriausiu atveju gatvės lygmens tikslumą)."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
-msgid "Limit switcher to current workspace."
-msgstr "Apriboti perjungėją dabartiniu darbalaukiu"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
-msgid ""
-"If true, only applications that have windows on the current workspace are "
-"shown in the switcher. Otherwise, all applications are included."
-msgstr ""
-"Jei teigiama, perjungimo lange bus rodomas tik programos, turinčios langų "
-"dabartiniame darbalaukyje. Priešingu atveju įtraukiamos visos programos."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "The application icon mode."
 msgstr "Programos piktogramos veiksena."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
@@ -283,56 +256,45 @@ msgstr ""
 "„thumbnail-only“ (rodo lango miniatiūrą), „app-icon-only“ (rodo tik "
 "programos piktogramą) arba „both“ (abu)."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid ""
-"If true, only windows from the current workspace are shown in the switcher. "
-"Otherwise, all windows are included."
-msgstr ""
-"Jei teigiama, perjungimo lange rodomi tik langai iš dabartinio darbalaukio. "
-"Priešingu atveju įtraukiami visi langai."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Attach modal dialog to the parent window"
 msgstr "Prikabinti modalinį dialogą prie tėvinio lango"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr "Šis raktas perrašo org.gnome.mutter raktą, kai vykdoma GNOME Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Įjungti kraštų išplėtimą, kai langai numetami ekrano kraštuose"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid "Workspaces are managed dynamically"
 msgstr "Darbalaukiai yra valdomi dinamiškai"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "Workspaces only on primary monitor"
 msgstr "Darbalaukiai tik pagrindiniame monitoriuje"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Atidėti fokuso pakeitimus pelei iki žymiklis nustos judėti"

-#: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
-msgid "Captive Portal"
-msgstr "Pagavimo portalas"
-
-#: ../js/extensionPrefs/main.js:127
+#: ../js/extensionPrefs/main.js:125
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Kilo klaida įkeliant %s nustatymų dialogą:"

-#: ../js/extensionPrefs/main.js:159
+#: ../js/extensionPrefs/main.js:157
+#| msgid "Configure GNOME Shell Extensions"
 msgid "GNOME Shell Extensions"
 msgstr "GNOME Shell plėtiniai"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:142
+#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:915
+#: ../js/ui/status/network.js:878
 msgid "Cancel"
 msgstr "Atsisakyti"

@@ -363,8 +325,8 @@ msgstr "Nėra sąraše?"
 msgid "(e.g., user or %s)"
 msgstr "(pvz., naudotojas arba %s)"

-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:268
-#: ../js/ui/components/networkAgent.js:286
+#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:262
+#: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Naudotojo vardas: "

@@ -393,50 +355,45 @@ msgstr "Nepavyko perskaityti komandos:"
 msgid "Execution of “%s” failed:"
 msgstr "Nepavyko įvykdyti „%s“:"

-#: ../js/portalHelper/main.js:84
-#| msgid "Authentication Required"
-msgid "Web Authentication Redirect"
-msgstr "Reikia patvirtinti tapatybę internete"
-
-#: ../js/ui/appDisplay.js:641
+#: ../js/ui/appDisplay.js:640
 msgid "Frequently used applications will appear here"
 msgstr "Čia bus matomos dažnai naudojamos programos"

-#: ../js/ui/appDisplay.js:752
+#: ../js/ui/appDisplay.js:751
 msgid "Frequent"
 msgstr "Dažnai naudojamos"

-#: ../js/ui/appDisplay.js:759
+#: ../js/ui/appDisplay.js:758
 msgid "All"
 msgstr "Visos"

-#: ../js/ui/appDisplay.js:1631
+#: ../js/ui/appDisplay.js:1571
 msgid "New Window"
 msgstr "Naujas langas"

-#: ../js/ui/appDisplay.js:1653 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1593 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Pašalinti iš mėgstamų"

-#: ../js/ui/appDisplay.js:1659
+#: ../js/ui/appDisplay.js:1599
 msgid "Add to Favorites"
 msgstr "Pridėti prie mėgstamų"

-#: ../js/ui/appDisplay.js:1668
+#: ../js/ui/appDisplay.js:1608
 msgid "Show Details"
 msgstr "Rodyti detalią informaciją"

-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:87
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s pridėta prie jūsų mėgstamų."

-#: ../js/ui/appFavorites.js:156
+#: ../js/ui/appFavorites.js:121
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s pašalinta iš jūsų mėgstamų."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:814
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:810
 #: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Nustatymai"
@@ -570,35 +527,35 @@ msgid "Next month"
 msgstr "Kitas mėnuo"

 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:785
+#: ../js/ui/calendar.js:775
 msgid "Nothing Scheduled"
 msgstr "Nieko nesuplanuota"

 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:803
+#: ../js/ui/calendar.js:793
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d d."

 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:806
+#: ../js/ui/calendar.js:796
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y m. %B %d d."

-#: ../js/ui/calendar.js:817
+#: ../js/ui/calendar.js:807
 msgid "Today"
 msgstr "Šiandien"

-#: ../js/ui/calendar.js:821
+#: ../js/ui/calendar.js:811
 msgid "Tomorrow"
 msgstr "Rytoj"

-#: ../js/ui/calendar.js:832
+#: ../js/ui/calendar.js:822
 msgid "This week"
 msgstr "Šią savaitę"

-#: ../js/ui/calendar.js:840
+#: ../js/ui/calendar.js:830
 msgid "Next week"
 msgstr "Kitą savaitę"

@@ -631,40 +588,40 @@ msgstr "Slaptažodis:"
 msgid "Type again:"
 msgstr "Įveskite dar kartą:"

-#: ../js/ui/components/networkAgent.js:137 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:918
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
+#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
 msgid "Connect"
 msgstr "Prisijungti"

-#: ../js/ui/components/networkAgent.js:230
-#: ../js/ui/components/networkAgent.js:242
-#: ../js/ui/components/networkAgent.js:270
-#: ../js/ui/components/networkAgent.js:290
-#: ../js/ui/components/networkAgent.js:300
+#: ../js/ui/components/networkAgent.js:224
+#: ../js/ui/components/networkAgent.js:236
+#: ../js/ui/components/networkAgent.js:264
+#: ../js/ui/components/networkAgent.js:284
+#: ../js/ui/components/networkAgent.js:294
 msgid "Password: "
 msgstr "Slaptažodis: "

-#: ../js/ui/components/networkAgent.js:235
+#: ../js/ui/components/networkAgent.js:229
 msgid "Key: "
 msgstr "Raktas: "

-#: ../js/ui/components/networkAgent.js:274
+#: ../js/ui/components/networkAgent.js:268
 msgid "Identity: "
 msgstr "Tapatybė: "

-#: ../js/ui/components/networkAgent.js:276
+#: ../js/ui/components/networkAgent.js:270
 msgid "Private key password: "
 msgstr "Privataus rakto slaptažodis: "

-#: ../js/ui/components/networkAgent.js:288
+#: ../js/ui/components/networkAgent.js:282
 msgid "Service: "
 msgstr "Tarnyba: "

-#: ../js/ui/components/networkAgent.js:317
+#: ../js/ui/components/networkAgent.js:311
 msgid "Authentication required by wireless network"
 msgstr "Belaidžiam tinklui reikia patvirtinti tapatybę"

-#: ../js/ui/components/networkAgent.js:318
+#: ../js/ui/components/networkAgent.js:312
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -673,35 +630,35 @@ msgstr ""
 "Slaptažodžiai arba šifravimo raktai yra būtini priėjimui prie belaidžio "
 "tinklo „%s“."

-#: ../js/ui/components/networkAgent.js:322
+#: ../js/ui/components/networkAgent.js:316
 msgid "Wired 802.1X authentication"
 msgstr "Laidinis 802.1X tapatybės patvirtinimas"

-#: ../js/ui/components/networkAgent.js:324
+#: ../js/ui/components/networkAgent.js:318
 msgid "Network name: "
 msgstr "Tinklo vardas: "

-#: ../js/ui/components/networkAgent.js:329
+#: ../js/ui/components/networkAgent.js:323
 msgid "DSL authentication"
 msgstr "DSL tapatybės patvirtinimas"

-#: ../js/ui/components/networkAgent.js:336
+#: ../js/ui/components/networkAgent.js:330
 msgid "PIN code required"
 msgstr "Reikalingas PIN kodas"

-#: ../js/ui/components/networkAgent.js:337
+#: ../js/ui/components/networkAgent.js:331
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Reikalingas PIN kodas mobiliajam plačiajuosčiam įrenginiui"

-#: ../js/ui/components/networkAgent.js:338
+#: ../js/ui/components/networkAgent.js:332
 msgid "PIN: "
 msgstr "PIN: "

-#: ../js/ui/components/networkAgent.js:344
+#: ../js/ui/components/networkAgent.js:338
 msgid "Mobile broadband network password"
 msgstr "Mobiliojo plačiajuosčio tinklo slaptažodis"

-#: ../js/ui/components/networkAgent.js:345
+#: ../js/ui/components/networkAgent.js:339
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Būtinas slaptažodis norint prisijungti prie „%s“."
@@ -999,7 +956,7 @@ msgstr "Rodyti paskyrą"
 msgid "Unknown reason"
 msgstr "Nežinoma priežastis"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:229
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
 msgid "Windows"
 msgstr "Langai"

@@ -1011,22 +968,22 @@ msgstr "Paleisti programas"
 msgid "Dash"
 msgstr "Paleidimo sritis"

-#: ../js/ui/dateMenu.js:96
+#: ../js/ui/dateMenu.js:97
 msgid "Open Calendar"
 msgstr "Atverti kalendorių"

-#: ../js/ui/dateMenu.js:100
+#: ../js/ui/dateMenu.js:101
 msgid "Open Clocks"
 msgstr "Atverti laikrodžius"

-#: ../js/ui/dateMenu.js:107
+#: ../js/ui/dateMenu.js:108
 msgid "Date & Time Settings"
 msgstr "Datos ir laiko nustatymai"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #. */
-#: ../js/ui/dateMenu.js:204
+#: ../js/ui/dateMenu.js:205
 msgid "%A %B %e, %Y"
 msgstr "%A, %Y m. %B %d d."

@@ -1175,7 +1132,7 @@ msgstr "Įdiegti"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Parsiųsti ir įdiegti „%s“ iš extensions.gnome.org?"

-#: ../js/ui/keyboard.js:653 ../js/ui/status/keyboard.js:339
+#: ../js/ui/keyboard.js:645 ../js/ui/status/keyboard.js:339
 msgid "Keyboard"
 msgstr "Klaviatūra"

@@ -1207,7 +1164,7 @@ msgstr "Įjungta"
 #. translators:
 #. * The device has been disabled
 #: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
-#: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Išjungta"

@@ -1231,43 +1188,43 @@ msgstr "Žiūrėti šaltinį"
 msgid "Web Page"
 msgstr "Tinklalapis"

-#: ../js/ui/messageTray.js:1325
+#: ../js/ui/messageTray.js:1326
 msgid "Open"
 msgstr "Atverti"

-#: ../js/ui/messageTray.js:1332
+#: ../js/ui/messageTray.js:1333
 msgid "Remove"
 msgstr "Pašalinti"

-#: ../js/ui/messageTray.js:1629
+#: ../js/ui/messageTray.js:1630
 msgid "Notifications"
 msgstr "Pranešimai"

-#: ../js/ui/messageTray.js:1636
+#: ../js/ui/messageTray.js:1637
 msgid "Clear Messages"
 msgstr "Išvalyti pranešimus"

-#: ../js/ui/messageTray.js:1655
+#: ../js/ui/messageTray.js:1656
 msgid "Notification Settings"
 msgstr "Pranešimų nustatymai"

-#: ../js/ui/messageTray.js:1708
+#: ../js/ui/messageTray.js:1709
 msgid "Tray Menu"
 msgstr "Dėklo meniu"

-#: ../js/ui/messageTray.js:1925
+#: ../js/ui/messageTray.js:1926
 msgid "No Messages"
 msgstr "Nėra pranešimų"

-#: ../js/ui/messageTray.js:1963
+#: ../js/ui/messageTray.js:1964
 msgid "Message Tray"
 msgstr "Pranešimų juosta"

-#: ../js/ui/messageTray.js:2966
+#: ../js/ui/messageTray.js:2967
 msgid "System Information"
 msgstr "Sistemos informacija"

-#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
+#: ../js/ui/notificationDaemon.js:516 ../src/shell-app.c:425
 msgctxt "program"
 msgid "Unknown"
 msgstr "Nežinoma"
@@ -1296,37 +1253,32 @@ msgstr "Apžvalga"
 msgid "Type to search…"
 msgstr "Rašykite, ko ieškote…"

-#: ../js/ui/panel.js:515
+#: ../js/ui/panel.js:516
 msgid "Quit"
 msgstr "Užverti"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview". */
-#: ../js/ui/panel.js:567
+#: ../js/ui/panel.js:568
 msgid "Activities"
 msgstr "Apžvalga"

-#: ../js/ui/panel.js:919
+#: ../js/ui/panel.js:915
 msgid "Top Bar"
 msgstr "Viršutinė juosta"

-#: ../js/ui/popupMenu.js:283
+#: ../js/ui/popupMenu.js:279
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:70
+#: ../js/ui/runDialog.js:74
 msgid "Enter a Command"
 msgstr "Įveskite komandą"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:114 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Užverti"

-#: ../js/ui/runDialog.js:273
-#| msgid "Estimating…"
-msgid "Restarting…"
-msgstr "Perleidžiama…"
-
 #. Translators: This is a time format for a date in
 #. long format */
 #: ../js/ui/screenShield.js:88
@@ -1357,11 +1309,11 @@ msgstr "Nepavyksta užrakinti"
 msgid "Lock was blocked by an application"
 msgstr "Programa užblokavo užrakinimą"

-#: ../js/ui/search.js:614
+#: ../js/ui/search.js:606
 msgid "Searching…"
 msgstr "Ieškoma…"

-#: ../js/ui/search.js:660
+#: ../js/ui/search.js:652
 msgid "No results."
 msgstr "Nerasta atitikmenų."

@@ -1437,9 +1389,9 @@ msgstr "Didelis tekstas"
 msgid "Bluetooth"
 msgstr "Bluetooth"

-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1281
-#: ../js/ui/status/network.js:1392 ../js/ui/status/rfkill.js:86
+#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:86
 #: ../js/ui/status/rfkill.js:114
 msgid "Turn Off"
 msgstr "Išjungti"
@@ -1456,7 +1408,7 @@ msgstr[0] "%d prijungtas įrenginys"
 msgstr[1] "%d prijungti įrenginiai"
 msgstr[2] "%d prijungtų įrenginių"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1309
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
 msgid "Not Connected"
 msgstr "Atsijungta"

@@ -1484,156 +1436,156 @@ msgstr "Įjungti"
 msgid "In Use"
 msgstr "Naudojama"

-#: ../js/ui/status/network.js:101
+#: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<nežinoma>"

-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1307
-#: ../js/ui/status/network.js:1511
+#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:1464
 msgid "Off"
 msgstr "Išjungta"

-#: ../js/ui/status/network.js:459
+#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "Prisijungta"

 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu) */
-#: ../js/ui/status/network.js:463
+#: ../js/ui/status/network.js:426
 msgid "Unmanaged"
 msgstr "Nevaldomas"

-#: ../js/ui/status/network.js:465
+#: ../js/ui/status/network.js:428
 msgid "Disconnecting"
 msgstr "Atsijungiama"

-#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1301
+#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1254
 msgid "Connecting"
 msgstr "Jungiamasi"

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:474
+#: ../js/ui/status/network.js:437
 msgid "Authentication required"
 msgstr "Reikia patvirtinti tapatybę"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:482
+#: ../js/ui/status/network.js:445
 msgid "Firmware missing"
 msgstr "Trūksta integruotos programinės įrangos (firmware)"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage */
-#: ../js/ui/status/network.js:486
+#: ../js/ui/status/network.js:449
 msgid "Unavailable"
 msgstr "Nepasiekiamas"

-#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1695
+#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1646
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"

-#: ../js/ui/status/network.js:504
+#: ../js/ui/status/network.js:467
 msgid "Wired Settings"
 msgstr "Laidinio ryšio nustatymai"

-#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:624
+#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
 msgid "Mobile Broadband Settings"
 msgstr "Mobiliojo plačiajuosčio tinklo nustatymai"

-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
 msgid "Hardware Disabled"
 msgstr "Aparatinė įranga išjungta"

-#: ../js/ui/status/network.js:632
+#: ../js/ui/status/network.js:595
 msgid "Use as Internet connection"
 msgstr "Naudoti kaip interneto ryšį"

-#: ../js/ui/status/network.js:813
+#: ../js/ui/status/network.js:776
 msgid "Airplane Mode is On"
 msgstr "Skrydžio veiksena įjungta"

-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:777
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Belaidis ryšys yra išjungta skrydžio veiksenoje."

-#: ../js/ui/status/network.js:815
+#: ../js/ui/status/network.js:778
 msgid "Turn Off Airplane Mode"
 msgstr "Išjungti skrydžio veikseną"

-#: ../js/ui/status/network.js:824
+#: ../js/ui/status/network.js:787
 msgid "Wi-Fi is Off"
 msgstr "Belaidžio ryšys išjungtas"

-#: ../js/ui/status/network.js:825
+#: ../js/ui/status/network.js:788
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Norint prisijungti prie tinklo reikia įjungti belaidį ryšį."

-#: ../js/ui/status/network.js:826
+#: ../js/ui/status/network.js:789
 msgid "Turn On Wi-Fi"
 msgstr "Įjungti belaidį ryšį"

-#: ../js/ui/status/network.js:851
+#: ../js/ui/status/network.js:814
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi tinklai"

-#: ../js/ui/status/network.js:853
+#: ../js/ui/status/network.js:816
 msgid "Select a network"
 msgstr "Pasirinkite tinklą"

-#: ../js/ui/status/network.js:882
+#: ../js/ui/status/network.js:845
 msgid "No Networks"
 msgstr "Nėra tinklų"

-#: ../js/ui/status/network.js:903 ../js/ui/status/rfkill.js:112
+#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:112
 msgid "Use hardware switch to turn off"
 msgstr "Išjungimui naudoti aparatinį jungiklį"

-#: ../js/ui/status/network.js:1173
+#: ../js/ui/status/network.js:1136
 msgid "Select Network"
 msgstr "Pasirinkite tinklą"

-#: ../js/ui/status/network.js:1179
+#: ../js/ui/status/network.js:1142
 msgid "Wi-Fi Settings"
 msgstr "Belaidžio ryšio nustatymai"

-#: ../js/ui/status/network.js:1281
+#: ../js/ui/status/network.js:1234
 msgid "Turn On"
 msgstr "Įjungti"

-#: ../js/ui/status/network.js:1298
+#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Prieigos taškas aktyvus"

-#: ../js/ui/status/network.js:1409
+#: ../js/ui/status/network.js:1362
 msgid "connecting..."
 msgstr "jungiamasi..."

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:1412
+#: ../js/ui/status/network.js:1365
 msgid "authentication required"
 msgstr "reikia patvirtinti tapatybę"

-#: ../js/ui/status/network.js:1414
+#: ../js/ui/status/network.js:1367
 msgid "connection failed"
 msgstr "nepavyko prisijungti"

-#: ../js/ui/status/network.js:1480 ../js/ui/status/rfkill.js:89
+#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:89
 msgid "Network Settings"
 msgstr "Tinklo nustatymai"

-#: ../js/ui/status/network.js:1482
+#: ../js/ui/status/network.js:1435
 msgid "VPN Settings"
 msgstr "VPN nustatymai"

-#: ../js/ui/status/network.js:1501
+#: ../js/ui/status/network.js:1454
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1656
+#: ../js/ui/status/network.js:1607
 msgid "Network Manager"
 msgstr "Tinklo valdymas"

-#: ../js/ui/status/network.js:1696
+#: ../js/ui/status/network.js:1647
 msgid "Activation of network connection failed"
 msgstr "Tinklo ryšio nepavyko aktyvuoti"

@@ -1715,11 +1667,11 @@ msgstr "Prisijungti kitu naudotoju"
 msgid "Unlock Window"
 msgstr "Atrakinimo langas"

-#: ../js/ui/viewSelector.js:233
+#: ../js/ui/viewSelector.js:100
 msgid "Applications"
 msgstr "Programos"

-#: ../js/ui/viewSelector.js:237
+#: ../js/ui/viewSelector.js:104
 msgid "Search"
 msgstr "Ieškoti"

@@ -1728,22 +1680,22 @@ msgstr "Ieškoti"
 msgid "“%s” is ready"
 msgstr "„%s“ yra pasirengusi"

-#: ../js/ui/windowManager.js:58
+#: ../js/ui/windowManager.js:57
 msgid "Do you want to keep these display settings?"
 msgstr "Ar nori įrašyti šiuos vaizduoklio nustatymus?"

 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #. */
-#: ../js/ui/windowManager.js:77
+#: ../js/ui/windowManager.js:76
 msgid "Revert Settings"
 msgstr "Grąžinti nustatymus"

-#: ../js/ui/windowManager.js:81
+#: ../js/ui/windowManager.js:80
 msgid "Keep Changes"
 msgstr "Įrašyti pakeitimus"

-#: ../js/ui/windowManager.js:100
+#: ../js/ui/windowManager.js:99
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1819,19 +1771,19 @@ msgstr[2] "%u įvesčių"
 msgid "System Sounds"
 msgstr "Sistemos garsai"

-#: ../src/main.c:371
+#: ../src/main.c:349
 msgid "Print version"
 msgstr "Išvesti versijos numerį"

-#: ../src/main.c:377
+#: ../src/main.c:355
 msgid "Mode used by GDM for login screen"
 msgstr "Veiksena, naudojama GDM prisijungimo ekrane"

-#: ../src/main.c:383
+#: ../src/main.c:361
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Naudoti konkrečią veikseną, pvz., „gdm“ prisijungimo ekranui"

-#: ../src/main.c:389
+#: ../src/main.c:367
 msgid "List possible modes"
 msgstr "Išvardinti galimas veiksenas"

@@ -1851,3 +1803,4 @@ msgstr "Slaptažodis negali būti tuščias"
 #: ../src/shell-polkit-authentication-agent.c:346
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Naudotojas užvėrė tapatybės patvirtinimo dialogą"
+
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/or.po
+++ b/po/or.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-07-18 07:33+0000\n"
-"PO-Revision-Date: 2014-07-18 13:24-0300\n"
+"POT-Creation-Date: 2014-06-03 07:28+0000\n"
+"PO-Revision-Date: 2014-06-03 10:26-0300\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -139,27 +139,18 @@ msgstr ""
 "área de favoritos."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
-msgid "App Picker View"
-msgstr "Visualização do seletor de aplicativos"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
-msgid "Index of the currently selected view in the application picker."
-msgstr ""
-"Índice da visualização atualmente selecionada no seletor de aplicativos."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
 msgstr "Histórico do diálogo de comandos (Alt-F2)"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
 msgid "History for the looking glass dialog"
 msgstr "Histórico do diálogo do shell looking glass"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "Sempre mostrar o item de menu \"Encerrar sessão\" no menu de usuário."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
@@ -168,14 +159,14 @@ msgstr ""
 "sessão\" quando houver somente um usuário, em situações de somente uma "
 "sessão."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
 "Se lembra ou não as senhas para montar sistemas de arquivos criptografados "
 "ou remotos"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid ""
 "The shell will request a password when an encrypted device or a remote "
 "filesystem is mounted. If the password can be saved for future use a "
@@ -187,78 +178,70 @@ msgstr ""
 "posterior, a caixa de seleção 'Lembrar senha' estará presente. Esta chave "
 "ajusta o estado padrão da caixa de seleção."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Mostrar o número da semana na agenda"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Se verdadeiro, exibe o número da semana na agenda."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Atalho de teclado para abrir um menu de aplicativo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Atalho de teclado para abrir um menu de aplicativo."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Atalho de teclado para abrir a visualização \"Mostrar aplicativos\""

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
 "Atalho de teclado para abrir a visualização \"Mostrar aplicativos\" do "
 "panorama de atividades."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to open the overview"
 msgstr "Atalho de teclado para abrir o panorama"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to open the Activities Overview."
 msgstr "Atalho de teclado para abrir o panorama de atividades."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Atalho de teclado para alternar a visibilidade da área de notificação"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Atalho de teclado para alternar a visibilidade da área de notificação."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Keybinding to focus the active notification"
 msgstr "Atalho de teclado para ativar a notificação ativa"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to focus the active notification."
 msgstr "Atalho de teclado para ativar a notificação ativa."

-# Tween pode significar uma contração de Between ou se referir a um termo "in-between" usado em animação gráfica. -- Enrico
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
-msgid ""
-"Keybinding that pauses and resumes all running tweens, for debugging purposes"
-msgstr ""
-"Atalho de teclado que pausa e continua todos os intermediários em execução, "
-"a fim de depuração"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Which keyboard to use"
 msgstr "Qual teclado usar"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "The type of keyboard to use."
 msgstr "O tipo do teclado para usar."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "The maximum accuracy level of location."
 msgstr "O nível máximo de precisão de local."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid ""
 "Configures the maximum level of location accuracy applications are allowed "
 "to see. Valid options are 'off' (disable location tracking), 'country', "
@@ -276,24 +259,11 @@ msgstr ""
 "recursos de rede (apesar de na melhor hipótese usarem precisão à nível de "
 "rua)."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
-msgid "Limit switcher to current workspace."
-msgstr "Limitar o alternador ao espaço de trabalho atual."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
-msgid ""
-"If true, only applications that have windows on the current workspace are "
-"shown in the switcher. Otherwise, all applications are included."
-msgstr ""
-"Se verdadeiro, o alternador mostrará somente os aplicativos que possuem "
-"janelas no espaço de trabalho atual. Caso contrário, todos os aplicativos "
-"serão incluídos."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "The application icon mode."
 msgstr "O modo ícone do aplicativo."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
@@ -303,59 +273,48 @@ msgstr ""
 "válidas são 'thumbnail-only' (mostra uma miniatura da janela), 'app-icon-"
 "only' (mostra apenas o ícone do aplicativo) ou 'both'."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid ""
-"If true, only windows from the current workspace are shown in the switcher. "
-"Otherwise, all windows are included."
-msgstr ""
-"Se verdadeiro, o alternador mostrará somente as janelas do espaço de "
-"trabalho atual. Caso contrário, todos as janelas serão incluídas."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Attach modal dialog to the parent window"
 msgstr "Anexar diálogo modal à janela pai"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do "
 "GNOME."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 "Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid "Workspaces are managed dynamically"
 msgstr "Espaços de trabalho são gerenciados dinamicamente"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "Workspaces only on primary monitor"
 msgstr "Espaços de trabalho apenas no monitor primário"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Atrasar foco altera o modo do mouse até o ponteiro parar de mover"

-#: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
-msgid "Captive Portal"
-msgstr "Portal cativo"
-
 #: ../js/extensionPrefs/main.js:125
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Ocorreu um erro ao carregar o dialogo de preferências para %s:"

 #: ../js/extensionPrefs/main.js:157
+#| msgid "Configure GNOME Shell Extensions"
 msgid "GNOME Shell Extensions"
 msgstr "Extensões do Shell do GNOME"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:142
+#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:915
+#: ../js/ui/status/network.js:878
 msgid "Cancel"
 msgstr "Cancelar"

@@ -386,8 +345,8 @@ msgstr "Não está listado?"
 msgid "(e.g., user or %s)"
 msgstr "(ex.: usuário ou %s)"

-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:268
-#: ../js/ui/components/networkAgent.js:286
+#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:262
+#: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Nome de usuário: "

@@ -416,35 +375,31 @@ msgstr "Não foi possível analisar comando:"
 msgid "Execution of “%s” failed:"
 msgstr "A execução de \"%s\" falhou:"

-#: ../js/portalHelper/main.js:84
-msgid "Web Authentication Redirect"
-msgstr "Redirecionamento para autenticação web"
-
-#: ../js/ui/appDisplay.js:641
+#: ../js/ui/appDisplay.js:640
 msgid "Frequently used applications will appear here"
 msgstr "Aplicativos usados frequentemente vão aparecer aqui"

-#: ../js/ui/appDisplay.js:752
+#: ../js/ui/appDisplay.js:751
 msgid "Frequent"
 msgstr "Frequente"

-#: ../js/ui/appDisplay.js:759
+#: ../js/ui/appDisplay.js:758
 msgid "All"
 msgstr "Todos"

-#: ../js/ui/appDisplay.js:1613
+#: ../js/ui/appDisplay.js:1571
 msgid "New Window"
 msgstr "Nova janela"

-#: ../js/ui/appDisplay.js:1635 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1593 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Remover dos favoritos"

-#: ../js/ui/appDisplay.js:1641
+#: ../js/ui/appDisplay.js:1599
 msgid "Add to Favorites"
 msgstr "Adicionar aos favoritos"

-#: ../js/ui/appDisplay.js:1650
+#: ../js/ui/appDisplay.js:1608
 msgid "Show Details"
 msgstr "Mostrar detalhes"

@@ -458,7 +413,7 @@ msgstr "%s foi adicionado aos seus favoritos."
 msgid "%s has been removed from your favorites."
 msgstr "%s foi removido dos seus favoritos."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:809
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:810
 #: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Configurações"
@@ -592,35 +547,35 @@ msgid "Next month"
 msgstr "Próximo mês"

 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:785
+#: ../js/ui/calendar.js:775
 msgid "Nothing Scheduled"
 msgstr "Nada agendado"

 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:803
+#: ../js/ui/calendar.js:793
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"

 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:806
+#: ../js/ui/calendar.js:796
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"

-#: ../js/ui/calendar.js:817
+#: ../js/ui/calendar.js:807
 msgid "Today"
 msgstr "Hoje"

-#: ../js/ui/calendar.js:821
+#: ../js/ui/calendar.js:811
 msgid "Tomorrow"
 msgstr "Amanhã"

-#: ../js/ui/calendar.js:832
+#: ../js/ui/calendar.js:822
 msgid "This week"
 msgstr "Esta semana"

-#: ../js/ui/calendar.js:840
+#: ../js/ui/calendar.js:830
 msgid "Next week"
 msgstr "Próxima semana"

@@ -653,40 +608,40 @@ msgstr "Senha:"
 msgid "Type again:"
 msgstr "Digite novamente:"

-#: ../js/ui/components/networkAgent.js:137 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:918
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
+#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
 msgid "Connect"
 msgstr "Conectar"

-#: ../js/ui/components/networkAgent.js:230
-#: ../js/ui/components/networkAgent.js:242
-#: ../js/ui/components/networkAgent.js:270
-#: ../js/ui/components/networkAgent.js:290
-#: ../js/ui/components/networkAgent.js:300
+#: ../js/ui/components/networkAgent.js:224
+#: ../js/ui/components/networkAgent.js:236
+#: ../js/ui/components/networkAgent.js:264
+#: ../js/ui/components/networkAgent.js:284
+#: ../js/ui/components/networkAgent.js:294
 msgid "Password: "
 msgstr "Senha: "

-#: ../js/ui/components/networkAgent.js:235
+#: ../js/ui/components/networkAgent.js:229
 msgid "Key: "
 msgstr "Chave: "

-#: ../js/ui/components/networkAgent.js:274
+#: ../js/ui/components/networkAgent.js:268
 msgid "Identity: "
 msgstr "Identidade: "

-#: ../js/ui/components/networkAgent.js:276
+#: ../js/ui/components/networkAgent.js:270
 msgid "Private key password: "
 msgstr "Senha da chave privada: "

-#: ../js/ui/components/networkAgent.js:288
+#: ../js/ui/components/networkAgent.js:282
 msgid "Service: "
 msgstr "Serviço: "

-#: ../js/ui/components/networkAgent.js:317
+#: ../js/ui/components/networkAgent.js:311
 msgid "Authentication required by wireless network"
 msgstr "Autenticação requisitada pela rede sem fio"

-#: ../js/ui/components/networkAgent.js:318
+#: ../js/ui/components/networkAgent.js:312
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -695,35 +650,35 @@ msgstr ""
 "Senhas ou chaves criptografadas são necessárias para acessar a rede sem fio "
 "\"%s\"."

-#: ../js/ui/components/networkAgent.js:322
+#: ../js/ui/components/networkAgent.js:316
 msgid "Wired 802.1X authentication"
 msgstr "Autenticação 802.1X cabeada"

-#: ../js/ui/components/networkAgent.js:324
+#: ../js/ui/components/networkAgent.js:318
 msgid "Network name: "
 msgstr "Nome da rede: "

-#: ../js/ui/components/networkAgent.js:329
+#: ../js/ui/components/networkAgent.js:323
 msgid "DSL authentication"
 msgstr "Autenticação DSL"

-#: ../js/ui/components/networkAgent.js:336
+#: ../js/ui/components/networkAgent.js:330
 msgid "PIN code required"
 msgstr "Código PIN requisitado"

-#: ../js/ui/components/networkAgent.js:337
+#: ../js/ui/components/networkAgent.js:331
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "O código PIN é necessário para o dispositivo móvel de banda larga"

-#: ../js/ui/components/networkAgent.js:338
+#: ../js/ui/components/networkAgent.js:332
 msgid "PIN: "
 msgstr "PIN: "

-#: ../js/ui/components/networkAgent.js:344
+#: ../js/ui/components/networkAgent.js:338
 msgid "Mobile broadband network password"
 msgstr "Senha da rede de banda larga móvel"

-#: ../js/ui/components/networkAgent.js:345
+#: ../js/ui/components/networkAgent.js:339
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Uma senha é necessária para se conectar a \"%s\""
@@ -1021,7 +976,7 @@ msgstr "Visualizar conta"
 msgid "Unknown reason"
 msgstr "Razão desconhecida"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:229
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
 msgid "Windows"
 msgstr "Janelas"

@@ -1033,23 +988,23 @@ msgstr "Mostrar aplicativos"
 msgid "Dash"
 msgstr "Dash"

-#: ../js/ui/dateMenu.js:96
+#: ../js/ui/dateMenu.js:97
 msgid "Open Calendar"
 msgstr "Abrir agenda"

-#: ../js/ui/dateMenu.js:100
+#: ../js/ui/dateMenu.js:101
 msgid "Open Clocks"
 msgstr "Abrir relógios"

 # O "&" foi inserido como "e" para versão 3.8.0 no gnome-control-center
-#: ../js/ui/dateMenu.js:107
+#: ../js/ui/dateMenu.js:108
 msgid "Date & Time Settings"
 msgstr "Configurações de data & hora"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #. */
-#: ../js/ui/dateMenu.js:204
+#: ../js/ui/dateMenu.js:205
 msgid "%A %B %e, %Y"
 msgstr "%A, %e de %B de %Y"

@@ -1130,7 +1085,7 @@ msgstr[1] "O sistema irá reiniciar automaticamente em %d segundos."
 #: ../js/ui/endSessionDialog.js:121
 msgctxt "title"
 msgid "Restart & Install Updates"
-msgstr "Reiniciar & instalar atualizações"
+msgstr "Reiniciar & Instalar atualizações"

 #: ../js/ui/endSessionDialog.js:123
 #, javascript-format
@@ -1226,7 +1181,7 @@ msgstr "Habilitado"
 #. translators:
 #. * The device has been disabled
 #: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
-#: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Desabilitado"

@@ -1250,43 +1205,43 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Página web"

-#: ../js/ui/messageTray.js:1325
+#: ../js/ui/messageTray.js:1326
 msgid "Open"
 msgstr "Abrir"

-#: ../js/ui/messageTray.js:1332
+#: ../js/ui/messageTray.js:1333
 msgid "Remove"
 msgstr "Remover"

-#: ../js/ui/messageTray.js:1629
+#: ../js/ui/messageTray.js:1630
 msgid "Notifications"
 msgstr "Notificações"

-#: ../js/ui/messageTray.js:1636
+#: ../js/ui/messageTray.js:1637
 msgid "Clear Messages"
 msgstr "Sem mensagens"

-#: ../js/ui/messageTray.js:1655
+#: ../js/ui/messageTray.js:1656
 msgid "Notification Settings"
 msgstr "Configurações de notificação"

-#: ../js/ui/messageTray.js:1708
+#: ../js/ui/messageTray.js:1709
 msgid "Tray Menu"
 msgstr "Menu de notificação"

-#: ../js/ui/messageTray.js:1925
+#: ../js/ui/messageTray.js:1926
 msgid "No Messages"
 msgstr "Sem mensagens"

-#: ../js/ui/messageTray.js:1963
+#: ../js/ui/messageTray.js:1964
 msgid "Message Tray"
 msgstr "Área de notificação"

-#: ../js/ui/messageTray.js:2966
+#: ../js/ui/messageTray.js:2967
 msgid "System Information"
 msgstr "Informações do sistema"

-#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
+#: ../js/ui/notificationDaemon.js:516 ../src/shell-app.c:425
 msgctxt "program"
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -1314,37 +1269,32 @@ msgstr "Panorama"
 msgid "Type to search…"
 msgstr "Digite para pesquisar…"

-#: ../js/ui/panel.js:515
+#: ../js/ui/panel.js:516
 msgid "Quit"
 msgstr "Sair"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview". */
-#: ../js/ui/panel.js:567
+#: ../js/ui/panel.js:568
 msgid "Activities"
 msgstr "Atividades"

-#: ../js/ui/panel.js:914
+#: ../js/ui/panel.js:915
 msgid "Top Bar"
 msgstr "Barra superior"

-#: ../js/ui/popupMenu.js:274
+#: ../js/ui/popupMenu.js:279
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:70
+#: ../js/ui/runDialog.js:74
 msgid "Enter a Command"
 msgstr "Digite um comando"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:114 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Fechar"

-#: ../js/ui/runDialog.js:273
-#| msgid "Estimating…"
-msgid "Restarting…"
-msgstr "Reiniciando…"
-
 #. Translators: This is a time format for a date in
 #. long format */
 #: ../js/ui/screenShield.js:88
@@ -1454,9 +1404,9 @@ msgstr "Texto grande"
 msgid "Bluetooth"
 msgstr "Bluetooth"

-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1281
-#: ../js/ui/status/network.js:1392 ../js/ui/status/rfkill.js:86
+#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:86
 #: ../js/ui/status/rfkill.js:114
 msgid "Turn Off"
 msgstr "Desligar"
@@ -1472,7 +1422,7 @@ msgid_plural "%d Connected Devices"
 msgstr[0] "%d dispositivo conectado"
 msgstr[1] "%d dispositivos conectados"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1309
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
 msgid "Not Connected"
 msgstr "Não conectado"

@@ -1500,157 +1450,157 @@ msgstr "Habilitar"
 msgid "In Use"
 msgstr "Em uso"

-#: ../js/ui/status/network.js:101
+#: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<desconhecido>"

-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1307
-#: ../js/ui/status/network.js:1511
+#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:1464
 msgid "Off"
 msgstr "Off"

-#: ../js/ui/status/network.js:459
+#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "Conectado"

 # Não gerenciável para transmitir a idéia que o Networkmanager não consegue gerenciar o dispositivo --Enrico
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu) */
-#: ../js/ui/status/network.js:463
+#: ../js/ui/status/network.js:426
 msgid "Unmanaged"
 msgstr "Não gerenciável"

-#: ../js/ui/status/network.js:465
+#: ../js/ui/status/network.js:428
 msgid "Disconnecting"
 msgstr "Desconectando"

-#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1301
+#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1254
 msgid "Connecting"
 msgstr "Conectando"

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:474
+#: ../js/ui/status/network.js:437
 msgid "Authentication required"
 msgstr "Autenticação necessária"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:482
+#: ../js/ui/status/network.js:445
 msgid "Firmware missing"
 msgstr "Firmware em falta"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage */
-#: ../js/ui/status/network.js:486
+#: ../js/ui/status/network.js:449
 msgid "Unavailable"
 msgstr "Indisponível"

-#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1695
+#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1646
 msgid "Connection failed"
 msgstr "Falha de conexão"

-#: ../js/ui/status/network.js:504
+#: ../js/ui/status/network.js:467
 msgid "Wired Settings"
 msgstr "Configurações da rede cabeada"

-#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:624
+#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
 msgid "Mobile Broadband Settings"
 msgstr "Configurações de banda larga móvel"

-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
 msgid "Hardware Disabled"
 msgstr "Hardware desabilitado"

-#: ../js/ui/status/network.js:632
+#: ../js/ui/status/network.js:595
 msgid "Use as Internet connection"
 msgstr "Usar como conexão de Internet"

-#: ../js/ui/status/network.js:813
+#: ../js/ui/status/network.js:776
 msgid "Airplane Mode is On"
 msgstr "Modo avião ligado"

-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:777
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "O Wi-Fi é desabilitado quando o modo avião está ligado."

-#: ../js/ui/status/network.js:815
+#: ../js/ui/status/network.js:778
 msgid "Turn Off Airplane Mode"
 msgstr "Desligar modo avião"

-#: ../js/ui/status/network.js:824
+#: ../js/ui/status/network.js:787
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi desligado"

-#: ../js/ui/status/network.js:825
+#: ../js/ui/status/network.js:788
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "O Wi-Fi precisa ser ligado a fim de conectar-se a uma rede."

-#: ../js/ui/status/network.js:826
+#: ../js/ui/status/network.js:789
 msgid "Turn On Wi-Fi"
 msgstr "Ligar Wi-Fi"

-#: ../js/ui/status/network.js:851
+#: ../js/ui/status/network.js:814
 msgid "Wi-Fi Networks"
 msgstr "Redes Wi-Fi"

-#: ../js/ui/status/network.js:853
+#: ../js/ui/status/network.js:816
 msgid "Select a network"
 msgstr "Selecione uma rede"

-#: ../js/ui/status/network.js:882
+#: ../js/ui/status/network.js:845
 msgid "No Networks"
 msgstr "Nenhuma rede"

-#: ../js/ui/status/network.js:903 ../js/ui/status/rfkill.js:112
+#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:112
 msgid "Use hardware switch to turn off"
 msgstr "Usar alternador de hardware para desligar"

-#: ../js/ui/status/network.js:1173
+#: ../js/ui/status/network.js:1136
 msgid "Select Network"
 msgstr "Selecione a rede"

-#: ../js/ui/status/network.js:1179
+#: ../js/ui/status/network.js:1142
 msgid "Wi-Fi Settings"
 msgstr "Configurações de Wi-Fi"

-#: ../js/ui/status/network.js:1281
+#: ../js/ui/status/network.js:1234
 msgid "Turn On"
 msgstr "Ligar"

-#: ../js/ui/status/network.js:1298
+#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Ponto de acesso ativo"

-#: ../js/ui/status/network.js:1409
+#: ../js/ui/status/network.js:1362
 msgid "connecting..."
 msgstr "conectando..."

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:1412
+#: ../js/ui/status/network.js:1365
 msgid "authentication required"
 msgstr "autenticação necessária"

-#: ../js/ui/status/network.js:1414
+#: ../js/ui/status/network.js:1367
 msgid "connection failed"
 msgstr "conexão falhou"

-#: ../js/ui/status/network.js:1480 ../js/ui/status/rfkill.js:89
+#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:89
 msgid "Network Settings"
 msgstr "Configurações de rede"

-#: ../js/ui/status/network.js:1482
+#: ../js/ui/status/network.js:1435
 msgid "VPN Settings"
 msgstr "Configurações de VPN"

-#: ../js/ui/status/network.js:1501
+#: ../js/ui/status/network.js:1454
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1656
+#: ../js/ui/status/network.js:1607
 msgid "Network Manager"
 msgstr "Gerenciador de rede"

-#: ../js/ui/status/network.js:1696
+#: ../js/ui/status/network.js:1647
 msgid "Activation of network connection failed"
 msgstr "Falha ao ativar a conexão da rede"

@@ -1734,11 +1684,11 @@ msgstr "Iniciar sessão como outro usuário"
 msgid "Unlock Window"
 msgstr "Desbloquear janela"

-#: ../js/ui/viewSelector.js:233
+#: ../js/ui/viewSelector.js:100
 msgid "Applications"
 msgstr "Aplicativos"

-#: ../js/ui/viewSelector.js:237
+#: ../js/ui/viewSelector.js:104
 msgid "Search"
 msgstr "Pesquisar"

@@ -1747,22 +1697,22 @@ msgstr "Pesquisar"
 msgid "“%s” is ready"
 msgstr "\"%s\" está pronto"

-#: ../js/ui/windowManager.js:58
+#: ../js/ui/windowManager.js:57
 msgid "Do you want to keep these display settings?"
 msgstr "Você deseja manter essas configurações de exibição?"

 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #. */
-#: ../js/ui/windowManager.js:77
+#: ../js/ui/windowManager.js:76
 msgid "Revert Settings"
 msgstr "Reverter configurações"

-#: ../js/ui/windowManager.js:81
+#: ../js/ui/windowManager.js:80
 msgid "Keep Changes"
 msgstr "Manter alterações"

-#: ../js/ui/windowManager.js:100
+#: ../js/ui/windowManager.js:99
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1835,19 +1785,19 @@ msgstr[1] "%u entradas"
 msgid "System Sounds"
 msgstr "Sons do sistema"

-#: ../src/main.c:371
+#: ../src/main.c:349
 msgid "Print version"
 msgstr "Versão de impressão"

-#: ../src/main.c:377
+#: ../src/main.c:355
 msgid "Mode used by GDM for login screen"
 msgstr "Modo usado pelo GDM para a tela de início de sessão"

-#: ../src/main.c:383
+#: ../src/main.c:361
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Utilizar um modo específico, ex.: \"gdm\" para a tela de login"

-#: ../src/main.c:389
+#: ../src/main.c:367
 msgid "List possible modes"
 msgstr "Listar modos possíveis"

--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/te.po
+++ b/po/te.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jasper St. Pierre	672a4a56bd	messageTray: Remove an unused variable	2014-06-04 12:58:34 -04:00
Jasper St. Pierre	50421ede37	messageTray: Add notification close button inside notification And remove the old close button outside it.	2014-06-04 12:39:34 -04:00
Jasper St. Pierre	826a7fa02a	messageTray: Implement new notification designs Rather than use an StTable, a custom ShellGenericContainer, and plenty of hacky style classes, replace them all with standard BoxLayouts and Bins. Remove the customContent parameter in favor of subclasses setting the child of this._bodyBin instead. With this comes a whole new notification implementation to implement the new notification designs. We lose a few of the fancy features like showing the first part of the body, ellipsized, next the banner when it will fit, and some other layout logic. But since the design of notifications is changing substantially anyways, I don't feel too bad...	2014-06-04 12:39:23 -04:00
Jasper St. Pierre	d7844bc7f4	messageTray: Glue the notification to the bottom of the screen, always We'll animate notifications popping up with another system soon enough, instead. The idea here is that instead of carefully animating the Y position of the notificationWidget when a notification updates, we simply animate the height of the new actor inside the notification. This will fix some of the awkward updates where instead of the notification content expanding, we see the buttons or action area pushed off the edge of the screen... Animations that happen as a result of adding something new to the notification or expanding it should be done by tweeing the new actors in inside the notification.	2014-06-03 14:48:48 -04:00
Jasper St. Pierre	485444a451	messageTray: Remove addBody as a public API As it's unused.	2014-06-03 14:48:48 -04:00
Jasper St. Pierre	e5318d5235	messageTray: Remove support for notifications with images This sufficiently complicates the code, and won't fit in the new design.	2014-06-03 14:48:48 -04:00
Jasper St. Pierre	e6e15489aa	messageTray: Remove support for resident notifications Now the only resident notification is a chat notification. The convenient thing about this special-case behavior is that there's already special-case code for it and the shell, and we always know that a chat notification will always be 1:1 with its chat source.	2014-06-03 14:48:48 -04:00
Jasper St. Pierre	0951d36e8f	notificationDaemon: Remove support for resident notifications They're not really an API that has caught on, and not really one we want to support, either.	2014-06-03 14:48:48 -04:00
Jasper St. Pierre	c38939902f	notificationDaemon: Remove the special-case hack for system tray icons Nothing in the system actually has a standard system tray icon anymore, so this hack isn't necessary.	2014-06-03 14:48:47 -04:00
Jasper St. Pierre	97974a3f2a	telepathyClient: Remove all the fancy features This can be done with another app, like Empathy or Chat.	2014-06-03 14:48:47 -04:00
Jasper St. Pierre	8b6cab741d	autorunManager: Remove the resident "Removable Devices" notification Users aren't usually the best at obeying the rules, and systems can deal with hotplug without ejecting first. https://bugzilla.gnome.org/show_bug.cgi?id=719857	2014-06-03 14:48:47 -04:00
Jasper St. Pierre	2aad0eac31	messageTray: Don't use a member variable when we can use a local Tiny cleanup.	2014-06-03 14:26:59 -04:00