Added Occitan translation

Updated Spanish translation
Updated French translation
2015-05-16 07:17:17 +00:00 · 2014-10-06 13:01:13 +02:00 · 2014-04-07 10:53:41 +00:00 · 2014-03-25 17:19:57 +00:00 · 2014-03-10 12:06:14 +00:00 · 2014-02-21 23:26:26 +01:00
151 changed files with 20684 additions and 21507 deletions
--- a/163
+++ b/163
@@ -1,68 +1,72 @@
-3.9.4
+3.8.4
 =====
-* Fix chat entries not being focused when expanded [Jasper; #698778]
-* Fix alignment of "Not Listed?" label [Mathieu; #702307]
-* Fix alignment of time stamps in chat notifications [Carlos; #687809]
-* Round the ends of slider trough [Jasper; #702825]
-* Add support for "box-shadow: none" [Cosimo; #702782]
-* Keep chrome below popup windows [Florian; #702338]
-* Move the session list to a popup menu [Ray; #702818]
-* Fix autorun notifications for "non-native" volumes [Matthias; #703418]
-* dnd: Speed up by not picking on each motion event [Jasper; #703443]
-* Fix management of asynchronous background loading [Lionel; #703001]
-* Rework focus handling [Jasper; #700735]
-* Optimize box-shadow rendering [Lionel; #689858]
-* Remove support for fixed positioning in BoxLayouts [Florian; #703808]
-* Misc bug fixes and cleanups [Adel, Jasper, Florian, Ray, Lionel, Emilio;
-  #702849, #610279, #703132, #703105, #703160, #703126, #703304, #703403,
-  #698593, #703442, #703565, #700901, #703874, #703807, #703893, #703909]
+* Fix initial text in logout dialog [Matthias; #702056]
+* Clear login messages when the user answers [John; #702458]
+* Align the "Not Listed?" label properly in the login screen [Mathieu; #702307]
+* Workaround crash causing bugs in code [Florian; #610279]
+* Improve time stamp in chat messages (frequency and formatting)
+  [Carlos; #687809, #687809]
+* Fix unlock screen after prematurely stopping curtain drag [Lionel; #703126]
+* Fix autorun notification [Matthis; 703418
+* Fix background occasionally turning solid blue on monitor changes [Lionel: #703001]
+* Increase message tray performance [Giovanni; #700194]
+* Fix focus of notifications after they're expanded [Jasper; #698778]
+* Fix orientation of gradient on app menu in RTL locales [Jasper; #704583]
+* Support filenames in addition to file uris for background
+  [Giovanni, Ray; #702121]
+* misc bug fixes [Adel, Florian, Emilio, Alban, Jasper; #702338, #704265,
+  #698863, #698484]

 Contributors:
-  Mathieu Bridon, Giovanni Campagna, Cosimo Cecchi, Matthias Clasen,
-  Fran Diéguez, Adel Gadllah, Lionel Landwerlin, Florian Müllner,
-  Emilio Pozuelo Monfort, Carlos Soriano, Jasper St. Pierre, Ray Strode
+  Mathieu Bridon, Alban Browaeys, Giovanni Campagna, Matthias Clasen, Adel Gadllah,
+  Emilio Pozuelo Monfort, Linonel Landwerlin, Carlos Soriano, Ray Strode,
+  John Wendell

-Translations:
-  Baurzhan Muftakhidinov [kk], Marek Černocký [cs], Daniel Mustieles [es],
-  Fran Diéguez [gl], Kjartan Maraas [nb], Andika Triwidada [id],
-  Benjamin Steinwender [de], Nguyễn Thái Ngọc Duy [vi], Trần Ngọc Quân [vi]
-
-3.9.3
+3.8.3
 =====
-* Don't push window thumbs when workspace switcher is hidden [Jasper; #701167]
+* Fix child menu regression introduced in 3.8.2 [Florian; #699678]
+* Fix alt-tab not always switching back to the previous window [Florian; #700356]
+* Fix VPN network icon regression introduced in 3.8.2 [Florian; #700394]
+* Allow switch-to-workspace-n keybindings in overview [Florian; #649977]
+* Update man page [Matthias; #700339]
+* Add FocusSearch DBus method [Florian; #700536]
+* gdm: Update the session chooser style [Allan; #695742]
+* Fix some app folders getting truncated at the top [Florian; #694371]
+* Fix duplicate cursors in screenshots with magnification [Florian; #700488]
+* popupMenu: Allow for an optional border for slider handle [Florian; #697917]
+* Synchronize input source switching with key events [Rui; #697007]
+* Switch input source on modifiers-only accelerator [Rui; #697008]
+* Allow input source switching in message tray [Rui; #697009]
 * Tweak timeout for activating windows during XDND [Adel; #700150]
+* Fix fullscreen windows not being unredirected when legacy tray icons
+  are around [Adel; #701224]
 * Fix ellipsization in control buttons in app picker [Carlos; #696307]
 * Fix DND to empty dash [Florian; #684618]
 * Fix OSD window appearing below system modal dialogs [Rui; #701269]
 * Clear clipboard on screen lock to prevent information leak [Florian; #698922]
 * Allow session mode specific overrides schema [Florian; #701717]
+* Fix incomplete app menu if multiple actions only become available later
+  [Xavier; #694612]
+* Fix showing the OSD when a fullscreen app is unredirected [Adel, #701224]
 * window-switcher: Only show windows from current workspace by default
-  [Florian; #701214]
-* logout dialog: Show the correct text right away [Matthias; #702056]
-* bluetooth: Port to bluez 5 [Emilio; #700891]
-* dateMenu: Allow events to span multiple lines [Giovanni; #701231]
-* gdm: Clear message queue when no more messages are pending [Jonh; #702458]
-* Misc bug fixes and cleanups [Jasper, Florian, Adel, Giovanni; #693836,
-  #700972, #701386, #700877, #701755, #698918, #701224, #702125, #701954,
-  #701849, #702121]
+  [Florian; #701214
+* Misc bug fixes [Florian, Rui, Giovanni, Stef; #700409, #700625, #700807,
+  #700842, #700900, #700944, #700190, #700972, #700877]

 Contributors:
-  Giovanni Campagna, Matthias Clasen, Fran Diéguez, Adel Gadllah, Rui Matos,
-  Florian Müllner, Emilio Pozuelo Monfort, Carlos Soriano, Jasper St. Pierre,
-  Jonh Wendell
+  Giovanni Campagna, Xavier Claessens, Matthias Clasen, Allan Day,
+  Adel Gadllah, Rui Matos, Florian Müllner, Carlos Soriano, Stef Walter

 Translations:
-  Marek Černocký [cs], Victor Ibragimov [tg], Fran Diéguez [gl],
-  Benjamin Steinwender [de], Cheng-Chia Tseng [zh_HK, zh_TW],
-  eternalhui [zh_CN], Ivaylo Valkov [bg], Kjartan Maraas [nb],
-  Daniel Mustieles [es]
+  Cheng-Chia Tseng [zh_HK, zh_TW], eternalhui [zh_CN]

-3.9.2
+3.8.2
 =====
-* Use a symbolic icon for DESKTOP windows [Matthias; #697914]
-* Move paint state cache into StWidget [Jasper; #697274]
+* Fix hotcorner regression in RTL locales [Jasper; #698884]
+* Allow some keybindings to work while a top bar menu is open [Florian; #698938]
+* Make open-app-menu keybinding a toggle action [Florian; #686756]
+* ctrlAltTab: Use symbolic icons for desktop windows [Matthias; #697914]
 * gdm: Fix regression where domain login hint not shown [Stef; #698200]
-* Make calendar keyboard navigable [Tanner; #667434]
 * Hide "Open Calendar" item when no calendar app is installed [Lionel; #697725]
 * Update how branding appears on login screen [Florian; #694912, #699877]
 * Allow OSD popups to grow if necessary [Marta; #696523]
@@ -70,69 +74,22 @@ Translations:
 * Fix insensitive button preventing empty keyring password [Stef; #696304]
 * Allow cancelling keyring dialog between prompts [Stef; #682830]
 * modalDialog: Show spinner while working [Stef; #684438]
-* overview: Only show close buttons for windows that may close [Jasper; #699269]
+* Provide a DBus API for screencasting [Florian; #696247]
+* Implement app folder keynav and shortcuts [Florian; #695314]
+* polkitAgent: Allow retrying after mistyped passwords [Stef; #684431]
 * Add input purpose and hints to StEntry and StIMText [Daiki; #691392]
 * Set input-purpose property for password entries [Rui; #700043]
-* Provide a DBus API for screencasting [Florian; #696247]
-* overview: Disable hotcorner during DND [Jasper; #698484]
-* polkitAgent: Allow retrying after mistyped passwords [Stef; #684431]
-* Add a way to get backtraces from criticals and warnings [Giovanni; #700262]
-* Allow switch-to-workspace-n keybindings in overview [Florian; #649977]
-* Update man page [Matthias; #700339]
-* Add FocusSearch DBus method [Florian; #700536]
-* Hide frequent view when app monitoring is disabled [Florian; #699714]
-* Show switcher popup for switch-to-workspace-n keybindings [Elad; #659288]
-* gdm: Update the session chooser style [Allan; #695742]
-* Fix some app folders getting truncated at the top [Florian; #694371]
-* Don't block the message tray while a notification is showing [Jasper; #700639]
-* popupMenu: Allow for an optional border for slider handle [Florian; #697917]
-* Re-lock screen when restarted after a crash [Colin; #691987]
-* Synchronize input source switching with key events [Rui; #697007]
-* Switch input source on modifiers-only accelerator [Rui; #697008]
-* Allow input source switching in message tray [Rui; #697009]
-* Misc bug fixes and cleanups [Alban, Jasper, Giovanni, Florian, Rui, Tomeu,
-  Stef, Gustavo; #698863, #699799, #699800, #676285, #699975, #700097, #698812,
-  #698486, #700194, #695314, #700257, #699678, #700356, #700322, #700394,
-  #700409, #700595, #700625, #691746, #700620, #700807, #659288, #700784,
-  #700842, #700847, #700488, #700735, #696159, #700900, #700853, #700923,
-  #700944, #697661, #700854, #700190, #699189, #701097]
+* Misc fixes and cleanups [Jasper, Florian, Giovanni, Tim, Rui; #697203,
+  #698959, #696720, #698531, #676285, #698812, #699189]

 Contributors:
-  Elad Alfassa, Alban Browaeys, Giovanni Campagna, Matthias Clasen, Allan Day,
-  Tanner Doshier, Lionel Landwerlin, Rui Matos, Simon McVittie,
-  Marta Milakovic, Florian Müllner, Gustavo Padovan, Jasper St. Pierre,
-  Daiki Ueno, Tomeu Vizoso, Stef Walter, Colin Walters
+  Giovanni Campagna, Matthias Clasen, Lionel Landwerlin, Tim Lunn, Rui Matos,
+  Simon McVittie, Marta Milakovic, Florian Müllner, Jasper St. Pierre,
+  Daiki Ueno, Stef Walter

 Translations:
-  Matej Urbančič [sl], Kjartan Maraas [nb], Victor Ibragimov [tg],
-  Dušan Kazik [sk], Gil Forcada [ca], Daniel Mustieles [es]
-
-3.9.1
-=====
-* Add additional toggle-overview keybinding [Matthias; #698251]
-* Disable <super> shortcut when sticky keys are enabled [Matthias; #685974]
-* Disable tray context menu while a notification displays [Jasper; #695800]
-* Watch GApplication busy state [Cosimo; #697207]
-* Disable style transitions if animations are disabled [Jasper; #698391]
-* Filter out hidden applications from "Frequent" view [Giovanni; #696949]
-* Fix window previews swapping place randomly [Jasper; #694469, #698776]
-* Add support for serialized GIcons in remote search providers [Cosimo; #698761]
-* Fix hotcorner regression in RTL locales [Jasper; #698884]
-* Allow some keybindings to work while a top bar menu is open [Florian; #698938]
-* Make open-app-menu keybinding a toggle action [Florian; #686756]
-* Only recognize common URL schemes in notification messages [Monica; #661225]
-* Misc fixes and cleanups [Tim, Jasper, Florian, Giovanni, Owen; #698531,
-  #698622, #698427, #698483, #698513, #697203, #698959, #698918, #699029,
-  #699075, #696720, #649748]
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Monica Chelliah, Matthias Clasen, Tim Lunn,
-  Florian Müllner, Jasper St. Pierre, Michael Wood, Owen W. Taylor
-
-Translations:
-  Fran Diéguez [gl], Muhammet Kara [tr], Daniel Mustieles [es],
-  Gil Forcada [ia], Anish A [ml], Dimitris Spingos [el], Marek Černocký [cs],
-  Žygimantas Beručka [lt]
+  Muhammet Kara [tr], Nik Kalach [ia], Žygimantas Beručka [lt],
+  Kjartan Maraas [nb]

 3.8.1
 =====
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.9.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.8.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -63,9 +63,9 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.35.4
-MUTTER_MIN_VERSION=3.9.4
+MUTTER_MIN_VERSION=3.8.3
 GTK_MIN_VERSION=3.7.9
-GIO_MIN_VERSION=2.37.0
+GIO_MIN_VERSION=2.35.0
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.5.3
 TELEPATHY_GLIB_MIN_VERSION=0.17.5
@@ -74,7 +74,7 @@ STARTUP_NOTIFICATION_MIN_VERSION=0.11
 GCR_MIN_VERSION=3.7.5
 GNOME_DESKTOP_REQUIRED_VERSION=3.7.90
 GNOME_MENUS_REQUIRED_VERSION=3.5.3
-NETWORKMANAGER_MIN_VERSION=0.9.8
+NETWORKMANAGER_MIN_VERSION=0.9.6
 PULSE_MIN_VERS=2.0

 # Collect more than 20 libraries for a prize!
@@ -109,7 +109,7 @@ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
 PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)

 AC_MSG_CHECKING([for bluetooth support])
-PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0],
+PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
 	 AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
--- a/data/50-gnome-shell-system.xml.in
+++ b/data/50-gnome-shell-system.xml.in
@@ -11,9 +11,6 @@
 	<KeyListEntry name="focus-active-notification"
                      _description="Focus the active notification"/>

-	<KeyListEntry name="toggle-overview"
-                      _description="Show the overview"/>
-
 	<KeyListEntry name="toggle-application-view"
                      _description="Show all applications"/>

--- a/data/org.gnome.ShellSearchProvider2.xml
+++ b/data/org.gnome.ShellSearchProvider2.xml
@@ -46,7 +46,7 @@
    <!--
        GetResultMetas:
        @identifiers: An array of result identifiers as returned by GetInitialResultSet() or GetSubsearchResultSet()
-        @metas: A dictionary describing the given search result, containing a human-readable 'name' (string), along with the result identifier this meta is for, 'id' (string). Optionally, 'icon' (a serialized GIcon as obtained by g_icon_serialize) can be specified if the result can be better served with a thumbnail of the content (such as with images). 'gicon' (a serialized GIcon as obtained by g_icon_to_string) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) are deprecated values that can also be used for that purpose. A 'description' field (string) may also be specified if more context would help the user find the desired result.
+        @metas: A dictionary describing the given search result, containing a human-readable 'name' (string), along with the result identifier this meta is for, 'id' (string). Optionally, either 'gicon' (a serialized GIcon) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) can be specified if the result can be better served with a thumbnail of the content (such as with images). A 'description' field (string) may also be specified if more context would help the user find the desired result.

        Return an array of meta data used to display each given result
    -->
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -21,6 +21,16 @@
        EnableExtension and DisableExtension DBus methods on org.gnome.Shell.
      </_description>
    </key>
+    <key name="enable-app-monitoring" type="b">
+      <default>true</default>
+      <_summary>Whether to collect stats about applications usage</_summary>
+      <_description>
+        The shell normally monitors active applications in order to present
+        the most used ones (e.g. in launchers). While this data will be
+        kept private, you may want to disable this for privacy reasons.
+        Please note that doing so won't remove already saved data.
+      </_description>
+    </key>
    <key name="favorite-apps" type="as">
      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
      <_summary>List of desktop file IDs for favorite applications</_summary>
@@ -107,13 +117,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
        Overview.
      </_description>
    </key>
-    <key name="toggle-overview" type="as">
-      <default>["&lt;Super&gt;s"]</default>
-      <_summary>Keybinding to open the overview</_summary>
-      <_description>
-        Keybinding to open the Activities Overview.
-      </_description>
-    </key>
    <key name="toggle-message-tray" type="as">
      <default>["&lt;Super&gt;m"]</default>
      <_summary>Keybinding to toggle the visibility of the message tray</_summary>
@@ -186,19 +189,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
    </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>
-	If true, only applications that have windows on the current workspace are shown in the switcher.
-	Otherwise, all applications are included.
-      </description>
-    </key>
-  </schema>
-
  <enum id="org.gnome.shell.window-switcher.AppIconMode">
    <value value="1" nick="thumbnail-only"/>
    <value value="2" nick="app-icon-only"/>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -123,26 +123,8 @@ StScrollBar StButton#vhandle:active {
    background-image: url("checkbox-focused.svg");
 }

-/* Slider */
-
-.slider {
-    height: 1em;
-    min-width: 15em;
-    -slider-height: 0.3em;
-    -slider-background-color: #333333;
-    -slider-border-color: #5f5f5f;
-    -slider-active-background-color: #76b0ec;
-    -slider-active-border-color: #1f6dbc;
-    -slider-border-width: 1px;
-    -slider-handle-radius: 0.5em;
-}
-
 /* PopupMenu */

-.popup-menu-ornament {
-    text-align: center;
-}
-
 .popup-menu-boxpointer,
 .candidate-popup-boxpointer {
    -arrow-border-radius: 8px;
@@ -189,6 +171,13 @@ StScrollBar StButton#vhandle:active {
    border-width: 0px;
 }

+.popup-combo-menu {
+    background-color: rgba(0,0,0,0.9);
+    padding: 1em 0em;
+    border: 1px solid #5f5f5f;
+    border-radius: 9px;
+}
+
 /* The remaining popup-menu sizing is all done in ems, so that if you
 * override .popup-menu.font-size, everything else will scale with it.
 */
@@ -212,6 +201,10 @@ StScrollBar StButton#vhandle:active {
 .popup-image-menu-item {
 }

+.popup-combobox-item {
+    spacing: 1em;
+}
+
 .popup-separator-menu-item {
    -gradient-height: 1px;
    -gradient-start: rgba(255,255,255,0.0);
@@ -225,6 +218,22 @@ StScrollBar StButton#vhandle:active {
    font-weight: bold;
 }

+.popup-slider-menu-item {
+    height: 1em;
+    min-width: 15em;
+    -slider-height: 0.3em;
+    -slider-background-color: #333333;
+    -slider-border-color: #5f5f5f;
+    -slider-active-background-color: #76b0ec;
+    -slider-active-border-color: #1f6dbc;
+    -slider-border-width: 1px;
+    -slider-handle-radius: 0.5em;
+}
+
+.popup-device-menu-item {
+    spacing: .5em;
+}
+
 .popup-status-menu-item {
    font-weight: normal;
    color: #999;
@@ -234,10 +243,19 @@ StScrollBar StButton#vhandle:active {
    color: white;
 }

+.popup-subtitle-menu-item, .popup-subtitle-menu-item:insensitive {
+    font-weight: bold;
+    color: white;
+}
+
 .popup-menu-icon {
    icon-size: 1.09em;
 }

+.popup-battery-percentage {
+    padding-left: 24px;
+}
+
 /* Switches */
 .toggle-switch {
    width: 65px;
@@ -262,51 +280,10 @@ StScrollBar StButton#vhandle:active {
    background-size: contain;
 }

-/* Network */
-
-.nm-dialog {
-    max-height: 400px;
-}
-
-.nm-dialog-content {
-    spacing: 8px;
-}
-
-.nm-dialog-header-hbox {
-    spacing: 4px;
-}
-
-.nm-dialog-header-icon {
-    icon-size: 32px;
-}
-
-.nm-dialog-scroll-view {
-    border: 2px solid #666;
-    border-radius: 6px;
-}
-
-.nm-dialog-header {
-    font-weight: bold;
-}
-
-.nm-dialog-item {
-    font-size: 12pt;
-    border-bottom: 1px solid #666;
-    padding: 12px;
-}
-
-.nm-dialog-item:checked {
-    background-color: #333;
-}
-
-.nm-dialog-icons {
+.nm-menu-item-icons {
    spacing: .5em;
 }

-.nm-dialog-icon {
-    icon-size: 16px;
-}
-
 /* Buttons */

 .candidate-page-button,
@@ -344,6 +321,10 @@ StScrollBar StButton#vhandle:active {
    border-width: 2px;
 }

+.app-view-control:focus {
+    padding: 3px;
+}
+
 .app-view-control:first-child:ltr:focus,
 .app-view-control:last-child:rtl:focus {
    border-right-width: 1px;
@@ -378,8 +359,7 @@ StScrollBar StButton#vhandle:active {
 .modal-dialog-button,
 .notification-button,
 .hotplug-notification-item,
-.app-view-controls,
-#screenShieldNotifications {
+.app-view-controls {
    border-radius: 18px;
 }

@@ -397,7 +377,6 @@ StScrollBar StButton#vhandle:active {
 /* Entries */

 #searchEntry,
-.login-dialog StEntry,
 .notification StEntry,
 .modal-dialog StEntry {
    color: rgb(64, 64, 64);
@@ -409,7 +388,6 @@ StScrollBar StButton#vhandle:active {
 }

 #searchEntry,
-.login-dialog StEntry,
 .run-dialog-entry,
 .notification StEntry {
    border: 2px solid rgba(245,245,245,0.2);
@@ -422,7 +400,6 @@ StScrollBar StButton#vhandle:active {

 #searchEntry:focus,
 #searchEntry:hover,
-.login-dialog StEntry:focus,
 .notification StEntry:focus,
 .modal-dialog StEntry {
    border: 2px solid rgb(136,138,133);
@@ -432,7 +409,6 @@ StScrollBar StButton#vhandle:active {
    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.6);
 }

-.login-dialog StEntry:focus,
 .notification StEntry:focus,
 .modal-dialog StEntry:focus {
    border: 2px solid #3465a4;
@@ -456,7 +432,6 @@ StScrollBar StButton#vhandle:active {
    transition-duration: 0ms;
 }

-.login-dialog StEntry,
 .notification StEntry,
 .modal-dialog StEntry {
    border-radius: 5px;
@@ -470,7 +445,6 @@ StScrollBar StButton#vhandle:active {
    padding: 0 4px;
 }

-.login-dialog StEntry:insensitive,
 .modal-dialog StEntry:insensitive {
    border-color: #666666;
    color: #9f9f9f;
@@ -488,6 +462,10 @@ StScrollBar StButton#vhandle:active {
    height: 1.86em;
 }

+#panel.lock-screen {
+    background-color: rgba(0,0,0,0.3);
+}
+
 #panel.unlock-screen,
 #panel.login-screen {
    background-color: transparent;
@@ -622,30 +600,58 @@ StScrollBar StButton#vhandle:active {
    spacing: 8px;
 }

+/* User Menu */
+
+#panelUserMenu {
+    spacing: 4px;
+}
+
+.status-chooser {
+    spacing: .4em;
+}
+
+.status-chooser .popup-menu-item,
+.status-chooser-combo .popup-menu-item {
+    padding: .4em;
+}
+
+.status-chooser-user-icon {
+    border: 2px solid #8b8b8b;
+    border-radius: 5px;
+    width: 48pt;
+    height: 48pt;
+    background-size: contain;
+}
+
+.status-chooser-user-icon:hover {
+    border: 2px solid #bbbbbb;
+}
+
+.status-chooser-user-name {
+    font-weight: bold;
+    font-size: 1.3em;
+    min-width: 120pt;
+}
+
+.status-chooser-combo {
+    border: 1px solid transparent;
+}
+
+.status-chooser-combo.popup-combo-menu {
+    padding: .4em 0em;
+    border-radius: 4px;
+    border: 1px solid #5f5f5f;
+}
+
+.status-chooser-status-item,
+.status-chooser-combo .popup-combobox-item {
+    spacing: .4em;
+}
+
 .system-status-icon {
    icon-size: 1.09em;
 }

-.system-switch-user-submenu-icon {
-    icon-size: 24px;
-    border: 1px solid #8b8b8b;
-}
-
-.system-menu-action {
-    color: #e6e6e6;
-    border-radius: 4px;
-    padding: 6px;
-}
-
-.system-menu-action:hover {
-    color: white;
-    background-color: rgba(255,255,255,0.1);
-}
-
-.system-menu-action > StIcon {
-    icon-size: 32px;
-}
-
 /* Overview */

 #overview {
@@ -893,11 +899,6 @@ StScrollBar StButton#vhandle:active {
    padding: 4px 32px;
 }

-.app-view-control:focus {
-    padding: 3px 31px;
-}
-
-
 .search-display > StBoxLayout,
 .all-apps > StBoxLayout,
 .frequent-apps > StBoxLayout {
@@ -1119,7 +1120,7 @@ StScrollBar StButton#vhandle:active {
    padding: 4px;
 }

-.lg-extensions-list {
+.lg-extension-list {
    padding: 4px;
    spacing: 6px;
 }
@@ -1147,6 +1148,11 @@ StScrollBar StButton#vhandle:active {

 /* Calendar popup */

+#calendarEventsArea {
+    /* this is the width of the second column of the popup */
+    min-width: 320px;
+}
+
 .calendar-vertical-separator {
    -stipple-width: 1px;
    -stipple-color: #505050;
@@ -1182,8 +1188,7 @@ StScrollBar StButton#vhandle:active {
    background-image: url("calendar-arrow-right.svg");
 }

-.calendar-change-month-back:hover,
-.calendar-change-month-back:focus {
+.calendar-change-month-back:hover {
    background-color: #999999;
 }
 .calendar-change-month-back:active {
@@ -1201,8 +1206,7 @@ StScrollBar StButton#vhandle:active {
    background-image: url("calendar-arrow-left.svg");
 }

-.calendar-change-month-forward:hover,
-.calendar-change-month-forward:focus {
+.calendar-change-month-forward:hover {
    background-color: #999999;
 }
 .calendar-change-month-forward:active {
@@ -1223,8 +1227,7 @@ StScrollBar StButton#vhandle:active {
    height: 2.4em;
 }

-.calendar-day-base:hover,
-.calendar-day-base:focus {
+.calendar-day-base:hover {
    background-color: #777777;
 }

@@ -1283,40 +1286,32 @@ StScrollBar StButton#vhandle:active {
    color: #333333;
 }

-.events-table {
-    width: 320px;
-    spacing-columns: 6pt;
-    padding: 0 1.4em;
+.events-header-vbox {
+    spacing: 6pt;
+    padding-right: .5em;
 }

-.events-table:ltr {
-    padding-right: 1.9em;
+.events-header-vbox:rtl {
+    padding-left: .5em;
 }

-.events-table:rtl {
-    padding-left: 1.9em;
+.events-header-hbox {
+    padding: 0.3em 1.4em;
 }

 .events-day-header {
    font-weight: bold;
    color: #999999;
-    padding-left: 0.4em;
-    padding-top: 1.2em;
-}
-
-.events-day-header:first-child {
-    padding-top: 0;
+    padding: 0.4em 1.4em 0em 1.4em;
 }

 .events-day-header:rtl {
-    padding-left: 0;
-    padding-right: 0.4em;
+    padding: 0em 1.4em 0.4em 1.4em;
 }

 .events-day-dayname {
    color: rgba(153, 153, 153, 1.0);
    text-align: left;
-    min-width: 20px;
 }

 .events-day-dayname:rtl {
@@ -1334,12 +1329,23 @@ StScrollBar StButton#vhandle:active {

 .events-day-task {
    color: rgba(153, 153, 153, 1.0);
-    padding-left: 8pt;
 }

-.events-day-task:rtl {
-    padding-left: 0px;
-    padding-right: 8pt;
+.events-day-name-box {
+    min-width: 15pt;
+}
+
+.events-time-box {
+    min-width: 48pt;
+    padding-right: 12pt;
+}
+
+.events-time-box:rtl {
+    padding-right: 0px;
+    padding-left: 12pt;
+}
+
+.events-event-box {
 }

 .url-highlighter {
@@ -2196,18 +2202,6 @@ StScrollBar StButton#vhandle:active {

 /* Login Dialog */

-.framed-user-icon {
-    border: 2px solid #8b8b8b;
-    border-radius: 5px;
-    width: 48pt;
-    height: 48pt;
-    background-size: contain;
-}
-
-.framed-user-icon:hover {
-    border: 2px solid #bbbbbb;
-}
-
 .login-dialog-banner {
    font-size: 10pt;
    font-weight: bold;
@@ -2237,10 +2231,6 @@ StScrollBar StButton#vhandle:active {
    min-width: 350px;
 }

-.login-dialog-button-box {
-    spacing: 5px;
-}
-
 .login-dialog-prompt-login-hint-message {
    font-size: 10.5pt;
 }
@@ -2322,9 +2312,6 @@ StScrollBar StButton#vhandle:active {
    font-weight: bold;
    color: #666666;
    padding-top: 1em;
-}
-
-.login-dialog-user-selection-box .login-dialog-not-listed-label {
    padding-left: 2px;
 }

@@ -2345,7 +2332,6 @@ StScrollBar StButton#vhandle:active {
    padding-top: 24px;
    padding-bottom: 12px;
    spacing: 8px;
-    width: 23em;
 }

 .login-dialog-prompt-label {
@@ -2353,17 +2339,47 @@ StScrollBar StButton#vhandle:active {
    font-size: 14px;
 }

-.login-dialog-session-list-button StIcon {
-    icon-size: 1.25em;
+.login-dialog-prompt-entry {
+    width: 15em;
+}
+
+.login-dialog-session-list,
+.login-dialog-session-list-item {
+    color: #babdb6;
+}
+
+.login-dialog-session-list-button:focus,
+.login-dialog-session-list-button:active,
+.login-dialog-session-list-button:hover,
+.login-dialog-session-list-item:focus,
+.login-dialog-session-list-item:hover {
+    color: white;
 }

 .login-dialog-session-list-button {
-    color: #8b8b8b;
+    padding: 4px;
 }

-.login-dialog-session-list-button:hover,
-.login-dialog-session-list-button:active {
-    color: white;
+.login-dialog-session-list-scroll-view {
+    padding: 6px;
+}
+
+.login-dialog-session-list-item {
+    padding-bottom: 6px;
+}
+
+.login-dialog-session-list-triangle {
+    padding-right: 6px;
+}
+
+.login-dialog-session-list-item-box {
+    padding-left: 6px;
+    spacing: 6px;
+}
+
+.login-dialog-session-list-item-dot {
+    width: 10px;
+    height: 10px;
 }

 .login-dialog-logo-bin {
@@ -2430,14 +2446,8 @@ StScrollBar StButton#vhandle:active {

 /* Screen shield */

-#panel.lock-screen,
-#screenShieldNotifications {
-    background-color: rgba(0,0,0,0.3);
-}
-
 .screen-shield-background {
    background: black;
-    box-shadow: 0px 4px 8px rgba(0,0,0,0.9);
 }

 #lockDialogGroup {
@@ -2479,27 +2489,33 @@ StScrollBar StButton#vhandle:active {
 }

 #screenShieldNotifications {
+    border-radius: 8px;
+    background-color: rgba(0.0, 0.0, 0.0, 0.9);
+    border: 2px solid #868686;
    max-height: 500px;
-    padding: 12px;
+    padding: 18px 0;
+    box-shadow: .5em .5em 20px rgba(0, 0, 0, 0.5);
 }

 .screen-shield-notifications-box {
-    spacing: 12px;
-    width: 30em;
+    spacing: 18px;
+    max-width: 34em;
 }

 .screen-shield-notification-source {
-    padding: 3px 6px;
+    padding: 13px 24px;
    spacing: 5px;
 }

 .screen-shield-notification-label {
+    font-size: 1.2em;
    font-weight: bold;
-    padding: 0px 0px 0px 12px;
+    padding: 0px 18px;
+    color: #babdb6;
 }

 .screen-shield-notification-count-text {
-    padding: 0px 0px 0px 12px;
+    padding: 0px 18px;
 }

 /* Remove background from notifications, otherwise
@@ -2517,31 +2533,6 @@ StScrollBar StButton#vhandle:active {
    padding-bottom: 0px;
 }

-#screenShieldNotifications .notification-button,
-#screenShieldNotifications .notification-icon-button {
-    border: 1px rgba(255,255,255,0.5);
-}
-
-#screenShieldNotifications StScrollBar StBin#trough {
-    background-color: rgba(0,0,0,0.2);
-}
-
-#screenShieldNotifications StScrollBar StButton#vhandle,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-    background-color: rgba(0,0,0,0.3);
-    border: none;
-}
-
-#screenShieldNotifications StScrollBar StButton#vhandle:hover,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-    background-color: rgba(0,0,0,0.6);
-}
-
-#screenShieldNotifications StScrollBar StButton#vhandle:active,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-    background-color: rgba(0,0,0,0.8);
-}
-
 .input-source-switcher-symbol {
   font-size: 34pt;
   width: 96px;
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -17,7 +17,6 @@ misc/config.js: misc/config.js.in Makefile
 jsdir = $(pkgdatadir)/js

 nobase_dist_js_DATA = 	\
-	gdm/authPrompt.js	\
 	gdm/batch.js		\
 	gdm/fingerprint.js	\
 	gdm/loginDialog.js	\
@@ -34,13 +33,10 @@ nobase_dist_js_DATA = 	\
 	misc/jsParse.js		\
 	misc/loginManager.js	\
 	misc/modemManager.js	\
-	misc/objectManager.js	\
 	misc/params.js		\
-	misc/smartcardManager.js \
 	misc/util.js		\
 	perf/core.js		\
 	ui/altTab.js		\
-	ui/animation.js		\
 	ui/appDisplay.js	\
 	ui/appFavorites.js	\
 	ui/backgroundMenu.js	\
@@ -72,7 +68,6 @@ nobase_dist_js_DATA = 	\
 	ui/sessionMode.js	\
 	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
-	ui/slider.js		\
 	ui/notificationDaemon.js \
 	ui/osdWindow.js		\
 	ui/overview.js		\
@@ -82,7 +77,6 @@ nobase_dist_js_DATA = 	\
 	ui/pointerWatcher.js    \
 	ui/popupMenu.js		\
 	ui/remoteSearch.js	\
-	ui/remoteMenu.js	\
 	ui/runDialog.js		\
 	ui/screencast.js	\
 	ui/screenshot.js	\
@@ -98,10 +92,10 @@ nobase_dist_js_DATA = 	\
 	ui/status/power.js	\
 	ui/status/volume.js	\
 	ui/status/bluetooth.js	\
-	ui/status/system.js	\
 	ui/switcherPopup.js	\
 	ui/tweener.js		\
 	ui/unlockDialog.js	\
+	ui/userMenu.js		\
 	ui/userWidget.js	\
 	ui/viewSelector.js	\
 	ui/wanda.js		\
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -1,506 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const Animation = imports.ui.animation;
-const Batch = imports.gdm.batch;
-const GdmUtil = imports.gdm.util;
-const Params = imports.misc.params;
-const ShellEntry = imports.ui.shellEntry;
-const Tweener = imports.ui.tweener;
-const UserWidget = imports.ui.userWidget;
-
-const DEFAULT_BUTTON_WELL_ICON_SIZE = 24;
-const DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0;
-const DEFAULT_BUTTON_WELL_ANIMATION_TIME = 0.3;
-
-const MESSAGE_FADE_OUT_ANIMATION_TIME = 0.5;
-
-const AuthPromptMode = {
-    UNLOCK_ONLY: 0,
-    UNLOCK_OR_LOG_IN: 1
-};
-
-const AuthPromptStatus = {
-    NOT_VERIFYING: 0,
-    VERIFYING: 1,
-    VERIFICATION_FAILED: 2,
-    VERIFICATION_SUCCEEDED: 3
-};
-
-const BeginRequestType = {
-    PROVIDE_USERNAME: 0,
-    DONT_PROVIDE_USERNAME: 1
-};
-
-const AuthPrompt = new Lang.Class({
-    Name: 'AuthPrompt',
-
-    _init: function(gdmClient, mode) {
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-
-        this._gdmClient = gdmClient;
-        this._mode = mode;
-
-        let reauthenticationOnly;
-        if (this._mode == AuthPromptMode.UNLOCK_ONLY)
-            reauthenticationOnly = true;
-        else if (this._mode == AuthPromptMode.UNLOCK_OR_LOG_IN)
-            reauthenticationOnly = false;
-
-        this._userVerifier = new GdmUtil.ShellUserVerifier(this._gdmClient, { reauthenticationOnly: reauthenticationOnly });
-
-        this._userVerifier.connect('ask-question', Lang.bind(this, this._onAskQuestion));
-        this._userVerifier.connect('show-message', Lang.bind(this, this._onShowMessage));
-        this._userVerifier.connect('verification-failed', Lang.bind(this, this._onVerificationFailed));
-        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
-        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
-        this._userVerifier.connect('show-login-hint', Lang.bind(this, this._onShowLoginHint));
-        this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._onHideLoginHint));
-        this._userVerifier.connect('smartcard-status-changed', Lang.bind(this, this._onSmartcardStatusChanged));
-        this.smartcardDetected = this._userVerifier.smartcardDetected;
-
-        this.connect('next', Lang.bind(this, function() {
-                         this.updateSensitivity(false);
-                         this.startSpinning();
-                         if (this._queryingService) {
-                             this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-                         } else {
-                             this._preemptiveAnswer = this._entry.text;
-                         }
-                     }));
-
-        this.actor = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
-                                        vertical: true });
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this.actor.connect('key-press-event',
-                           Lang.bind(this, function(actor, event) {
-                               if (event.get_key_symbol() == Clutter.KEY_Escape) {
-                                   this.cancel();
-                               }
-                           }));
-
-        this._userWell = new St.Bin({ x_fill: true,
-                                      x_align: St.Align.START });
-        this.actor.add(this._userWell,
-                       { x_align: St.Align.START,
-                         x_fill: true,
-                         y_fill: true,
-                         expand: true });
-        this._label = new St.Label({ style_class: 'login-dialog-prompt-label' });
-
-        this.actor.add(this._label,
-                       { expand: true,
-                         x_fill: true,
-                         y_fill: true,
-                         x_align: St.Align.START });
-        this._entry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
-                                     can_focus: true });
-        ShellEntry.addContextMenu(this._entry, { isPassword: true });
-
-        this.actor.add(this._entry,
-                       { expand: true,
-                         x_fill: true,
-                         y_fill: false,
-                         x_align: St.Align.START });
-
-        this._entry.grab_key_focus();
-
-        this._message = new St.Label({ opacity: 0 });
-        this._message.clutter_text.line_wrap = true;
-        this.actor.add(this._message, { x_fill: true });
-
-        this._loginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint-message' });
-        this.actor.add(this._loginHint);
-
-        this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
-                                             vertical: false });
-        this.actor.add(this._buttonBox,
-                       { expand:  true,
-                         x_align: St.Align.MIDDLE,
-                         y_align: St.Align.END });
-
-        this._defaultButtonWell = new St.Widget();
-        this._defaultButtonWellActor = null;
-
-        this._initButtons();
-
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
-        this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
-        this._spinner.actor.opacity = 0;
-        this._spinner.actor.show();
-        this._defaultButtonWell.add_child(this._spinner.actor);
-    },
-
-    _onDestroy: function() {
-        this._userVerifier.clear();
-        this._userVerifier.disconnectAll();
-        this._userVerifier = null;
-    },
-
-    _initButtons: function() {
-        this.cancelButton = new St.Button({ style_class: 'modal-dialog-button',
-                                            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                            reactive: true,
-                                            can_focus: true,
-                                            label: _("Cancel") });
-        this.cancelButton.connect('clicked',
-                                   Lang.bind(this, function() {
-                                       this.cancel();
-                                   }));
-        this._buttonBox.add(this.cancelButton,
-                            { expand: false,
-                              x_fill: false,
-                              y_fill: false,
-                              x_align: St.Align.START,
-                              y_align: St.Align.END });
-
-        this._buttonBox.add(this._defaultButtonWell,
-                            { expand: true,
-                              x_fill: false,
-                              y_fill: false,
-                              x_align: St.Align.END,
-                              y_align: St.Align.MIDDLE });
-        this.nextButton = new St.Button({ style_class: 'modal-dialog-button',
-                                          button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                          reactive: true,
-                                          can_focus: true,
-                                          label: _("Next") });
-        this.nextButton.connect('clicked',
-                                 Lang.bind(this, function() {
-                                     this.emit('next');
-                                 }));
-        this.nextButton.add_style_pseudo_class('default');
-        this._buttonBox.add(this.nextButton,
-                            { expand: false,
-                              x_fill: false,
-                              y_fill: false,
-                              x_align: St.Align.END,
-                              y_align: St.Align.END });
-
-        this._updateNextButtonSensitivity(this._entry.text.length > 0);
-
-        this._entry.clutter_text.connect('text-changed',
-                                         Lang.bind(this, function() {
-                                             if (!this._userVerifier.hasPendingMessages)
-                                                 this._fadeOutMessage();
-
-                                             this._updateNextButtonSensitivity(this._entry.text.length > 0);
-                                         }));
-        this._entry.clutter_text.connect('activate', Lang.bind(this, function() {
-            this.emit('next');
-        }));
-    },
-
-    _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
-        if (this._preemptiveAnswer) {
-            this._userVerifier.answerQuery(this._queryingService, this._preemptiveAnswer);
-            this._preemptiveAnswer = null;
-            return;
-        }
-
-        if (this._queryingService)
-            this.clear();
-
-        this._queryingService = serviceName;
-        this.setPasswordChar(passwordChar);
-        this.setQuestion(question);
-
-        if (passwordChar) {
-            if (this._userVerifier.reauthenticating)
-                this.nextButton.label = _("Unlock");
-            else
-                this.nextButton.label = C_("button", "Sign In");
-        } else {
-            this.nextButton.label = _("Next");
-        }
-
-        this.updateSensitivity(true);
-        this.emit('prompted');
-    },
-
-    _onSmartcardStatusChanged: function() {
-        this.smartcardDetected = this._userVerifier.smartcardDetected;
-
-        // Don't reset on smartcard insertion if we're already verifying
-        // and the smartcard is the main service
-        if (this._userVerifier.serviceIsDefault(GdmUtil.SMARTCARD_SERVICE_NAME) &&
-            this.verificationStatus == AuthPromptStatus.VERIFYING &&
-            this.smartcardDetected)
-            return;
-
-        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            this.reset();
-    },
-
-    _onShowMessage: function(userVerifier, message, styleClass) {
-        this.setMessage(message, styleClass);
-        this.emit('prompted');
-    },
-
-    _onVerificationFailed: function() {
-        this.clear();
-
-        this.updateSensitivity(true);
-        this.setActorInDefaultButtonWell(null);
-        this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
-    },
-
-    _onVerificationComplete: function() {
-        this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
-    },
-
-    _onReset: function() {
-        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED) {
-            this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-            this.reset();
-        }
-    },
-
-    _onShowLoginHint: function(verifier, message) {
-        this.setHint(message);
-    },
-
-    _onHideLoginHint: function() {
-        this.setHint(null);
-    },
-
-    addActorToDefaultButtonWell: function(actor) {
-        this._defaultButtonWell.add_child(actor);
-
-        actor.add_constraint(new Clutter.AlignConstraint({ source: this._spinner.actor,
-                                                           align_axis: Clutter.AlignAxis.BOTH,
-                                                           factor: 0.5 }));
-    },
-
-    setActorInDefaultButtonWell: function(actor, animate) {
-        if (!this._defaultButtonWellActor &&
-            !actor)
-            return;
-
-        let oldActor = this._defaultButtonWellActor;
-
-        if (oldActor)
-            Tweener.removeTweens(oldActor);
-
-        let isSpinner;
-        if (actor == this._spinner.actor)
-            isSpinner = true;
-        else
-            isSpinner = false;
-
-        if (this._defaultButtonWellActor != actor && oldActor) {
-            if (!animate) {
-                oldActor.opacity = 0;
-            } else {
-                Tweener.addTween(oldActor,
-                                 { opacity: 0,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear',
-                                   onCompleteScope: this,
-                                   onComplete: function() {
-                                      if (isSpinner) {
-                                          if (this._spinner)
-                                              this._spinner.stop();
-                                      }
-                                   }
-                                 });
-            }
-        }
-
-        if (actor) {
-            if (isSpinner)
-                this._spinner.play();
-
-            if (!animate)
-                actor.opacity = 255;
-            else
-                Tweener.addTween(actor,
-                                 { opacity: 255,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear' });
-        }
-
-        this._defaultButtonWellActor = actor;
-    },
-
-    startSpinning: function() {
-        this.setActorInDefaultButtonWell(this._spinner.actor, true);
-    },
-
-    stopSpinning: function() {
-        this.setActorInDefaultButtonWell(null, false);
-    },
-
-    clear: function() {
-        this._entry.text = '';
-        this.stopSpinning();
-    },
-
-    setPasswordChar: function(passwordChar) {
-        this._entry.clutter_text.set_password_char(passwordChar);
-        this._entry.menu.isPassword = passwordChar != '';
-    },
-
-    setQuestion: function(question) {
-        this._label.set_text(question);
-
-        this._label.show();
-        this._entry.show();
-
-        this._loginHint.opacity = 0;
-        this._loginHint.show();
-
-        this._entry.grab_key_focus();
-    },
-
-    getAnswer: function() {
-        let text = this._entry.get_text();
-
-        return text;
-    },
-
-    _fadeOutMessage: function() {
-        if (this._message.opacity == 0)
-            return;
-        Tweener.removeTweens(this._message);
-        Tweener.addTween(this._message,
-                         { opacity: 0,
-                           time: MESSAGE_FADE_OUT_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
-    },
-
-    setMessage: function(message, styleClass) {
-        if (message) {
-            Tweener.removeTweens(this._message);
-            this._message.text = message;
-            this._message.styleClass = styleClass;
-            this._message.opacity = 255;
-        } else {
-            this._message.opacity = 0;
-        }
-    },
-
-    _updateNextButtonSensitivity: function(sensitive) {
-        this.nextButton.reactive = sensitive;
-        this.nextButton.can_focus = sensitive;
-    },
-
-    updateSensitivity: function(sensitive) {
-        this._updateNextButtonSensitivity(sensitive);
-        this._entry.reactive = sensitive;
-        this._entry.clutter_text.editable = sensitive;
-    },
-
-    hide: function() {
-        this.setActorInDefaultButtonWell(null, true);
-        this.actor.hide();
-        this._loginHint.opacity = 0;
-
-        this.setUser(null);
-
-        this.updateSensitivity(true);
-        this._entry.set_text('');
-    },
-
-    setUser: function(user) {
-        if (user) {
-            let userWidget = new UserWidget.UserWidget(user);
-            this._userWell.set_child(userWidget.actor);
-        } else {
-            this._userWell.set_child(null);
-        }
-    },
-
-    setHint: function(message) {
-        if (message) {
-            this._loginHint.set_text(message)
-            this._loginHint.opacity = 255;
-        } else {
-            this._loginHint.opacity = 0;
-            this._loginHint.set_text('');
-        }
-    },
-
-    reset: function() {
-        let oldStatus = this.verificationStatus;
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-
-        if (oldStatus == AuthPromptStatus.VERIFYING)
-            this._userVerifier.cancel();
-
-        this._queryingService = null;
-        this.clear();
-        this._message.opacity = 0;
-        this.setUser(null);
-        this.stopSpinning();
-        this.setHint(null);
-
-        if (oldStatus == AuthPromptStatus.VERIFICATION_FAILED)
-            this.emit('failed');
-
-        let beginRequestType;
-
-        if (this._mode == AuthPromptMode.UNLOCK_ONLY) {
-            // The user is constant at the unlock screen
-            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        } else if (this.smartcardDetected &&
-                   this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME)) {
-            // We don't need to know the username if the user preempted the login screen
-            // with a smartcard.
-            beginRequestType = BeginRequestType.DONT_PROVIDE_USERNAME;
-        } else {
-            // In all other cases, we should get the username up front.
-            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        }
-
-        this.emit('reset', beginRequestType);
-    },
-
-    addCharacter: function(unichar) {
-        if (!this._entry.visible)
-            return;
-
-        this._entry.grab_key_focus();
-        this._entry.clutter_text.insert_unichar(unichar);
-    },
-
-    begin: function(params) {
-        params = Params.parse(params, { userName: null,
-                                        hold: null });
-
-        this.updateSensitivity(false);
-
-        let hold = params.hold;
-        if (!hold)
-            hold = new Batch.Hold();
-
-        this._userVerifier.begin(params.userName, hold);
-        this.verificationStatus = AuthPromptStatus.VERIFYING;
-    },
-
-    finish: function(onComplete) {
-        if (!this._userVerifier.hasPendingMessages) {
-            onComplete();
-            return;
-        }
-
-        let signalId = this._userVerifier.connect('no-more-messages',
-                                                  Lang.bind(this, function() {
-                                                      this._userVerifier.disconnect(signalId);
-                                                      onComplete();
-                                                  }));
-    },
-
-    cancel: function() {
-        this.reset();
-        this.emit('cancelled');
-    }
-});
-Signals.addSignalMethods(AuthPrompt.prototype);
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -19,29 +19,30 @@
 */

 const AccountsService = imports.gi.AccountsService;
-const Atk = imports.gi.Atk;
 const Clutter = imports.gi.Clutter;
-const Gdm = imports.gi.Gdm;
+const CtrlAltTab = imports.ui.ctrlAltTab;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const AuthPrompt = imports.gdm.authPrompt;
-const Batch = imports.gdm.batch;
-const BoxPointer = imports.ui.boxpointer;
-const CtrlAltTab = imports.ui.ctrlAltTab;
-const GdmUtil = imports.gdm.util;
-const Layout = imports.ui.layout;
-const Main = imports.ui.main;
-const PopupMenu = imports.ui.popupMenu;
+const Lang = imports.lang;
+const Pango = imports.gi.Pango;
 const Realmd = imports.gdm.realmd;
+const Signals = imports.signals;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Gdm = imports.gi.Gdm;
+
+const Batch = imports.gdm.batch;
+const Fprint = imports.gdm.fingerprint;
+const GdmUtil = imports.gdm.util;
+const Lightbox = imports.ui.lightbox;
+const Main = imports.ui.main;
+const ModalDialog = imports.ui.modalDialog;
+const PanelMenu = imports.ui.panelMenu;
 const Tweener = imports.ui.tweener;
+const UserMenu = imports.ui.userMenu;
 const UserWidget = imports.ui.userWidget;

 const _FADE_ANIMATION_TIME = 0.25;
@@ -68,8 +69,8 @@ const UserListItem = new Lang.Class({
                                     x_align: St.Align.START,
                                     x_fill: true });

-        this._userAvatar = new UserWidget.Avatar(this.user,
-                                                 { styleClass: 'login-dialog-user-list-item-icon' });
+        this._userAvatar = new UserMenu.UserAvatarWidget(this.user,
+                                                         { styleClass: 'login-dialog-user-list-item-icon' });
        layout.add(this._userAvatar.actor);
        let textLayout = new St.BoxLayout({ style_class: 'login-dialog-user-list-item-text-box',
                                            vertical:    true });
@@ -287,124 +288,209 @@ const UserList = new Lang.Class({
 });
 Signals.addSignalMethods(UserList.prototype);

-const SessionMenuButton = new Lang.Class({
-    Name: 'SessionMenuButton',
+const SessionListItem = new Lang.Class({
+    Name: 'SessionListItem',
+
+    _init: function(id, name) {
+        this.id = id;
+
+        this.actor = new St.Button({ style_class: 'login-dialog-session-list-item',
+                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                     can_focus: true,
+                                     reactive: true,
+                                     x_fill: true,
+                                     x_align: St.Align.START });
+
+        this._box = new St.BoxLayout({ style_class: 'login-dialog-session-list-item-box' });
+
+        this.actor.add_actor(this._box);
+        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+
+        this._dot = new St.DrawingArea({ style_class: 'login-dialog-session-list-item-dot' });
+        this._dot.connect('repaint', Lang.bind(this, this._onRepaintDot));
+        this._box.add_actor(this._dot);
+        this.setShowDot(false);
+
+        let label = new St.Label({ style_class: 'login-dialog-session-list-item-label',
+                                   text: name });
+        this.actor.label_actor = label;
+
+        this._box.add_actor(label);
+    },
+
+    setShowDot: function(show) {
+        if (show)
+            this._dot.opacity = 255;
+        else
+            this._dot.opacity = 0;
+    },
+
+    _onRepaintDot: function(area) {
+        let cr = area.get_context();
+        let [width, height] = area.get_surface_size();
+        let color = area.get_theme_node().get_foreground_color();
+
+        cr.setSourceRGBA (color.red / 255,
+                          color.green / 255,
+                          color.blue / 255,
+                          color.alpha / 255);
+        cr.arc(width / 2, height / 2, width / 3, 0, 2 * Math.PI);
+        cr.fill();
+        cr.$dispose();
+    },
+
+    _onClicked: function() {
+        this.emit('activate');
+    }
+});
+Signals.addSignalMethods(SessionListItem.prototype);
+
+const SessionList = new Lang.Class({
+    Name: 'SessionList',

    _init: function() {
-        let gearIcon = new St.Icon({ icon_name: 'emblem-system-symbolic' });
+        this.actor = new St.Bin();
+
+        this._box = new St.BoxLayout({ style_class: 'login-dialog-session-list',
+                                       vertical: true});
+        this.actor.child = this._box;
+
        this._button = new St.Button({ style_class: 'login-dialog-session-list-button',
-                                       reactive: true,
-                                       track_hover: true,
+                                       button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                       can_focus: true,
-                                       accessible_name: _("Choose Session"),
-                                       accessible_role: Atk.Role.MENU,
-                                       child: gearIcon });
+                                       x_fill: true,
+                                       y_fill: true });
+        let box = new St.BoxLayout();
+        this._button.add_actor(box);

-        this.actor = new St.Bin({ child: this._button });
+        this._triangle = new St.Label({ style_class: 'login-dialog-session-list-triangle',
+                                        text: '\u25B8' });
+        box.add_actor(this._triangle);

-        this._menu = new PopupMenu.PopupMenu(this._button, 0, St.Side.TOP);
-        Main.uiGroup.add_actor(this._menu.actor);
-        this._menu.actor.hide();
+        let label = new St.Label({ style_class: 'login-dialog-session-list-label',
+                                   text: _("Session…") });
+        box.add_actor(label);

-        this._menu.connect('open-state-changed',
-                           Lang.bind(this, function(menu, isOpen) {
-                                if (isOpen)
-                                    this._button.add_style_pseudo_class('active');
-                                else
-                                    this._button.remove_style_pseudo_class('active');
-                           }));
-
-        let subtitle = new PopupMenu.PopupMenuItem(_("Session"), { style_class: 'popup-subtitle-menu-item',
-                                                                   reactive: false });
-        this._menu.addMenuItem(subtitle);
-
-        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button });
-        this._manager.addMenu(this._menu);
-
-        this._button.connect('clicked', Lang.bind(this, function() {
-            this._menu.toggle();
-        }));
-
-        this._items = {};
-        this._activeSessionId = null;
+        this._button.connect('clicked',
+                             Lang.bind(this, this._onClicked));
+        this._box.add_actor(this._button);
+        this._scrollView = new St.ScrollView({ style_class: 'login-dialog-session-list-scroll-view'});
+        this._scrollView.set_policy(Gtk.PolicyType.NEVER,
+                                    Gtk.PolicyType.AUTOMATIC);
+        this._box.add_actor(this._scrollView);
+        this._itemList = new St.BoxLayout({ style_class: 'login-dialog-session-item-list',
+                                            vertical: true });
+        this._scrollView.add_actor(this._itemList);
+        this._scrollView.hide();
+        this.isOpen = false;
        this._populate();
    },

+    open: function() {
+        if (this.isOpen)
+            return;
+
+        this._button.add_style_pseudo_class('open');
+        this._scrollView.show();
+        this._triangle.set_text('\u25BE');
+
+        this.isOpen = true;
+    },
+
+    close: function() {
+        if (!this.isOpen)
+            return;
+
+        this._button.remove_style_pseudo_class('open');
+        this._scrollView.hide();
+        this._triangle.set_text('\u25B8');
+
+        this.isOpen = false;
+    },
+
+    _onClicked: function() {
+        if (!this.isOpen)
+            this.open();
+        else
+            this.close();
+    },
+
    updateSensitivity: function(sensitive) {
        this._button.reactive = sensitive;
        this._button.can_focus = sensitive;
-        this._menu.close(BoxPointer.PopupAnimation.NONE);
-    },

-    _updateOrnament: function() {
-        let itemIds = Object.keys(this._items);
-        for (let i = 0; i < itemIds.length; i++) {
-            if (itemIds[i] == this._activeSessionId)
-                this._items[itemIds[i]].setOrnament(PopupMenu.Ornament.DOT);
-            else
-                this._items[itemIds[i]].setOrnament(PopupMenu.Ornament.NONE);
-        }
+        for (let id in this._items)
+            this._items[id].actor.reactive = sensitive;
    },

    setActiveSession: function(sessionId) {
         if (sessionId == this._activeSessionId)
             return;

+         if (this._activeSessionId)
+             this._items[this._activeSessionId].setShowDot(false);
+
+         this._items[sessionId].setShowDot(true);
         this._activeSessionId = sessionId;
-         this._updateOrnament();

         this.emit('session-activated', this._activeSessionId);
    },

-    close: function() {
-        this._menu.close();
-    },
-
    _populate: function() {
+        this._itemList.destroy_all_children();
+        this._activeSessionId = null;
+        this._items = {};
+
        let ids = Gdm.get_session_ids();
        ids.sort();

        if (ids.length <= 1) {
+            this._box.hide();
            this._button.hide();
-            return;
+        } else {
+            this._button.show();
+            this._box.show();
        }

        for (let i = 0; i < ids.length; i++) {
            let [sessionName, sessionDescription] = Gdm.get_session_name_and_description(ids[i]);

-            let id = ids[i];
-            let item = new PopupMenu.PopupMenuItem(sessionName);
-            this._menu.addMenuItem(item);
-            this._items[id] = item;
+            let item = new SessionListItem(ids[i], sessionName);
+            this._itemList.add_actor(item.actor);
+            this._items[ids[i]] = item;

            if (!this._activeSessionId)
-                this.setActiveSession(id);
+                this.setActiveSession(ids[i]);

-            item.connect('activate', Lang.bind(this, function() {
-                this.setActiveSession(id);
-            }));
+            item.connect('activate',
+                         Lang.bind(this, function() {
+                             this.setActiveSession(item.id);
+                         }));
        }
    }
 });
-Signals.addSignalMethods(SessionMenuButton.prototype);
+Signals.addSignalMethods(SessionList.prototype);

 const LoginDialog = new Lang.Class({
    Name: 'LoginDialog',
+    Extends: ModalDialog.ModalDialog,

    _init: function(parentActor) {
-        this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,
-                                     style_class: 'login-dialog',
-                                     visible: false });
-
-        this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        parentActor.add_child(this.actor);
+        this.parent({ shellReactive: true,
+                      styleClass: 'login-dialog',
+                      parentActor: parentActor,
+                      keybindingMode: Shell.KeyBindingMode.LOGIN_SCREEN,
+                      shouldFadeIn: false });
+        this.connect('destroy',
+                     Lang.bind(this, this._onDestroy));
+        this.connect('opened',
+                     Lang.bind(this, this._onOpened));

        this._userManager = AccountsService.UserManager.get_default()
-        let gdmClient = new Gdm.Client();
+        this._greeterClient = new Gdm.Client();

        if (GLib.getenv('GDM_GREETER_TEST') != '1') {
-            this._greeter = gdmClient.get_greeter_sync(null);
+            this._greeter = this._greeterClient.get_greeter_sync(null);

            this._greeter.connect('default-session-name-changed',
                                  Lang.bind(this, this._onDefaultSessionChanged));
@@ -415,6 +501,15 @@ const LoginDialog = new Lang.Class({
                                  Lang.bind(this, this._onTimedLoginRequested));
        }

+        this._userVerifier = new GdmUtil.ShellUserVerifier(this._greeterClient);
+        this._userVerifier.connect('ask-question', Lang.bind(this, this._askQuestion));
+        this._userVerifier.connect('show-message', Lang.bind(this, this._showMessage));
+        this._userVerifier.connect('verification-failed', Lang.bind(this, this._verificationFailed));
+        this._userVerifier.connect('reset', Lang.bind(this, this._reset));
+        this._userVerifier.connect('show-login-hint', Lang.bind(this, this._showLoginHint));
+        this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._hideLoginHint));
+        this._verifyingUser = false;
+
        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });

        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
@@ -431,12 +526,8 @@ const LoginDialog = new Lang.Class({
                                   Lang.bind(this, this._updateLogoTexture));

        this._userSelectionBox = new St.BoxLayout({ style_class: 'login-dialog-user-selection-box',
-                                                    vertical: true,
-                                                    visible: false });
-        this._userSelectionBox.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
-                                                                            align_axis: Clutter.AlignAxis.BOTH,
-                                                                            factor: 0.5 }));
-        this.actor.add_child(this._userSelectionBox);
+                                                    vertical: true });
+        this.contentLayout.add(this._userSelectionBox);

        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
                                           text: '' });
@@ -449,18 +540,60 @@ const LoginDialog = new Lang.Class({
                                     x_fill: true,
                                     y_fill: true });

-        this._authPrompt = new AuthPrompt.AuthPrompt(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
-        this._authPrompt.connect('prompted', Lang.bind(this, this._onPrompted));
-        this._authPrompt.connect('reset', Lang.bind(this, this._onReset));
-        this._authPrompt.hide();
+        this.setInitialKeyFocus(this._userList.actor);

-        this._authPrompt.actor.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
-                                                                            align_axis: Clutter.AlignAxis.BOTH,
-                                                                            factor: 0.5 }));
+        this._promptBox = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
+                                             vertical: true });
+        this.contentLayout.add(this._promptBox,
+                               { expand: true,
+                                 x_fill: true,
+                                 y_fill: true,
+                                 x_align: St.Align.START });
+        this._promptUser = new St.Bin({ x_fill: true,
+                                        x_align: St.Align.START });
+        this._promptBox.add(this._promptUser,
+                            { x_align: St.Align.START,
+                              x_fill: true,
+                              y_fill: true,
+                              expand: true });
+        this._promptLabel = new St.Label({ style_class: 'login-dialog-prompt-label' });

-        this.actor.add_child(this._authPrompt.actor);
-        this._userList.actor.add_constraint(new Clutter.BindConstraint({ source: this._authPrompt.actor,
-                                                                         coordinate: Clutter.BindCoordinate.WIDTH }));
+        this._promptBox.add(this._promptLabel,
+                            { expand: true,
+                              x_fill: true,
+                              y_fill: true,
+                              x_align: St.Align.START });
+        this._promptEntry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
+                                           can_focus: true });
+        this._promptEntryTextChangedId = 0;
+        this._promptEntryActivateId = 0;
+        this._promptBox.add(this._promptEntry,
+                            { expand: true,
+                              x_fill: true,
+                              y_fill: false,
+                              x_align: St.Align.START });
+
+        this._promptMessage = new St.Label({ visible: false });
+        this._promptBox.add(this._promptMessage, { x_fill: true });
+
+        this._promptLoginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint-message' });
+        this._promptLoginHint.hide();
+        this._promptBox.add(this._promptLoginHint);
+
+        this._signInButton = null;
+
+        this._sessionList = new SessionList();
+        this._sessionList.connect('session-activated',
+                                  Lang.bind(this, function(list, sessionId) {
+                                                this._greeter.call_select_session_sync (sessionId, null);
+                                            }));
+
+        this._promptBox.add(this._sessionList.actor,
+                            { expand: true,
+                              x_fill: false,
+                              y_fill: true,
+                              x_align: St.Align.START });
+        this._promptBox.hide();

        // translators: this message is shown below the user list on the
        // login screen. It can be activated to reveal an entry for
@@ -475,13 +608,7 @@ const LoginDialog = new Lang.Class({
                                                x_align: St.Align.START,
                                                x_fill: true });

-        this._notListedButton.connect('clicked',
-                                      Lang.bind(this, function() {
-            this._authPrompt.cancelButton.show();
-            this._hideUserListAskForUsernameAndBeginVerification();
-        }));
-
-        this._notListedButton.hide();
+        this._notListedButton.connect('clicked', Lang.bind(this, this._hideUserListAndLogIn));

        this._userSelectionBox.add(this._notListedButton,
                                   { expand: false,
@@ -490,13 +617,7 @@ const LoginDialog = new Lang.Class({

        this._logoBin = new St.Bin({ style_class: 'login-dialog-logo-bin', y_expand: true });
        this._logoBin.set_y_align(Clutter.ActorAlign.END);
-        this._logoBin.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
-                                                                   align_axis: Clutter.AlignAxis.X_AXIS,
-                                                                   factor: 0.5 }));
-        this._logoBin.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
-                                                                   align_axis: Clutter.AlignAxis.Y_AXIS,
-                                                                   factor: 1.0 }));
-        this.actor.add_child(this._logoBin);
+        this.backgroundStack.add_actor(this._logoBin);
        this._updateLogo();

        if (!this._userManager.is_loaded)
@@ -516,26 +637,20 @@ const LoginDialog = new Lang.Class({
                                   this._onUserListActivated(item);
                               }));

-
-        this._sessionMenuButton = new SessionMenuButton();
-        this._sessionMenuButton.connect('session-activated',
-                                  Lang.bind(this, function(list, sessionId) {
-                                                this._greeter.call_select_session_sync (sessionId, null);
-                                            }));
-        this._sessionMenuButton.actor.opacity = 0;
-        this._sessionMenuButton.actor.show();
-        this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton.actor);
-
   },

    _updateDisableUserList: function() {
        let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);

+        // If this is the first time around, set initial focus
+        if (this._disableUserList == undefined && disableUserList)
+            this.setInitialKeyFocus(this._promptEntry);
+
        if (disableUserList != this._disableUserList) {
            this._disableUserList = disableUserList;

-            if (this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-                this._authPrompt.reset();
+            if (!this._verifyingUser)
+                this._reset();
        }
    },

@@ -569,58 +684,195 @@ const LoginDialog = new Lang.Class({
        this._updateLogoTexture(this._textureCache, this._logoFileUri);
    },

-    _onPrompted: function() {
-        this._sessionMenuButton.updateSensitivity(true);
+    _reset: function() {
+        this._userVerifier.clear();

-        if (this._shouldShowSessionMenuButton())
-            this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton.actor);
-        this._showPrompt();
+        this._updateSensitivity(true);
+        this._promptMessage.hide();
+        this._user = null;
+        this._verifyingUser = false;
+
+        if (this._disableUserList)
+            this._hideUserListAndLogIn();
+        else
+            this._showUserList();
    },

-    _onReset: function(authPrompt, beginRequest) {
-        this._sessionMenuButton.updateSensitivity(true);
+    _verificationFailed: function() {
+        this._promptEntry.text = '';

-        this._user = null;
-
-        if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) {
-            if (this._disableUserList) {
-                this._authPrompt.cancelButton.hide();
-                this._hideUserListAskForUsernameAndBeginVerification();
-            } else {
-                this._showUserList();
-            }
-        } else {
-            this._authPrompt.cancelButton.hide();
-            this._hideUserListAndBeginVerification();
-        }
+        this._updateSensitivity(true);
+        this.setWorking(false);
    },

    _onDefaultSessionChanged: function(client, sessionId) {
-        this._sessionMenuButton.setActiveSession(sessionId);
+        this._sessionList.setActiveSession(sessionId);
    },

-    _shouldShowSessionMenuButton: function() {
-        if (this._authPrompt.verifyingUser)
-          return true;
-
-        if (!this._user)
-          return false;
-
-        if (this._user.is_logged_in)
-          return false;
-
-        return true;
+    _showMessage: function(userVerifier, message, styleClass) {
+        if (message) {
+            this._promptMessage.text = message;
+            this._promptMessage.styleClass = styleClass;
+            this._promptMessage.show();
+        } else {
+            this._promptMessage.hide();
+        }
    },

-    _showPrompt: function() {
-        if (this._authPrompt.actor.visible)
-            return;
-        this._authPrompt.actor.opacity = 0;
-        this._authPrompt.actor.show();
-        Tweener.addTween(this._authPrompt.actor,
+    _showLoginHint: function(verifier, message) {
+        this._promptLoginHint.set_text(message)
+        this._promptLoginHint.show();
+        this._promptLoginHint.opacity = 255;
+    },
+
+    _hideLoginHint: function() {
+        this._promptLoginHint.hide();
+        this._promptLoginHint.set_text('');
+    },
+
+    cancel: function() {
+        if (this._verifyingUser)
+            this._userVerifier.cancel();
+        else
+            this._reset();
+    },
+
+    _showPrompt: function(forSecret) {
+        this._sessionList.actor.hide();
+        this._promptLabel.show();
+        this._promptEntry.show();
+        this._promptLoginHint.opacity = 0;
+        this._promptLoginHint.show();
+        this._promptBox.opacity = 0;
+        this._promptBox.show();
+        Tweener.addTween(this._promptBox,
                         { opacity: 255,
                           time: _FADE_ANIMATION_TIME,
                           transition: 'easeOutQuad' });
+
+        if ((this._user && !this._user.is_logged_in()) || this._verifyingUser)
+            this._sessionList.actor.show();
+
+        this._promptEntry.grab_key_focus();
+
+        let hold = new Batch.Hold();
+        let tasks = [function() {
+                         this._prepareDialog(forSecret, hold);
+                     },
+
+                     hold];
+
+        let batch = new Batch.ConcurrentBatch(this, tasks);
+
+        return batch.run();
+    },
+
+    _prepareDialog: function(forSecret, hold) {
+        this.buttonLayout.visible = true;
+        this.clearButtons();
+
+        if (!this._disableUserList || this._verifyingUser)
+            this.addButton({ action: Lang.bind(this, this.cancel),
+                             label: _("Cancel"),
+                             key: Clutter.Escape },
+                           { expand: true,
+                             x_fill: false,
+                             y_fill: false,
+                             x_align: St.Align.START,
+                             y_align: St.Align.MIDDLE });
+        this.placeSpinner({ expand: false,
+                            x_fill: false,
+                            y_fill: false,
+                            x_align: St.Align.END,
+                            y_align: St.Align.MIDDLE });
+        this._signInButton = this.addButton({ action: Lang.bind(this, function() {
+                                                          hold.release();
+                                                      }),
+                                              label: forSecret ? C_("button", "Sign In") : _("Next"),
+                                              default: true },
+                                            { expand: false,
+                                              x_fill: false,
+                                              y_fill: false,
+                                              x_align: St.Align.END,
+                                              y_align: St.Align.MIDDLE });
+
+        this._updateSignInButtonSensitivity(this._promptEntry.text.length > 0);
+
+        this._promptEntryTextChangedId =
+            this._promptEntry.clutter_text.connect('text-changed',
+                                                    Lang.bind(this, function() {
+                                                        this._updateSignInButtonSensitivity(this._promptEntry.text.length > 0);
+                                                    }));
+
+        this._promptEntryActivateId =
+            this._promptEntry.clutter_text.connect('activate', function() {
+                hold.release();
+            });
+    },
+
+    _updateSensitivity: function(sensitive) {
+        this._promptEntry.reactive = sensitive;
+        this._promptEntry.clutter_text.editable = sensitive;
+        this._sessionList.updateSensitivity(sensitive);
+        this._updateSignInButtonSensitivity(sensitive);
+    },
+
+    _updateSignInButtonSensitivity: function(sensitive) {
+        if (this._signInButton) {
+            this._signInButton.reactive = sensitive;
+            this._signInButton.can_focus = sensitive;
+        }
+    },
+
+    _hidePrompt: function() {
+        this.setButtons([]);
+
+        if (this._promptEntryTextChangedId > 0) {
+            this._promptEntry.clutter_text.disconnect(this._promptEntryTextChangedId);
+            this._promptEntryTextChangedId = 0;
+        }
+
+        if (this._promptEntryActivateId > 0) {
+            this._promptEntry.clutter_text.disconnect(this._promptEntryActivateId);
+            this._promptEntryActivateId = 0;
+        }
+
+        this.setWorking(false);
+        this._promptBox.hide();
+        this._promptLoginHint.hide();
+
+        this._promptUser.set_child(null);
+
+        this._updateSensitivity(true);
+        this._promptEntry.set_text('');
+
+        this._sessionList.close();
+        this._promptLoginHint.hide();
+
+        this.clearButtons();
+        this._signInButton = null;
+    },
+
+    _askQuestion: function(verifier, serviceName, question, passwordChar) {
+        this._promptLabel.set_text(question);
+
+        this._updateSensitivity(true);
+        this._promptEntry.set_text('');
+        this._promptEntry.clutter_text.set_password_char(passwordChar);
+
+        let tasks = [function() {
+                         return this._showPrompt(!!passwordChar);
+                     },
+
+                     function() {
+                         let text = this._promptEntry.get_text();
+                         this._updateSensitivity(false);
+                         this.setWorking(true);
+                         this._userVerifier.answerQuery(serviceName, text);
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        return batch.run();
    },

    _showRealmLoginHint: function(realmManager, hint) {
@@ -633,36 +885,38 @@ const LoginDialog = new Lang.Class({

        // Translators: this message is shown below the username entry field
        // to clue the user in on how to login to the local network realm
-        this._authPrompt.setHint(_("(e.g., user or %s)").format(hint));
+        this._showLoginHint(null, _("(e.g., user or %s)").format(hint));
    },

-    _askForUsernameAndBeginVerification: function() {
-        this._authPrompt.setPasswordChar('');
-        this._authPrompt.setQuestion(_("Username: "));
+    _askForUsernameAndLogIn: function() {
+        this._promptLabel.set_text(_("Username: "));
+        this._promptEntry.set_text('');
+        this._promptEntry.clutter_text.set_password_char('');

        let realmManager = new Realmd.Manager();
-        let realmSignalId = realmManager.connect('login-format-changed',
-                                                 Lang.bind(this, this._showRealmLoginHint));
+        let signalId = realmManager.connect('login-format-changed',
+	                                        Lang.bind(this, this._showRealmLoginHint));
        this._showRealmLoginHint(realmManager.loginFormat);

-        let nextSignalId = this._authPrompt.connect('next',
-                                                    Lang.bind(this, function() {
-                                                        this._authPrompt.disconnect(nextSignalId);
-                                                        this._authPrompt.updateSensitivity(false);
-                                                        let answer = this._authPrompt.getAnswer();
-                                                        this._authPrompt.clear();
-                                                        this._authPrompt.cancelButton.show();
-                                                        this._authPrompt.startSpinning();
-                                                        this._authPrompt.begin({ userName: answer });
+        let tasks = [this._showPrompt,

-                                                        realmManager.disconnect(realmSignalId)
-                                                        realmManager.release();
-                                                    }));
-        this._showPrompt();
+                     function() {
+                         let userName = this._promptEntry.get_text();
+                         this._promptEntry.reactive = false;
+                         return this._beginVerificationForUser(userName);
+                     },
+
+                     function() {
+                         realmManager.disconnect(signalId)
+                         realmManager.release();
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        return batch.run();
    },

    _startSession: function(serviceName) {
-        Tweener.addTween(this.actor,
+        Tweener.addTween(this.dialogLayout,
                         { opacity: 0,
                           time: _FADE_ANIMATION_TIME,
                           transition: 'easeOutQuad',
@@ -671,7 +925,7 @@ const LoginDialog = new Lang.Class({

                               for (let i = 0; i < children.length; i++) {
                                   if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.actor.opacity;
+                                       children[i].opacity = this.dialogLayout.opacity;
                               }
                           },
                           onUpdateScope: this,
@@ -685,9 +939,15 @@ const LoginDialog = new Lang.Class({
    },

    _onSessionOpened: function(client, serviceName) {
-        this._authPrompt.finish(Lang.bind(this, function() {
+        if (!this._userVerifier.hasPendingMessages) {
            this._startSession(serviceName);
-        }));
+        } else {
+            let signalId = this._userVerifier.connect('no-more-messages',
+                                                      Lang.bind(this, function() {
+                                                          this._userVerifier.disconnect(signalId);
+                                                          this._startSession(serviceName);
+                                                      }));
+        }
    },

    _waitForItemForUser: function(userName) {
@@ -819,42 +1079,38 @@ const LoginDialog = new Lang.Class({
        this._userSelectionBox.visible = expanded;
    },

-    _hideUserList: function() {
+    _hideUserListAndLogIn: function() {
        this._setUserListExpanded(false);
-        if (this._userSelectionBox.visible)
-            GdmUtil.cloneAndFadeOutActor(this._userSelectionBox);
-    },
-
-    _hideUserListAskForUsernameAndBeginVerification: function() {
-        this._hideUserList();
-        this._askForUsernameAndBeginVerification();
-    },
-
-    _hideUserListAndBeginVerification: function() {
-        this._hideUserList();
-        this._authPrompt.begin();
+        GdmUtil.cloneAndFadeOutActor(this._userSelectionBox);
+        this._askForUsernameAndLogIn();
    },

    _showUserList: function() {
-        this._authPrompt.hide();
-        this._sessionMenuButton.close();
-        this._authPrompt.cancelButton.show();
+        this._hidePrompt();
        this._setUserListExpanded(true);
-        this._notListedButton.show();
        this._userList.actor.grab_key_focus();
    },

-    _beginVerificationForItem: function(item) {
-        this._authPrompt.setUser(item.user);
-
-        let userName = item.user.get_user_name();
+    _beginVerificationForUser: function(userName) {
        let hold = new Batch.Hold();

-        this._authPrompt.begin({ userName: userName,
-                                 hold: hold });
+        this._userVerifier.begin(userName, hold);
+        this._verifyingUser = true;
        return hold;
    },

+    _beginVerificationForItem: function(item) {
+        let userWidget = new UserWidget.UserWidget(item.user);
+        this._promptUser.set_child(userWidget.actor);
+
+        let tasks = [function() {
+                         let userName = item.user.get_user_name();
+                         return this._beginVerificationForUser(userName);
+                     }];
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        return batch.run();
+    },
+
    _onUserListActivated: function(activatedItem) {
        let tasks = [function() {
                         return GdmUtil.cloneAndFadeOutActor(this._userSelectionBox);
@@ -897,23 +1153,21 @@ const LoginDialog = new Lang.Class({
                                  }));
    },

-    open: function() {
-        Main.ctrlAltTabManager.addGroup(this.actor,
+    _onOpened: function() {
+        Main.ctrlAltTabManager.addGroup(this.dialogLayout,
                                        _("Login Window"),
                                        'dialog-password-symbolic',
                                        { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
-        this._userList.actor.grab_key_focus();
-        this.actor.show();

-        return true;
    },

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

    addCharacter: function(unichar) {
-        this._authPrompt.addCharacter(unichar);
+        this._promptEntry.clutter_text.insert_unichar(unichar);
    },
 });
-Signals.addSignalMethods(LoginDialog.prototype);
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -6,26 +6,20 @@ const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
-const St = imports.gi.St;

 const Batch = imports.gdm.batch;
 const Fprint = imports.gdm.fingerprint;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
-const ShellEntry = imports.ui.shellEntry;
-const SmartcardManager = imports.misc.smartcardManager;
 const Tweener = imports.ui.tweener;

 const PASSWORD_SERVICE_NAME = 'gdm-password';
 const FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
-const SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
 const FADE_ANIMATION_TIME = 0.16;
 const CLONE_FADE_ANIMATION_TIME = 0.25;

 const LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
-const PASSWORD_AUTHENTICATION_KEY = 'enable-password-authentication';
 const FINGERPRINT_AUTHENTICATION_KEY = 'enable-fingerprint-authentication';
-const SMARTCARD_AUTHENTICATION_KEY = 'enable-smartcard-authentication';
 const BANNER_MESSAGE_KEY = 'banner-message-enable';
 const BANNER_MESSAGE_TEXT_KEY = 'banner-message-text';
 const ALLOWED_FAILURES_KEY = 'allowed-failures';
@@ -120,34 +114,11 @@ const ShellUserVerifier = new Lang.Class({
        this._client = client;

        this._settings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
-        this._settings.connect('changed',
-                               Lang.bind(this, function() {
-                                   this._updateDefaultService();
-                               }));
-        this._updateDefaultService();

        this._fprintManager = new Fprint.FprintManager();
-        this._smartcardManager = SmartcardManager.getSmartcardManager();
-
-        // We check for smartcards right away, since an inserted smartcard
-        // at startup should result in immediately initiating authentication.
-        // This is different than fingeprint readers, where we only check them
-        // after a user has been picked.
-        this._checkForSmartcard();
-
-        this._smartcardManager.connect('smartcard-inserted',
-                                       Lang.bind(this, function() {
-                                           this._checkForSmartcard();
-                                       }));
-        this._smartcardManager.connect('smartcard-removed',
-                                       Lang.bind(this, function() {
-                                           this._checkForSmartcard();
-                                       }));
-
        this._messageQueue = [];
        this._messageQueueTimeoutId = 0;
        this.hasPendingMessages = false;
-        this.reauthenticating = false;

        this._failCounter = 0;
    },
@@ -156,7 +127,6 @@ const ShellUserVerifier = new Lang.Class({
        this._cancellable = new Gio.Cancellable();
        this._hold = hold;
        this._userName = userName;
-        this.reauthenticating = false;

        this._checkForFingerprintReader();

@@ -174,10 +144,8 @@ const ShellUserVerifier = new Lang.Class({
        if (this._cancellable)
            this._cancellable.cancel();

-        if (this._userVerifier) {
+        if (this._userVerifier)
            this._userVerifier.call_cancel_sync(null);
-            this.clear();
-        }
    },

    clear: function() {
@@ -195,14 +163,15 @@ const ShellUserVerifier = new Lang.Class({
    },

    answerQuery: function(serviceName, answer) {
-        if (!this.hasPendingMessages) {
+        if (!this._userVerifier.hasPendingMessages) {
+            this._clearMessageQueue();
            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
        } else {
-            let signalId = this.connect('no-more-messages',
-                                        Lang.bind(this, function() {
-                                            this.disconnect(signalId);
-                                            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
-                                        }));
+            let signalId = this._userVerifier.connect('no-more-messages',
+                                                      Lang.bind(this, function() {
+                                                          this._userVerifier.disconnect(signalId);
+                                                          this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
+                                                      }));
        }
    },

@@ -272,28 +241,6 @@ const ShellUserVerifier = new Lang.Class({
            }));
    },

-    _checkForSmartcard: function() {
-        let smartcardDetected;
-
-        if (!this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY))
-            smartcardDetected = false;
-        else if (this.reauthenticating)
-            smartcardDetected = this._smartcardManager.hasInsertedLoginToken();
-        else
-            smartcardDetected = this._smartcardManager.hasInsertedTokens();
-
-        if (smartcardDetected != this.smartcardDetected) {
-            this.smartcardDetected = smartcardDetected;
-
-            if (this.smartcardDetected)
-                this._preemptingService = SMARTCARD_SERVICE_NAME;
-            else if (this._preemptingService == SMARTCARD_SERVICE_NAME)
-                this._preemptingService = null;
-
-            this.emit('smartcard-status-changed');
-        }
-    },
-
    _reportInitError: function(where, error) {
        logError(error, where);
        this._hold.release();
@@ -319,7 +266,6 @@ const ShellUserVerifier = new Lang.Class({
            return;
        }

-        this.reauthenticating = true;
        this._connectSignals();
        this._beginVerification();
        this._hold.release();
@@ -350,35 +296,11 @@ const ShellUserVerifier = new Lang.Class({
        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
    },

-    _getForegroundService: function() {
-        if (this._preemptingService)
-            return this._preemptingService;
-
-        return this._defaultService;
-    },
-
-    serviceIsForeground: function(serviceName) {
-        return serviceName == this._getForegroundService();
-    },
-
-    serviceIsDefault: function(serviceName) {
-        return serviceName == this._defaultService;
-    },
-
-    _updateDefaultService: function() {
-        if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
-            this._defaultService = PASSWORD_SERVICE_NAME;
-        else if (this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY))
-            this._defaultService = SMARTCARD_SERVICE_NAME;
-        else if (this._settings.get_boolean(FINGERPRINT_AUTHENTICATION_KEY))
-            this._defaultService = FINGERPRINT_SERVICE_NAME;
-    },
-
    _beginVerification: function() {
        this._hold.acquire();

        if (this._userName) {
-            this._userVerifier.call_begin_verification_for_user(this._getForegroundService(),
+            this._userVerifier.call_begin_verification_for_user(PASSWORD_SERVICE_NAME,
                                                                this._userName,
                                                                this._cancellable,
                                                                Lang.bind(this, function(obj, result) {
@@ -394,7 +316,7 @@ const ShellUserVerifier = new Lang.Class({
                this._hold.release();
            }));

-            if (this._haveFingerprintReader && !this.serviceIsForeground(FINGERPRINT_SERVICE_NAME)) {
+            if (this._haveFingerprintReader) {
                this._hold.acquire();

                this._userVerifier.call_begin_verification_for_user(FINGERPRINT_SERVICE_NAME,
@@ -414,7 +336,7 @@ const ShellUserVerifier = new Lang.Class({
                }));
            }
        } else {
-            this._userVerifier.call_begin_verification(this._getForegroundService(),
+            this._userVerifier.call_begin_verification(PASSWORD_SERVICE_NAME,
                                                       this._cancellable,
                                                       Lang.bind(this, function(obj, result) {
                try {
@@ -432,36 +354,39 @@ const ShellUserVerifier = new Lang.Class({
    },

    _onInfo: function(client, serviceName, info) {
-        if (this.serviceIsForeground(serviceName)) {
-            this._queueMessage(info, 'login-dialog-message-info');
-        } else if (serviceName == FINGERPRINT_SERVICE_NAME &&
+        // We don't display fingerprint messages, because they
+        // have words like UPEK in them. Instead we use the messages
+        // as a cue to display our own message.
+        if (serviceName == FINGERPRINT_SERVICE_NAME &&
            this._haveFingerprintReader) {
-            // We don't show fingeprint messages directly since it's
-            // not the main auth service. Instead we use the messages
-            // as a cue to display our own message.

            // Translators: this message is shown below the password entry field
            // to indicate the user can swipe their finger instead
            this.emit('show-login-hint', _("(or swipe finger)"));
+        } else if (serviceName == PASSWORD_SERVICE_NAME) {
+            this._queueMessage(info, 'login-dialog-message-info');
        }
    },

    _onProblem: function(client, serviceName, problem) {
-        if (!this.serviceIsForeground(serviceName))
+        // we don't want to show auth failed messages to
+        // users who haven't enrolled their fingerprint.
+        if (serviceName != PASSWORD_SERVICE_NAME)
            return;
-
        this._queueMessage(problem, 'login-dialog-message-warning');
    },

    _onInfoQuery: function(client, serviceName, question) {
-        if (!this.serviceIsForeground(serviceName))
+        // We only expect questions to come from the main auth service
+        if (serviceName != PASSWORD_SERVICE_NAME)
            return;

        this.emit('ask-question', serviceName, question, '');
    },

    _onSecretInfoQuery: function(client, serviceName, secretQuestion) {
-        if (!this.serviceIsForeground(serviceName))
+        // We only expect secret requests to come from the main auth service
+        if (serviceName != PASSWORD_SERVICE_NAME)
            return;

        this.emit('ask-question', serviceName, secretQuestion, '\u25cf');
@@ -470,7 +395,6 @@ const ShellUserVerifier = new Lang.Class({
    _onReset: function() {
        // Clear previous attempts to authenticate
        this._failCounter = 0;
-        this._updateDefaultService();

        this.emit('reset');
    },
@@ -499,24 +423,24 @@ const ShellUserVerifier = new Lang.Class({
            this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);

        if (canRetry) {
-            if (!this.hasPendingMessages) {
+            if (!this._userVerifier.hasPendingMessages) {
                this._retry();
            } else {
-                let signalId = this.connect('no-more-messages',
-                                            Lang.bind(this, function() {
-                                                this.disconnect(signalId);
-                                                this._retry();
-                                            }));
+                let signalId = this._userVerifier.connect('no-more-messages',
+                                                          Lang.bind(this, function() {
+                                                              this._userVerifier.disconnect(signalId);
+                                                              this._retry();
+                                                          }));
            }
        } else {
-            if (!this.hasPendingMessages) {
+            if (!this._userVerifier.hasPendingMessages) {
                this._cancelAndReset();
            } else {
-                let signalId = this.connect('no-more-messages',
-                                            Lang.bind(this, function() {
-                                                this.disconnect(signalId);
-                                                this._cancelAndReset();
-                                            }));
+                let signalId = this._userVerifier.connect('no-more-messages',
+                                                          Lang.bind(this, function() {
+                                                              this._userVerifier.disconnect(signalId);
+                                                              this._cancelAndReset();
+                                                          }));
            }
        }

@@ -527,7 +451,7 @@ const ShellUserVerifier = new Lang.Class({
        // if the password service fails, then cancel everything.
        // But if, e.g., fingerprint fails, still give
        // password authentication a chance to succeed
-        if (this.serviceIsForeground(serviceName)) {
+        if (serviceName == PASSWORD_SERVICE_NAME) {
            this._verificationFailed(true);
        }

--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -1,275 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Params = imports.misc.params;
-const Signals = imports.signals;
-
-// Specified in the D-Bus specification here:
-// http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager
-const ObjectManagerIface = <interface name="org.freedesktop.DBus.ObjectManager">
-  <method name="GetManagedObjects">
-    <arg name="objects" type="a{oa{sa{sv}}}" direction="out"/>
-  </method>
-  <signal name="InterfacesAdded">
-    <arg name="objectPath" type="o"/>
-    <arg name="interfaces" type="a{sa{sv}}" />
-  </signal>
-  <signal name="InterfacesRemoved">
-    <arg name="objectPath" type="o"/>
-    <arg name="interfaces" type="as" />
-  </signal>
-</interface>
-
-const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface);
-
-const ObjectManager = new Lang.Class({
-    Name: 'ObjectManager',
-    _init: function(params) {
-        params = Params.parse(params, { connection: null,
-                                        name: null,
-                                        objectPath: null,
-                                        knownInterfaces: null,
-                                        cancellable: null,
-                                        onLoaded: null });
-
-        this._connection = params.connection;
-        this._serviceName = params.name;
-        this._managerPath = params.objectPath;
-        this._cancellable = params.cancellable;
-
-        this._managerProxy = new Gio.DBusProxy({ g_connection: this._connection,
-                                                 g_interface_name: ObjectManagerInfo.name,
-                                                 g_interface_info: ObjectManagerInfo,
-                                                 g_name: this._serviceName,
-                                                 g_object_path: this._managerPath,
-                                                 g_flags: Gio.DBusProxyFlags.NONE });
-
-        this._interfaceInfos = {};
-        this._objects = {};
-        this._interfaces = {};
-        this._pendingProxies = [];
-        this._onLoaded = params.onLoaded;
-
-        if (params.knownInterfaces)
-            this._registerInterfaces(params.knownInterfaces);
-
-        this._managerProxy.init_async(GLib.PRIORITY_DEFAULT,
-                                      this._cancellable,
-                                      Lang.bind(this, this._onManagerProxyLoaded));
-    },
-
-    _addInterface: function(objectPath, interfaceName, onFinished) {
-        let info = this._interfaceInfos[interfaceName];
-
-        if (!info)
-            return;
-
-        let proxy = new Gio.DBusProxy({ g_connection: this._connection,
-                                        g_name: this._serviceName,
-                                        g_object_path: objectPath,
-                                        g_interface_name: interfaceName,
-                                        g_interface_info: info,
-                                        g_flags: Gio.DBusProxyFlags.NONE });
-
-        this._pendingProxies.push(proxy);
-
-        proxy.init_async(GLib.PRIORITY_DEFAULT,
-                         this._cancellable,
-                         Lang.bind(this, function(initable, result) {
-                             let index = this._pendingProxies.indexOf(proxy);
-
-                             if (index >= 0)
-                                 this._pendingProxies.splice(index, 1);
-
-                             let error = null;
-                             try {
-                                 initable.init_finish(result);
-                             } catch(e) {
-                                 logError(e, 'could not initialize proxy for interface ' + interfaceName);
-
-                                 if (onFinished)
-                                     onFinished();
-                                 return;
-                             }
-
-                             let isNewObject;
-
-                             if (!this._objects[objectPath]) {
-                                 this._objects[objectPath] = {};
-                                 isNewObject = true;
-                             } else {
-                                 isNewObject = false;
-                             }
-
-                             this._objects[objectPath][interfaceName] = proxy;
-
-                             if (!this._interfaces[interfaceName])
-                                 this._interfaces[interfaceName] = [];
-
-                             this._interfaces[interfaceName].push(proxy);
-
-                             if (isNewObject)
-                                 this.emit('object-added', objectPath);
-
-                             this.emit('interface-added', interfaceName, proxy);
-
-                             if (onFinished)
-                                 onFinished();
-                         }));
-    },
-
-    _removeInterface: function(objectPath, interfaceName) {
-        if (!this._objects[objectPath])
-            return;
-
-        let proxy = this._objects[objectPath][interfaceName];
-
-        if (this._interfaces[interfaceName]) {
-            let index = this._interfaces[interfaceName].indexOf(proxy);
-
-            if (index >= 0)
-                this._interfaces[interfaceName].splice(index, 1);
-
-            if (this._interfaces[interfaceName].length == 0)
-                delete this._interfaces[interfaceName];
-        }
-
-        this.emit('interface-removed', interfaceName, proxy);
-
-        this._objects[objectPath][interfaceName] = null;
-
-        if (Object.keys(this._objects[objectPath]).length == 0) {
-            delete this._objects[objectPath];
-            this.emit('object-removed', objectPath);
-        }
-    },
-
-    _onManagerProxyLoaded: function(initable, result) {
-        let error = null;
-        try {
-            initable.init_finish(result);
-        } catch(e) {
-            logError(e, 'could not initialize object manager for object ' + params.name);
-
-            if (this._onLoaded)
-                this._onLoaded();
-            return;
-        }
-
-        this._managerProxy.connectSignal('InterfacesAdded',
-                                         Lang.bind(this, function(objectManager, sender, [objectPath, interfaces]) {
-                                             let interfaceNames = Object.keys(interfaces);
-                                             for (let i = 0; i < interfaceNames.length; i++)
-                                                 this._addInterface(objectPath, interfaceNames[i]);
-                                         }));
-        this._managerProxy.connectSignal('InterfacesRemoved',
-                                         Lang.bind(this, function(objectManager, sender, [objectPath, interfaceNames]) {
-                                             for (let i = 0; i < interfaceNames.length; i++)
-                                                 this._removeInterface(objectPath, interfaceNames[i]);
-                                         }));
-
-
-        this._managerProxy.GetManagedObjectsRemote(Lang.bind(this, function(result, error) {
-            if (!result) {
-                if (error) {
-                   logError(error, 'could not get remote objects for service ' + this._serviceName + ' path ' + this._managerPath);
-                }
-
-                if (this._onLoaded)
-                    this._onLoaded();
-                return;
-            }
-
-            let [objects] = result;
-
-            if (Object.keys(this._interfaceInfos).length == 0) {
-                if (this._onLoaded)
-                    this._onLoaded();
-                return;
-            }
-
-            let numLoadInhibitors = 0;
-
-            // First inhibitor is to prevent onLoaded from getting
-            // called until all interfaces have started being added.
-            // Subsequent inhibitors are to prevent onLoaded from getting
-            // called until all interfaces finish getting added.
-            numLoadInhibitors++;
-            let objectPaths = Object.keys(objects);
-            for (let i = 0; i < objectPaths.length; i++) {
-                let objectPath = objectPaths[i];
-                let object = objects[objectPath];
-
-                let interfaceNames = Object.keys(object);
-                for (let j = 0; j < interfaceNames.length; j++) {
-                    let interfaceName = interfaceNames[j];
-
-                    numLoadInhibitors++;
-                    this._addInterface(objectPath,
-                                       interfaceName,
-                                       Lang.bind(this, function() {
-                                           numLoadInhibitors--;
-
-                                           if (numLoadInhibitors == 0) {
-                                               if (this._onLoaded)
-                                                   this._onLoaded();
-                                           }
-                                       }));
-                }
-            }
-            numLoadInhibitors--;
-
-            if (numLoadInhibitors == 0) {
-                if (this._onLoaded)
-                    this._onLoaded();
-            }
-        }));
-    },
-
-    _registerInterfaces: function(interfaces) {
-        for (let i = 0; i < interfaces.length; i++) {
-            let info = Gio.DBusInterfaceInfo.new_for_xml(interfaces[i]);
-
-            this._interfaceInfos[info.name] = info;
-        }
-    },
-
-    getProxy: function(objectPath, interfaceName) {
-        let object = this._objects[objectPath];
-
-        if (!object)
-            return null;
-
-        return object[interfaceName];
-    },
-
-    getProxiesForInterface: function(interfaceName) {
-        let proxyList = this._interfaces[interfaceName];
-
-        if (!proxyList)
-            return [];
-
-        return proxyList;
-    },
-
-    getAllProxies: function() {
-        let proxies = [];
-
-        let objectPaths = Object.keys(this._objects);
-        for (let i = 0; i < objectPaths.length; i++) {
-            let object = this._objects[objectPaths];
-
-            let interfaceNames = Object.keys(object);
-            for (let j = 0; i < interfaceNames.length; i++) {
-                let interfaceName = interfaceNames[i];
-                if (object[interfaceName])
-                    proxies.push(object(interfaceName));
-            }
-        }
-
-        return proxies;
-    }
-});
-Signals.addSignalMethods(ObjectManager.prototype);
--- a/js/misc/smartcardManager.js
+++ b/js/misc/smartcardManager.js
@@ -1,142 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-
-const ObjectManager = imports.misc.objectManager;
-
-const _SMARTCARD_SERVICE_DBUS_NAME = "org.gnome.SettingsDaemon.Smartcard";
-
-const SmartcardManagerIface = <interface name="org.gnome.SettingsDaemon.Smartcard.Manager">
-  <method name="GetLoginToken">
-      <arg name="token" type="o" direction="out"/>
-  </method>
-  <method name="GetInsertedTokens">
-      <arg name="tokens" type="ao" direction="out"/>
-  </method>
-</interface>;
-
-const SmartcardTokenIface = <interface name="org.gnome.SettingsDaemon.Smartcard.Token">
-  <property name="Name" type="s" access="read"/>
-  <property name="Driver" type="o" access="read"/>
-  <property name="IsInserted" type="b" access="read"/>
-  <property name="UsedToLogin" type="b" access="read"/>
-</interface>;
-
-const SmartcardDriverIface = <interface name="org.gnome.SettingsDaemon.Smartcard.Driver">
-  <property name="Library" type="s" access="read"/>
-  <property name="Description" type="s" access="read"/>
-</interface>;
-
-let _smartcardManager = null;
-
-function getSmartcardManager() {
-    if (_smartcardManager == null)
-        _smartcardManager = new SmartcardManager();
-
-    return _smartcardManager;
-}
-
-const SmartcardManager = new Lang.Class({
-    Name: 'SmartcardManager',
-    _init: function() {
-        this._objectManager = new ObjectManager.ObjectManager({ connection: Gio.DBus.session,
-                                                                name: _SMARTCARD_SERVICE_DBUS_NAME,
-                                                                objectPath: '/org/gnome/SettingsDaemon/Smartcard',
-                                                                knownInterfaces: [ SmartcardManagerIface,
-                                                                                   SmartcardTokenIface,
-                                                                                   SmartcardDriverIface ],
-                                                                onLoaded: Lang.bind(this, this._onLoaded) });
-        this._insertedTokens = {};
-        this._removedTokens = {};
-        this._loginToken = null;
-    },
-
-    _onLoaded: function() {
-        let tokens = this._objectManager.getProxiesForInterface('org.gnome.SettingsDaemon.Smartcard.Token');
-
-        for (let i = 0; i < tokens.length; i++)
-            this._addToken(tokens[i]);
-
-        this._objectManager.connect('interface-added', Lang.bind(this, function(objectManager, interfaceName, proxy) {
-                                        if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token')
-                                            this._addToken(proxy);
-                                    }));
-
-        this._objectManager.connect('interface-removed', Lang.bind(this, function(objectManager, interfaceName, proxy) {
-                                        if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token')
-                                            this._removeToken(proxy);
-                                    }));
-    },
-
-    _updateToken: function(token) {
-        let objectPath = token.get_object_path();
-
-        delete this._insertedTokens[objectPath];
-        delete this._removedTokens[objectPath];
-
-        if (token.IsInserted)
-            this._insertedTokens[objectPath] = token;
-        else
-            this._removedTokens[objectPath] = token;
-
-        if (token.UsedToLogin)
-            this._loginToken = token;
-    },
-
-    _addToken: function(token) {
-        this._updateToken(token);
-
-        token.connect('g-properties-changed',
-                      Lang.bind(this, function(proxy, properties) {
-                          if ('IsInserted' in properties.deep_unpack()) {
-                              this._updateToken(token);
-
-                              if (token.IsInserted) {
-                                  this.emit('smartcard-inserted', token.Name);
-                              } else {
-                                  this.emit('smartcard-removed', token.Name);
-                              }
-                          }
-                      }));
-
-        // Emit a smartcard-inserted at startup if it's already plugged in
-        if (token.IsInserted)
-            this.emit('smartcard-inserted', token.Name);
-    },
-
-    _removeToken: function(token) {
-        let objectPath = token.get_object_path();
-
-        if (objectPath) {
-            if (this._removedTokens[objectPath] == token) {
-                delete this._removedTokens[objectPath];
-            }
-
-            if (this._insertedTokens[objectPath] == token) {
-                delete this._insertedTokens[objectPath];
-                this.emit('smartcard-removed', token.Name);
-            }
-        }
-
-        token.disconnectAll();
-    },
-
-    hasInsertedTokens: function() {
-        return Object.keys(this._insertedTokens).length > 0;
-    },
-
-    hasInsertedLoginToken: function() {
-        if (!this._loginToken)
-            return false;
-
-        if (!this._loginToken.IsInserted)
-            return false;
-
-        return true;
-    }
-
-});
-Signals.addSignalMethods(SmartcardManager.prototype);
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -18,7 +18,7 @@ const _urlRegexp = new RegExp(
    '(^|' + _leadingJunk + ')' +
    '(' +
        '(?:' +
-            '(?:http|https|ftp)://' +             // scheme://
+            '[a-z][\\w-]+://' +                   // scheme://
            '|' +
            'www\\d{0,3}[.]' +                    // www.
            '|' +
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -436,11 +436,8 @@ const AppSwitcher = new Lang.Class({
        this._arrows = [];

        let windowTracker = Shell.WindowTracker.get_default();
-        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,
-                                                     global.screen, workspace);
+                                                     global.screen, null);

        // Construct the AppIcons, add to the popup
        for (let i = 0; i < apps.length; i++) {
@@ -450,9 +447,7 @@ const AppSwitcher = new Lang.Class({
            appIcon.cachedWindows = allWindows.filter(function(w) {
                return windowTracker.get_window_app (w) == appIcon.app;
            });
-            if (workspace == null || appIcon.cachedWindows.length > 0) {
-                this._addIcon(appIcon);
-            }
+            this._addIcon(appIcon);
        }

        this._curApp = -1;
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@@ -1,84 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const St = imports.gi.St;
-const Signals = imports.signals;
-const Atk = imports.gi.Atk;
-
-const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
-
-const Animation = new Lang.Class({
-    Name: 'Animation',
-
-    _init: function(filename, width, height, speed) {
-        this.actor = new St.Bin();
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this._speed = speed;
-
-        this._isLoaded = false;
-        this._isPlaying = false;
-        this._timeoutId = 0;
-        this._frame = 0;
-        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
-                                                                            Lang.bind(this, this._animationsLoaded));
-        this.actor.set_child(this._animations);
-    },
-
-    play: function() {
-        if (this._isLoaded && this._timeoutId == 0) {
-            if (this._frame == 0)
-                this._showFrame(0);
-
-            this._timeoutId = Mainloop.timeout_add(this._speed, Lang.bind(this, this._update));
-        }
-
-        this._isPlaying = true;
-    },
-
-    stop: function() {
-        if (this._timeoutId > 0) {
-            Mainloop.source_remove(this._timeoutId);
-            this._timeoutId = 0;
-        }
-
-        this._isPlaying = false;
-    },
-
-    _showFrame: function(frame) {
-        let oldFrameActor = this._animations.get_child_at_index(this._frame);
-        if (oldFrameActor)
-            oldFrameActor.hide();
-
-        this._frame = (frame % this._animations.get_n_children());
-
-        let newFrameActor = this._animations.get_child_at_index(this._frame);
-        if (newFrameActor)
-            newFrameActor.show();
-    },
-
-    _update: function() {
-        this._showFrame(this._frame + 1);
-        return true;
-    },
-
-    _animationsLoaded: function() {
-        this._isLoaded = true;
-
-        if (this._isPlaying)
-            this.play();
-    },
-
-    _onDestroy: function() {
-        this.stop();
-    }
-});
-
-const AnimatedIcon = new Lang.Class({
-    Name: 'AnimatedIcon',
-    Extends: Animation,
-
-    _init: function(filename, size) {
-        this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
-    }
-});
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -323,8 +323,6 @@ const FrequentView = new Lang.Class({
    loadApps: function() {
        let mostUsed = this._usage.get_most_used ("");
        for (let i = 0; i < mostUsed.length; i++) {
-            if (!mostUsed[i].get_app_info().should_show())
-                continue;
            let appIcon = new AppIcon(mostUsed[i]);
            this._grid.addItem(appIcon.actor, -1);
        }
@@ -358,6 +356,17 @@ const ControlsBoxLayout = Lang.Class({
        let totalSpacing = this.spacing * (childrenCount - 1);
        return [maxMinWidth * childrenCount + totalSpacing,
                maxNaturalWidth * childrenCount + totalSpacing];
+    },
+
+    vfunc_set_container: function(container) {
+        if(this._styleChangedId) {
+            this._container.disconnect(this._styleChangedId);
+            this._styleChangedId = 0;
+        }
+        if(container != null)
+            this._styleChangedId = container.connect('style-changed', Lang.bind(this,
+                    function() { this.spacing = this._container.get_theme_node().get_length('spacing'); }));
+        this._container = container;
    }
 });

@@ -375,9 +384,6 @@ const AppDisplay = new Lang.Class({
        global.settings.connect('changed::app-folder-categories', Lang.bind(this, function() {
            Main.queueDeferredWork(this._allAppsWorkId);
        }));
-        this._privacySettings = new Gio.Settings({ schema: 'org.gnome.desktop.privacy' });
-        this._privacySettings.connect('changed::remember-app-usage',
-                                      Lang.bind(this, this._updateFrequentVisibility));

        this._views = [];

@@ -405,9 +411,8 @@ const AppDisplay = new Lang.Class({
        this.actor.add(this._viewStack, { expand: true });

        let layout = new ControlsBoxLayout({ homogeneous: true });
-        this._controls = new St.Widget({ style_class: 'app-view-controls',
-                                         layout_manager: layout });
-        layout.hookup_style(this._controls);
+        this._controls = new St.Widget({ style_class: 'app-view-controls' });
+        this._controls.set_layout_manager(layout);
        this.actor.add(new St.Bin({ child: this._controls }));


@@ -422,7 +427,6 @@ const AppDisplay = new Lang.Class({
                }));
        }
        this._showView(Views.FREQUENT);
-        this._updateFrequentVisibility();

        // We need a dummy actor to catch the keyboard focus if the
        // user Ctrl-Alt-Tabs here before the deferred work creates
@@ -452,19 +456,6 @@ const AppDisplay = new Lang.Class({
        }
    },

-    _updateFrequentVisibility: function() {
-        let enabled = this._privacySettings.get_boolean('remember-app-usage');
-        this._views[Views.FREQUENT].control.visible = enabled;
-
-        let visibleViews = this._views.filter(function(v) {
-            return v.control.visible;
-        });
-        this._controls.visible = visibleViews.length > 1;
-
-        if (!enabled && this._views[Views.FREQUENT].view.actor.visible)
-            this._showView(Views.ALL);
-    },
-
    _redisplay: function() {
        this._redisplayFrequentApps();
        this._redisplayAllApps();
@@ -535,11 +526,11 @@ const AppSearchProvider = new Lang.Class({
    },

    getInitialResultSet: function(terms) {
-        this.searchSystem.setResults(this, this._appSys.initial_search(terms));
+        this.searchSystem.pushResults(this, this._appSys.initial_search(terms));
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.searchSystem.setResults(this, this._appSys.subsearch(previousResults, terms));
+        this.searchSystem.pushResults(this, this._appSys.subsearch(previousResults, terms));
    },

    activateResult: function(app) {
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -142,40 +142,33 @@ const BackgroundCache = new Lang.Class({
                                        cancellable: null,
                                        onFinished: null });

-        let fileLoad = { filename: params.filename,
-                         style: params.style,
-                         shouldCopy: false,
-                         monitorIndex: params.monitorIndex,
-                         effects: params.effects,
-                         onFinished: params.onFinished,
-                         cancellable: new Gio.Cancellable(), };
-        this._pendingFileLoads.push(fileLoad);
-
-        if (params.cancellable) {
-            params.cancellable.connect(Lang.bind(this, function(c) {
-               fileLoad.cancellable.cancel();
-            }));
+        for (let i = 0; i < this._pendingFileLoads.length; i++) {
+            if (this._pendingFileLoads[i].filename == params.filename &&
+                this._pendingFileLoads[i].style == params.style) {
+                this._pendingFileLoads[i].callers.push({ shouldCopy: true,
+                                                         monitorIndex: params.monitorIndex,
+                                                         effects: params.effects,
+                                                         onFinished: params.onFinished });
+                return;
+            }
        }

+        this._pendingFileLoads.push({ filename: params.filename,
+                                      style: params.style,
+                                      callers: [{ shouldCopy: false,
+                                                  monitorIndex: params.monitorIndex,
+                                                  effects: params.effects,
+                                                  onFinished: params.onFinished }] });
+
        let content = new Meta.Background({ meta_screen: global.screen,
                                            monitor: params.monitorIndex,
                                            effects: params.effects });

        content.load_file_async(params.filename,
                                params.style,
-                                fileLoad.cancellable,
+                                params.cancellable,
                                Lang.bind(this,
                                          function(object, result) {
-                                              if (fileLoad.cancellable.is_cancelled()) {
-                                                  if (params.cancellable && params.cancellable.is_cancelled()) {
-                                                      if (params.onFinished)
-                                                          params.onFinished(null);
-                                                      this._removePendingFileLoad(fileLoad);
-                                                      return;
-                                                  }
-                                                  return;
-                                              }
-
                                              try {
                                                  content.load_file_finish(result);

@@ -185,25 +178,22 @@ const BackgroundCache = new Lang.Class({
                                                  content = null;
                                              }

-                                              let needsCopy = false;
                                              for (let i = 0; i < this._pendingFileLoads.length; i++) {
                                                  let pendingLoad = this._pendingFileLoads[i];
                                                  if (pendingLoad.filename != params.filename ||
                                                      pendingLoad.style != params.style)
                                                      continue;

-                                                  if (pendingLoad.cancellable.is_cancelled())
-                                                      continue;
+                                                  for (let j = 0; j < pendingLoad.callers.length; j++) {
+                                                      if (pendingLoad.callers[j].onFinished) {
+                                                          if (content && pendingLoad.callers[j].shouldCopy) {
+                                                              content = object.copy(pendingLoad.callers[j].monitorIndex,
+                                                                                    pendingLoad.callers[j].effects);

-                                                  pendingLoad.cancellable.cancel();
-                                                  if (pendingLoad.onFinished) {
-                                                      if (content && needsCopy) {
-                                                          content = object.copy(pendingLoad.monitorIndex,
-                                                                                pendingLoad.effects);
+                                                          }
+
+                                                          pendingLoad.callers[j].onFinished(content);
                                                      }
-
-                                                      needsCopy = true;
-                                                      pendingLoad.onFinished(content);
                                                  }

                                                  this._pendingFileLoads.splice(i, 1);
@@ -211,15 +201,6 @@ const BackgroundCache = new Lang.Class({
                                          }));
    },

-    _removePendingFileLoad: function(fileLoad) {
-        for (let i = 0; i < this._pendingFileLoads.length; i++) {
-            if (this._pendingFileLoads[i].cancellable == fileLoad.cancellable) {
-                this._pendingFileLoads.splice(i, 1);
-                break;
-            }
-        }
-    },
-
    getImageContent: function(params) {
        params = Params.parse(params, { monitorIndex: 0,
                                        style: null,
@@ -337,9 +318,9 @@ const Background = new Lang.Class({
        this._cancellable = new Gio.Cancellable();
        this.isLoaded = false;

-        this._settings.connect('changed', Lang.bind(this, function() {
-                                   this.emit('changed');
-                               }));
+        this._settingsChangedSignalId = this._settings.connect('changed', Lang.bind(this, function() {
+                                            this.emit('changed');
+                                        }));

        this._load();
    },
@@ -380,6 +361,10 @@ const Background = new Lang.Class({

        this.actor.disconnect(this._destroySignalId);
        this._destroySignalId = 0;
+
+        if (this._settingsChangedSignalId != 0)
+            this._settings.disconnect(this._settingsChangedSignalId);
+        this._settingsChangedSignalId = 0;
    },

    _setLoaded: function() {
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -443,18 +443,16 @@ const Calendar = new Lang.Class({
        this.actor.add(this._topBox,
                       { row: 0, col: 0, col_span: offsetCols + 7 });

-        this._backButton = new St.Button({ style_class: 'calendar-change-month-back',
-                                           can_focus: true });
-        this._topBox.add(this._backButton);
-        this._backButton.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
+        let back = new St.Button({ style_class: 'calendar-change-month-back' });
+        this._topBox.add(back);
+        back.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));

        this._monthLabel = new St.Label({style_class: 'calendar-month-label'});
        this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });

-        this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward',
-                                              can_focus: true });
-        this._topBox.add(this._forwardButton);
-        this._forwardButton.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));
+        let forward = new St.Button({ style_class: 'calendar-change-month-forward' });
+        this._topBox.add(forward);
+        forward.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));

        // Add weekday labels...
        //
@@ -513,12 +511,10 @@ const Calendar = new Lang.Class({
            }
        }

-        this._backButton.grab_key_focus();
-
        this.setDate(newDate, false);
-    },
+   },

-    _onNextMonthButtonClicked: function() {
+   _onNextMonthButtonClicked: function() {
        let newDate = new Date(this._selectedDate);
        let oldMonth = newDate.getMonth();
        if (oldMonth == 11) {
@@ -537,9 +533,7 @@ const Calendar = new Lang.Class({
            }
        }

-        this._forwardButton.grab_key_focus();
-
-        this.setDate(newDate, false);
+       this.setDate(newDate, false);
    },

    _onSettingsChange: function() {
@@ -596,8 +590,7 @@ const Calendar = new Lang.Class({
        // nRows here means 6 weeks + one header + one navbar
        let nRows = 8;
        while (row < 8) {
-            let button = new St.Button({ label: iter.getDate().toString(),
-                                         can_focus: true });
+            let button = new St.Button({ label: iter.getDate().toString() });
            let rtl = button.get_text_direction() == Clutter.TextDirection.RTL;

            if (this._eventSource.isDummy)
@@ -605,12 +598,8 @@ const Calendar = new Lang.Class({

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

            let hasEvents = this._eventSource.hasEvents(iter);
@@ -635,6 +624,9 @@ const Calendar = new Lang.Class({
            else if (iter.getMonth() != this._selectedDate.getMonth())
                styleClass += ' calendar-other-month-day';

+            if (_sameDay(this._selectedDate, iter))
+                button.add_style_pseudo_class('active');
+
            if (hasEvents)
                styleClass += ' calendar-day-with-events'

@@ -644,13 +636,6 @@ const Calendar = new Lang.Class({
            this.actor.add(button,
                           { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7 });

-            if (_sameDay(this._selectedDate, iter)) {
-                button.add_style_pseudo_class('active');
-
-                if (this._shouldDateGrabFocus)
-                    button.grab_key_focus();
-            }
-
            if (this._useWeekdate && iter.getDay() == 4) {
                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
                                           style_class: 'calendar-day-base calendar-week-number'});
@@ -675,7 +660,7 @@ const EventsList = new Lang.Class({
    Name: 'EventsList',

    _init: function() {
-        this.actor = new St.Table({ style_class: 'events-table' });
+        this.actor = new St.BoxLayout({ vertical: true, style_class: 'events-header-vbox'});
        this._date = new Date();
        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
        this._desktopSettings.connect('changed', Lang.bind(this, this._update));
@@ -687,72 +672,55 @@ const EventsList = new Lang.Class({
        this._eventSource.connect('changed', Lang.bind(this, this._update));
    },

-    _addEvent: function(event, index, includeDayName) {
-        let dayString;
-        if (includeDayName)
-            dayString = _getEventDayAbbreviation(event.date.getDay());
-        else
-            dayString = '';
-
-        let dayLabel = new St.Label({ style_class: 'events-day-dayname',
-                                      text: dayString });
-        dayLabel.clutter_text.line_wrap = false;
-        dayLabel.clutter_text.ellipsize = false;
-
-        this.actor.add(dayLabel, { row: index, col: 0,
-                                   x_expand: false, x_align: St.Align.END,
-                                   y_fill: false, y_align: St.Align.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 });
-        timeLabel.clutter_text.line_wrap = false;
-        timeLabel.clutter_text.ellipsize = false;
-
-        this.actor.add(timeLabel, { row: index, col: 1,
-                                    x_expand: false, x_align: St.Align.MIDDLE,
-                                    y_fill: false, y_align: St.Align.START });
-
-        let titleLabel = new St.Label({ style_class: 'events-day-task',
-                                        text: event.summary });
-        titleLabel.clutter_text.line_wrap = true;
-        titleLabel.clutter_text.ellipsize = false;
-
-        this.actor.add(titleLabel, { row: index, col: 2,
-                                     x_expand: true, x_align: St.Align.START,
-                                     y_fill: false, y_align: St.Align.START });
+    _addEvent: function(dayNameBox, timeBox, eventTitleBox, includeDayName, day, time, desc) {
+        if (includeDayName) {
+            dayNameBox.add(new St.Label( { style_class: 'events-day-dayname',
+                                           text: day } ),
+                           { x_fill: true } );
+        }
+        timeBox.add(new St.Label( { style_class: 'events-day-time',
+                                    text: time} ),
+                    { x_fill: true } );
+        eventTitleBox.add(new St.Label( { style_class: 'events-day-task',
+                                          text: desc} ));
    },

-    _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
+    _addPeriod: function(header, begin, end, includeDayName, showNothingScheduled) {
        let events = this._eventSource.getEvents(begin, end);

-        if (events.length == 0 && !showNothingScheduled)
-            return index;
+        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);;

-        this.actor.add(new St.Label({ style_class: 'events-day-header', text: header }),
-                       { row: index, col: 0, col_span: 3,
-                         // In theory, x_expand should be true here, but x_expand
-                         // is a property of the column for StTable, ie all day cells
-                         // get it too
-                         x_expand: false, x_align: St.Align.START,
-                         y_fill: false, y_align: St.Align.START });
-        index++;
+        if (events.length == 0 && !showNothingScheduled)
+            return;
+
+        let vbox = new St.BoxLayout( {vertical: true} );
+        this.actor.add(vbox);
+
+        vbox.add(new St.Label({ style_class: 'events-day-header', text: header }));
+        let box = new St.BoxLayout({style_class: 'events-header-hbox'});
+        let dayNameBox = new St.BoxLayout({ vertical: true, style_class: 'events-day-name-box' });
+        let timeBox = new St.BoxLayout({ vertical: true, style_class: 'events-time-box' });
+        let eventTitleBox = new St.BoxLayout({ vertical: true, style_class: 'events-event-box' });
+        box.add(dayNameBox, {x_fill: false});
+        box.add(timeBox, {x_fill: false});
+        box.add(eventTitleBox, {expand: true});
+        vbox.add(box);

        for (let n = 0; n < events.length; n++) {
-            this._addEvent(events[n], index, includeDayName);
-            index++;
+            let event = events[n];
+            let dayString = _getEventDayAbbreviation(event.date.getDay());
+            let timeString = _formatEventTime(event, clockFormat);
+            let summaryString = event.summary;
+            this._addEvent(dayNameBox, timeBox, eventTitleBox, includeDayName, dayString, timeString, summaryString);
        }

        if (events.length == 0 && showNothingScheduled) {
            let now = new Date();
            /* Translators: Text to show if there are no events */
            let nothingEvent = new CalendarEvent(now, now, _("Nothing Scheduled"), true);
-            this._addEvent(nothingEvent, index, false);
-            index++;
+            let timeString = _formatEventTime(nothingEvent, clockFormat);
+            this._addEvent(dayNameBox, timeBox, eventTitleBox, false, "", timeString, nothingEvent.summary);
        }
-
-        return index;
    },

    _showOtherDay: function(day) {
@@ -769,21 +737,20 @@ const EventsList = new Lang.Class({
        else
            /* Translators: Shown on calendar heading when selected day occurs on different year */
            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
-        this._addPeriod(dayString, 0, dayBegin, dayEnd, false, true);
+        this._addPeriod(dayString, dayBegin, dayEnd, false, true);
    },

    _showToday: function() {
        this.actor.destroy_all_children();
-        let index = 0;

        let now = new Date();
        let dayBegin = _getBeginningOfDay(now);
        let dayEnd = _getEndOfDay(now);
-        index = this._addPeriod(_("Today"), index, dayBegin, dayEnd, false, true);
+        this._addPeriod(_("Today"), dayBegin, dayEnd, false, true);

        let tomorrowBegin = new Date(dayBegin.getTime() + 86400 * 1000);
        let tomorrowEnd = new Date(dayEnd.getTime() + 86400 * 1000);
-        index = this._addPeriod(_("Tomorrow"), index, tomorrowBegin, tomorrowEnd, false, true);
+        this._addPeriod(_("Tomorrow"), tomorrowBegin, tomorrowEnd, false, true);

        let dayInWeek = (dayEnd.getDay() - this._weekStart + 7) % 7;

@@ -794,7 +761,7 @@ const EventsList = new Lang.Class({
             */
            let thisWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
            let thisWeekEnd = new Date(dayEnd.getTime() + (6 - dayInWeek) * 86400 * 1000);
-            index = this._addPeriod(_("This week"), index, thisWeekBegin, thisWeekEnd, true, false);
+            this._addPeriod(_("This week"), thisWeekBegin, thisWeekEnd, true, false);
        } else {
            /* otherwise it's one of the two last days of the week ... show
             * "Next week" and include events up until and including *next*
@@ -802,7 +769,7 @@ const EventsList = new Lang.Class({
             */
            let nextWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
            let nextWeekEnd = new Date(dayEnd.getTime() + (13 - dayInWeek) * 86400 * 1000);
-            index = this._addPeriod(_("Next week"), index, nextWeekBegin, nextWeekEnd, true, false);
+            this._addPeriod(_("Next week"), nextWeekBegin, nextWeekEnd, true, false);
        }
    },

--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -16,7 +16,7 @@ const PolkitAgent = imports.gi.PolkitAgent;
 const Components = imports.ui.components;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
-const UserWidget = imports.ui.userWidget;
+const UserMenu = imports.ui.userMenu;

 const DIALOG_ICON_SIZE = 48;

@@ -100,9 +100,9 @@ const AuthenticationDialog = new Lang.Class({
            let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout',
                                             vertical: false });
            messageBox.add(userBox);
-            this._userAvatar = new UserWidget.Avatar(this._user,
-                                                     { iconSize: DIALOG_ICON_SIZE,
-                                                       styleClass: 'polkit-dialog-user-icon' });
+            this._userAvatar = new UserMenu.UserAvatarWidget(this._user,
+                                                             { iconSize: DIALOG_ICON_SIZE,
+                                                               styleClass: 'polkit-dialog-user-icon' });
            this._userAvatar.actor.hide();
            userBox.add(this._userAvatar.actor,
                        { x_fill:  true,
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -58,10 +58,15 @@ const CtrlAltTabManager = new Lang.Class({
    },

    focusGroup: function(item, timestamp) {
-        if (item.focusCallback)
+        if (item.focusCallback) {
            item.focusCallback(timestamp);
-        else
+        } else {
+            if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
+                global.stage_input_mode == Shell.StageInputMode.NORMAL)
+                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+
            item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        }
    },

    // Sort the items into a consistent order; panel first, tray last,
@@ -132,6 +137,8 @@ const CtrlAltTabManager = new Lang.Class({
    },

    _focusWindows: function(timestamp) {
+        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
+        global.stage.key_focus = null;
        global.screen.focus_default_window(timestamp);
    }
 });
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -287,7 +287,13 @@ const ShowAppsIcon = new Lang.Class({
    },

    handleDragOver: function(source, actor, x, y, time) {
-        if (!this._canRemoveApp(getAppFromSource(source)))
+        let app = getAppFromSource(source);
+        if (app == null)
+            return DND.DragMotionResult.NO_DROP;
+
+        let id = app.get_id();
+        let isFavorite = AppFavorites.getAppFavorites().isFavorite(id);
+        if (!isFavorite)
            return DND.DragMotionResult.NO_DROP;

        return DND.DragMotionResult.MOVE_DROP;
@@ -295,7 +301,7 @@ const ShowAppsIcon = new Lang.Class({

    acceptDrop: function(source, actor, x, y, time) {
        let app = getAppFromSource(source);
-        if (!this._canRemoveApp(app))
+        if (app == null)
            return false;

        let id = app.get_id();
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -49,6 +49,11 @@ const DateMenuButton = new Lang.Class({
            menuAlignment = 1.0 - menuAlignment;
        this.parent(menuAlignment);

+        // At this moment calendar menu is not keyboard navigable at
+        // all (so not accessible), so it doesn't make sense to set as
+        // role ATK_ROLE_MENU like other elements of the panel.
+        this.actor.accessible_role = Atk.Role.LABEL;
+
        this._clockDisplay = new St.Label();
        this.actor.add_actor(this._clockDisplay);

@@ -80,14 +85,17 @@ const DateMenuButton = new Lang.Class({
        vbox.add(this._calendar.actor);

        let separator = new PopupMenu.PopupSeparatorMenuItem();
-        vbox.add(separator.actor, { y_align: St.Align.END, expand: true, y_fill: false });
+        separator.setColumnWidths(1);
+        vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false});

        this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
        this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
+        this._openCalendarItem.actor.can_focus = false;
        vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});

        this._openClocksItem = new PopupMenu.PopupMenuItem(_("Open Clocks"));
        this._openClocksItem.connect('activate', Lang.bind(this, this._onOpenClocksActivate));
+        this._openClocksItem.actor.can_focus = false;
        vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});

        Shell.AppSystem.get_default().connect('installed-changed',
@@ -96,6 +104,7 @@ const DateMenuButton = new Lang.Class({
        item = this.menu.addSettingsAction(_("Date & Time Settings"), 'gnome-datetime-panel.desktop');
        if (item) {
            item.actor.show_on_set_parent = false;
+            item.actor.can_focus = false;
            item.actor.reparent(vbox);
            this._dateAndTimeSeparator = separator;
        }
@@ -106,7 +115,12 @@ const DateMenuButton = new Lang.Class({
        hbox.add(this._separator);

        // Fill up the second column
-        hbox.add(this._eventList.actor, { expand: true, y_fill: false, y_align: St.Align.START });
+        vbox = new St.BoxLayout({ name: 'calendarEventsArea',
+                                  vertical: true });
+        hbox.add(vbox, { expand: true });
+
+        // Event list
+        vbox.add(this._eventList.actor, { expand: true });

        // Whenever the menu is opened, select today
        this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
@@ -153,14 +167,15 @@ const DateMenuButton = new Lang.Class({
        this._openClocksItem.actor.visible = visible &&
            (this._getClockApp() != null);
        this._separator.visible = visible;
-        this._eventList.actor.visible = visible;
        if (visible) {
-            let alignment = 0.25;
-            if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-                alignment = 1.0 - alignment;
-            this.menu._arrowAlignment = alignment;
+          let alignment = 0.25;
+          if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+            alignment = 1.0 - alignment;
+          this.menu._arrowAlignment = alignment;
+          this._eventList.actor.get_parent().show();
        } else {
-            this.menu._arrowAlignment = 0.5;
+          this.menu._arrowAlignment = 0.5;
+          this._eventList.actor.get_parent().hide();
        }
    },

--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -1,7 +1,6 @@
 // -*- 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 St = imports.gi.St;
 const Lang = imports.lang;
@@ -44,7 +43,9 @@ let dragMonitors = [];

 function _getEventHandlerActor() {
    if (!eventHandlerActor) {
-        eventHandlerActor = new Clutter.Actor({ width: 0, height: 0 });
+        eventHandlerActor = new Clutter.Rectangle();
+        eventHandlerActor.width = 0;
+        eventHandlerActor.height = 0;
        Main.uiGroup.add_actor(eventHandlerActor);
        // We connect to 'event' rather than 'captured-event' because the capturing phase doesn't happen
        // when you've grabbed the pointer.
@@ -359,65 +360,60 @@ const _Draggable = new Lang.Class({
        return true;
    },

-    _updateDragHover : function () {
-        let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
-                                                                  this._dragX, this._dragY);
-        let dragEvent = {
-            x: this._dragX,
-            y: this._dragY,
-            dragActor: this._dragActor,
-            source: this.actor._delegate,
-            targetActor: target
-        };
-        for (let i = 0; i < dragMonitors.length; i++) {
-            let motionFunc = dragMonitors[i].dragMotion;
-            if (motionFunc) {
-                let result = motionFunc(dragEvent);
-                if (result != DragMotionResult.CONTINUE) {
-                    global.set_cursor(DRAG_CURSOR_MAP[result]);
-                    return false;
-                }
-            }
-        }
-
-        while (target) {
-            if (target._delegate && target._delegate.handleDragOver) {
-                let [r, targX, targY] = target.transform_stage_point(this._dragX, this._dragY);
-                // We currently loop through all parents on drag-over even if one of the children has handled it.
-                // We can check the return value of the function and break the loop if it's true if we don't want
-                // to continue checking the parents.
-                let result = target._delegate.handleDragOver(this.actor._delegate,
-                                                             this._dragActor,
-                                                             targX,
-                                                             targY,
-                                                             0);
-                if (result != DragMotionResult.CONTINUE) {
-                    global.set_cursor(DRAG_CURSOR_MAP[result]);
-                    return false;
-                }
-            }
-            target = target.get_parent();
-        }
-        global.set_cursor(Shell.Cursor.DND_IN_DRAG);
-        return false;
-    },
-
-    _queueUpdateDragHover: function() {
-        if (this._updateHoverId)
-            GLib.source_remove(this._updateHoverId);
-
-        this._updateHoverId = GLib.idle_add(GLib.PRIORITY_DEFAULT,
-                                            Lang.bind(this, this._updateDragHover));
-    },
-
    _updateDragPosition : function (event) {
        let [stageX, stageY] = event.get_coords();
        this._dragX = stageX;
        this._dragY = stageY;
-        this._dragActor.set_position(stageX + this._dragOffsetX,
-                                     stageY + this._dragOffsetY);

-        this._queueUpdateDragHover();
+        // If we are dragging, update the position
+        if (this._dragActor) {
+            this._dragActor.set_position(stageX + this._dragOffsetX,
+                                         stageY + this._dragOffsetY);
+
+            let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
+                                                                      stageX, stageY);
+
+            // We call observers only once per motion with the innermost
+            // target actor. If necessary, the observer can walk the
+            // parent itself.
+            let dragEvent = {
+                x: stageX,
+                y: stageY,
+                dragActor: this._dragActor,
+                source: this.actor._delegate,
+                targetActor: target
+            };
+            for (let i = 0; i < dragMonitors.length; i++) {
+                let motionFunc = dragMonitors[i].dragMotion;
+                if (motionFunc) {
+                    let result = motionFunc(dragEvent);
+                    if (result != DragMotionResult.CONTINUE) {
+                        global.set_cursor(DRAG_CURSOR_MAP[result]);
+                        return true;
+                    }
+                }
+            }
+            while (target) {
+                if (target._delegate && target._delegate.handleDragOver) {
+                    let [r, targX, targY] = target.transform_stage_point(stageX, stageY);
+                    // We currently loop through all parents on drag-over even if one of the children has handled it.
+                    // We can check the return value of the function and break the loop if it's true if we don't want
+                    // to continue checking the parents.
+                    let result = target._delegate.handleDragOver(this.actor._delegate,
+                                                                 this._dragActor,
+                                                                 targX,
+                                                                 targY,
+                                                                 event.get_time());
+                    if (result != DragMotionResult.CONTINUE) {
+                        global.set_cursor(DRAG_CURSOR_MAP[result]);
+                        return true;
+                    }
+                }
+                target = target.get_parent();
+            }
+            global.set_cursor(Shell.Cursor.DND_IN_DRAG);
+        }
+
        return true;
    },

@@ -517,11 +513,6 @@ const _Draggable = new Lang.Class({
    },

    _cancelDrag: function(eventTime) {
-        if (this._updateHoverId) {
-            GLib.source_remove(this._updateHoverId);
-            this._updateHoverId = 0;
-        }
-
        this.emit('drag-cancelled', eventTime);
        this._dragInProgress = false;
        let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -35,7 +35,7 @@ const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
-const UserWidget = imports.ui.userWidget;
+const UserMenu = imports.ui.userMenu;

 let _endSessionDialog = null;

@@ -360,9 +360,9 @@ const EndSessionDialog = new Lang.Class({
                                                icon_size: _DIALOG_ICON_SIZE,
                                                style_class: dialogContent.iconStyleClass });
        } else {
-            let avatarWidget = new UserWidget.Avatar(this._user,
-                                                     { iconSize: _DIALOG_ICON_SIZE,
-                                                       styleClass: dialogContent.iconStyleClass });
+            let avatarWidget = new UserMenu.UserAvatarWidget(this._user,
+                                                             { iconSize: _DIALOG_ICON_SIZE,
+                                                               styleClass: dialogContent.iconStyleClass });
            this._iconBin.child = avatarWidget.actor;
            avatarWidget.update();
        }
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -5,12 +5,13 @@ imports.gi.versions.Gio = '2.0';
 imports.gi.versions.Gdk = '3.0';
 imports.gi.versions.GdkPixbuf = '2.0';
 imports.gi.versions.Gtk = '3.0';
+imports.gi.versions.TelepathyGLib = '0.12';
+imports.gi.versions.TelepathyLogger = '0.2';

 const Clutter = imports.gi.Clutter;;
 const Gettext = imports.gettext;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;

@@ -40,22 +41,6 @@ function _patchContainerClass(containerClass) {
    };
 }

-function _patchLayoutClass(layoutClass, styleProps) {
-    if (styleProps)
-        layoutClass.prototype.hookup_style = function(container) {
-            container.connect('style-changed', Lang.bind(this, function() {
-                let node = container.get_theme_node();
-                for (let prop in styleProps)
-                    this[prop] = node.get_length(styleProps[prop]);
-            }));
-        };
-    layoutClass.prototype.child_set = function(actor, props) {
-        let meta = this.get_child_meta(actor.get_parent(), actor);
-        for (let prop in props)
-            meta[prop] = props[prop];
-    };
-}
-
 function _makeLoggingFunc(func) {
    return function() {
        return func([].join.call(arguments, ', '));
@@ -77,12 +62,6 @@ function init() {
    _patchContainerClass(St.BoxLayout);
    _patchContainerClass(St.Table);

-    _patchLayoutClass(Clutter.TableLayout, { row_spacing: 'spacing-rows',
-                                             column_spacing: 'spacing-columns' });
-    _patchLayoutClass(Clutter.GridLayout, { row_spacing: 'spacing-rows',
-                                            column_spacing: 'spacing-columns' });
-    _patchLayoutClass(Clutter.BoxLayout, { spacing: 'spacing' });
-
    Clutter.Actor.prototype.toString = function() {
        return St.describe_actor(this);
    };
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -292,7 +292,7 @@ function disableAllExtensions() {
        return;

    if (initted) {
-        extensionOrder.slice().reverse().forEach(function(uuid) {
+        enabledExtensions.forEach(function(uuid) {
            disableExtension(uuid);
        });
    }
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -32,9 +32,13 @@ const GrabHelper = new Lang.Class({

        this._actors = [];
        this._capturedEventId = 0;
+        this._keyFocusNotifyId = 0;
+        this._focusWindowChangedId = 0;
        this._ignoreRelease = false;
+        this._isUngrabbingCount = 0;

        this._modalCount = 0;
+        this._grabFocusCount = 0;
    },

    // addActor:
@@ -114,36 +118,38 @@ const GrabHelper = new Lang.Class({
    // grab:
    // @params: A bunch of parameters, see below
    //
-    // The general effect of a "grab" is to ensure that the passed in actor
-    // and all actors inside the grab get exclusive control of the mouse and
-    // keyboard, with the grab automatically being dropped if the user tries
-    // to dismiss it. The actor is passed in through @params.actor.
+    // Grabs the mouse and keyboard, according to the GrabHelper's
+    // parameters. If @newFocus is not %null, then the keyboard focus
+    // is moved to the first #StWidget:can-focus widget inside it.
    //
-    // grab() can be called multiple times, with the scope of the grab being
-    // changed to a different actor every time. A nested grab does not have
-    // to have its grabbed actor inside the parent grab actors.
+    // The grab will automatically be dropped if:
+    //   - The user clicks outside the grabbed actors
+    //   - The user types Escape
+    //   - The keyboard focus is moved outside the grabbed actors
+    //   - A window is focused
    //
-    // Grabs can be automatically dropped if the user tries to dismiss it
-    // in one of two ways: the user clicking outside the currently grabbed
-    // actor, or the user typing the Escape key.
+    // If @params.actor is not null, then it will be focused as the
+    // new actor. If you attempt to grab an already focused actor, the
+    // request to be focused will be ignored. The actor will not be
+    // added to the grab stack, so do not call a paired ungrab().
    //
-    // If the user clicks outside the grabbed actors, and the clicked on
-    // actor is part of a previous grab in the stack, grabs will be popped
-    // until that grab is active. However, the click event will not be
-    // replayed to the actor.
+    // If @params contains { modal: true }, then grab() will push a modal
+    // on the owner of the GrabHelper. As long as there is at least one
+    // { modal: true } actor on the grab stack, the grab will be kept.
+    // When the last { modal: true } actor is ungrabbed, then the modal
+    // will be dropped. A modal grab can fail if there is already a grab
+    // in effect from aother application; in this case the function returns
+    // false and nothing happens. Non-modal grabs can never fail.
    //
-    // If the user types the Escape key, one grab from the grab stack will
-    // be popped.
-    //
-    // When a grab is popped by user interacting as described above, if you
-    // pass a callback as @params.onUngrab, it will be called with %true.
-    //
-    // If @params.focus is not null, we'll set the key focus directly
-    // to that actor instead of navigating in @params.actor. This is for
-    // use cases like menus, where we want to grab the menu actor, but keep
-    // focus on the clicked on menu item.
+    // If @params contains { grabFocus: true }, then if you call grab()
+    // while the shell is outside the overview, it will set the stage
+    // input mode to %Shell.StageInputMode.FOCUSED, and ungrab() will
+    // revert it back, and re-focus the previously-focused window (if
+    // another window hasn't been explicitly focused before then).
    grab: function(params) {
        params = Params.parse(params, { actor: null,
+                                        modal: false,
+                                        grabFocus: false,
                                        focus: null,
                                        onUngrab: null });

@@ -156,18 +162,24 @@ const GrabHelper = new Lang.Class({

        params.savedFocus = focus;

-        if (!this._takeModalGrab())
+        if (params.modal && !this._takeModalGrab())
+            return false;
+
+        if (params.grabFocus && !this._takeFocusGrab(hadFocus))
            return false;

        this._grabStack.push(params);

        if (params.focus) {
            params.focus.grab_key_focus();
-        } else if (newFocus && hadFocus) {
+        } else if (newFocus && (hadFocus || params.grabFocus)) {
            if (!newFocus.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false))
                newFocus.grab_key_focus();
        }

+        if ((params.grabFocus || params.modal) && !this._capturedEventId)
+            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+
        return true;
    },

@@ -176,8 +188,6 @@ const GrabHelper = new Lang.Class({
        if (firstGrab) {
            if (!Main.pushModal(this._owner, this._modalParams))
                return false;
-
-            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
        }

        this._modalCount++;
@@ -189,15 +199,58 @@ const GrabHelper = new Lang.Class({
        if (this._modalCount > 0)
            return;

-        global.stage.disconnect(this._capturedEventId);
-        this._capturedEventId = 0;
-
-        this._ignoreRelease = false;
-
        Main.popModal(this._owner);
        global.sync_pointer();
    },

+    _takeFocusGrab: function(hadFocus) {
+        let firstGrab = (this._grabFocusCount == 0);
+        if (firstGrab) {
+            let metaDisplay = global.screen.get_display();
+
+            this._grabbedFromKeynav = hadFocus;
+            this._preGrabInputMode = global.stage_input_mode;
+
+            if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE ||
+                this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
+                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+            }
+
+            this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
+            this._focusWindowChangedId = metaDisplay.connect('notify::focus-window', Lang.bind(this, this._focusWindowChanged));
+        }
+
+        this._grabFocusCount++;
+        return true;
+    },
+
+    _releaseFocusGrab: function() {
+        this._grabFocusCount--;
+        if (this._grabFocusCount > 0)
+            return;
+
+        if (this._keyFocusNotifyId > 0) {
+            global.stage.disconnect(this._keyFocusNotifyId);
+            this._keyFocusNotifyId = 0;
+        }
+
+        if (this._focusWindowChangedId > 0) {
+            let metaDisplay = global.screen.get_display();
+            metaDisplay.disconnect(this._focusWindowChangedId);
+            this._focusWindowChangedId = 0;
+        }
+
+        let prePopInputMode = global.stage_input_mode;
+
+        if (this._grabbedFromKeynav) {
+            if (this._preGrabInputMode == Shell.StageInputMode.FOCUSED &&
+                prePopInputMode != Shell.StageInputMode.FULLSCREEN)
+                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+        }
+
+        global.screen.focus_default_window(global.display.get_current_time_roundtrip());
+    },
+
    // ignoreRelease:
    //
    // Make sure that the next button release event evaluated by the
@@ -211,14 +264,10 @@ const GrabHelper = new Lang.Class({
    // ungrab:
    // @params: The parameters for the grab; see below.
    //
-    // Pops @params.actor from the grab stack, potentially dropping
-    // the grab. If the actor is not on the grab stack, this call is
-    // ignored with no ill effects.
+    // Pops an actor from the grab stack, potentially dropping the grab.
    //
-    // If the actor is not at the top of the grab stack, grabs are
-    // popped until the grabbed actor is at the top of the grab stack.
-    // The onUngrab callback for every grab is called for every popped
-    // grab with the parameter %false.
+    // If the actor that was popped from the grab stack was not the actor
+    // That was passed in, this call is ignored.
    ungrab: function(params) {
        params = Params.parse(params, { actor: this.currentGrab.actor,
                                        isUser: false });
@@ -227,6 +276,14 @@ const GrabHelper = new Lang.Class({
        if (grabStackIndex < 0)
            return;

+        // We may get key focus changes when calling onUngrab, which
+        // would cause an extra ungrab() on the next actor in the
+        // stack, which is wrong. Ignore key focus changes during the
+        // ungrab, and restore the saved key focus ourselves afterwards.
+        // We use a count as ungrab() may be re-entrant, as onUngrab()
+        // may ungrab additional actors.
+        this._isUngrabbingCount++;
+
        let focus = global.stage.key_focus;
        let hadFocus = focus && this._isWithinGrabbedActor(focus);

@@ -241,7 +298,18 @@ const GrabHelper = new Lang.Class({
            if (poppedGrab.onUngrab)
                poppedGrab.onUngrab(params.isUser);

-            this._releaseModalGrab();
+            if (poppedGrab.modal)
+                this._releaseModalGrab();
+
+            if (poppedGrab.grabFocus)
+                this._releaseFocusGrab();
+        }
+
+        if (!this.grabbed && this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+
+            this._ignoreRelease = false;
        }

        if (hadFocus) {
@@ -249,6 +317,8 @@ const GrabHelper = new Lang.Class({
            if (poppedGrab.savedFocus)
                poppedGrab.savedFocus.grab_key_focus();
        }
+
+        this._isUngrabbingCount--;
    },

    _onCapturedEvent: function(actor, event) {
@@ -269,6 +339,9 @@ const GrabHelper = new Lang.Class({
            return true;
        }

+        if (!button && this._modalCount == 0)
+            return false;
+
        if (this._isWithinGrabbedActor(event.get_source()))
            return false;

@@ -285,6 +358,21 @@ const GrabHelper = new Lang.Class({
            return true;
        }

-        return true;
+        return this._modalCount > 0;
    },
+
+    _onKeyFocusChanged: function() {
+        if (this._isUngrabbingCount > 0)
+            return;
+
+        let focus = global.stage.key_focus;
+        if (!focus || !this._isWithinGrabbedActor(focus))
+            this.ungrab({ isUser: true });
+    },
+
+    _focusWindowChanged: function() {
+        let metaDisplay = global.screen.get_display();
+        if (metaDisplay.focus_window != null)
+            this.ungrab({ isUser: true });
+    }
 });
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -118,25 +118,10 @@ const MonitorConstraint = new Lang.Class({
    }
 });

-const Monitor = new Lang.Class({
-    Name: 'Monitor',
-
-    _init: function(index, geometry) {
-        this.index = index;
-        this.x = geometry.x;
-        this.y = geometry.y;
-        this.width = geometry.width;
-        this.height = geometry.height;
-    },
-
-    get inFullscreen() {
-        return global.screen.get_monitor_in_fullscreen(this.index);
-    }
-})
-
 const defaultParams = {
    trackFullscreen: false,
    affectsStruts: false,
+    affectsInputRegion: true
 };

 const LayoutManager = new Lang.Class({
@@ -188,12 +173,10 @@ const LayoutManager = new Lang.Class({
        global.stage.remove_actor(global.window_group);
        this.uiGroup.add_actor(global.window_group);

+        global.stage.remove_actor(global.overlay_group);
+        this.uiGroup.add_actor(global.overlay_group);
        global.stage.add_child(this.uiGroup);

-        this.overviewGroup = new St.Widget({ name: 'overviewGroup',
-                                             visible: false });
-        this.addChrome(this.overviewGroup);
-
        this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
                                                 visible: false,
                                                 clip_to_allocation: true,
@@ -244,24 +227,24 @@ const LayoutManager = new Lang.Class({
        this._monitorsChanged();
    },

-    // This is called by Main after everything else is constructed
+    // This is called by Main after everything else is constructed;
+    // it needs access to Main.overview, which didn't exist
+    // yet when the LayoutManager was constructed.
    init: function() {
+        Main.overview.connect('showing', Lang.bind(this, this._overviewShowing));
+        Main.overview.connect('hidden', Lang.bind(this, this._overviewHidden));
        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));

-        this._loadBackground();
+        this._prepareStartupAnimation();
    },

-    showOverview: function() {
-        this.overviewGroup.show();
-
+    _overviewShowing: function() {
        this._inOverview = true;
        this._updateVisibility();
        this._queueUpdateRegions();
    },

-    hideOverview: function() {
-        this.overviewGroup.hide();
-
+    _overviewHidden: function() {
        this._inOverview = false;
        this._updateVisibility();
        this._queueUpdateRegions();
@@ -278,7 +261,7 @@ const LayoutManager = new Lang.Class({
        this.monitors = [];
        let nMonitors = screen.get_n_monitors();
        for (let i = 0; i < nMonitors; i++)
-            this.monitors.push(new Monitor(i, screen.get_monitor_geometry(i)));
+            this.monitors.push(screen.get_monitor_geometry(i));

        if (nMonitors == 1) {
            this.primaryIndex = this.bottomIndex = 0;
@@ -300,10 +283,8 @@ const LayoutManager = new Lang.Class({

    _updateHotCorners: function() {
        // destroy old hot corners
-        this.hotCorners.forEach(function(corner) {
-            if (corner)
-                corner.destroy();
-        });
+        for (let i = 0; i < this.hotCorners.length; i++)
+            this.hotCorners[i].destroy();
        this.hotCorners = [];

        let size = this.panelBox.height;
@@ -314,9 +295,9 @@ const LayoutManager = new Lang.Class({
            let cornerX = this._rtl ? monitor.x + monitor.width : monitor.x;
            let cornerY = monitor.y;

-            let haveTopLeftCorner = true;
-
            if (i != this.primaryIndex) {
+                let haveTopLeftCorner = true;
+
                // Check if we have a top left (right for RTL) corner.
                // I.e. if there is no monitor directly above or to the left(right)
                let besideX = this._rtl ? monitor.x + 1 : cornerX - 1;
@@ -343,15 +324,14 @@ const LayoutManager = new Lang.Class({
                        break;
                    }
                }
+
+                if (!haveTopLeftCorner)
+                    continue;
            }

-            if (haveTopLeftCorner) {
-                let corner = new HotCorner(this, monitor, cornerX, cornerY);
-                corner.setBarrierSize(size);
-                this.hotCorners.push(corner);
-            } else {
-                this.hotCorners.push(null);
-            }
+            let corner = new HotCorner(this, monitor, cornerX, cornerY);
+            corner.setBarrierSize(size);
+            this.hotCorners.push(corner);
        }

        this.emit('hot-corners-changed');
@@ -367,7 +347,7 @@ const LayoutManager = new Lang.Class({
                              BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
                          }));

-        this._bgManagers.push(bgManager);
+        this._bgManagers[monitorIndex] = bgManager;

        return bgManager.background;
    },
@@ -428,8 +408,7 @@ const LayoutManager = new Lang.Class({

        let size = this.panelBox.height;
        this.hotCorners.forEach(function(corner) {
-            if (corner)
-                corner.setBarrierSize(size);
+            corner.setBarrierSize(size);
        });
    },

@@ -528,10 +507,17 @@ const LayoutManager = new Lang.Class({
    get focusIndex() {
        let i = Main.layoutManager.primaryIndex;

-        if (global.stage.key_focus != null)
-            i = this.findIndexForActor(global.stage.key_focus);
-        else if (global.display.focus_window != null)
-            i = global.display.focus_window.get_monitor();
+        if (global.stage_input_mode == Shell.StageInputMode.FOCUSED ||
+            global.stage_input_mode == Shell.StageInputMode.FULLSCREEN) {
+            let focusActor = global.stage.key_focus;
+            if (focusActor)
+                i = this.findIndexForActor(focusActor);
+        } else {
+            let focusWindow = global.display.focus_window;
+            if (focusWindow)
+                i = focusWindow.get_monitor();
+        }
+
        return i;
    },

@@ -550,25 +536,6 @@ const LayoutManager = new Lang.Class({
        return this._keyboardIndex;
    },

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

    _prepareStartupAnimation: function() {
-        // During the initial transition, add a simple actor to block all events,
-        // so they don't get delivered to X11 windows that have been transformed.
-        this._coverPane = new Clutter.Actor({ opacity: 0,
-                                              width: global.screen_width,
-                                              height: global.screen_height,
-                                              reactive: true });
-        this.addChrome(this._coverPane);
+        // Set ourselves to FULLSCREEN input mode while the animation is running
+        // so events don't get delivered to X11 windows (which are distorted by the animation)
+        global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;

        if (Main.sessionMode.isGreeter) {
            this.panelBox.translation_y = -this.panelBox.height;
@@ -618,18 +581,35 @@ const LayoutManager = new Lang.Class({
            global.window_group.set_clip(monitor.x, monitor.y, monitor.width, monitor.height);
        }

-        this.emit('startup-prepared');
+        this._systemBackground = new Background.SystemBackground();
+        this._systemBackground.actor.hide();

-        // We're mostly prepared for the startup animation
-        // now, but since a lot is going on asynchronously
-        // during startup, let's defer the startup animation
-        // until the event loop is uncontended and idle.
-        // This helps to prevent us from running the animation
-        // when the system is bogged down
-        GLib.idle_add(GLib.PRIORITY_LOW, Lang.bind(this, function() {
-            this._startupAnimation();
-            return false;
-        }));
+        global.stage.insert_child_below(this._systemBackground.actor, null);
+
+        let constraint = new Clutter.BindConstraint({ source: global.stage,
+                                                      coordinate: Clutter.BindCoordinate.ALL });
+        this._systemBackground.actor.add_constraint(constraint);
+
+        let signalId = this._systemBackground.connect('loaded',
+                                                      Lang.bind(this, function() {
+                                                          this._systemBackground.disconnect(signalId);
+                                                          this._systemBackground.actor.show();
+                                                          global.stage.show();
+
+                                                          this.emit('startup-prepared');
+
+                                                          // We're mostly prepared for the startup animation
+                                                          // now, but since a lot is going on asynchronously
+                                                          // during startup, let's defer the startup animation
+                                                          // until the event loop is uncontended and idle.
+                                                          // This helps to prevent us from running the animation
+                                                          // when the system is bogged down
+                                                          GLib.idle_add(GLib.PRIORITY_LOW,
+                                                                        Lang.bind(this, function() {
+                                                                            this._startupAnimation();
+                                                                            return false;
+                                                                        }));
+                                                      }));
    },

    _startupAnimation: function() {
@@ -665,8 +645,7 @@ const LayoutManager = new Lang.Class({
        // we no longer need to clear the stage
        global.stage.no_clear_hint = true;

-        this._coverPane.destroy();
-        this._coverPane = null;
+        global.stage_input_mode = Shell.StageInputMode.NORMAL;

        this._systemBackground.actor.destroy();
        this._systemBackground = null;
@@ -687,6 +666,7 @@ const LayoutManager = new Lang.Class({
    },

    showKeyboard: function () {
+        this.keyboardBox.raise_top();
        Tweener.addTween(this.keyboardBox,
                         { anchor_y: this.keyboardBox.height,
                           time: KEYBOARD_ANIMATION_TIME,
@@ -731,10 +711,11 @@ const LayoutManager = new Lang.Class({
    // @actor: an actor to add to the chrome
    // @params: (optional) additional params
    //
-    // Adds @actor to the chrome, and extends the input region
-    // to include it. Changes in @actor's size, position, and
-    // visibility will automatically result in appropriate changes
-    // to the input region.
+    // Adds @actor to the chrome, and (unless %affectsInputRegion in
+    // @params is %false) extends the input region to include it.
+    // Changes in @actor's size, position, and visibility will
+    // automatically result in appropriate changes to the input
+    // region.
    //
    // If %affectsStruts in @params is %true (and @actor is along a
    // screen edge), then @actor's size and position will also affect
@@ -921,8 +902,13 @@ const LayoutManager = new Lang.Class({
    },

    _updateFullscreen: function() {
+        for (let i = 0; i < this.monitors.length; i++)
+            this.monitors[i].inFullscreen = global.screen.get_monitor_in_fullscreen (i);
+
        this._updateVisibility();
        this._queueUpdateRegions();
+
+        this.emit('fullscreen-changed');
    },

    _windowsRestacked: function() {
@@ -950,7 +936,7 @@ const LayoutManager = new Lang.Class({

        for (i = 0; i < this._trackedActors.length; i++) {
            let actorData = this._trackedActors[i];
-            if (!wantsInputRegion && !actorData.affectsStruts)
+            if (!(actorData.affectsInputRegion && wantsInputRegion) && !actorData.affectsStruts)
                continue;

            let [x, y] = actorData.actor.get_transformed_position();
@@ -960,8 +946,13 @@ const LayoutManager = new Lang.Class({
            w = Math.round(w);
            h = Math.round(h);

-            if (wantsInputRegion && actorData.actor.get_paint_visibility())
-                rects.push(new Meta.Rectangle({ x: x, y: y, width: w, height: h }));
+            if (actorData.affectsInputRegion && wantsInputRegion) {
+                let rect = new Meta.Rectangle({ x: x, y: y, width: w, height: h});
+
+                if (actorData.actor.get_paint_visibility() &&
+                    !this.uiGroup.get_skip_paint(actorData.actor))
+                    rects.push(rect);
+            }

            if (actorData.affectsStruts) {
                // Limit struts to the size of the screen
@@ -1132,11 +1123,11 @@ const HotCorner = new Lang.Class({
                                             height: 3,
                                             reactive: true });

-            this._corner = new Clutter.Actor({ name: 'hot-corner',
-                                               width: 1,
-                                               height: 1,
-                                               opacity: 0,
-                                               reactive: true });
+            this._corner = new Clutter.Rectangle({ name: 'hot-corner',
+                                                   width: 1,
+                                                   height: 1,
+                                                   opacity: 0,
+                                                   reactive: true });
            this._corner._delegate = this;

            this.actor.add_child(this._corner);
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -308,6 +308,10 @@ const Result = new Lang.Class({
        box.add(resultTxt);
        let objLink = new ObjLink(this._lookingGlass, o);
        box.add(objLink.actor);
+        let line = new Clutter.Rectangle({ name: 'Separator' });
+        let padBin = new St.Bin({ name: 'Separator', x_fill: true, y_fill: true });
+        padBin.add_actor(line);
+        this.actor.add(padBin);
    }
 });

@@ -849,9 +853,8 @@ const LookingGlass = new Lang.Class({
        this._updateFont();

        // We want it to appear to slide out from underneath the panel
-        Main.uiGroup.add_actor(this.actor);
-        Main.uiGroup.set_child_below_sibling(this.actor,
-                                             Main.layoutManager.panelBox);
+        Main.layoutManager.panelBox.add_actor(this.actor);
+        this.actor.lower_bottom();
        Main.layoutManager.panelBox.connect('allocation-changed',
                                            Lang.bind(this, this._queueResize));
        Main.layoutManager.keyboardBox.connect('allocation-changed',
@@ -986,18 +989,28 @@ const LookingGlass = new Lang.Class({

    _showCompletions: function(completions) {
        if (!this._completionActor) {
-            this._completionActor = new St.Label({ name: 'LookingGlassAutoCompletionText', style_class: 'lg-completions-text' });
-            this._completionActor.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            this._completionActor.clutter_text.line_wrap = true;
+            let actor = new St.BoxLayout({ vertical: true });
+
+            this._completionText = new St.Label({ name: 'LookingGlassAutoCompletionText', style_class: 'lg-completions-text' });
+            this._completionText.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+            this._completionText.clutter_text.line_wrap = true;
+            actor.add(this._completionText);
+
+            let line = new Clutter.Rectangle();
+            let padBin = new St.Bin({ x_fill: true, y_fill: true });
+            padBin.add_actor(line);
+            actor.add(padBin);
+
+            this._completionActor = actor;
            this._evalBox.insert_child_below(this._completionActor, this._entryArea);
        }

-        this._completionActor.set_text(completions.join(', '));
+        this._completionText.set_text(completions.join(', '));

        // Setting the height to -1 allows us to get its actual preferred height rather than
        // whatever was last given in set_height by Tweener.
        this._completionActor.set_height(-1);
-        let [minHeight, naturalHeight] = this._completionActor.get_preferred_height(this._resultsArea.get_width());
+        let [minHeight, naturalHeight] = this._completionText.get_preferred_height(this._resultsArea.get_width());

        // Don't reanimate if we are already visible
        if (this._completionActor.visible) {
@@ -1073,7 +1086,7 @@ const LookingGlass = new Lang.Class({
        let availableHeight = primary.height - Main.layoutManager.keyboardBox.height;
        let myHeight = Math.min(primary.height * 0.7, availableHeight * 0.9);
        this.actor.x = (primary.width - myWidth) / 2;
-        this._hiddenY = Main.layoutManager.panelBox.height - myHeight - 4; // -4 to hide the top corners
+        this._hiddenY = this.actor.get_parent().height - myHeight - 4; // -4 to hide the top corners
        this._targetY = this._hiddenY + myHeight;
        this.actor.y = this._hiddenY;
        this.actor.width = myWidth;
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -40,9 +40,6 @@ const Util = imports.misc.util;

 const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);

-const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
-const STICKY_KEYS_ENABLE = 'stickykeys-enable';
-
 let componentManager = null;
 let panel = null;
 let overview = null;
@@ -70,8 +67,7 @@ let layoutManager = null;
 let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
-let _a11ySettings = null;
-let dynamicWorkspacesSchema = null;
+let _workspacesSettings = null;

 function _sessionUpdated() {
    _loadDefaultStylesheet();
@@ -121,12 +117,16 @@ function _sessionsLoaded() {
 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);
+        Meta.prefs_override_preference_schema (keys[i], sessionMode.overridesSchema);

+    let workspacesSchema;
    if (keys.indexOf('dynamic-workspaces') > -1)
-        dynamicWorkspacesSchema = sessionMode.overridesSchema;
+        workspacesSchema = sessionMode.overridesSchema;
    else
-        dynamicWorkspacesSchema = 'org.gnome.mutter';
+        workspacesSchema = 'org.gnome.mutter';
+
+     _workspacesSettings = new Gio.Settings({ schema: workspacesSchema });
+     _workspacesSettings.connect('changed::dynamic-workspaces', _queueCheckWorkspaces);
 }

 function _initializeUI() {
@@ -138,9 +138,11 @@ function _initializeUI() {
    // and recalculate application associations, so to avoid
    // races for now we initialize it here.  It's better to
    // be predictable anyways.
-    Shell.WindowTracker.get_default();
+    let tracker = Shell.WindowTracker.get_default();
    Shell.AppUsage.get_default();

+    tracker.connect('startup-sequence-changed', _queueCheckWorkspaces);
+
    _loadDefaultStylesheet();

    // Setup the stage hierarchy early
@@ -170,12 +172,9 @@ function _initializeUI() {
    layoutManager.init();
    overview.init();

-    _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.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
+                                            false, -1, 1);
+    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));

    // Provide the bus object for gnome-session to
    // initiate logouts.
@@ -195,6 +194,14 @@ function _initializeUI() {
        Scripting.runPerfScript(module, perfOutput);
    }

+    global.screen.connect('notify::n-workspaces', _nWorkspacesChanged);
+
+    global.screen.connect('window-entered-monitor', _windowEnteredMonitor);
+    global.screen.connect('window-left-monitor', _windowLeftMonitor);
+    global.screen.connect('restacked', _windowsRestacked);
+
+    _nWorkspacesChanged();
+
    ExtensionDownloader.init();
    ExtensionSystem.init();

@@ -208,12 +215,190 @@ function _initializeUI() {
                              if (keybindingMode == Shell.KeyBindingMode.NONE) {
                                  keybindingMode = Shell.KeyBindingMode.NORMAL;
                              }
-                              if (screenShield) {
-                                  screenShield.lockIfWasLocked();
-                              }
                          });
 }

+let _workspaces = [];
+let _checkWorkspacesId = 0;
+
+/*
+ * When the last window closed on a workspace is a dialog or splash
+ * screen, we assume that it might be an initial window shown before
+ * the main window of an application, and give the app a grace period
+ * where it can map another window before we remove the workspace.
+ */
+const LAST_WINDOW_GRACE_TIME = 1000;
+
+function _checkWorkspaces() {
+    let i;
+    let emptyWorkspaces = [];
+
+    if (!Meta.prefs_get_dynamic_workspaces()) {
+        _checkWorkspacesId = 0;
+        return false;
+    }
+
+    for (i = 0; i < _workspaces.length; i++) {
+        let lastRemoved = _workspaces[i]._lastRemovedWindow;
+        if ((lastRemoved &&
+             (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+              lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
+              lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
+            _workspaces[i]._keepAliveId)
+                emptyWorkspaces[i] = false;
+        else
+            emptyWorkspaces[i] = true;
+    }
+
+    let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
+    for (i = 0; i < sequences.length; i++) {
+        let index = sequences[i].get_workspace();
+        if (index >= 0 && index <= global.screen.n_workspaces)
+            emptyWorkspaces[index] = false;
+    }
+
+    let windows = global.get_window_actors();
+    for (i = 0; i < windows.length; i++) {
+        let win = windows[i];
+
+        if (win.get_meta_window().is_on_all_workspaces())
+            continue;
+
+        let workspaceIndex = win.get_workspace();
+        emptyWorkspaces[workspaceIndex] = false;
+    }
+
+    // If we don't have an empty workspace at the end, add one
+    if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
+        global.screen.append_new_workspace(false, global.get_current_time());
+        emptyWorkspaces.push(false);
+    }
+
+    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+    let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
+                                    activeWorkspaceIndex < emptyWorkspaces.length - 1);
+    // Don't enter the overview when removing multiple empty workspaces at startup
+    let showOverview  = (removingCurrentWorkspace &&
+                         !emptyWorkspaces.every(function(x) { return x; }));
+
+    if (removingCurrentWorkspace) {
+        // "Merge" the empty workspace we are removing with the one at the end
+        wm.blockAnimations();
+    }
+
+    // Delete other empty workspaces; do it from the end to avoid index changes
+    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
+        if (emptyWorkspaces[i])
+            global.screen.remove_workspace(_workspaces[i], global.get_current_time());
+    }
+
+    if (removingCurrentWorkspace) {
+        global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
+        wm.unblockAnimations();
+
+        if (!overview.visible && showOverview)
+            overview.show();
+    }
+
+    _checkWorkspacesId = 0;
+    return false;
+}
+
+function keepWorkspaceAlive(workspace, duration) {
+    if (workspace._keepAliveId)
+        Mainloop.source_remove(workspace._keepAliveId);
+
+    workspace._keepAliveId = Mainloop.timeout_add(duration, function() {
+        workspace._keepAliveId = 0;
+        _queueCheckWorkspaces();
+        return false;
+    });
+}
+
+function _windowRemoved(workspace, window) {
+    workspace._lastRemovedWindow = window;
+    _queueCheckWorkspaces();
+    Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, function() {
+        if (workspace._lastRemovedWindow == window) {
+            workspace._lastRemovedWindow = null;
+            _queueCheckWorkspaces();
+        }
+        return false;
+    });
+}
+
+function _windowLeftMonitor(metaScreen, monitorIndex, metaWin) {
+    // If the window left the primary monitor, that
+    // might make that workspace empty
+    if (monitorIndex == layoutManager.primaryIndex)
+        _queueCheckWorkspaces();
+}
+
+function _windowEnteredMonitor(metaScreen, monitorIndex, metaWin) {
+    // If the window entered the primary monitor, that
+    // might make that workspace non-empty
+    if (monitorIndex == layoutManager.primaryIndex)
+        _queueCheckWorkspaces();
+}
+
+function _windowsRestacked() {
+    // Figure out where the pointer is in case we lost track of
+    // it during a grab. (In particular, if a trayicon popup menu
+    // is dismissed, see if we need to close the message tray.)
+    global.sync_pointer();
+}
+
+function _queueCheckWorkspaces() {
+    if (_checkWorkspacesId == 0)
+        _checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, _checkWorkspaces);
+}
+
+function _nWorkspacesChanged() {
+    let oldNumWorkspaces = _workspaces.length;
+    let newNumWorkspaces = global.screen.n_workspaces;
+
+    if (oldNumWorkspaces == newNumWorkspaces)
+        return false;
+
+    let lostWorkspaces = [];
+    if (newNumWorkspaces > oldNumWorkspaces) {
+        let w;
+
+        // Assume workspaces are only added at the end
+        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
+            _workspaces[w] = global.screen.get_workspace_by_index(w);
+
+        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
+            let workspace = _workspaces[w];
+            workspace._windowAddedId = workspace.connect('window-added', _queueCheckWorkspaces);
+            workspace._windowRemovedId = workspace.connect('window-removed', _windowRemoved);
+        }
+
+    } else {
+        // Assume workspaces are only removed sequentially
+        // (e.g. 2,3,4 - not 2,4,7)
+        let removedIndex;
+        let removedNum = oldNumWorkspaces - newNumWorkspaces;
+        for (let w = 0; w < oldNumWorkspaces; w++) {
+            let workspace = global.screen.get_workspace_by_index(w);
+            if (_workspaces[w] != workspace) {
+                removedIndex = w;
+                break;
+            }
+        }
+
+        let lostWorkspaces = _workspaces.splice(removedIndex, removedNum);
+        lostWorkspaces.forEach(function(workspace) {
+                                   workspace.disconnect(workspace._windowAddedId);
+                                   workspace.disconnect(workspace._windowRemovedId);
+                               });
+    }
+
+    _queueCheckWorkspaces();
+
+    return false;
+}
+
 function _loadDefaultStylesheet() {
    if (!sessionMode.isPrimary)
        return;
@@ -264,8 +449,7 @@ function loadTheme() {
    if (_cssStylesheet != null)
        cssStylesheet = _cssStylesheet;

-    let theme = new St.Theme ({ application_stylesheet: cssStylesheet,
-                                default_stylesheet: _defaultCssStylesheet });
+    let theme = new St.Theme ({ application_stylesheet: cssStylesheet });

    if (previousTheme) {
        let customStylesheets = previousTheme.get_custom_stylesheets();
@@ -356,6 +540,8 @@ function pushModal(actor, params) {
        Meta.disable_unredirect_for_screen(global.screen);
    }

+    global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
+
    modalCount += 1;
    let actorDestroyId = actor.connect('destroy', function() {
        let index = _findModal(actor);
@@ -404,6 +590,7 @@ function popModal(actor, timestamp) {
    if (focusIndex < 0) {
        global.stage.set_key_focus(null);
        global.end_modal(timestamp);
+        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
        keybindingMode = Shell.KeyBindingMode.NORMAL;

        throw new Error('incorrect pop');
@@ -451,6 +638,7 @@ function popModal(actor, timestamp) {
        return;

    global.end_modal(timestamp);
+    global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
    Meta.enable_unredirect_for_screen(global.screen);
    keybindingMode = Shell.KeyBindingMode.NORMAL;
 }
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -97,65 +97,6 @@ function _fixMarkup(text, allowMarkup) {
    return GLib.markup_escape_text(text, -1);
 }

-const FocusGrabber = new Lang.Class({
-    Name: 'FocusGrabber',
-
-    _init: function(actor) {
-        this._actor = actor;
-        this._prevKeyFocusActor = null;
-        this._focusActorChangedId = 0;
-        this._focused = false;
-    },
-
-    grabFocus: function() {
-        if (this._focused)
-            return;
-
-        this._prevFocusedWindow = global.display.focus_window;
-        this._prevKeyFocusActor = global.stage.get_key_focus();
-
-        this._focusActorChangedId = global.stage.connect('notify::key-focus', Lang.bind(this, this._focusActorChanged));
-
-        if (!this._actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false))
-            this._actor.grab_key_focus();
-
-        this._focused = true;
-    },
-
-    _focusUngrabbed: function() {
-        if (!this._focused)
-            return false;
-
-        if (this._focusActorChangedId > 0) {
-            global.stage.disconnect(this._focusActorChangedId);
-            this._focusActorChangedId = 0;
-        }
-
-        this._focused = false;
-        return true;
-    },
-
-    _focusActorChanged: function() {
-        let focusedActor = global.stage.get_key_focus();
-        if (!focusedActor || !this._actor.contains(focusedActor))
-            this._focusUngrabbed();
-    },
-
-    ungrabFocus: function() {
-        if (!this._focusUngrabbed())
-            return;
-
-        if (this._prevKeyFocusActor) {
-            global.stage.set_key_focus(this._prevKeyFocusActor);
-            this._prevKeyFocusActor = null;
-        } else {
-            let focusedActor = global.stage.get_key_focus();
-            if (focusedActor && this._actor.contains(focusedActor))
-                global.stage.set_key_focus(null);
-        }
-    }
-});
-
 const URLHighlighter = new Lang.Class({
    Name: 'URLHighlighter',

@@ -1424,10 +1365,6 @@ const SummaryItem = new Lang.Class({
        this.notificationStackWidget.add_actor(this.notificationStackView);

        this.closeButton = Util.makeCloseButton();
-            this.closeButton.connect('clicked', Lang.bind(this, function() {
-            source.destroy();
-            source.emit('done-displaying-content');
-        }));
        this.notificationStackWidget.add_actor(this.closeButton);
        this._stackedNotifications = [];

@@ -1616,28 +1553,28 @@ const MessageTray = new Lang.Class({

        this.actor = new St.Widget({ name: 'message-tray',
                                     reactive: true,
+                                     track_hover: true,
                                     layout_manager: new Clutter.BinLayout(),
                                     x_expand: true,
                                     y_expand: true,
                                     y_align: Clutter.ActorAlign.START,
                                   });
+        this.actor.connect('notify::hover', Lang.bind(this, this._onTrayHoverChanged));

        this._notificationWidget = new St.Widget({ name: 'notification-container',
-                                                   reactive: true,
-                                                   track_hover: true,
                                                   y_align: Clutter.ActorAlign.START,
                                                   x_align: Clutter.ActorAlign.CENTER,
                                                   y_expand: true,
                                                   x_expand: true,
                                                   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.actor.add_actor(this._notificationWidget);

        this._notificationBin = new St.Bin({ y_expand: true });
        this._notificationBin.set_y_align(Clutter.ActorAlign.START);
        this._notificationWidget.add_actor(this._notificationBin);
        this._notificationWidget.hide();
-        this._notificationFocusGrabber = new FocusGrabber(this._notificationWidget);
        this._notificationQueue = [];
        this._notification = null;
        this._notificationClickedId = 0;
@@ -1692,19 +1629,19 @@ const MessageTray = new Lang.Class({

        this._trayState = State.HIDDEN;
        this._traySummoned = false;
-        this._useLongerNotificationLeftTimeout = false;
+        this._useLongerTrayLeftTimeout = false;
        this._trayLeftTimeoutId = 0;

-        // pointerInNotification is sort of a misnomer -- it tracks whether
+        // pointerInTray is sort of a misnomer -- it tracks whether
        // a message tray notification should expand. The value is
-        // partially driven by the hover state of the notification, but has
+        // partially driven by the hover state of the tray, but has
        // a lot of complex state related to timeouts and the current
        // state of the pointer when a notification pops up.
-        this._pointerInNotification = false;
+        this._pointerInTray = false;

-        // This tracks this._notificationWidget.hover and is used to fizzle
-        // out non-changing hover notifications in onNotificationHoverChanged.
-        this._notificationHovered = false;
+        // This tracks this.actor.hover and is used to fizzle
+        // out non-changing hover notifications in onTrayHoverChanged.
+        this._trayHovered = false;

        this._keyboardVisible = false;
        this._notificationClosed = false;
@@ -1716,29 +1653,25 @@ const MessageTray = new Lang.Class({
        this._desktopCloneState = State.HIDDEN;
        this._notificationRemoved = false;
        this._reNotifyAfterHideNotification = null;
+        this._inFullscreen = false;
        this._desktopClone = null;
        this._inCtrlAltTab = false;

        this.clearableCount = 0;

-        this._lightboxes = [];
-        let lightboxContainers = [global.window_group,
-                                  Main.layoutManager.overviewGroup];
-        for (let i = 0; i < lightboxContainers.length; i++)
-            this._lightboxes.push(new Lightbox.Lightbox(lightboxContainers[i],
-                                                        { inhibitEvents: true,
-                                                          fadeInTime: ANIMATION_TIME,
-                                                          fadeOutTime: ANIMATION_TIME,
-                                                          fadeFactor: 0.2
-                                                        }));
+        this._lightbox = new Lightbox.Lightbox(global.overlay_group,
+                                               { inhibitEvents: true,
+                                                 fadeInTime: ANIMATION_TIME,
+                                                 fadeOutTime: ANIMATION_TIME,
+                                                 fadeFactor: 0.2
+                                               });

        Main.layoutManager.trayBox.add_actor(this.actor);
-        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('fullscreen-changed', Lang.bind(this, this._updateState));
        Main.layoutManager.connect('hot-corners-changed', Lang.bind(this, this._hotCornersChanged));

        // If the overview shows or hides while we're in
@@ -1786,6 +1719,9 @@ const MessageTray = new Lang.Class({
        this.actor.add_action(clickAction);

        clickAction.connect('clicked', Lang.bind(this, function(action) {
+            if (this._trayState != State.SHOWN)
+                return;
+
            let button = action.get_button();
            if (button == 3)
                this._openContextMenu();
@@ -1796,7 +1732,7 @@ const MessageTray = new Lang.Class({
        clickAction.connect('long-press', Lang.bind(this, function(action, actor, state) {
            switch (state) {
            case Clutter.LongPressState.QUERY:
-                return true;
+                return this._trayState == State.SHOWN;
            case Clutter.LongPressState.ACTIVATE:
                this._openContextMenu();
            }
@@ -1812,6 +1748,7 @@ const MessageTray = new Lang.Class({
        let [x, y, mask] = global.get_pointer();
        this._contextMenu.setPosition(Math.round(x), Math.round(y));
        this._grabHelper.grab({ actor: this._contextMenu.actor,
+                                grabFocus: true,
                                onUngrab: Lang.bind(this, function () {
                                    this._contextMenu.close(BoxPointer.PopupAnimation.FULL);
                                })
@@ -1857,12 +1794,12 @@ const MessageTray = new Lang.Class({
                           y == monitor.y + monitor.height - 1);
        if (shouldDwell) {
            // We only set up dwell timeout when the user is not hovering over the tray
-            // (!this._notificationHovered). This avoids bringing up the message tray after the
+            // (!this.actor.hover). This avoids bringing up the message tray after the
            // user clicks on a notification with the pointer on the bottom pixel
            // of the monitor. The _trayDwelling variable is used so that we only try to
            // fire off one tray dwell - if it fails (because, say, the user has the mouse down),
            // we don't try again until the user moves the mouse up and down again.
-            if (!this._trayDwelling && !this._notificationHovered && this._trayDwellTimeoutId == 0) {
+            if (!this._trayDwelling && !this.actor.hover && this._trayDwellTimeoutId == 0) {
                // Save the interaction timestamp so we can detect user input
                let focusWindow = global.display.focus_window;
                this._trayDwellUserTime = focusWindow ? focusWindow.user_time : 0;
@@ -1919,8 +1856,9 @@ const MessageTray = new Lang.Class({
    _closeNotification: function() {
        if (this._notificationState == State.SHOWN) {
            this._closeButton.hide();
-            this._notification.emit('done-displaying');
-            this._notification.destroy();
+            this._notificationClosed = true;
+            this._updateState();
+            this._notificationClosed = false;
        }
    },

@@ -2061,6 +1999,7 @@ const MessageTray = new Lang.Class({
        }

        let index = this._notificationQueue.indexOf(notification);
+        notification.destroy();
        if (index != -1)
            this._notificationQueue.splice(index, 1);
    },
@@ -2089,6 +2028,7 @@ const MessageTray = new Lang.Class({

    hide: function() {
        this._traySummoned = false;
+        this.actor.set_hover(false);
        this._updateState();
    },

@@ -2155,21 +2095,25 @@ const MessageTray = new Lang.Class({
            this._grabHelper.addActor(corner.actor);
    },

-    _onNotificationHoverChanged: function() {
-        if (this._notificationWidget.hover == this._notificationHovered)
+    _onTrayHoverChanged: function() {
+        if (this.actor.hover == this._trayHovered)
            return;

-        this._notificationHovered = this._notificationWidget.hover;
-        if (this._notificationHovered) {
+        this._trayHovered = this.actor.hover;
+        if (this._trayHovered) {
            // No dwell inside notifications at the bottom of the screen
            this._cancelTrayDwell();

-            this._useLongerNotificationLeftTimeout = false;
-            if (this._notificationLeftTimeoutId) {
-                Mainloop.source_remove(this._notificationLeftTimeoutId);
-                this._notificationLeftTimeoutId = 0;
-                this._notificationLeftMouseX = -1;
-                this._notificationLeftMouseY = -1;
+            // Don't do anything if the one pixel area at the bottom is hovered over while the tray is hidden.
+            if (this._trayState == State.HIDDEN && this._notificationState == State.HIDDEN)
+                return;
+
+            this._useLongerTrayLeftTimeout = false;
+            if (this._trayLeftTimeoutId) {
+                Mainloop.source_remove(this._trayLeftTimeoutId);
+                this._trayLeftTimeoutId = 0;
+                this._trayLeftMouseX = -1;
+                this._trayLeftMouseY = -1;
                return;
            }

@@ -2178,32 +2122,32 @@ const MessageTray = new Lang.Class({
                    global.stage.get_actor_at_pos(Clutter.PickMode.ALL, this._showNotificationMouseX, this._showNotificationMouseY);
                this._showNotificationMouseX = -1;
                this._showNotificationMouseY = -1;
-                // Don't set this._pointerInNotification to true if the pointer was initially in the area where the notification
+                // Don't set this._pointerInTray to true if the pointer was initially in the area where the notification
                // popped up. That way we will not be expanding notifications that happen to pop up over the pointer
                // automatically. Instead, the user is able to expand the notification by mousing away from it and then
                // mousing back in. Because this is an expected action, we set the boolean flag that indicates that a longer
                // timeout should be used before popping down the notification.
                if (this.actor.contains(actorAtShowNotificationPosition)) {
-                    this._useLongerNotificationLeftTimeout = true;
+                    this._useLongerTrayLeftTimeout = true;
                    return;
                }
            }
-            this._pointerInNotification = true;
+            this._pointerInTray = true;
            this._updateState();
        } else {
            // We record the position of the mouse the moment it leaves the tray. These coordinates are used in
-            // this._onNotificationLeftTimeout() to determine if the mouse has moved far enough during the initial timeout for us
+            // this._onTrayLeftTimeout() to determine if the mouse has moved far enough during the initial timeout for us
            // to consider that the user intended to leave the tray and therefore hide the tray. If the mouse is still
            // close to its previous position, we extend the timeout once.
            let [x, y, mods] = global.get_pointer();
-            this._notificationLeftMouseX = x;
-            this._notificationLeftMouseY = y;
+            this._trayLeftMouseX = x;
+            this._trayLeftMouseY = y;

            // We wait just a little before hiding the message tray in case the user quickly moves the mouse back into it.
            // We wait for a longer period if the notification popped up where the mouse pointer was already positioned.
            // That gives the user more time to mouse away from the notification and mouse back in in order to expand it.
-            let timeout = this._useLongerNotificationLeftTimeout ? LONGER_HIDE_TIMEOUT * 1000 : HIDE_TIMEOUT * 1000;
-            this._notificationLeftTimeoutId = Mainloop.timeout_add(timeout, Lang.bind(this, this._onNotificationLeftTimeout));
+            let timeout = this._useLongerTrayLeftTimeout ? LONGER_HIDE_TIMEOUT * 1000 : HIDE_TIMEOUT * 1000;
+            this._trayLeftTimeoutId = Mainloop.timeout_add(timeout, Lang.bind(this, this._onTrayLeftTimeout));
        }
    },

@@ -2227,22 +2171,22 @@ const MessageTray = new Lang.Class({
        this._updateState();
    },

-    _onNotificationLeftTimeout: function() {
+    _onTrayLeftTimeout: function() {
        let [x, y, mods] = global.get_pointer();
        // We extend the timeout once if the mouse moved no further than MOUSE_LEFT_ACTOR_THRESHOLD to either side or up.
        // We don't check how far down the mouse moved because any point above the tray, but below the exit coordinate,
        // is close to the tray.
-        if (this._notificationLeftMouseX > -1 &&
-            y > this._notificationLeftMouseY - MOUSE_LEFT_ACTOR_THRESHOLD &&
-            x < this._notificationLeftMouseX + MOUSE_LEFT_ACTOR_THRESHOLD &&
-            x > this._notificationLeftMouseX - MOUSE_LEFT_ACTOR_THRESHOLD) {
-            this._notificationLeftMouseX = -1;
-            this._notificationLeftTimeoutId = Mainloop.timeout_add(LONGER_HIDE_TIMEOUT * 1000,
-                                                             Lang.bind(this, this._onNotificationLeftTimeout));
+        if (this._trayLeftMouseX > -1 &&
+            y > this._trayLeftMouseY - MOUSE_LEFT_ACTOR_THRESHOLD &&
+            x < this._trayLeftMouseX + MOUSE_LEFT_ACTOR_THRESHOLD &&
+            x > this._trayLeftMouseX - MOUSE_LEFT_ACTOR_THRESHOLD) {
+            this._trayLeftMouseX = -1;
+            this._trayLeftTimeoutId = Mainloop.timeout_add(LONGER_HIDE_TIMEOUT * 1000,
+                                                             Lang.bind(this, this._onTrayLeftTimeout));
        } else {
-            this._notificationLeftTimeoutId = 0;
-            this._useLongerNotificationLeftTimeout = false;
-            this._pointerInNotification = false;
+            this._trayLeftTimeoutId = 0;
+            this._useLongerTrayLeftTimeout = false;
+            this._pointerInTray = false;
            this._updateNotificationTimeout(0);
            this._updateState();
        }
@@ -2250,7 +2194,7 @@ const MessageTray = new Lang.Class({
    },

    _escapeTray: function() {
-        this._pointerInNotification = false;
+        this._pointerInTray = false;
        this._traySummoned = false;
        this._setClickedSummaryItem(null);
        this._updateNotificationTimeout(0);
@@ -2259,33 +2203,26 @@ const MessageTray = new Lang.Class({

    // All of the logic for what happens when occurs here; the various
    // event handlers merely update variables such as
-    // 'this._pointerInNotification', 'this._traySummoned', etc, and
+    // 'this._pointerInTray', 'this._traySummoned', etc, and
    // _updateState() figures out what (if anything) needs to be done
    // at the present time.
    _updateState: function() {
        // Notifications
-        let notificationQueue = this._notificationQueue.filter(function(n) {
-            return !n.acknowledged;
-        });
-        let hasNotifications = Main.sessionMode.hasNotifications;
-
-        this._notificationQueue = notificationQueue;
+        let notificationQueue = this._notificationQueue;
        let notificationUrgent = notificationQueue.length > 0 && notificationQueue[0].urgency == Urgency.CRITICAL;
        let notificationForFeedback = notificationQueue.length > 0 && notificationQueue[0].forFeedback;
        let notificationsLimited = this._busy || Main.layoutManager.bottomMonitor.inFullscreen;
-        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent || notificationForFeedback) && hasNotifications;
+        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent || notificationForFeedback) && Main.sessionMode.hasNotifications;
        let nextNotification = notificationQueue.length > 0 ? notificationQueue[0] : null;
-        let notificationPinned = this._pointerInNotification && !this._notificationRemoved;
+        let notificationPinned = this._pointerInTray && !this._notificationRemoved;
        let notificationExpanded = this._notification && this._notification.expanded;
        let notificationExpired = this._notificationTimeoutId == 0 &&
                                  !(this._notification && this._notification.urgency == Urgency.CRITICAL) &&
                                  !(this._notification && this._notification.focused) &&
-                                  !this._pointerInNotification;
-        let notificationLockedOut = !hasNotifications && this._notification;
-        let notificationMustClose = (this._notificationRemoved || notificationLockedOut ||
-                                     (notificationExpired && this._userActiveWhileNotificationShown) ||
-                                     this._notificationClosed || this._traySummoned);
-        let canShowNotification = notificationsPending && this._trayState == State.HIDDEN && !this._traySummoned;
+                                  !this._pointerInTray;
+        let notificationLockedOut = !Main.sessionMode.hasNotifications && this._notification;
+        let notificationMustClose = this._notificationRemoved || notificationLockedOut || (notificationExpired && this._userActiveWhileNotificationShown) || this._notificationClosed;
+        let canShowNotification = notificationsPending && this._trayState == State.HIDDEN;

        if (this._notificationState == State.HIDDEN) {
            if (canShowNotification)
@@ -2299,6 +2236,12 @@ const MessageTray = new Lang.Class({
                this._ensureNotificationFocused();
        }

+        let notificationsVisible = this._notificationState != State.HIDDEN;
+        let notificationsDone = !notificationsVisible && !notificationsPending;
+
+        let mustHideTray = ((notificationsPending && notificationUrgent)
+                           || notificationsVisible || !Main.sessionMode.hasNotifications);
+
        // Summary notification
        let haveClickedSummaryItem = this._clickedSummaryItem != null;
        let summarySourceIsMainNotificationSource = (haveClickedSummaryItem && this._notification &&
@@ -2323,7 +2266,7 @@ const MessageTray = new Lang.Class({
            if (haveClickedSummaryItem && !summarySourceIsMainNotificationSource && canShowSummaryBoxPointer && !requestedNotificationStackIsEmpty)
                this._showSummaryBoxPointer();
        } else if (this._summaryBoxPointerState == State.SHOWN) {
-            if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || !hasNotifications) {
+            if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || mustHideTray) {
                this._hideSummaryBoxPointer();
                if (wrongSummaryBoxPointer)
                    this._showSummaryBoxPointer();
@@ -2333,7 +2276,7 @@ const MessageTray = new Lang.Class({
        // Tray itself
        let trayIsVisible = (this._trayState == State.SHOWING ||
                             this._trayState == State.SHOWN);
-        let trayShouldBeVisible = this._traySummoned && !this._keyboardVisible && hasNotifications;
+        let trayShouldBeVisible = this._traySummoned && !this._keyboardVisible && !mustHideTray;
        if (!trayIsVisible && trayShouldBeVisible)
            trayShouldBeVisible = this._showTray();
        else if (trayIsVisible && !trayShouldBeVisible)
@@ -2377,6 +2320,7 @@ const MessageTray = new Lang.Class({

    _showTray: function() {
        if (!this._grabHelper.grab({ actor: this.actor,
+                                     modal: true,
                                     onUngrab: Lang.bind(this, this._escapeTray) })) {
            this._traySummoned = false;
            return false;
@@ -2389,8 +2333,7 @@ const MessageTray = new Lang.Class({
                      transition: 'easeOutQuad'
                    });

-        for (let i = 0; i < this._lightboxes.length; i++)
-            this._lightboxes[i].show();
+        this._lightbox.show();

        return true;
    },
@@ -2413,7 +2356,7 @@ const MessageTray = new Lang.Class({

        if (this._desktopClone)
            this._desktopClone.destroy();
-        let cloneSource = Main.overview.visible ? Main.layoutManager.overviewGroup : global.window_group;
+        let cloneSource = Main.overview.visible ? global.overlay_group : global.window_group;
        this._desktopClone = new Clutter.Clone({ source: cloneSource,
                                                 clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
        Main.uiGroup.insert_child_above(this._desktopClone, cloneSource);
@@ -2445,8 +2388,7 @@ const MessageTray = new Lang.Class({
        // which would happen if GrabHelper ungrabbed for us.
        // This is a no-op in that case.
        this._grabHelper.ungrab({ actor: this.actor });
-        for (let i = 0; i < this._lightboxes.length; i++)
-            this._lightboxes[i].hide();
+        this._lightbox.hide();
    },

    _hideDesktopClone: function() {
@@ -2495,7 +2437,7 @@ const MessageTray = new Lang.Class({
        let [x, y, mods] = global.get_pointer();
        // We save the position of the mouse at the time when we started showing the notification
        // in order to determine if the notification popped up under it. We make that check if
-        // the user starts moving the mouse and _onNotificationHoverChanged() gets called. We don't
+        // the user starts moving the mouse and _onTrayHoverChanged() gets called. We don't
        // expand the notification if it just happened to pop up under the mouse unless the user
        // explicitly mouses away from it and then mouses back in.
        this._showNotificationMouseX = x;
@@ -2557,13 +2499,13 @@ const MessageTray = new Lang.Class({

    _notificationTimeout: function() {
        let [x, y, mods] = global.get_pointer();
-        if (y > this._lastSeenMouseY + 10 && !this._notificationHovered) {
+        if (y > this._lastSeenMouseY + 10 && !this.actor.hover) {
            // The mouse is moving towards the notification, so don't
            // hide it yet. (We just create a new timeout (and destroy
            // the old one) each time because the bookkeeping is
            // simpler.)
            this._updateNotificationTimeout(1000);
-        } else if (this._useLongerNotificationLeftTimeout && !this._notificationLeftTimeoutId &&
+        } else if (this._useLongerTrayLeftTimeout && !this._trayLeftTimeoutId &&
                  (x != this._lastSeenMouseX || y != this._lastSeenMouseY)) {
            // Refresh the timeout if the notification originally
            // popped up under the pointer, and the pointer is hovering
@@ -2580,7 +2522,19 @@ const MessageTray = new Lang.Class({
    },

    _hideNotification: function() {
-        this._notificationFocusGrabber.ungrabFocus();
+        // HACK!
+        // There seems to be a reentrancy issue in calling .ungrab() here,
+        // which causes _updateState to be called before _notificationState
+        // becomes HIDING. That hides the notification again, nullifying the
+        // object but not setting _notificationState (and that's the weird part)
+        // As then _notificationState is stuck into SHOWN but _notification
+        // is null, every new _updateState fails and the message tray is
+        // lost forever.
+        //
+        // See more at https://bugzilla.gnome.org/show_bug.cgi?id=683986
+        this._notificationState = State.HIDING;
+
+        this._grabHelper.ungrab({ actor: this._notification.actor });

        if (this._notificationExpandedId) {
            this._notification.disconnect(this._notificationExpandedId);
@@ -2595,12 +2549,12 @@ const MessageTray = new Lang.Class({
            this._notificationUnfocusedId = 0;
        }

-        this._useLongerNotificationLeftTimeout = false;
-        if (this._notificationLeftTimeoutId) {
-            Mainloop.source_remove(this._notificationLeftTimeoutId);
-            this._notificationLeftTimeoutId = 0;
-            this._notificationLeftMouseX = -1;
-            this._notificationLeftMouseY = -1;
+        this._useLongerTrayLeftTimeout = false;
+        if (this._trayLeftTimeoutId) {
+            Mainloop.source_remove(this._trayLeftTimeoutId);
+            this._trayLeftTimeoutId = 0;
+            this._trayLeftMouseX = -1;
+            this._trayLeftMouseY = -1;
        }

        if (this._notificationRemoved) {
@@ -2630,9 +2584,14 @@ const MessageTray = new Lang.Class({
        if (notification.isTransient)
            notification.destroy(NotificationDestroyedReason.EXPIRED);

-        this._closeButton.hide();
-        this._pointerInNotification = false;
        this._notificationRemoved = false;
+        this._closeButton.hide();
+        this._pointerInTray = false;
+
+        // Clutter will send a leave-event the next time the mouse
+        // moves, but we need to set this here now to update the
+        // state machine.
+        this.actor.hover = false;
        this._notificationBin.child = null;
        this._notificationWidget.hide();
    },
@@ -2678,7 +2637,8 @@ const MessageTray = new Lang.Class({
    },

    _ensureNotificationFocused: function() {
-        this._notificationFocusGrabber.grabFocus();
+        this._grabHelper.grab({ actor: this._notification.actor,
+                                grabFocus: true });
    },

    _onSourceDoneDisplayingContent: function(source, closeTray) {
@@ -2691,34 +2651,38 @@ const MessageTray = new Lang.Class({
    },

    _showSummaryBoxPointer: function() {
-        let child;
-        let summaryItem = this._clickedSummaryItem;
-        if (this._clickedSummaryItemMouseButton == 1) {
-            // Acknowledge all our notifications
-            summaryItem.source.notifications.forEach(function(n) { n.acknowledged = true; });
-
-            child = summaryItem.notificationStackWidget;
-
-            let closeButton = summaryItem.closeButton;
-            closeButton.show();
-            summaryItem.prepareNotificationStackForShowing();
-        } else if (this._clickedSummaryItemMouseButton == 3) {
-            child = summaryItem.rightClickMenu;
-        }
-
-        // If the user clicked the middle mouse button, or the item
-        // doesn't have a right-click menu, do nothing.
-        if (!child)
-            return;
-
-        this._summaryBoxPointerItem = summaryItem;
+        this._summaryBoxPointerItem = this._clickedSummaryItem;
        this._summaryBoxPointerContentUpdatedId = this._summaryBoxPointerItem.connect('content-updated',
                                                                                      Lang.bind(this, this._onSummaryBoxPointerContentUpdated));
        this._sourceDoneDisplayingId = this._summaryBoxPointerItem.source.connect('done-displaying-content',
                                                                                  Lang.bind(this, this._onSourceDoneDisplayingContent));

-        this._summaryBoxPointer.bin.child = child;
+        let hasRightClickMenu = this._summaryBoxPointerItem.rightClickMenu != null;
+        if (this._clickedSummaryItemMouseButton == 1 || !hasRightClickMenu) {
+            let newQueue = [];
+            for (let i = 0; i < this._notificationQueue.length; i++) {
+                let notification = this._notificationQueue[i];
+                let sameSource = this._summaryBoxPointerItem.source == notification.source;
+                if (sameSource)
+                    notification.acknowledged = true;
+                else
+                    newQueue.push(notification);
+            }
+            this._notificationQueue = newQueue;
+
+            this._summaryBoxPointer.bin.child = this._summaryBoxPointerItem.notificationStackWidget;
+
+            let closeButton = this._summaryBoxPointerItem.closeButton;
+            closeButton.show();
+            this._summaryBoxPointerCloseClickedId = closeButton.connect('clicked', Lang.bind(this, this._hideSummaryBoxPointer));
+            this._summaryBoxPointerItem.prepareNotificationStackForShowing();
+        } else if (this._clickedSummaryItemMouseButton == 3) {
+            this._summaryBoxPointer.bin.child = this._clickedSummaryItem.rightClickMenu;
+            this._summaryBoxPointerCloseClickedId = 0;
+        }
+
        this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
+                                grabFocus: true,
                                onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });

        this._summaryBoxPointer.actor.opacity = 0;
@@ -2797,7 +2761,10 @@ const MessageTray = new Lang.Class({
            this._summaryBoxPointerItem.disconnect(this._summaryBoxPointerContentUpdatedId);
            this._summaryBoxPointerContentUpdatedId = 0;
        }
-
+        if (this._summaryBoxPointerCloseClickedId != 0) {
+            this._summaryBoxPointerItem.closeButton.disconnect(this._summaryBoxPointerCloseClickedId);
+            this._summaryBoxPointerCloseClickedId = 0;
+        }
        if (this._sourceDoneDisplayingId) {
            this._summaryBoxPointerItem.source.disconnect(this._sourceDoneDisplayingId);
            this._sourceDoneDisplayingId = 0;
@@ -2824,14 +2791,17 @@ const MessageTray = new Lang.Class({
        this._summaryBoxPointerState = State.HIDDEN;
        this._summaryBoxPointer.bin.child = null;

+        let sourceNotificationStackDoneShowing = null;
        if (doneShowingNotificationStack) {
-            let source = this._summaryBoxPointerItem.source;
-
            this._summaryBoxPointerItem.doneShowingNotificationStack();
-            this._summaryBoxPointerItem = null;
+            sourceNotificationStackDoneShowing = this._summaryBoxPointerItem.source;
+        }

-            if (source.isTransient && !this._reNotifyAfterHideNotification)
-                source.destroy(NotificationDestroyedReason.EXPIRED);
+        this._summaryBoxPointerItem = null;
+
+        if (sourceNotificationStackDoneShowing) {
+            if (sourceNotificationStackDoneShowing.isTransient && !this._reNotifyAfterHideNotification)
+                sourceNotificationStackDoneShowing.destroy(NotificationDestroyedReason.EXPIRED);
            if (this._reNotifyAfterHideNotification) {
                this._onNotify(this._reNotifyAfterHideNotification.source, this._reNotifyAfterHideNotification);
                this._reNotifyAfterHideNotification = null;
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -14,7 +14,6 @@ const Atk = imports.gi.Atk;

 const Params = imports.misc.params;

-const Animation = imports.ui.animation;
 const Layout = imports.ui.layout;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
@@ -79,8 +78,9 @@ const ModalDialog = new Lang.Class({

        this.dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog',
                                               vertical:    true });
-        if (params.styleClass != null)
+        if (params.styleClass != null) {
            this.dialogLayout.add_style_class_name(params.styleClass);
+        }

        if (!this._shellReactive) {
            this._lightbox = new Lightbox.Lightbox(this._group,
@@ -187,8 +187,10 @@ const ModalDialog = new Lang.Class({
    },

    placeSpinner: function(layoutInfo) {
+        /* This is here because of recursive imports */
+        const Panel = imports.ui.panel;
        let spinnerIcon = global.datadir + '/theme/process-working.svg';
-        this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
+        this._workSpinner = new Panel.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
        this._workSpinner.actor.opacity = 0;
        this._workSpinner.actor.show();

@@ -356,9 +358,8 @@ const ModalDialog = new Lang.Class({
        if (this._savedKeyFocus) {
            this._savedKeyFocus.grab_key_focus();
            this._savedKeyFocus = null;
-        } else {
+        } else
            this._initialKeyFocus.grab_key_focus();
-        }

        if (!this._shellReactive)
            this._eventBlocker.lower_bottom();
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -717,8 +717,8 @@ const Source = new Lang.Class({
            this.notifications.length > 0)
            return false;

-        let id = global.stage.connect('deactivate', Lang.bind(this, function () {
-            global.stage.disconnect(id);
+        let id = global.connect('notify::stage-input-mode', Lang.bind(this, function () {
+            global.disconnect(id);
            this.trayIcon.click(event);
        }));

--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -107,7 +107,7 @@ const OsdWindow = new Lang.Class({
                                   Lang.bind(this, this._monitorsChanged));
        this._monitorsChanged();

-        Main.uiGroup.add_child(this.actor);
+        Main.layoutManager.addChrome(this.actor, { affectsInputRegion: false });
    },

    setIcon: function(icon) {
@@ -158,11 +158,11 @@ const OsdWindow = new Lang.Class({
            return;

        Mainloop.source_remove(this._hideTimeoutId);
+        this._hideTimeoutId = 0;
        this._hide();
    },

    _hide: function() {
-        this._hideTimeoutId = 0;
        Tweener.addTween(this.actor,
                         { opacity: 0,
                           time: FADE_TIME,
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -11,6 +11,7 @@ const Shell = imports.gi.Shell;
 const Gdk = imports.gi.Gdk;

 const Background = imports.ui.background;
+const Dash = imports.ui.dash;
 const DND = imports.ui.dnd;
 const LayoutManager = imports.ui.layout;
 const Main = imports.ui.main;
@@ -19,6 +20,7 @@ const OverviewControls = imports.ui.overviewControls;
 const Panel = imports.ui.panel;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
+const ViewSelector = imports.ui.viewSelector;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;

 // Time for initial animation going into Overview mode
@@ -115,7 +117,7 @@ const Overview = new Lang.Class({
        let monitor = Main.layoutManager.primaryMonitor;

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

        let layout = new Clutter.BinLayout();
        this._stack = new Clutter.Actor({ layout_manager: layout });
@@ -131,8 +133,17 @@ const Overview = new Lang.Class({
                                            y_expand: true });
        this._overview._delegate = this;

+        this._groupStack = new St.Widget({ layout_manager: new Clutter.BinLayout(),
+                                           x_expand: true, y_expand: true,
+                                           clip_to_allocation: true });
+        this._group = new St.BoxLayout({ name: 'overview-group',
+                                         reactive: true,
+                                         x_expand: true, y_expand: true });
+        this._groupStack.add_actor(this._group);
+
        this._backgroundGroup = new Meta.BackgroundGroup();
-        Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
+        global.overlay_group.add_child(this._backgroundGroup);
+        this._backgroundGroup.hide();
        this._bgManagers = [];

        this._activationTime = 0;
@@ -146,13 +157,14 @@ const Overview = new Lang.Class({
        // During transitions, we raise this to the top to avoid having the overview
        // area be reactive; it causes too many issues such as double clicks on
        // Dash elements, or mouseover handlers in the workspaces.
-        this._coverPane = new Clutter.Actor({ opacity: 0,
-                                              reactive: true });
-        this._stack.add_actor(this._coverPane);
+        this._coverPane = new Clutter.Rectangle({ opacity: 0,
+                                                  reactive: true });
+        this._overview.add_actor(this._coverPane);
        this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return true; }));

+        this._stack.hide();
        this._stack.add_actor(this._overview);
-        Main.layoutManager.overviewGroup.add_child(this._stack);
+        global.overlay_group.add_actor(this._stack);

        this._coverPane.hide();

@@ -165,6 +177,7 @@ const Overview = new Lang.Class({
        Main.xdndHandler.connect('drag-end', Lang.bind(this, this._onDragEnd));

        global.screen.connect('restacked', Lang.bind(this, this._onRestacked));
+        this._group.connect('scroll-event', Lang.bind(this, this._onScrollEvent));

        this._windowSwitchTimeoutId = 0;
        this._windowSwitchTimestamp = 0;
@@ -263,13 +276,28 @@ const Overview = new Lang.Class({
        this._overview.add_actor(this._searchEntryBin);

        // Create controls
-        this._controls = new OverviewControls.ControlsManager(this._searchEntry);
-        this._dash = this._controls.dash;
-        this._viewSelector = this._controls.viewSelector;
+        this._dash = new Dash.Dash();
+        this._viewSelector = new ViewSelector.ViewSelector(this._searchEntry,
+                                                           this._dash.showAppsButton);
+        this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
+        this._controls = new OverviewControls.ControlsManager(this._dash,
+                                                              this._thumbnailsBox,
+                                                              this._viewSelector);
+
+        this._controls.dashActor.x_align = Clutter.ActorAlign.START;
+        this._controls.dashActor.y_expand = true;
+
+        // Put the dash in a separate layer to allow content to be centered
+        this._groupStack.add_actor(this._controls.dashActor);
+
+        // Pack all the actors into the group
+        this._group.add_actor(this._controls.dashSpacer);
+        this._group.add(this._viewSelector.actor, { x_fill: true,
+                                                    expand: true });
+        this._group.add_actor(this._controls.thumbnailsActor);

        // Add our same-line elements after the search entry
-        this._overview.add(this._controls.actor, { y_fill: true, expand: true });
-        this._controls.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+        this._overview.add(this._groupStack, { y_fill: true, expand: true });

        this._stack.add_actor(this._controls.indicatorActor);

@@ -462,17 +490,16 @@ const Overview = new Lang.Class({
    // show:
    //
    // Animates the overview visible and grabs mouse and keyboard input
-    show: function() {
+    show : function() {
        if (this.isDummy)
            return;
        if (this._shown)
            return;
        this._shown = true;

-        if (!this._syncGrab())
+        if (!this._syncInputMode())
            return;

-        Main.layoutManager.showOverview();
        this._animateVisible();
    },

@@ -522,6 +549,8 @@ const Overview = new Lang.Class({
        //
        // Disable unredirection while in the overview
        Meta.disable_unredirect_for_screen(global.screen);
+        this._stack.show();
+        this._backgroundGroup.show();
        this._viewSelector.show();

        this._stack.opacity = 0;
@@ -562,7 +591,7 @@ const Overview = new Lang.Class({
        this._animateNotVisible();

        this._shown = false;
-        this._syncGrab();
+        this._syncInputMode();
    },

    toggle: function() {
@@ -593,8 +622,8 @@ const Overview = new Lang.Class({

    //// Private methods ////

-    _syncGrab: function() {
-        // We delay grab changes during animation so that when removing the
+    _syncInputMode: function() {
+        // We delay input mode changes during animation so that when removing the
        // overview we don't have a problem with the release of a press/release
        // going to an application.
        if (this.animationInProgress)
@@ -612,12 +641,16 @@ const Overview = new Lang.Class({
                        return false;
                    }
                }
+            } else {
+                global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
            }
        } else {
            if (this._modal) {
                Main.popModal(this._overview);
                this._modal = false;
            }
+            else if (global.stage_input_mode == Shell.StageInputMode.FULLSCREEN)
+                global.stage_input_mode = Shell.StageInputMode.NORMAL;
        }
        return true;
    },
@@ -656,7 +689,7 @@ const Overview = new Lang.Class({
        if (!this._shown)
            this._animateNotVisible();

-        this._syncGrab();
+        this._syncInputMode();
        global.sync_pointer();
    },

@@ -666,19 +699,20 @@ const Overview = new Lang.Class({

        this._viewSelector.hide();
        this._desktopFade.hide();
-        this._coverPane.hide();
+        this._backgroundGroup.hide();
+        this._stack.hide();

        this.visible = false;
        this.animationInProgress = false;

+        this._coverPane.hide();
+
        this.emit('hidden');
        // Handle any calls to show* while we were hiding
        if (this._shown)
            this._animateVisible();
-        else
-            Main.layoutManager.hideOverview();

-        this._syncGrab();
+        this._syncInputMode();

        // Fake a pointer event if requested
        if (this._needsFakePointerEvent) {
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -1,18 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const GObject = imports.gi.GObject;
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

-const Dash = imports.ui.dash;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 const ViewSelector = imports.ui.viewSelector;
-const WorkspaceThumbnail = imports.ui.workspaceThumbnail;

 const SIDE_CONTROLS_ANIMATION_TIME = 0.16;

@@ -247,7 +244,6 @@ const ThumbnailsSlider = new Lang.Class({

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

    _getAlwaysZoomOut: function() {
@@ -273,11 +269,6 @@ const ThumbnailsSlider = new Lang.Class({
        return alwaysZoomOut;
    },

-    getNonExpandedWidth: function() {
-        let child = this.actor.get_first_child();
-        return child.get_theme_node().get_length('visible-width');
-    },
-
    getSlide: function() {
        if (!this.visible)
            return 0;
@@ -289,16 +280,18 @@ const ThumbnailsSlider = new Lang.Class({
        let child = this.actor.get_first_child();
        let preferredHeight = child.get_preferred_height(-1)[1];
        let expandedWidth = child.get_preferred_width(preferredHeight)[1];
+        let visibleWidth = child.get_theme_node().get_length('visible-width');

-        return this.getNonExpandedWidth() / expandedWidth;
+        return visibleWidth / expandedWidth;
    },

    getVisibleWidth: function() {
        let alwaysZoomOut = this._getAlwaysZoomOut();
        if (alwaysZoomOut)
            return this.parent();
-        else
-            return this.getNonExpandedWidth();
+
+        let child = this.actor.get_first_child();
+        return child.get_theme_node().get_length('visible-width');
    }
 });

@@ -316,10 +309,6 @@ const DashSlider = new Lang.Class({
        // available allocation
        this._dash.actor.x_expand = true;
        this._dash.actor.y_expand = true;
-
-        this.actor.x_align = Clutter.ActorAlign.START;
-        this.actor.y_expand = true;
-
        this.actor.add_actor(this._dash.actor);

        this._dash.connect('icon-size-changed', Lang.bind(this, this.updateSlide));
@@ -490,77 +479,39 @@ const MessagesIndicator = new Lang.Class({
 const ControlsManager = new Lang.Class({
    Name: 'ControlsManager',

-    _init: function(searchEntry) {
-        this.dash = new Dash.Dash();
-        this._dashSlider = new DashSlider(this.dash);
-        this._dashSpacer = new DashSpacer();
-        this._dashSpacer.setDashActor(this._dashSlider.actor);
+    _init: function(dash, thumbnails, viewSelector) {
+        this._dashSlider = new DashSlider(dash);
+        this.dashActor = this._dashSlider.actor;
+        this.dashSpacer = new DashSpacer();
+        this.dashSpacer.setDashActor(this.dashActor);

-        this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
-        this._thumbnailsSlider = new ThumbnailsSlider(this._thumbnailsBox);
+        this._thumbnailsSlider = new ThumbnailsSlider(thumbnails);
+        this.thumbnailsActor = this._thumbnailsSlider.actor;

-        this.viewSelector = new ViewSelector.ViewSelector(searchEntry,
-                                                          this.dash.showAppsButton);
-        this.viewSelector.connect('page-changed', Lang.bind(this, this._setVisibility));
-        this.viewSelector.connect('page-empty', Lang.bind(this, this._onPageEmpty));
-
-        this._indicator = new MessagesIndicator(this.viewSelector);
+        this._indicator = new MessagesIndicator(viewSelector);
        this.indicatorActor = this._indicator.actor;

-        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
-                                     reactive: true,
-                                     x_expand: true, y_expand: true,
-                                     clip_to_allocation: true });
-        this._group = new St.BoxLayout({ name: 'overview-group',
-                                        x_expand: true, y_expand: true });
-        this.actor.add_actor(this._group);
-
-        this.actor.add_actor(this._dashSlider.actor);
-
-        this._group.add_actor(this._dashSpacer);
-        this._group.add(this.viewSelector.actor, { x_fill: true,
-                                                   expand: true });
-        this._group.add_actor(this._thumbnailsSlider.actor);
-
-        this._group.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesGeometry));
+        this._viewSelector = viewSelector;
+        this._viewSelector.connect('page-changed', Lang.bind(this, this._setVisibility));
+        this._viewSelector.connect('page-empty', Lang.bind(this, this._onPageEmpty));

        Main.overview.connect('showing', Lang.bind(this, this._updateSpacerVisibility));
        Main.overview.connect('item-drag-begin', Lang.bind(this,
            function() {
-                let activePage = this.viewSelector.getActivePage();
+                let activePage = this._viewSelector.getActivePage();
                if (activePage != ViewSelector.ViewPage.WINDOWS)
-                    this.viewSelector.fadeHalf();
+                    this._viewSelector.fadeHalf();
            }));
        Main.overview.connect('item-drag-end', Lang.bind(this,
            function() {
-                this.viewSelector.fadeIn();
+                this._viewSelector.fadeIn();
            }));
        Main.overview.connect('item-drag-cancelled', Lang.bind(this,
            function() {
-                this.viewSelector.fadeIn();
+                this._viewSelector.fadeIn();
            }));
    },

-    _updateWorkspacesGeometry: function() {
-        let [x, y] = this.actor.get_transformed_position();
-        let [width, height] = this.actor.get_transformed_size();
-        let geometry = { x: x, y: y, width: width, height: height };
-
-        let spacing = this.actor.get_theme_node().get_length('spacing');
-        let dashWidth = this._dashSlider.getVisibleWidth() + spacing;
-        let thumbnailsWidth = this._thumbnailsSlider.getNonExpandedWidth() + spacing;
-
-        geometry.width -= dashWidth;
-        geometry.width -= thumbnailsWidth;
-
-        if (this.actor.get_text_direction() == Clutter.TextDirection.LTR)
-            geometry.x += dashWidth;
-        else
-            geometry.x += thumbnailsWidth;
-
-        this.viewSelector.setWorkspacesFullGeometry(geometry);
-    },
-
    _setVisibility: function() {
        // Ignore the case when we're leaving the overview, since
        // actors will be made visible again when entering the overview
@@ -570,7 +521,7 @@ const ControlsManager = new Lang.Class({
            (Main.overview.animationInProgress && !Main.overview.visibleTarget))
            return;

-        let activePage = this.viewSelector.getActivePage();
+        let activePage = this._viewSelector.getActivePage();
        let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS ||
                           activePage == ViewSelector.ViewPage.APPS);
        let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
@@ -590,8 +541,8 @@ const ControlsManager = new Lang.Class({
        if (Main.overview.animationInProgress && !Main.overview.visibleTarget)
            return;

-        let activePage = this.viewSelector.getActivePage();
-        this._dashSpacer.visible = (activePage == ViewSelector.ViewPage.WINDOWS);
+        let activePage = this._viewSelector.getActivePage();
+        this.dashSpacer.visible = (activePage == ViewSelector.ViewPage.WINDOWS);
    },

    _onPageEmpty: function() {
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -15,14 +15,12 @@ const Signals = imports.signals;
 const Atk = imports.gi.Atk;


-const Animation = imports.ui.animation;
 const Config = imports.misc.config;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const DND = imports.ui.dnd;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
-const RemoteMenu = imports.ui.remoteMenu;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

@@ -30,6 +28,7 @@ const PANEL_ICON_SIZE = 24;

 const BUTTON_DND_ACTIVATION_TIMEOUT = 250;

+const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const SPINNER_ANIMATION_TIME = 0.2;

 // To make sure the panel corners blend nicely with the panel,
@@ -75,6 +74,81 @@ function _unpremultiply(color) {
                               blue: blue, alpha: color.alpha });
 };

+const Animation = new Lang.Class({
+    Name: 'Animation',
+
+    _init: function(filename, width, height, speed) {
+        this.actor = new St.Bin();
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+        this._speed = speed;
+
+        this._isLoaded = false;
+        this._isPlaying = false;
+        this._timeoutId = 0;
+        this._frame = 0;
+        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
+                                                                            Lang.bind(this, this._animationsLoaded));
+        this.actor.set_child(this._animations);
+    },
+
+    play: function() {
+        if (this._isLoaded && this._timeoutId == 0) {
+            if (this._frame == 0)
+                this._showFrame(0);
+
+            this._timeoutId = Mainloop.timeout_add(this._speed, Lang.bind(this, this._update));
+        }
+
+        this._isPlaying = true;
+    },
+
+    stop: function() {
+        if (this._timeoutId > 0) {
+            Mainloop.source_remove(this._timeoutId);
+            this._timeoutId = 0;
+        }
+
+        this._isPlaying = false;
+    },
+
+    _showFrame: function(frame) {
+        let oldFrameActor = this._animations.get_child_at_index(this._frame);
+        if (oldFrameActor)
+            oldFrameActor.hide();
+
+        this._frame = (frame % this._animations.get_n_children());
+
+        let newFrameActor = this._animations.get_child_at_index(this._frame);
+        if (newFrameActor)
+            newFrameActor.show();
+    },
+
+    _update: function() {
+        this._showFrame(this._frame + 1);
+        return true;
+    },
+
+    _animationsLoaded: function() {
+        this._isLoaded = true;
+
+        if (this._isPlaying)
+            this.play();
+    },
+
+    _onDestroy: function() {
+        this.stop();
+    }
+});
+
+const AnimatedIcon = new Lang.Class({
+    Name: 'AnimatedIcon',
+    Extends: Animation,
+
+    _init: function(filename, size) {
+        this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+    }
+});
+
 const TextShadower = new Lang.Class({
    Name: 'TextShadower',

@@ -285,7 +359,7 @@ const AppMenuButton = new Lang.Class({
        if (!success || this._spinnerIcon == icon)
            return;
        this._spinnerIcon = icon;
-        this._spinner = new Animation.AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);
+        this._spinner = new AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);
        this._container.add_actor(this._spinner.actor);
        this._spinner.actor.hide();
        this._spinner.actor.lower_bottom();
@@ -452,7 +526,7 @@ const AppMenuButton = new Lang.Class({
            // If the app has just lost focus to the panel, pretend
            // nothing happened; otherwise you can't keynav to the
            // app menu.
-            if (global.stage.key_focus != null)
+            if (global.stage_input_mode == Shell.StageInputMode.FOCUSED)
                return;
        }
        this._sync();
@@ -497,14 +571,9 @@ const AppMenuButton = new Lang.Class({
        }

        if (targetApp == this._targetApp) {
-            if (targetApp &&
-                targetApp.get_state() != Shell.AppState.STARTING &&
-                targetApp.get_state() != Shell.AppState.BUSY) {
+            if (targetApp && targetApp.get_state() != Shell.AppState.STARTING) {
                this.stopAnimation();
                this._maybeSetMenu();
-            } else if (targetApp &&
-                       targetApp.get_state() == Shell.AppState.BUSY) {
-                this.startAnimation();
            }
            return;
        }
@@ -535,8 +604,7 @@ const AppMenuButton = new Lang.Class({
        this._syncIcon();
        this._iconBox.show();

-        if (targetApp.get_state() == Shell.AppState.STARTING ||
-            targetApp.get_state() == Shell.AppState.BUSY)
+        if (targetApp.get_state() == Shell.AppState.STARTING)
            this.startAnimation();
        else
            this._maybeSetMenu();
@@ -548,11 +616,11 @@ const AppMenuButton = new Lang.Class({
        let menu;

        if (this._targetApp.action_group && this._targetApp.menu) {
-            if (this.menu instanceof RemoteMenu.RemoteMenu &&
+            if (this.menu instanceof PopupMenu.RemoteMenu &&
                this.menu.actionGroup == this._targetApp.action_group)
                return;

-            menu = new RemoteMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
+            menu = new PopupMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
            menu.connect('activate', Lang.bind(this, function() {
                let win = this._targetApp.get_windows()[0];
                win.check_alive(global.get_current_time());
@@ -858,7 +926,7 @@ const PANEL_ITEM_IMPLEMENTATIONS = {
    'lockScreen': imports.ui.status.lockScreenMenu.Indicator,
    'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
    'powerMenu': imports.gdm.powerMenu.PowerMenuButton,
-    'system': imports.ui.status.system.Indicator,
+    'userMenu': imports.ui.userMenu.UserMenuButton
 };

 if (Config.HAVE_BLUETOOTH)
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -110,7 +110,6 @@ const Button = new Lang.Class({

        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)
            this.menu = new PopupMenu.PopupDummyMenu(this.actor);
@@ -184,18 +183,7 @@ const Button = new Lang.Class({
            return false;
    },

-    _onVisibilityChanged: function() {
-        if (!this.menu)
-            return;
-
-        if (!this.actor.visible)
-            this.menu.close();
-    },
-
    _onMenuKeyPress: function(actor, event) {
-        if (global.focus_manager.navigate_from_event(event))
-            return true;
-
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
            let group = global.focus_manager.get_group(this.actor);
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
--- a/js/ui/remoteMenu.js
+++ b/js/ui/remoteMenu.js
@@ -1,199 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Atk = imports.gi.Atk;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const ShellMenu = imports.gi.ShellMenu;
-const St = imports.gi.St;
-
-const PopupMenu = imports.ui.popupMenu;
-
-function stripMnemonics(label) {
-    if (!label)
-        return '';
-
-    // remove all underscores that are not followed by another underscore
-    return label.replace(/_([^_])/, '$1');
-}
-
-function _insertItem(menu, trackerItem, position) {
-    let mapper;
-
-    if (trackerItem.get_is_separator())
-        mapper = new RemoteMenuSeparatorItemMapper(trackerItem);
-    else if (trackerItem.get_has_submenu())
-        mapper = new RemoteMenuSubmenuItemMapper(trackerItem);
-    else
-        mapper = new RemoteMenuItemMapper(trackerItem);
-
-    let item = mapper.menuItem;
-    menu.addMenuItem(item, position);
-}
-
-function _removeItem(menu, position) {
-    let items = menu._getMenuItems();
-    items[position].destroy();
-}
-
-const RemoteMenuSeparatorItemMapper = new Lang.Class({
-    Name: 'RemoteMenuSeparatorItemMapper',
-
-    _init: function(trackerItem) {
-        this._trackerItem = trackerItem;
-        this.menuItem = new PopupMenu.PopupSeparatorMenuItem();
-        this._trackerItem.connect('notify::label', Lang.bind(this, this._updateLabel));
-        this._updateLabel();
-
-        this.menuItem.connect('destroy', function() {
-            trackerItem.run_dispose();
-        });
-    },
-
-    _updateLabel: function() {
-        this.menuItem.label.text = stripMnemonics(this._trackerItem.label);
-    },
-});
-
-const RequestSubMenu = new Lang.Class({
-    Name: 'RequestSubMenu',
-    Extends: PopupMenu.PopupSubMenuMenuItem,
-
-    _init: function() {
-        this.parent('');
-        this._requestOpen = false;
-    },
-
-    _setOpenState: function(open) {
-        this.emit('request-open', open);
-        this._requestOpen = open;
-    },
-
-    _getOpenState: function() {
-        return this._requestOpen;
-    },
-});
-
-const RemoteMenuSubmenuItemMapper = new Lang.Class({
-    Name: 'RemoteMenuSubmenuItemMapper',
-
-    _init: function(trackerItem) {
-        this._trackerItem = trackerItem;
-        this.menuItem = new RequestSubMenu();
-        this._trackerItem.connect('notify::label', Lang.bind(this, this._updateLabel));
-        this._updateLabel();
-
-        this._tracker = Shell.MenuTracker.new_for_item_submenu(this._trackerItem,
-                                                               _insertItem.bind(null, this.menuItem.menu),
-                                                               _removeItem.bind(null, this.menuItem.menu));
-
-        this.menuItem.connect('request-open', Lang.bind(this, function(menu, open) {
-            this._trackerItem.request_submenu_shown(open);
-        }));
-
-        this._trackerItem.connect('notify::submenu-shown', Lang.bind(this, function() {
-            this.menuItem.setSubmenuShown(this._trackerItem.get_submenu_shown());
-        }));
-
-        this.menuItem.connect('destroy', function() {
-            trackerItem.run_dispose();
-        });
-    },
-
-    destroy: function() {
-        this._tracker.destroy();
-        this.parent();
-    },
-
-    _updateLabel: function() {
-        this.menuItem.label.text = stripMnemonics(this._trackerItem.label);
-    },
-});
-
-const RemoteMenuItemMapper = new Lang.Class({
-    Name: 'RemoteMenuItemMapper',
-
-    _init: function(trackerItem) {
-        this._trackerItem = trackerItem;
-
-        this.menuItem = new PopupMenu.PopupBaseMenuItem();
-        this._label = new St.Label();
-        this.menuItem.addActor(this._label);
-        this.menuItem.actor.label_actor = this._label;
-
-        this.menuItem.connect('activate', Lang.bind(this, function() {
-            this._trackerItem.activated();
-        }));
-
-        this._trackerItem.bind_property('visible', this.menuItem.actor, 'visible', GObject.BindingFlags.SYNC_CREATE);
-
-        this._trackerItem.connect('notify::label', Lang.bind(this, this._updateLabel));
-        this._trackerItem.connect('notify::sensitive', Lang.bind(this, this._updateSensitivity));
-        this._trackerItem.connect('notify::role', Lang.bind(this, this._updateRole));
-        this._trackerItem.connect('notify::toggled', Lang.bind(this, this._updateDecoration));
-
-        this._updateLabel();
-        this._updateSensitivity();
-        this._updateRole();
-
-        this.menuItem.connect('destroy', function() {
-            trackerItem.run_dispose();
-        });
-    },
-
-    _updateLabel: function() {
-        this._label.text = stripMnemonics(this._trackerItem.label);
-    },
-
-    _updateSensitivity: function() {
-        this.menuItem.setSensitive(this._trackerItem.sensitive);
-    },
-
-    _updateDecoration: function() {
-        let ornamentForRole = {};
-        ornamentForRole[ShellMenu.MenuTrackerItemRole.RADIO] = PopupMenu.Ornament.DOT;
-        ornamentForRole[ShellMenu.MenuTrackerItemRole.CHECK] = PopupMenu.Ornament.CHECK;
-
-        let ornament = PopupMenu.Ornament.NONE;
-        if (this._trackerItem.toggled)
-            ornament = ornamentForRole[this._trackerItem.role];
-
-        this.menuItem.setOrnament(ornament);
-    },
-
-    _updateRole: function() {
-        let a11yRoles = {};
-        a11yRoles[ShellMenu.MenuTrackerItemRole.NORMAL] = Atk.Role.MENU_ITEM;
-        a11yRoles[ShellMenu.MenuTrackerItemRole.RADIO] = Atk.Role.RADIO_MENU_ITEM;
-        a11yRoles[ShellMenu.MenuTrackerItemRole.CHECK] = Atk.Role.CHECK_MENU_ITEM;
-
-        let a11yRole = a11yRoles[this._trackerItem.role];
-        this.menuItem.actor.accessible_role = a11yRole;
-
-        this._updateDecoration();
-    },
-});
-
-const RemoteMenu = new Lang.Class({
-    Name: 'RemoteMenu',
-    Extends: PopupMenu.PopupMenu,
-
-    _init: function(sourceActor, model, actionGroup) {
-        this.parent(sourceActor, 0.0, St.Side.TOP);
-
-        this._model = model;
-        this._actionGroup = actionGroup;
-        this._tracker = Shell.MenuTracker.new(this._actionGroup,
-                                              this._model,
-                                              null, /* action namespace */
-                                              _insertItem.bind(null, this),
-                                              _removeItem.bind(null, this));
-    },
-
-    destroy: function() {
-        this._tracker.destroy();
-        this.parent();
-    },
-});
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -7,6 +7,7 @@ const Lang = imports.lang;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

+const FileUtils = imports.misc.fileUtils;
 const Search = imports.ui.search;

 const KEY_FILE_GROUP = 'Shell Search Provider';
@@ -59,114 +60,108 @@ var SearchProviderProxy = Gio.DBusProxy.makeProxyWrapper(SearchProviderIface);
 var SearchProvider2Proxy = Gio.DBusProxy.makeProxyWrapper(SearchProvider2Iface);

 function loadRemoteSearchProviders(addProviderCallback) {
-    let objectPaths = {};
-    let loadedProviders = [];
+    let data = { loadedProviders: [],
+                 objectPaths: {},
+                 addProviderCallback: addProviderCallback };
+    FileUtils.collectFromDatadirsAsync('search-providers',
+                                       { loadedCallback: remoteProvidersLoaded,
+                                         processFile: loadRemoteSearchProvider,
+                                         data: data
+                                       });
+}

-    function loadRemoteSearchProvider(file) {
-        let keyfile = new GLib.KeyFile();
-        let path = file.get_path();
+function loadRemoteSearchProvider(file, info, data) {
+    let keyfile = new GLib.KeyFile();
+    let path = file.get_path();

-        try {
-            keyfile.load_from_file(path, 0);
-        } catch(e) {
-            return;
-        }
-
-        if (!keyfile.has_group(KEY_FILE_GROUP))
-            return;
-
-        let remoteProvider;
-        try {
-            let group = KEY_FILE_GROUP;
-            let busName = keyfile.get_string(group, 'BusName');
-            let objectPath = keyfile.get_string(group, 'ObjectPath');
-
-            if (objectPaths[objectPath])
-                return;
-
-            let appInfo = null;
-            try {
-                let desktopId = keyfile.get_string(group, 'DesktopId');
-                appInfo = Gio.DesktopAppInfo.new(desktopId);
-            } catch (e) {
-                log('Ignoring search provider ' + path + ': missing DesktopId');
-                return;
-            }
-
-            let version = '1';
-            try {
-                version = keyfile.get_string(group, 'Version');
-            } catch (e) {
-                // ignore error
-            }
-
-            if (version >= 2)
-                remoteProvider = new RemoteSearchProvider2(appInfo, busName, objectPath);
-            else
-                remoteProvider = new RemoteSearchProvider(appInfo, busName, objectPath);
-
-            objectPaths[objectPath] = remoteProvider;
-            loadedProviders.push(remoteProvider);
-        } catch(e) {
-            log('Failed to add search provider %s: %s'.format(path, e.toString()));
-        }
+    try {
+        keyfile.load_from_file(path, 0);
+    } catch(e) {
+        return;
    }

-    let dataDirs = GLib.get_system_data_dirs();
-    dataDirs.forEach(function(dataDir) {
-        let path = GLib.build_filenamev([dataDir, 'gnome-shell', 'search-providers']);
-        let dir = Gio.File.new_for_path(path);
-        let fileEnum;
-        try {
-            fileEnum = dir.enumerate_children('standard::name,standard::type',
-                                              Gio.FileQueryInfoFlags.NONE, null);
-        } catch (e) {
-            fileEnum = null;
-        }
-        if (fileEnum != null) {
-            let info;
-            while ((info = fileEnum.next_file(null)))
-                loadRemoteSearchProvider(fileEnum.get_child(info));
-        }
-    });
+    if (!keyfile.has_group(KEY_FILE_GROUP))
+        return;

+    let remoteProvider;
+    try {
+        let group = KEY_FILE_GROUP;
+        let busName = keyfile.get_string(group, 'BusName');
+        let objectPath = keyfile.get_string(group, 'ObjectPath');
+
+        if (data.objectPaths[objectPath])
+            return;
+
+        let appInfo = null;
+        try {
+            let desktopId = keyfile.get_string(group, 'DesktopId');
+            appInfo = Gio.DesktopAppInfo.new(desktopId);
+        } catch (e) {
+            log('Ignoring search provider ' + path + ': missing DesktopId');
+            return;
+        }
+
+        let version = '1';
+        try {
+            version = keyfile.get_string(group, 'Version');
+        } catch (e) {
+            // ignore error
+        }
+
+        if (version >= 2)
+            remoteProvider = new RemoteSearchProvider2(appInfo, busName, objectPath);
+        else
+            remoteProvider = new RemoteSearchProvider(appInfo, busName, objectPath);
+
+        data.objectPaths[objectPath] = remoteProvider;
+        data.loadedProviders.push(remoteProvider);
+    } catch(e) {
+        log('Failed to add search provider %s: %s'.format(path, e.toString()));
+    }
+}
+
+function remoteProvidersLoaded(loadState) {
    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
    let sortOrder = searchSettings.get_strv('sort-order');

    // Special case gnome-control-center to be always active and always first
    sortOrder.unshift('gnome-control-center.desktop');

-    loadedProviders.sort(function(providerA, providerB) {
-        let idxA, idxB;
-        let appIdA, appIdB;
+    loadState.loadedProviders.sort(
+        function(providerA, providerB) {
+            let idxA, idxB;
+            let appIdA, appIdB;

-        appIdA = providerA.appInfo.get_id();
-        appIdB = providerB.appInfo.get_id();
+            appIdA = providerA.appInfo.get_id();
+            appIdB = providerB.appInfo.get_id();

-        idxA = sortOrder.indexOf(appIdA);
-        idxB = sortOrder.indexOf(appIdB);
+            idxA = sortOrder.indexOf(appIdA);
+            idxB = sortOrder.indexOf(appIdB);

-        // if no provider is found in the order, use alphabetical order
-        if ((idxA == -1) && (idxB == -1)) {
-            let nameA = providerA.appInfo.get_name();
-            let nameB = providerB.appInfo.get_name();
+            // if no provider is found in the order, use alphabetical order
+            if ((idxA == -1) && (idxB == -1)) {
+                let nameA = providerA.appInfo.get_name();
+                let nameB = providerB.appInfo.get_name();

-            return GLib.utf8_collate(nameA, nameB);
-        }
+                return GLib.utf8_collate(nameA, nameB);
+            }

-        // if providerA isn't found, it's sorted after providerB
-        if (idxA == -1)
-            return 1;
+            // if providerA isn't found, it's sorted after providerB
+            if (idxA == -1)
+                return 1;

-        // if providerB isn't found, it's sorted after providerA
-        if (idxB == -1)
-            return -1;
+            // if providerB isn't found, it's sorted after providerA
+            if (idxB == -1)
+                return -1;

-        // finally, if both providers are found, return their order in the list
-        return (idxA - idxB);
-    });
+            // finally, if both providers are found, return their order in the list
+            return (idxA - idxB);
+        });

-    loadedProviders.forEach(addProviderCallback);
+    loadState.loadedProviders.forEach(
+        function(provider) {
+            loadState.addProviderCallback(provider);
+        });
 }

 const RemoteSearchProvider = new Lang.Class({
@@ -192,9 +187,7 @@ const RemoteSearchProvider = new Lang.Class({

    createIcon: function(size, meta) {
        let gicon;
-        if (meta['icon']) {
-            gicon = Gio.icon_deserialize(meta['icon']);
-        } else if (meta['gicon']) {
+        if (meta['gicon']) {
            gicon = Gio.icon_new_for_string(meta['gicon']);
        } else if (meta['icon-data']) {
            let [width, height, rowStride, hasAlpha,
@@ -210,7 +203,7 @@ const RemoteSearchProvider = new Lang.Class({
    _getResultsFinished: function(results, error) {
        if (error)
            return;
-        this.searchSystem.setResults(this, results[0]);
+        this.searchSystem.pushResults(this, results[0]);
    },

    getInitialResultSet: function(terms) {
@@ -222,7 +215,7 @@ const RemoteSearchProvider = new Lang.Class({
                                                 this._cancellable);
        } catch(e) {
            log('Error calling GetInitialResultSet for provider %s: %s'.format(this.id, e.toString()));
-            this.searchSystem.setResults(this, []);
+            this.searchSystem.pushResults(this, []);
        }
    },

@@ -235,7 +228,7 @@ const RemoteSearchProvider = new Lang.Class({
                                                   this._cancellable);
        } catch(e) {
            log('Error calling GetSubsearchResultSet for provider %s: %s'.format(this.id, e.toString()));
-            this.searchSystem.setResults(this, []);
+            this.searchSystem.pushResults(this, []);
        }
    },

@@ -247,12 +240,8 @@ const RemoteSearchProvider = new Lang.Class({
        let metas = results[0];
        let resultMetas = [];
        for (let i = 0; i < metas.length; i++) {
-            for (let prop in metas[i]) {
-                // we can use the serialized icon variant directly
-                if (prop != 'icon')
-                    metas[i][prop] = metas[i][prop].deep_unpack();
-            }
-
+            for (let prop in metas[i])
+                metas[i][prop] = metas[i][prop].deep_unpack();
            resultMetas.push({ id: metas[i]['id'],
                               name: metas[i]['name'],
                               description: metas[i]['description'],
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -23,7 +23,6 @@ const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const MessageTray = imports.ui.messageTray;
 const ShellDBus = imports.ui.shellDBus;
-const SmartcardManager = imports.misc.smartcardManager;
 const Tweener = imports.ui.tweener;
 const Util = imports.misc.util;

@@ -31,7 +30,6 @@ const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
 const LOCK_ENABLED_KEY = 'lock-enabled';
 const LOCK_DELAY_KEY = 'lock-delay';

-const LOCKED_STATE_STR = 'screenShield.locked';
 // fraction of screen height the arrow must reach before completing
 // the slide up automatically
 const ARROW_DRAG_THRESHOLD = 0.1;
@@ -216,7 +214,6 @@ const NotificationsBox = new Lang.Class({

        if (musicNotification != null &&
            this._musicBin.child == null) {
-            musicNotification.acknowledged = true;
            if (musicNotification.actor.get_parent() != null)
                musicNotification.actor.get_parent().remove_actor(musicNotification.actor);
            this._musicBin.child = musicNotification.actor;
@@ -249,7 +246,6 @@ const NotificationsBox = new Lang.Class({
            sourceCountChangedId: 0,
            sourceTitleChangedId: 0,
            sourceUpdatedId: 0,
-            sourceNotifyId: 0,
            musicNotification: null,
            sourceBox: null,
            titleLabel: null,
@@ -260,12 +256,6 @@ const NotificationsBox = new Lang.Class({
        this._showSource(source, obj, obj.sourceBox);
        this._notificationBox.add(obj.sourceBox, { x_fill: false, x_align: St.Align.START });

-        if (obj.musicNotification) {
-            obj.sourceNotifyId = source.connect('notify', Lang.bind(this, function(source, notification) {
-                notification.acknowledged = true;
-            }));
-        }
-
        obj.sourceCountChangedId = source.connect('count-updated', Lang.bind(this, function(source) {
            this._countChanged(source, obj);
        }));
@@ -346,8 +336,6 @@ const NotificationsBox = new Lang.Class({
        if (obj.musicNotification) {
            this._musicBin.child = null;
            obj.musicNotification = null;
-
-            source.disconnect(obj.sourceNotifyId);
        }

        source.disconnect(obj.sourceDestroyId);
@@ -490,6 +478,7 @@ const ScreenShield = new Lang.Class({

        this._lockDialogGroup = new St.Widget({ x_expand: true,
                                                y_expand: true,
+                                                reactive: true,
                                                opacity: 0,
                                                pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
                                                name: 'lockDialogGroup' });
@@ -517,13 +506,6 @@ const ScreenShield = new Lang.Class({

        this._screenSaverDBus = new ShellDBus.ScreenSaverDBus(this);

-        this._smartcardManager = SmartcardManager.getSmartcardManager();
-        this._smartcardManager.connect('smartcard-inserted',
-                                       Lang.bind(this, function() {
-                                           if (this._isLocked)
-                                               this._liftShield(true, 0);
-                                       }));
-
        this._inhibitor = null;
        this._aboutToSuspend = false;
        this._loginManager = LoginManager.getLoginManager();
@@ -772,19 +754,6 @@ const ScreenShield = new Lang.Class({
            }
        }

-        if (this._lightbox.actor.visible ||
-            this._isActive) {
-            // We're either shown and active, or in the process of
-            // showing.
-            // The latter is a very unlikely condition (it requires
-            // idle-delay < 20), but in any case we have nothing
-            // to do at this point: either isActive is true, or
-            // it will soon be.
-            // isActive can also be true if the lightbox is hidden,
-            // in case the shield is down and the user hasn't unlocked yet
-            return;
-        }
-
        if (!this._becomeModal()) {
            // We could not become modal, so we can't activate the
            // screenshield. The user is probably very upset at this
@@ -798,6 +767,19 @@ const ScreenShield = new Lang.Class({
            return;
        }

+        if (this._lightbox.actor.visible ||
+            this._isActive) {
+            // We're either shown and active, or in the process of
+            // showing.
+            // The latter is a very unlikely condition (it requires
+            // idle-delay < 20), but in any case we have nothing
+            // to do at this point: either isActive is true, or
+            // it will soon be.
+            // isActive can also be true if the lightbox is hidden,
+            // in case the shield is down and the user hasn't unlocked yet
+            return;
+        }
+
        this._lightbox.show();

        if (this._activationTime == 0)
@@ -935,6 +917,7 @@ const ScreenShield = new Lang.Class({
            }

            this._dialog.connect('failed', Lang.bind(this, this._onUnlockFailed));
+            this._dialog.connect('unlocked', Lang.bind(this, this._onUnlockSucceded));
        }

        this._dialog.allowCancel = allowCancel;
@@ -944,6 +927,10 @@ const ScreenShield = new Lang.Class({
        this._resetLockScreen(true, false);
    },

+    _onUnlockSucceded: function() {
+        this.deactivate(true);
+    },
+
    _resetLockScreen: function(animateLockScreen, animateLockDialog) {
        // Don't reset the lock screen unless it is completely hidden
        // This prevents the shield going down if the lock-delay timeout
@@ -1129,12 +1116,6 @@ const ScreenShield = new Lang.Class({
    },

    deactivate: function(animate) {
-        this._dialog.finish(Lang.bind(this, function() {
-            this._finishDeactivate(animate);
-        }));
-    },
-
-    _finishDeactivate: function(animate) {
        this._hideLockScreen(animate, 0);

        if (this._hasLockScreen)
@@ -1145,14 +1126,6 @@ const ScreenShield = new Lang.Class({
        if (Main.sessionMode.currentMode == 'unlock-dialog')
            Main.sessionMode.popMode('unlock-dialog');

-        if (this._dialog && !this._isGreeter)
-            this._dialog.popModal();
-
-        if (this._isModal) {
-            Main.popModal(this.actor);
-            this._isModal = false;
-        }
-
        Tweener.addTween(this._lockDialogGroup, {
            scale_x: 0,
            scale_y: 0,
@@ -1170,6 +1143,12 @@ const ScreenShield = new Lang.Class({
        }

        this._lightbox.hide();
+
+        if (this._isModal) {
+            Main.popModal(this.actor);
+            this._isModal = false;
+        }
+
        this.actor.hide();

        if (this._becameActiveId != 0) {
@@ -1187,7 +1166,6 @@ const ScreenShield = new Lang.Class({
        this._isLocked = false;
        this.emit('active-changed');
        this.emit('locked-changed');
-        global.set_runtime_state(LOCKED_STATE_STR, null);
    },

    activate: function(animate) {
@@ -1204,7 +1182,6 @@ const ScreenShield = new Lang.Class({
        }

        this._resetLockScreen(animate, animate);
-        global.set_runtime_state(LOCKED_STATE_STR, GLib.Variant.new('b', true));

        // We used to set isActive and emit active-changed here,
        // but now we do that from lockScreenShown, which means
@@ -1237,15 +1214,5 @@ const ScreenShield = new Lang.Class({

        this.emit('locked-changed');
    },
-
-    // If the previous shell crashed, and gnome-session restarted us, then re-lock
-    lockIfWasLocked: function() {
-        let wasLocked = global.get_runtime_state('b', LOCKED_STATE_STR);
-        if (wasLocked === null)
-            return;
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            this.lock(false);
-        }));
-    }
 });
 Signals.addSignalMethods(ScreenShield.prototype);
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -31,7 +31,7 @@ const SearchSystem = new Lang.Class({

        let remoteIndex = this._remoteProviders.indexOf(provider);
        if (remoteIndex != -1)
-            this._remoteProviders.splice(remoteIndex, 1);
+            this._remoteProviders.splice(index, 1);
    },

    getProviders: function() {
@@ -51,7 +51,7 @@ const SearchSystem = new Lang.Class({
        this._previousResults = [];
    },

-    setResults: function(provider, results) {
+    pushResults: function(provider, results) {
        let i = this._providers.indexOf(provider);
        if (i == -1)
            return;
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -180,82 +180,13 @@ const GridSearchResult = new Lang.Class({
    }
 });

-const SearchResultsBase = new Lang.Class({
-    Name: 'SearchResultsBase',
+const ListSearchResults = new Lang.Class({
+    Name: 'ListSearchResults',

    _init: function(provider) {
        this.provider = provider;

-        this._terms = [];
-
-        this.actor = new St.BoxLayout({ style_class: 'search-section',
-                                        vertical: true });
-
-        this._resultDisplayBin = new St.Bin({ x_fill: true,
-                                              y_fill: true });
-        this.actor.add(this._resultDisplayBin, { expand: true });
-
-        let separator = new Separator.HorizontalSeparator({ style_class: 'search-section-separator' });
-        this.actor.add(separator.actor);
-    },
-
-    destroy: function() {
-        this.actor.destroy();
-        this._terms = [];
-    },
-
-    _clearResultDisplay: function() {
-    },
-
-    clear: function() {
-        this._clearResultDisplay();
-        this.actor.hide();
-    },
-
-    _keyFocusIn: function(icon) {
-        this.emit('key-focus-in', icon);
-    },
-
-    _setMoreIconVisible: function(visible) {
-    },
-
-    updateSearch: function(providerResults, terms, callback) {
-        this._terms = terms;
-
-        if (providerResults.length == 0) {
-            this._clearResultDisplay();
-            this.actor.hide();
-            callback();
-        } else {
-            let maxResults = this._getMaxDisplayedResults();
-            let results = providerResults.slice(0, maxResults);
-            let hasMoreResults = results.length < providerResults.length;
-
-            this.provider.getResultMetas(results, Lang.bind(this, function(metas) {
-                this.clear();
-
-                // To avoid CSS transitions causing flickering when
-                // the first search result stays the same, we hide the
-                // content while filling in the results.
-                this.actor.hide();
-                this._clearResultDisplay();
-                this._renderResults(metas);
-                this._setMoreIconVisible(hasMoreResults && this.provider.canLaunchSearch);
-                this.actor.show();
-                callback();
-            }));
-        }
-    }
-});
-
-const ListSearchResults = new Lang.Class({
-    Name: 'ListSearchResults',
-    Extends: SearchResultsBase,
-
-    _init: function(provider) {
-        this.parent(provider);
-
-        this._container = new St.BoxLayout({ style_class: 'search-section-content' });
+        this.actor = new St.BoxLayout({ style_class: 'search-section-content' });
        this.providerIcon = new ProviderIcon(provider);
        this.providerIcon.connect('clicked', Lang.bind(this,
            function() {
@@ -263,27 +194,48 @@ const ListSearchResults = new Lang.Class({
                Main.overview.toggle();
            }));

-        this._container.add(this.providerIcon, { x_fill: false,
-                                                 y_fill: false,
-                                                 x_align: St.Align.START,
-                                                 y_align: St.Align.START });
+        this.actor.add(this.providerIcon, { x_fill: false,
+                                            y_fill: false,
+                                            x_align: St.Align.START,
+                                            y_align: St.Align.START });

        this._content = new St.BoxLayout({ style_class: 'list-search-results',
                                           vertical: true });
-        this._container.add(this._content, { expand: true });
+        this.actor.add(this._content, { expand: true });

-        this._resultDisplayBin.set_child(this._container);
+        this._notDisplayedResult = [];
+        this._terms = [];
+        this._pendingClear = false;
    },

-    _setMoreIconVisible: function(visible) {
-        this.providerIcon.moreIcon.visible = true;
+    getResultsForDisplay: function() {
+        let alreadyVisible = this._pendingClear ? 0 : this.getVisibleResultCount();
+        let canDisplay = MAX_LIST_SEARCH_RESULTS_ROWS - alreadyVisible;
+
+        let newResults = this._notDisplayedResult.splice(0, canDisplay);
+        return newResults;
    },

-    _getMaxDisplayedResults: function() {
-        return MAX_LIST_SEARCH_RESULTS_ROWS;
+    getVisibleResultCount: function() {
+        return this._content.get_n_children();
    },

-    _renderResults: function(metas) {
+    hasMoreResults: function() {
+        return this._notDisplayedResult.length > 0;
+    },
+
+    setResults: function(results, terms) {
+        // copy the lists
+        this._notDisplayedResult = results.slice(0);
+        this._terms = terms.slice(0);
+        this._pendingClear = true;
+    },
+
+    _keyFocusIn: function(icon) {
+        this.emit('key-focus-in', icon);
+    },
+
+    renderResults: function(metas) {
        for (let i = 0; i < metas.length; i++) {
            let display = new ListSearchResult(this.provider, metas[i], this._terms);
            display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
@@ -291,12 +243,13 @@ const ListSearchResults = new Lang.Class({
        }
    },

-    _clearResultDisplay: function () {
+    clear: function () {
        this._content.destroy_all_children();
+        this._pendingClear = false;
    },

    getFirstResult: function() {
-        if (this._content.get_n_children() > 0)
+        if (this.getVisibleResultCount() > 0)
            return this._content.get_child_at_index(0)._delegate;
        else
            return null;
@@ -306,24 +259,50 @@ Signals.addSignalMethods(ListSearchResults.prototype);

 const GridSearchResults = new Lang.Class({
    Name: 'GridSearchResults',
-    Extends: SearchResultsBase,

    _init: function(provider) {
-        this.parent(provider);
+        this.provider = provider;

        this._grid = new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS,
                                             xAlign: St.Align.START });
-        this._bin = new St.Bin({ x_align: St.Align.MIDDLE });
-        this._bin.set_child(this._grid.actor);
+        this.actor = new St.Bin({ x_align: St.Align.MIDDLE });

-        this._resultDisplayBin.set_child(this._bin);
+        this.actor.set_child(this._grid.actor);
+
+        this._notDisplayedResult = [];
+        this._terms = [];
+        this._pendingClear = false;
    },

-    _getMaxDisplayedResults: function() {
-        return this._grid.childrenInRow(this._bin.width) * this._grid.getRowLimit();
+    getResultsForDisplay: function() {
+        let alreadyVisible = this._pendingClear ? 0 : this._grid.visibleItemsCount();
+        let canDisplay = this._grid.childrenInRow(this.actor.width) * this._grid.getRowLimit()
+                         - alreadyVisible;
+
+        let newResults = this._notDisplayedResult.splice(0, canDisplay);
+        return newResults;
    },

-    _renderResults: function(metas) {
+    getVisibleResultCount: function() {
+        return this._grid.visibleItemsCount();
+    },
+
+    hasMoreResults: function() {
+        return this._notDisplayedResult.length > 0;
+    },
+
+    setResults: function(results, terms) {
+        // copy the lists
+        this._notDisplayedResult = results.slice(0);
+        this._terms = terms.slice(0);
+        this._pendingClear = true;
+    },
+
+    _keyFocusIn: function(icon) {
+        this.emit('key-focus-in', icon);
+    },
+
+    renderResults: function(metas) {
        for (let i = 0; i < metas.length; i++) {
            let display = new GridSearchResult(this.provider, metas[i], this._terms);
            display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
@@ -331,12 +310,13 @@ const GridSearchResults = new Lang.Class({
        }
    },

-    _clearResultDisplay: function () {
+    clear: function () {
        this._grid.removeAll();
+        this._pendingClear = false;
    },

    getFirstResult: function() {
-        if (this._grid.visibleItemsCount() > 0)
+        if (this.getVisibleResultCount() > 0)
            return this._grid.getItemAtIndex(0)._delegate;
        else
            return null;
@@ -386,9 +366,9 @@ const SearchResults = new Lang.Class({
        this._content.add(this._statusBin, { expand: true });
        this._statusBin.add_actor(this._statusText);
        this._providers = this._searchSystem.getProviders();
-        this._providerDisplays = {};
+        this._providerMeta = [];
        for (let i = 0; i < this._providers.length; i++) {
-            this.createProviderDisplay(this._providers[i]);
+            this.createProviderMeta(this._providers[i]);
        }

        this._highlightDefault = false;
@@ -406,33 +386,61 @@ const SearchResults = new Lang.Class({
        Util.ensureActorVisibleInScrollView(this._scrollView, icon);
    },

-    createProviderDisplay: function(provider) {
-        let providerDisplay = null;
+    createProviderMeta: function(provider) {
+        let providerBox = new St.BoxLayout({ style_class: 'search-section',
+                                             vertical: true });
+        let providerIcon = null;
+        let resultDisplay = null;

        if (provider.appInfo) {
-            providerDisplay = new ListSearchResults(provider);
+            resultDisplay = new ListSearchResults(provider);
+            providerIcon = resultDisplay.providerIcon;
        } else {
-            providerDisplay = new GridSearchResults(provider);
+            resultDisplay = new GridSearchResults(provider);
        }

-        providerDisplay.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
-        this._providerDisplays[provider.id] = providerDisplay;
-        this._content.add(providerDisplay.actor);
+        resultDisplay.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
+
+        let resultDisplayBin = new St.Bin({ child: resultDisplay.actor,
+                                            x_fill: true,
+                                            y_fill: true });
+        providerBox.add(resultDisplayBin, { expand: true });
+
+        let separator = new Separator.HorizontalSeparator({ style_class: 'search-section-separator' });
+        providerBox.add(separator.actor);
+
+        this._providerMeta.push({ provider: provider,
+                                  actor: providerBox,
+                                  icon: providerIcon,
+                                  resultDisplay: resultDisplay });
+        this._content.add(providerBox);
    },

-    destroyProviderDisplay: function(provider) {
-        this._providerDisplays[provider.id].destroy();
-        delete this._providerDisplays[provider.id];
+    destroyProviderMeta: function(provider) {
+        for (let i=0; i < this._providerMeta.length; i++) {
+            let meta = this._providerMeta[i];
+            if (meta.provider == provider) {
+                meta.actor.destroy();
+                this._providerMeta.splice(i, 1);
+                break;
+            }
+        }
    },

    _clearDisplay: function() {
-        for (let i = 0; i < this._providers.length; i++) {
-            let provider = this._providers[i];
-            let providerDisplay = this._providerDisplays[provider.id];
-            providerDisplay.clear();
+        for (let i = 0; i < this._providerMeta.length; i++) {
+            let meta = this._providerMeta[i];
+            meta.resultDisplay.clear();
+            meta.actor.hide();
        }
    },

+    _clearDisplayForProvider: function(provider) {
+        let meta = this._metaForProvider(provider);
+        meta.resultDisplay.clear();
+        meta.actor.hide();
+    },
+
    reset: function() {
        this._searchSystem.reset();
        this._statusBin.hide();
@@ -446,17 +454,20 @@ const SearchResults = new Lang.Class({
        this._statusBin.show();
    },

+    _metaForProvider: function(provider) {
+        return this._providerMeta[this._providers.indexOf(provider)];
+    },
+
    _maybeSetInitialSelection: function() {
        let newDefaultResult = null;

-        for (let i = 0; i < this._providers.length; i++) {
-            let provider = this._providers[i];
-            let display = this._providerDisplays[provider.id];
+        for (let i = 0; i < this._providerMeta.length; i++) {
+            let meta = this._providerMeta[i];

-            if (!display.actor.visible)
+            if (!meta.actor.visible)
                continue;

-            let firstResult = display.getFirstResult();
+            let firstResult = meta.resultDisplay.getFirstResult();
            if (firstResult) {
                newDefaultResult = firstResult;
                break; // select this one!
@@ -476,14 +487,11 @@ const SearchResults = new Lang.Class({
    _updateStatusText: function () {
        let haveResults = false;

-        for (let i = 0; i < this._providers.length; i++) {
-            let provider = this._providers[i];
-            let display = this._providerDisplays[provider.id];
-            if (display.getFirstResult()) {
+        for (let i = 0; i < this._providerMeta.length; ++i)
+            if (this._providerMeta[i].resultDisplay.getFirstResult()) {
                haveResults = true;
                break;
            }
-        }

        if (!haveResults) {
            this._statusText.set_text(_("No results."));
@@ -496,12 +504,42 @@ const SearchResults = new Lang.Class({
    _updateResults: function(searchSystem, results) {
        let terms = searchSystem.getTerms();
        let [provider, providerResults] = results;
-        let display = this._providerDisplays[provider.id];
+        let meta = this._metaForProvider(provider);

-        display.updateSearch(providerResults, terms, Lang.bind(this, function() {
+        if (providerResults.length == 0) {
+            this._clearDisplayForProvider(provider);
+            meta.resultDisplay.setResults([], []);
            this._maybeSetInitialSelection();
            this._updateStatusText();
-        }));
+        } else {
+            meta.resultDisplay.setResults(providerResults, terms);
+            let results = meta.resultDisplay.getResultsForDisplay();
+
+            if (meta.icon)
+                meta.icon.moreIcon.visible =
+                    meta.resultDisplay.hasMoreResults() &&
+                    provider.canLaunchSearch;
+
+            provider.getResultMetas(results, Lang.bind(this, function(metas) {
+                this._clearDisplayForProvider(provider);
+                meta.actor.show();
+
+                // Hiding drops the key focus if we have it
+                let focus = global.stage.get_key_focus();
+                // To avoid CSS transitions causing flickering when
+                // the first search result stays the same, we hide the
+                // content while filling in the results.
+                this._content.hide();
+
+                meta.resultDisplay.renderResults(metas);
+                this._maybeSetInitialSelection();
+                this._updateStatusText();
+
+                this._content.show();
+                if (this._content.contains(focus))
+                    global.stage.set_key_focus(focus);
+            }));
+        }
    },

    activateDefault: function() {
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -60,7 +60,7 @@ const _modes = {
        unlockDialog: undefined,
        components: ['polkitAgent', 'telepathyClient'],
        panel: {
-            left: [],
+            left: ['userMenu'],
            center: [],
            right: ['lockScreen']
        },
@@ -72,13 +72,24 @@ const _modes = {
        unlockDialog: undefined,
        components: ['polkitAgent', 'telepathyClient'],
        panel: {
-            left: [],
+            left: ['userMenu'],
            center: [],
            right: ['a11y', 'keyboard', 'lockScreen']
        },
        panelStyle: 'unlock-screen'
    },

+    'initial-setup': {
+        hasWindows: true,
+        isPrimary: true,
+        components: ['networkAgent', 'keyring'],
+        panel: {
+            left: [],
+            center: ['dateMenu'],
+            right: ['a11yGreeter', 'keyboard', 'volume', 'battery']
+        }
+    },
+
    'user': {
        hasOverview: true,
        showCalendarEvents: true,
@@ -97,7 +108,7 @@ const _modes = {
            left: ['activities', 'appMenu'],
            center: ['dateMenu'],
            right: ['a11y', 'keyboard', 'volume', 'bluetooth',
-                    'network', 'battery', 'system']
+                    'network', 'battery', 'userMenu']
        }
    }
 };
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -41,7 +41,6 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
 <signal name="AcceleratorActivated">
    <arg name="action" type="u" />
    <arg name="deviceid" type="u" />
-    <arg name="timestamp" type="u" />
 </signal>
 <property name="Mode" type="s" access="read" />
 <property name="OverviewActive" type="b" access="readwrite" />
@@ -80,8 +79,8 @@ const GnomeShell = new Lang.Class({
        this._grabbers = new Hash.Map();

        global.display.connect('accelerator-activated', Lang.bind(this,
-            function(display, action, deviceid, timestamp) {
-                this._emitAcceleratorActivated(action, deviceid, timestamp);
+            function(display, action, deviceid) {
+                this._emitAcceleratorActivated(action, deviceid);
            }));
    },

@@ -167,7 +166,7 @@ const GnomeShell = new Lang.Class({
        return invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded]));
    },

-    _emitAcceleratorActivated: function(action, deviceid, timestamp) {
+    _emitAcceleratorActivated: function(action, deviceid) {
        let destination = this._grabbedAccelerators.get(action);
        if (!destination)
            return;
@@ -178,7 +177,7 @@ const GnomeShell = new Lang.Class({
                               this._dbusImpl.get_object_path(),
                               info ? info.name : null,
                               'AcceleratorActivated',
-                               GLib.Variant.new('(uuu)', [action, deviceid, timestamp]));
+                               GLib.Variant.new('(uu)', [action, deviceid]));
    },

    _grabAcceleratorForSender: function(accelerator, flags, sender) {
--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@@ -1,210 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Cairo = imports.cairo;
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const St = imports.gi.St;
-const Signals = imports.signals;
-
-const SLIDER_SCROLL_STEP = 0.05; /* Slider scrolling step in % */
-
-const Slider = new Lang.Class({
-    Name: "Slider",
-
-    _init: function(value) {
-        if (isNaN(value))
-            // Avoid spreading NaNs around
-            throw TypeError('The slider value must be a number');
-        this._value = Math.max(Math.min(value, 1), 0);
-
-        this.actor = new St.DrawingArea({ style_class: 'slider',
-                                          can_focus: true,
-                                          reactive: true });
-        this.actor.connect('repaint', Lang.bind(this, this._sliderRepaint));
-        this.actor.connect('button-press-event', Lang.bind(this, this._startDragging));
-        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
-        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
-
-        this._releaseId = this._motionId = 0;
-        this._dragging = false;
-    },
-
-    setValue: function(value) {
-        if (isNaN(value))
-            throw TypeError('The slider value must be a number');
-
-        this._value = Math.max(Math.min(value, 1), 0);
-        this.actor.queue_repaint();
-    },
-
-    _sliderRepaint: function(area) {
-        let cr = area.get_context();
-        let themeNode = area.get_theme_node();
-        let [width, height] = area.get_surface_size();
-
-        let handleRadius = themeNode.get_length('-slider-handle-radius');
-
-        let handleBorderWidth = themeNode.get_length('-slider-handle-border-width');
-        let [hasHandleColor, handleBorderColor] =
-            themeNode.lookup_color('-slider-handle-border-color', false);
-
-        let sliderHeight = themeNode.get_length('-slider-height');
-
-        let sliderBorderWidth = themeNode.get_length('-slider-border-width');
-        let sliderBorderRadius = Math.min(width, sliderHeight) / 2;
-
-        let sliderBorderColor = themeNode.get_color('-slider-border-color');
-        let sliderColor = themeNode.get_color('-slider-background-color');
-
-        let sliderActiveBorderColor = themeNode.get_color('-slider-active-border-color');
-        let sliderActiveColor = themeNode.get_color('-slider-active-background-color');
-
-        const TAU = Math.PI * 2;
-
-        let handleX = handleRadius + (width - 2 * handleRadius) * this._value;
-
-        cr.arc(sliderBorderRadius + sliderBorderWidth, height / 2, sliderBorderRadius, TAU * 1/4, TAU * 3/4);
-        cr.lineTo(handleX, (height - sliderHeight) / 2);
-        cr.lineTo(handleX, (height + sliderHeight) / 2);
-        cr.lineTo(sliderBorderRadius + sliderBorderWidth, (height + sliderHeight) / 2);
-        Clutter.cairo_set_source_color(cr, sliderActiveColor);
-        cr.fillPreserve();
-        Clutter.cairo_set_source_color(cr, sliderActiveBorderColor);
-        cr.setLineWidth(sliderBorderWidth);
-        cr.stroke();
-
-        cr.arc(width - sliderBorderRadius - sliderBorderWidth, height / 2, sliderBorderRadius, TAU * 3/4, TAU * 1/4);
-        cr.lineTo(handleX, (height + sliderHeight) / 2);
-        cr.lineTo(handleX, (height - sliderHeight) / 2);
-        cr.lineTo(width - sliderBorderRadius - sliderBorderWidth, (height - sliderHeight) / 2);
-        Clutter.cairo_set_source_color(cr, sliderColor);
-        cr.fillPreserve();
-        Clutter.cairo_set_source_color(cr, sliderBorderColor);
-        cr.setLineWidth(sliderBorderWidth);
-        cr.stroke();
-
-        let handleY = height / 2;
-
-        let color = themeNode.get_foreground_color();
-        Clutter.cairo_set_source_color(cr, color);
-        cr.arc(handleX, handleY, handleRadius, 0, 2 * Math.PI);
-        cr.fillPreserve();
-        if (hasHandleColor && handleBorderWidth) {
-            Clutter.cairo_set_source_color(cr, handleBorderColor);
-            cr.setLineWidth(handleBorderWidth);
-            cr.stroke();
-        }
-        cr.$dispose();
-    },
-
-    _startDragging: function(actor, event) {
-        this.startDragging(event);
-    },
-
-    startDragging: function(event) {
-        if (this._dragging)
-            return false;
-
-        this._dragging = true;
-
-        let device = event.get_device();
-        device.grab(this.actor);
-        this._grabbedDevice = device;
-
-        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);
-        return true;
-    },
-
-    _endDragging: function() {
-        if (this._dragging) {
-            this.actor.disconnect(this._releaseId);
-            this.actor.disconnect(this._motionId);
-
-            this._grabbedDevice.ungrab();
-            this._grabbedDevice = null;
-            this._dragging = false;
-
-            this.emit('drag-end');
-        }
-        return true;
-    },
-
-    scroll: function(event) {
-        let direction = event.get_scroll_direction();
-        let delta;
-
-        if (event.is_pointer_emulated())
-            return;
-
-        if (direction == Clutter.ScrollDirection.DOWN) {
-            delta = -SLIDER_SCROLL_STEP;
-        } else if (direction == Clutter.ScrollDirection.UP) {
-            delta = +SLIDER_SCROLL_STEP;
-        } else if (direction == Clutter.ScrollDirection.SMOOTH) {
-            let [dx, dy] = event.get_scroll_delta();
-            // Even though the slider is horizontal, use dy to match
-            // the UP/DOWN above.
-            delta = -dy / 10;
-        }
-
-        this._value = Math.min(Math.max(0, this._value + delta), 1);
-
-        this.actor.queue_repaint();
-        this.emit('value-changed', this._value);
-    },
-
-    _onScrollEvent: function(actor, event) {
-        this.scroll(event);
-    },
-
-    _motionEvent: function(actor, event) {
-        let absX, absY;
-        [absX, absY] = event.get_coords();
-        this._moveHandle(absX, absY);
-        return true;
-    },
-
-    _onKeyPressEvent: function (actor, event) {
-        let key = event.get_key_symbol();
-        if (key == Clutter.KEY_Right || key == Clutter.KEY_Left) {
-            let delta = key == Clutter.KEY_Right ? 0.1 : -0.1;
-            this._value = Math.max(0, Math.min(this._value + delta, 1));
-            this._slider.queue_repaint();
-            this.emit('value-changed', this._value);
-            this.emit('drag-end');
-            return true;
-        }
-        return false;
-    },
-
-    _moveHandle: function(absX, absY) {
-        let relX, relY, sliderX, sliderY;
-        [sliderX, sliderY] = this.actor.get_transformed_position();
-        relX = absX - sliderX;
-        relY = absY - sliderY;
-
-        let width = this.actor.width;
-        let handleRadius = this.actor.get_theme_node().get_length('-slider-handle-radius');
-
-        let newvalue;
-        if (relX < handleRadius)
-            newvalue = 0;
-        else if (relX > width - handleRadius)
-            newvalue = 1;
-        else
-            newvalue = (relX - handleRadius) / (width - 2 * handleRadius);
-        this._value = newvalue;
-        this.actor.queue_repaint();
-        this.emit('value-changed', this._value);
-    },
-
-    get value() {
-        return this._value;
-    }
-});
-
-Signals.addSignalMethods(Slider.prototype);
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -68,6 +68,9 @@ const ATIndicator = new Lang.Class({
        let mouseKeys = this._buildItem(_("Mouse Keys"), A11Y_SCHEMA, KEY_MOUSE_KEYS_ENABLED);
        this.menu.addMenuItem(mouseKeys);

+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addSettingsAction(_("Universal Access Settings"), 'gnome-universal-access-panel.desktop');
+
        this._syncMenuVisibility();
    },

--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -13,6 +13,13 @@ const NotificationDaemon = imports.ui.notificationDaemon;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

+const ConnectionState = {
+    DISCONNECTED: 0,
+    CONNECTED: 1,
+    DISCONNECTING: 2,
+    CONNECTING: 3
+}
+
 const Indicator = new Lang.Class({
    Name: 'BTIndicator',
    Extends: PanelMenu.SystemStatusButton,
@@ -20,38 +27,261 @@ const Indicator = new Lang.Class({
    _init: function() {
        this.parent('bluetooth-disabled-symbolic', _("Bluetooth"));

-        // The Bluetooth menu only appears when Bluetooth is in use,
-        // so just statically build it with a "Turn Off" menu item.
-        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Bluetooth"), true);
-        this._item.icon.icon_name = 'bluetooth-active-symbolic';
-        this._item.menu.addAction(_("Turn Off"), Lang.bind(this, function() {
-            this._applet.killswitch_state = GnomeBluetooth.KillswitchState.SOFT_BLOCKED;
-        }));
-        this._item.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-bluetooth-panel.desktop');
-
        this._applet = new GnomeBluetoothApplet.Applet();
-        this._applet.connect('devices-changed', Lang.bind(this, this._sync));
-        this._sync();
+
+        this._killswitch = new PopupMenu.PopupSwitchMenuItem(_("Bluetooth"), false);
+        this._applet.connect('notify::killswitch-state', Lang.bind(this, this._updateKillswitch));
+        this._killswitch.connect('toggled', Lang.bind(this, function() {
+            let current_state = this._applet.killswitch_state;
+            if (current_state != GnomeBluetooth.KillswitchState.HARD_BLOCKED &&
+                current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER) {
+                this._applet.killswitch_state = this._killswitch.state ?
+                    GnomeBluetooth.KillswitchState.UNBLOCKED:
+                    GnomeBluetooth.KillswitchState.SOFT_BLOCKED;
+            } else
+                this._killswitch.setToggleState(false);
+        }));
+
+        this._discoverable = new PopupMenu.PopupSwitchMenuItem(_("Visibility"), this._applet.discoverable);
+        this._applet.connect('notify::discoverable', Lang.bind(this, function() {
+            this._discoverable.setToggleState(this._applet.discoverable);
+        }));
+        this._discoverable.connect('toggled', Lang.bind(this, function() {
+            this._applet.discoverable = this._discoverable.state;
+        }));
+
+        this._updateKillswitch();
+        this.menu.addMenuItem(this._killswitch);
+        this.menu.addMenuItem(this._discoverable);
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        this._fullMenuItems = [new PopupMenu.PopupSeparatorMenuItem(),
+                               new PopupMenu.PopupMenuItem(_("Send Files to Device…")),
+                               new PopupMenu.PopupMenuItem(_("Set Up a New Device…")),
+                               new PopupMenu.PopupSeparatorMenuItem()];
+        this._hasDevices = false;
+
+        this._fullMenuItems[1].connect('activate', function() {
+            GLib.spawn_command_line_async('bluetooth-sendto');
+        });
+        this._fullMenuItems[2].connect('activate', function() {
+            GLib.spawn_command_line_async('bluetooth-wizard');
+        });
+
+        for (let i = 0; i < this._fullMenuItems.length; i++) {
+            let item = this._fullMenuItems[i];
+            this.menu.addMenuItem(item);
+        }
+
+        this._deviceItemPosition = 3;
+        this._deviceItems = [];
+        this._applet.connect('devices-changed', Lang.bind(this, this._updateDevices));
+        this._updateDevices();
+
+        this._applet.connect('notify::show-full-menu', Lang.bind(this, this._updateFullMenu));
+        this._updateFullMenu();
+
+        this.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-bluetooth-panel.desktop');

        this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest));
        this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest));
        this._applet.connect('auth-request', Lang.bind(this, this._authRequest));
-        this._applet.connect('auth-service-request', Lang.bind(this, this._authServiceRequest));
        this._applet.connect('cancel-request', Lang.bind(this, this._cancelRequest));
    },

-    _sync: function() {
-        let connectedDevices = this._applet.get_devices().filter(function(device) {
-            return device.connected;
-        });
-        let nDevices = connectedDevices.length;
+    _updateKillswitch: function() {
+        let current_state = this._applet.killswitch_state;
+        let on = current_state == GnomeBluetooth.KillswitchState.UNBLOCKED;
+        let has_adapter = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER;
+        let can_toggle = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER &&
+                         current_state != GnomeBluetooth.KillswitchState.HARD_BLOCKED;

-        let on = nDevices > 0;
-        this.mainIcon.visible = on;
-        this.actor.visible = on;
+        this._killswitch.setToggleState(on);
+        if (can_toggle)
+            this._killswitch.setStatus(null);
+        else
+            /* TRANSLATORS: this means that bluetooth was disabled by hardware rfkill */
+            this._killswitch.setStatus(_("hardware disabled"));

-        if (on)
-            this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices").format(nDevices);
+        this.actor.visible = has_adapter;
+
+        if (on) {
+            this._discoverable.actor.show();
+            this.setIcon('bluetooth-active-symbolic');
+        } else {
+            this._discoverable.actor.hide();
+            this.setIcon('bluetooth-disabled-symbolic');
+        }
+    },
+
+    _updateDevices: function() {
+        let devices = this._applet.get_devices();
+
+        let newlist = [ ];
+        for (let i = 0; i < this._deviceItems.length; i++) {
+            let item = this._deviceItems[i];
+            let destroy = true;
+            for (let j = 0; j < devices.length; j++) {
+                if (item._device.device_path == devices[j].device_path) {
+                    this._updateDeviceItem(item, devices[j]);
+                    destroy = false;
+                    break;
+                }
+            }
+            if (destroy)
+                item.destroy();
+            else
+                newlist.push(item);
+        }
+
+        this._deviceItems = newlist;
+        this._hasDevices = newlist.length > 0;
+        for (let i = 0; i < devices.length; i++) {
+            let d = devices[i];
+            if (d._item)
+                continue;
+            let item = this._createDeviceItem(d);
+            if (item) {
+                this.menu.addMenuItem(item, this._deviceItemPosition + this._deviceItems.length);
+                this._deviceItems.push(item);
+                this._hasDevices = true;
+            }
+        }
+    },
+
+    _updateDeviceItem: function(item, device) {
+        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) {
+            item.destroy();
+            return;
+        }
+
+        let prevDevice = item._device;
+        let prevCapabilities = prevDevice.capabilities;
+        let prevCanConnect = prevDevice.can_connect;
+
+        // adopt the new device object
+        item._device = device;
+        device._item = item;
+
+        // update properties
+        item.label.text = device.alias;
+
+        if (prevCapabilities != device.capabilities ||
+            prevCanConnect != device.can_connect) {
+            // need to rebuild the submenu
+            item.menu.removeAll();
+            this._buildDeviceSubMenu(item, device);
+        }
+
+        // update connected property
+        if (device.can_connect)
+            item._connectedMenuItem.setToggleState(device.connected);
+    },
+
+    _createDeviceItem: function(device) {
+        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
+            return null;
+        let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
+
+        // adopt the device object, and add a back link
+        item._device = device;
+        device._item = item;
+
+        this._buildDeviceSubMenu(item, device);
+
+        return item;
+    },
+
+    _buildDeviceSubMenu: function(item, device) {
+        if (device.can_connect) {
+            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+            item._connected = device.connected;
+            item._connectedMenuItem = menuitem;
+            menuitem.connect('toggled', Lang.bind(this, function() {
+                if (item._connected > ConnectionState.CONNECTED) {
+                    // operation already in progress, revert
+                    // (should not happen anyway)
+                    menuitem.setToggleState(menuitem.state);
+                }
+                if (item._connected) {
+                    item._connected = ConnectionState.DISCONNECTING;
+                    menuitem.setStatus(_("disconnecting..."));
+                    this._applet.disconnect_device(item._device.device_path, function(applet, success) {
+                        if (success) { // apply
+                            item._connected = ConnectionState.DISCONNECTED;
+                            menuitem.setToggleState(false);
+                        } else { // revert
+                            item._connected = ConnectionState.CONNECTED;
+                            menuitem.setToggleState(true);
+                        }
+                        menuitem.setStatus(null);
+                    });
+                } else {
+                    item._connected = ConnectionState.CONNECTING;
+                    menuitem.setStatus(_("connecting..."));
+                    this._applet.connect_device(item._device.device_path, function(applet, success) {
+                        if (success) { // apply
+                            item._connected = ConnectionState.CONNECTED;
+                            menuitem.setToggleState(true);
+                        } else { // revert
+                            item._connected = ConnectionState.DISCONNECTED;
+                            menuitem.setToggleState(false);
+                        }
+                        menuitem.setStatus(null);
+                    });
+                }
+            }));
+
+            item.menu.addMenuItem(menuitem);
+        }
+
+        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
+            item.menu.addAction(_("Send Files…"), Lang.bind(this, function() {
+                this._applet.send_to_address(device.bdaddr, device.alias);
+            }));
+        }
+
+        switch (device.type) {
+        case GnomeBluetoothApplet.Type.KEYBOARD:
+            item.menu.addSettingsAction(_("Keyboard Settings"), 'gnome-keyboard-panel.desktop');
+            break;
+        case GnomeBluetoothApplet.Type.MOUSE:
+            item.menu.addSettingsAction(_("Mouse Settings"), 'gnome-mouse-panel.desktop');
+            break;
+        case GnomeBluetoothApplet.Type.HEADSET:
+        case GnomeBluetoothApplet.Type.HEADPHONES:
+        case GnomeBluetoothApplet.Type.OTHER_AUDIO:
+            item.menu.addSettingsAction(_("Sound Settings"), 'gnome-sound-panel.desktop');
+            break;
+        default:
+            break;
+        }
+    },
+
+    _updateFullMenu: function() {
+        if (this._applet.show_full_menu) {
+            this._showAll(this._fullMenuItems);
+            if (this._hasDevices)
+                this._showAll(this._deviceItems);
+        } else {
+            this._hideAll(this._fullMenuItems);
+            this._hideAll(this._deviceItems);
+        }
+    },
+
+    _showAll: function(items) {
+        for (let i = 0; i < items.length; i++)
+            items[i].actor.show();
+    },
+
+    _hideAll: function(items) {
+        for (let i = 0; i < items.length; i++)
+            items[i].actor.hide();
+    },
+
+    _destroyAll: function(items) {
+        for (let i = 0; i < items.length; i++)
+            items[i].destroy();
    },

    _ensureSource: function() {
@@ -62,14 +292,9 @@ const Indicator = new Lang.Class({
        }
    },

-    _authRequest: function(applet, device_path, name, long_name) {
+    _authRequest: function(applet, device_path, name, long_name, uuid) {
        this._ensureSource();
-        this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name));
-    },
-
-    _authServiceRequest: function(applet, device_path, name, long_name, uuid) {
-        this._ensureSource();
-        this._source.notify(new AuthServiceNotification(this._source, this._applet, device_path, name, long_name, uuid));
+        this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name, uuid));
    },

    _confirmRequest: function(applet, device_path, name, long_name, pin) {
@@ -91,34 +316,6 @@ const AuthNotification = new Lang.Class({
    Name: 'AuthNotification',
    Extends: MessageTray.Notification,

-    _init: function(source, applet, device_path, name, long_name) {
-        this.parent(source,
-                    _("Bluetooth"),
-                    _("Authorization request from %s").format(name),
-                    { customContent: true });
-        this.setResident(true);
-
-        this._applet = applet;
-        this._devicePath = device_path;
-        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
-
-        this.addButton('allow', _("Allow"));
-        this.addButton('deny', _("Deny"));
-
-        this.connect('action-invoked', Lang.bind(this, function(self, action) {
-            if (action == 'allow')
-                this._applet.agent_reply_confirm(this._devicePath, true);
-            else
-                this._applet.agent_reply_confirm(this._devicePath, false);
-            this.destroy();
-        }));
-    }
-});
-
-const AuthServiceNotification = new Lang.Class({
-    Name: 'AuthServiceNotification',
-    Extends: MessageTray.Notification,
-
    _init: function(source, applet, device_path, name, long_name, uuid) {
        this.parent(source,
                    _("Bluetooth"),
@@ -137,14 +334,14 @@ const AuthServiceNotification = new Lang.Class({
        this.connect('action-invoked', Lang.bind(this, function(self, action) {
            switch (action) {
            case 'always-grant':
-                this._applet.agent_reply_auth_service(this._devicePath, true, true);
+                this._applet.agent_reply_auth(this._devicePath, true, true);
                break;
            case 'grant':
-                this._applet.agent_reply_auth_service(this._devicePath, true, false);
+                this._applet.agent_reply_auth(this._devicePath, true, false);
                break;
            case 'reject':
            default:
-                this._applet.agent_reply_auth_service(this._devicePath, false, false);
+                this._applet.agent_reply_auth(this._devicePath, false, false);
            }
            this.destroy();
        }));
@@ -166,7 +363,7 @@ const ConfirmNotification = new Lang.Class({
        this._applet = applet;
        this._devicePath = device_path;
        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
-        this.addBody(_("Please confirm whether the Passkey '%06d' matches the one on the device.").format(pin));
+        this.addBody(_("Please confirm whether the PIN '%06d' matches the one on the device.").format(pin));

        /* Translators: this is the verb, not the noun */
        this.addButton('matches', _("Matches"));
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -398,6 +398,8 @@ const InputSourceIndicator = new Lang.Class({
        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
        this._sessionUpdated();

+        this.menu.addSettingsAction(_("Region & Language Settings"), 'gnome-region-panel.desktop');
+
        this._sourcesPerWindow = false;
        this._focusWindowNotifyId = 0;
        this._overviewShowingId = 0;
@@ -476,7 +478,7 @@ const InputSourceIndicator = new Lang.Class({
        [oldSource, this._currentSource] = [this._currentSource, newSource];

        if (oldSource) {
-            oldSource.menuItem.setOrnament(PopupMenu.Ornament.NONE);
+            oldSource.menuItem.setShowDot(false);
            oldSource.indicatorLabel.hide();
        }

@@ -494,7 +496,7 @@ const InputSourceIndicator = new Lang.Class({

        this.actor.show();

-        newSource.menuItem.setOrnament(PopupMenu.Ornament.DOT);
+        newSource.menuItem.setShowDot(true);
        newSource.indicatorLabel.show();

        this._buildPropSection(newSource.properties);
@@ -718,8 +720,7 @@ const InputSourceIndicator = new Lang.Class({
                item.prop = prop;
                radioGroup.push(item);
                item.radioGroup = radioGroup;
-                item.setOrnament(prop.get_state() == IBus.PropState.CHECKED ?
-                                 PopupMenu.Ornament.DOT : PopupMenu.Ornament.NONE);
+                item.setShowDot(prop.get_state() == IBus.PropState.CHECKED);
                item.connect('activate', Lang.bind(this, function() {
                    if (item.prop.get_state() == IBus.PropState.CHECKED)
                        return;
@@ -727,12 +728,12 @@ const InputSourceIndicator = new Lang.Class({
                    let group = item.radioGroup;
                    for (let i = 0; i < group.length; ++i) {
                        if (group[i] == item) {
-                            item.setOrnament(PopupMenu.Ornament.DOT);
+                            item.setShowDot(true);
                            item.prop.set_state(IBus.PropState.CHECKED);
                            this._ibusManager.activateProperty(item.prop.get_key(),
                                                               IBus.PropState.CHECKED);
                        } else {
-                            group[i].setOrnament(PopupMenu.Ornament.NONE);
+                            group[i].setShowDot(false);
                            group[i].prop.set_state(IBus.PropState.UNCHECKED);
                            this._ibusManager.activateProperty(group[i].prop.get_key(),
                                                               IBus.PropState.UNCHECKED);
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -2,15 +2,39 @@

 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const UPower = imports.gi.UPowerGlib;
+const St = imports.gi.St;

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

 const BUS_NAME = 'org.gnome.SettingsDaemon.Power';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Power';

+const UPDeviceType = {
+    UNKNOWN: 0,
+    AC_POWER: 1,
+    BATTERY: 2,
+    UPS: 3,
+    MONITOR: 4,
+    MOUSE: 5,
+    KEYBOARD: 6,
+    PDA: 7,
+    PHONE: 8,
+    MEDIA_PLAYER: 9,
+    TABLET: 10,
+    COMPUTER: 11
+};
+
+const UPDeviceState = {
+    UNKNOWN: 0,
+    CHARGING: 1,
+    DISCHARGING: 2,
+    EMPTY: 3,
+    FULLY_CHARGED: 4,
+    PENDING_CHARGE: 5,
+    PENDING_DISCHARGE: 6
+};
+
 const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
 <method name="GetDevices">
    <arg type="a(susdut)" direction="out" />
@@ -31,73 +55,96 @@ const Indicator = new Lang.Class({
        this.parent('battery-missing-symbolic', _("Battery"));

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

-        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Battery"), true);
-        this._item.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop');
-        this.menu.addMenuItem(this._item);
+        this._deviceItems = [ ];
+        this._hasPrimary = false;
+        this._primaryDeviceId = null;

-        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-        this._sessionUpdated();
+        this._batteryItem = new PopupMenu.PopupMenuItem('', { reactive: false });
+        this._primaryPercentage = new St.Label({ style_class: 'popup-battery-percentage' });
+        this._batteryItem.addActor(this._primaryPercentage, { align: St.Align.END });
+        this.menu.addMenuItem(this._batteryItem);
+
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this._otherDevicePosition = 2;
+
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop');
    },

-    _sessionUpdated: function() {
-        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
-        this.menu.setSensitive(sensitive);
-    },
-
-    _statusForDevice: function(device) {
-        let [device_id, device_type, icon, percentage, state, seconds] = device;
-
-        if (state == UPower.DeviceState.FULLY_CHARGED)
-            return _("Fully Charged");
-
-        let time = Math.round(seconds / 60);
-        if (time == 0) {
-            // 0 is reported when UPower does not have enough data
-            // to estimate battery life
-            return _("Estimating…");
-        }
-
-        let minutes = time % 60;
-        let hours = Math.floor(time / 60);
-
-        if (state == UPower.DeviceState.DISCHARGING) {
-            // Translators: this is <hours>:<minutes> Remaining (<percentage>)
-            return _("%d\u2236%d Remaining (%d%%)".format(hours, minutes, percentage));
-        }
-
-        if (state == UPower.DeviceState.CHARGING) {
-            // Translators: this is <hours>:<minutes> Until Full (<percentage>)
-            return _("%d\u2236%d Until Full (%d%%)".format(hours, minutes, percentage));
-        }
-
-        // state is one of PENDING_CHARGING, PENDING_DISCHARGING
-        return _("Estimating…");
-    },
-
-    _syncStatusLabel: function() {
+    _readPrimaryDevice: function() {
        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
            if (error) {
-                this._item.actor.hide();
+                this._hasPrimary = false;
+                this._primaryDeviceId = null;
+                this._batteryItem.actor.hide();
+                return;
+            }
+            let [[device_id, device_type, icon, percentage, state, seconds]] = result;
+            if (device_type == UPDeviceType.BATTERY) {
+                this._hasPrimary = true;
+                let time = Math.round(seconds / 60);
+                if (time == 0) {
+                    // 0 is reported when UPower does not have enough data
+                    // to estimate battery life
+                    this._batteryItem.label.text = _("Estimating…");
+                } else {
+                    let minutes = time % 60;
+                    let hours = Math.floor(time / 60);
+                    let timestring;
+                    if (time >= 60) {
+                        if (minutes == 0) {
+                            timestring = ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
+                        } else {
+                            /* TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" */
+                            let template = _("%d %s %d %s remaining");
+
+                            timestring = template.format (hours, ngettext("hour", "hours", hours), minutes, ngettext("minute", "minutes", minutes));
+                        }
+                    } else
+                        timestring = ngettext("%d minute remaining", "%d minutes remaining", minutes).format(minutes);
+                    this._batteryItem.label.text = timestring;
+                }
+                this._primaryPercentage.text = C_("percent of battery remaining", "%d%%").format(Math.round(percentage));
+                this._batteryItem.actor.show();
+            } else {
+                this._hasPrimary = false;
+                this._batteryItem.actor.hide();
+            }
+
+            this._primaryDeviceId = device_id;
+        }));
+    },
+
+    _readOtherDevices: function() {
+        this._proxy.GetDevicesRemote(Lang.bind(this, function(result, error) {
+            this._deviceItems.forEach(function(i) { i.destroy(); });
+            this._deviceItems = [];
+
+            if (error) {
                return;
            }

-            let [device] = result;
-            let [device_id, device_type] = device;
-            if (device_type == UPower.DeviceKind.BATTERY) {
-                this._item.status.text = this._statusForDevice(device);
-                this._item.actor.show();
-            } else {
-                this._item.actor.hide();
+            let position = 0;
+            let [devices] = result;
+            for (let i = 0; i < devices.length; i++) {
+                let [device_id, device_type] = devices[i];
+                if (device_type == UPDeviceType.AC_POWER || device_id == this._primaryDeviceId)
+                    continue;
+
+                let item = new DeviceItem (devices[i]);
+                this._deviceItems.push(item);
+                this.menu.addMenuItem(item, this._otherDevicePosition + position);
+                position++;
            }
        }));
    },
@@ -109,15 +156,71 @@ const Indicator = new Lang.Class({
        if (icon) {
            let gicon = Gio.icon_new_for_string(icon);
            this.setGIcon(gicon);
-            this._item.icon.gicon = gicon;
            hasIcon = true;
        }
        this.mainIcon.visible = hasIcon;
        this.actor.visible = hasIcon;
    },

-    _sync: function() {
+    _devicesChanged: function() {
        this._syncIcon();
-        this._syncStatusLabel();
+        this._readPrimaryDevice();
+        this._readOtherDevices();
+    }
+});
+
+const DeviceItem = new Lang.Class({
+    Name: 'DeviceItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function(device) {
+        this.parent({ reactive: false });
+
+        let [device_id, device_type, icon, percentage, state, time] = device;
+
+        this._box = new St.BoxLayout({ style_class: 'popup-device-menu-item' });
+        this._label = new St.Label({ text: this._deviceTypeToString(device_type) });
+
+        this._icon = new St.Icon({ gicon: Gio.icon_new_for_string(icon),
+                                   style_class: 'popup-menu-icon' });
+
+        this._box.add_actor(this._icon);
+        this._box.add_actor(this._label);
+        this.addActor(this._box);
+
+        let percentLabel = new St.Label({ text: C_("percent of battery remaining", "%d%%").format(Math.round(percentage)),
+                                          style_class: 'popup-battery-percentage' });
+        this.addActor(percentLabel, { align: St.Align.END });
+        //FIXME: ideally we would like to expose this._label and percentLabel
+        this.actor.label_actor = percentLabel;
+    },
+
+    _deviceTypeToString: function(type) {
+	switch (type) {
+	case UPDeviceType.AC_POWER:
+            return _("AC Adapter");
+        case UPDeviceType.BATTERY:
+            return _("Laptop Battery");
+        case UPDeviceType.UPS:
+            return _("UPS");
+        case UPDeviceType.MONITOR:
+            return _("Monitor");
+        case UPDeviceType.MOUSE:
+            return _("Mouse");
+        case UPDeviceType.KEYBOARD:
+            return _("Keyboard");
+        case UPDeviceType.PDA:
+            return _("PDA");
+        case UPDeviceType.PHONE:
+            return _("Cell Phone");
+        case UPDeviceType.MEDIA_PLAYER:
+            return _("Media Player");
+        case UPDeviceType.TABLET:
+            return _("Tablet");
+        case UPDeviceType.COMPUTER:
+            return _("Computer");
+        default:
+            return C_("device", "Unknown");
+        }
    }
 });
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -1,358 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const AccountsService = imports.gi.AccountsService;
-const Gdm = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Clutter = imports.gi.Clutter;
-
-const BoxPointer = imports.ui.boxpointer;
-const GnomeSession = imports.misc.gnomeSession;
-const LoginManager = imports.misc.loginManager;
-const Main = imports.ui.main;
-const ModalDialog = imports.ui.modalDialog;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-const Util = imports.misc.util;
-const UserWidget = imports.ui.userWidget;
-
-const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
-const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
-const PRIVACY_SCHEMA = 'org.gnome.desktop.privacy'
-const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
-const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
-const DISABLE_LOG_OUT_KEY = 'disable-log-out';
-const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';
-
-const MAX_USERS_IN_SESSION_DIALOG = 5;
-
-const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
-    <property name="Id" type="s" access="read"/>
-    <property name="Remote" type="b" access="read"/>
-    <property name="Class" type="s" access="read"/>
-    <property name="Type" type="s" access="read"/>
-    <property name="State" type="s" access="read"/>
-</interface>;
-
-const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
-
-const Indicator = new Lang.Class({
-    Name: 'SystemIndicator',
-    Extends: PanelMenu.SystemStatusButton,
-
-    _init: function() {
-        this.parent('system-shutdown-symbolic', _("System"));
-
-        this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
-        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
-        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
-
-        this._session = new GnomeSession.SessionManager();
-        this._haveShutdown = true;
-
-        this._loginManager = LoginManager.getLoginManager();
-        this._userManager = AccountsService.UserManager.get_default();
-        this._user = this._userManager.get_user(GLib.get_user_name());
-
-        this._createSubMenu();
-
-        this._userManager.connect('notify::is-loaded',
-                                  Lang.bind(this, this._updateMultiUser));
-        this._userManager.connect('notify::has-multiple-users',
-                                  Lang.bind(this, this._updateMultiUser));
-        this._userManager.connect('user-added',
-                                  Lang.bind(this, this._updateMultiUser));
-        this._userManager.connect('user-removed',
-                                  Lang.bind(this, this._updateMultiUser));
-        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
-                                       Lang.bind(this, this._updateMultiUser));
-        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
-                                       Lang.bind(this, this._updateMultiUser));
-        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
-                                       Lang.bind(this, this._updateLockScreen));
-        global.settings.connect('changed::' + ALWAYS_SHOW_LOG_OUT_KEY,
-                                Lang.bind(this, this._updateMultiUser));
-        this._updateSwitchUser();
-        this._updateMultiUser();
-
-        // Whether shutdown is available or not depends on both lockdown
-        // settings (disable-log-out) and Polkit policy - the latter doesn't
-        // notify, so we update the menu item each time the menu opens or
-        // the lockdown setting changes, which should be close enough.
-        this.menu.connect('open-state-changed', Lang.bind(this,
-            function(menu, open) {
-                if (!open)
-                    return;
-
-                this._updateHaveShutdown();
-            }));
-        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
-                                       Lang.bind(this, this._updateHaveShutdown));
-
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-        this._sessionUpdated();
-    },
-
-    _sessionUpdated: function() {
-        this._updateLockScreen();
-        this._updatePowerOff();
-        this._settingsAction.visible = Main.sessionMode.allowSettings;
-    },
-
-    _updateMultiUser: function() {
-        let shouldShowInMode = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
-        let hasSwitchUser = this._updateSwitchUser();
-        let hasLogout = this._updateLogout();
-
-        this._switchUserSubMenu.actor.visible = shouldShowInMode && (hasSwitchUser || hasLogout);
-    },
-
-    _updateSwitchUser: function() {
-        let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
-        let multiUser = this._userManager.can_switch() && this._userManager.has_multiple_users;
-
-        let visible = allowSwitch && multiUser;
-        this._loginScreenItem.actor.visible = visible;
-        return visible;
-    },
-
-    _updateLogout: function() {
-        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
-        let alwaysShow = global.settings.get_boolean(ALWAYS_SHOW_LOG_OUT_KEY);
-        let systemAccount = this._user.system_account;
-        let localAccount = this._user.local_account;
-        let multiUser = this._userManager.has_multiple_users;
-        let multiSession = Gdm.get_session_ids().length > 1;
-
-        let visible = allowLogout && (alwaysShow || multiUser || multiSession || systemAccount || !localAccount);
-        this._logoutItem.actor.visible = visible;
-        return visible;
-    },
-
-    _updateSwitchUserSubMenu: function() {
-        this._switchUserSubMenu.label.text = this._user.get_real_name();
-
-        let iconFile = this._user.get_icon_file();
-        if (iconFile && !GLib.file_test(iconFile, GLib.FileTest.EXISTS))
-            iconFile = null;
-
-        if (iconFile) {
-            let file = Gio.File.new_for_path(iconFile);
-            let gicon = new Gio.FileIcon({ file: file });
-            this._switchUserSubMenu.icon.gicon = gicon;
-        } else {
-            this._switchUserSubMenu.icon_name = 'avatar-default-symbolic';
-        }
-    },
-
-    _updateLockScreen: function() {
-        let showLock = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
-        let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
-        this._lockScreenAction.visible = showLock && allowLockScreen && LoginManager.canLock();
-    },
-
-    _updateHaveShutdown: function() {
-        this._session.CanShutdownRemote(Lang.bind(this,
-            function(result, error) {
-                if (!error) {
-                    this._haveShutdown = result[0];
-                    this._updatePowerOff();
-                }
-            }));
-    },
-
-    _updatePowerOff: function() {
-        this._powerOffAction.visible = this._haveShutdown && !Main.sessionMode.isLocked;
-    },
-
-    _createActionButton: function(iconName, accessibleName) {
-        let icon = new St.Button({ reactive: true,
-                                   can_focus: true,
-                                   track_hover: true,
-                                   accessible_name: accessibleName,
-                                   style_class: 'system-menu-action' });
-        icon.child = new St.Icon({ icon_name: iconName });
-        return icon;
-    },
-
-    _createSubMenu: function() {
-        let item;
-
-        this._switchUserSubMenu = new PopupMenu.PopupSubMenuMenuItem('', true);
-        this._switchUserSubMenu.icon.style_class = 'system-switch-user-submenu-icon';
-
-        item = new PopupMenu.PopupMenuItem(_("Switch User"));
-        item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
-        this._switchUserSubMenu.menu.addMenuItem(item);
-        this._loginScreenItem = item;
-
-        item = new PopupMenu.PopupMenuItem(_("Log Out"));
-        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
-        this._switchUserSubMenu.menu.addMenuItem(item);
-        this._logoutItem = item;
-
-        this._user.connect('notify::is-loaded', Lang.bind(this, this._updateSwitchUserSubMenu));
-        this._user.connect('changed', Lang.bind(this, this._updateSwitchUserSubMenu));
-
-        this.menu.addMenuItem(this._switchUserSubMenu);
-
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        let hbox = new St.BoxLayout({ style_class: 'system-menu-actions-box' });
-
-        this._settingsAction = this._createActionButton('preferences-system-symbolic', _("Settings"));
-        this._settingsAction.connect('clicked', Lang.bind(this, this._onSettingsClicked));
-        hbox.add(this._settingsAction, { expand: true, x_fill: false });
-
-        this._lockScreenAction = this._createActionButton('changes-prevent-symbolic', _("Lock"));
-        this._lockScreenAction.connect('clicked', Lang.bind(this, this._onLockScreenClicked));
-        hbox.add(this._lockScreenAction, { expand: true, x_fill: false });
-
-        this._powerOffAction = this._createActionButton('system-shutdown-symbolic', _("Power Off"));
-        this._powerOffAction.connect('clicked', Lang.bind(this, this._onPowerOffClicked));
-        hbox.add(this._powerOffAction, { expand: true, x_fill: false });
-
-        item = new PopupMenu.PopupBaseMenuItem({ reactive: false,
-                                                 can_focus: false });
-        item.addActor(hbox, { expand: true });
-
-        this.menu.addMenuItem(item);
-    },
-
-    _onSettingsClicked: function() {
-        this.menu.itemActivated();
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
-        Main.overview.hide();
-        app.activate();
-    },
-
-    _onLockScreenClicked: function() {
-        this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-        Main.overview.hide();
-        Main.screenShield.lock(true);
-    },
-
-    _onLoginScreenActivate: function() {
-        this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-        Main.overview.hide();
-        if (Main.screenShield)
-            Main.screenShield.lock(false);
-        Gdm.goto_login_session_sync(null);
-    },
-
-    _onQuitSessionActivate: function() {
-        Main.overview.hide();
-        this._session.LogoutRemote(0);
-    },
-
-    _openSessionWarnDialog: function(sessions) {
-        let dialog = new ModalDialog.ModalDialog();
-        let subjectLabel = new St.Label({ style_class: 'end-session-dialog-subject',
-                                          text: _("Other users are logged in.") });
-        dialog.contentLayout.add(subjectLabel, { y_fill: true,
-                                                 y_align: St.Align.START });
-
-        let descriptionLabel = new St.Label({ style_class: 'end-session-dialog-description'});
-        descriptionLabel.set_text(_("Shutting down might cause them to lose unsaved work."));
-        descriptionLabel.clutter_text.line_wrap = true;
-        dialog.contentLayout.add(descriptionLabel, { x_fill: true,
-                                                     y_fill: true,
-                                                     y_align: St.Align.START });
-
-        let scrollView = new St.ScrollView({ style_class: 'end-session-dialog-app-list' });
-        scrollView.add_style_class_name('vfade');
-        scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        dialog.contentLayout.add(scrollView, { x_fill: true, y_fill: true });
-
-        let userList = new St.BoxLayout({ vertical: true });
-        scrollView.add_actor(userList);
-
-        for (let i = 0; i < sessions.length; i++) {
-            let session = sessions[i];
-            let userEntry = new St.BoxLayout({ style_class: 'login-dialog-user-list-item',
-                                               vertical: false });
-            let avatar = new UserWidget.Avatar(session.user);
-            avatar.update();
-            userEntry.add(avatar.actor);
-
-            let userLabelText = "";;
-            let userName = session.user.get_real_name() ?
-                           session.user.get_real_name() : session.username;
-
-            if (session.info.remote)
-                /* Translators: Remote here refers to a remote session, like a ssh login */
-                userLabelText = _("%s (remote)").format(userName);
-            else if (session.info.type == "tty")
-                /* Translators: Console here refers to a tty like a VT console */
-                userLabelText = _("%s (console)").format(userName);
-            else
-                userLabelText = userName;
-
-            let textLayout = new St.BoxLayout({ style_class: 'login-dialog-user-list-item-text-box',
-                                                vertical: true });
-            textLayout.add(new St.Label({ text: userLabelText }),
-                           { y_fill: false,
-                             y_align: St.Align.MIDDLE,
-                             expand: true });
-            userEntry.add(textLayout, { expand: true });
-            userList.add(userEntry, { x_fill: true });
-        }
-
-        let cancelButton = { label: _("Cancel"),
-                             action: function() { dialog.close(); },
-                             key: Clutter.Escape };
-
-        let powerOffButton = { label: _("Power Off"),  action: Lang.bind(this, function() {
-            dialog.close();
-            this._session.ShutdownRemote();
-        }), default: true };
-
-        dialog.setButtons([cancelButton, powerOffButton]);
-
-        dialog.open();
-    },
-
-    _onPowerOffClicked: function() {
-        this.menu.itemActivated();
-        Main.overview.hide();
-        this._loginManager.listSessions(Lang.bind(this, function(result) {
-            let sessions = [];
-            let n = 0;
-            for (let i = 0; i < result.length; i++) {
-                let[id, uid, userName, seat, sessionPath] = result[i];
-                let proxy = new SystemdLoginSession(Gio.DBus.system,
-                                                    'org.freedesktop.login1',
-                                                    sessionPath);
-
-                if (proxy.Class != 'user')
-                    continue;
-
-                if (proxy.State == 'closing')
-                    continue;
-
-                if (proxy.Id == GLib.getenv('XDG_SESSION_ID'))
-                    continue;
-
-                sessions.push({ user: this._userManager.get_user(userName),
-                                username: userName,
-                                info: { type: proxy.Type,
-                                        remote: proxy.Remote }
-                              });
-
-                // limit the number of entries
-                n++;
-                if (n == MAX_USERS_IN_SESSION_DIALOG)
-                    break;
-            }
-
-            if (n != 0)
-                this._openSessionWarnDialog(sessions);
-            else
-                this._session.ShutdownRemote();
-        }));
-    }
-});
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -9,7 +9,8 @@ const Signals = imports.signals;

 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Slider = imports.ui.slider;
+
+const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */

 const VOLUME_NOTIFY_ID = 1;

@@ -29,25 +30,21 @@ function getMixerControl() {
 const StreamSlider = new Lang.Class({
    Name: 'StreamSlider',

-    _init: function(control) {
+    _init: function(control, title) {
        this._control = control;

-        this.item = new PopupMenu.PopupBaseMenuItem({ activate: false });
+        this.item = new PopupMenu.PopupMenuSection();

-        this._slider = new Slider.Slider(0);
+        this._title = new PopupMenu.PopupMenuItem(title, { reactive: false });
+        this._slider = new PopupMenu.PopupSliderMenuItem(0);
        this._slider.connect('value-changed', Lang.bind(this, this._sliderChanged));
        this._slider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));

-        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
-
-        this.item.addActor(this._icon, { align: St.Align.MIDDLE });
-        this.item.addActor(this._slider.actor, { expand: true });
-
-        this.item.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
-            this._slider.startDragging(event);
-        }));
+        this.item.addMenuItem(this._title);
+        this.item.addMenuItem(this._slider);

        this._stream = null;
+        this._shouldShow = true;
    },

    get stream() {
@@ -89,7 +86,8 @@ const StreamSlider = new Lang.Class({

    _updateVisibility: function() {
        let visible = this._shouldBeVisible();
-        this.item.actor.visible = visible;
+        this._title.actor.visible = visible;
+        this._slider.actor.visible = visible;
    },

    scroll: function(event) {
@@ -183,17 +181,11 @@ const OutputStreamSlider = new Lang.Class({
        this._portChangedId = 0;
    },

-    _updateSliderIcon: function() {
-        this._icon.icon_name = (this._hasHeadphones ?
-                                'audio-headphones-symbolic' :
-                                'audio-speakers-symbolic');
-    },
-
    _portChanged: function() {
        let hasHeadphones = this._findHeadphones(this._stream);
        if (hasHeadphones != this._hasHeadphones) {
            this._hasHeadphones = hasHeadphones;
-            this._updateSliderIcon();
+            this.emit('headphones-changed', this._hasHeadphones);
        }
    }
 });
@@ -202,11 +194,10 @@ const InputStreamSlider = new Lang.Class({
    Name: 'InputStreamSlider',
    Extends: StreamSlider,

-    _init: function(control) {
-        this.parent(control);
+    _init: function(control, title) {
+        this.parent(control, title);
        this._control.connect('stream-added', Lang.bind(this, this._maybeShowInput));
        this._control.connect('stream-removed', Lang.bind(this, this._maybeShowInput));
-        this._icon.icon_name = 'audio-input-microphone-symbolic';
    },

    _connectStream: function(stream) {
@@ -254,13 +245,17 @@ const VolumeMenu = new Lang.Class({
        this._control.connect('default-sink-changed', Lang.bind(this, this._readOutput));
        this._control.connect('default-source-changed', Lang.bind(this, this._readInput));

-        this._output = new OutputStreamSlider(this._control);
+        /* Translators: This is the label for audio volume */
+        this._output = new OutputStreamSlider(this._control, _("Volume"));
        this._output.connect('stream-updated', Lang.bind(this, function() {
            this.emit('icon-changed');
        }));
+        this._output.connect('headphones-changed', Lang.bind(this, function(stream, value) {
+            this.emit('headphones-changed', value);
+        }));
        this.addMenuItem(this._output.item);

-        this._input = new InputStreamSlider(this._control);
+        this._input = new InputStreamSlider(this._control, _("Microphone"));
        this.addMenuItem(this._input.item);

        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@@ -308,9 +303,18 @@ const Indicator = new Lang.Class({
            this.actor.visible = (icon != null);
            this.setIcon(icon);
        }));
+        this._volumeMenu.connect('headphones-changed', Lang.bind(this, function(menu, value) {
+            this._headphoneIcon.visible = value;
+        }));
+
+        this._headphoneIcon = this.addIcon(new Gio.ThemedIcon({ name: 'audio-headphones-symbolic' }));
+        this._headphoneIcon.visible = false;

        this.menu.addMenuItem(this._volumeMenu);

+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addSettingsAction(_("Sound Settings"), 'gnome-sound-panel.desktop');
+
        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
    },

--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const AccountsService = imports.gi.AccountsService;
-const Atk = imports.gi.Atk;
 const Clutter = imports.gi.Clutter;
 const Gdm  = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
@@ -13,13 +12,14 @@ const Signals = imports.signals;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;

-const Layout = imports.ui.layout;
 const Main = imports.ui.main;
+const ModalDialog = imports.ui.modalDialog;
 const Panel = imports.ui.panel;
+const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
+const UserMenu = imports.ui.userMenu;
 const UserWidget = imports.ui.userWidget;

-const AuthPrompt = imports.gdm.authPrompt;
 const Batch = imports.gdm.batch;
 const GdmUtil = imports.gdm.util;
 const LoginDialog = imports.gdm.loginDialog;
@@ -29,35 +29,91 @@ const IDLE_TIMEOUT = 2 * 60;

 const UnlockDialog = new Lang.Class({
    Name: 'UnlockDialog',
+    Extends: ModalDialog.ModalDialog,

    _init: function(parentActor) {
-        this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,
-                                     style_class: 'login-dialog',
-                                     visible: false });
-
-        this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
-        parentActor.add_child(this.actor);
+        this.parent({ shellReactive: true,
+                      styleClass: 'login-dialog',
+                      keybindingMode: Shell.KeyBindingMode.UNLOCK_SCREEN,
+                      parentActor: parentActor
+                    });

        this._userManager = AccountsService.UserManager.get_default();
        this._userName = GLib.get_user_name();
        this._user = this._userManager.get_user(this._userName);

-        this._promptBox = new St.BoxLayout({ vertical: true });
-        this.actor.add_child(this._promptBox);
-        this._promptBox.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
-                                                                     align_axis: Clutter.AlignAxis.BOTH,
-                                                                     factor: 0.5 }));
+        this._failCounter = 0;
+        this._firstQuestion = true;

-        this._authPrompt = new AuthPrompt.AuthPrompt(new Gdm.Client(), AuthPrompt.AuthPromptMode.UNLOCK_ONLY);
-        this._authPrompt.connect('failed', Lang.bind(this, this._fail));
-        this._authPrompt.connect('cancelled', Lang.bind(this, this._fail));
-        this._authPrompt.connect('reset', Lang.bind(this, this._onReset));
-        this._authPrompt.setPasswordChar('\u25cf');
-        this._authPrompt.nextButton.label = _("Unlock");
+        this._greeterClient = new Gdm.Client();
+        this._userVerifier = new GdmUtil.ShellUserVerifier(this._greeterClient, { reauthenticationOnly: true });
+        this._userVerified = false;

-        this._promptBox.add_child(this._authPrompt.actor);
+        this._userVerifier.connect('ask-question', Lang.bind(this, this._onAskQuestion));
+        this._userVerifier.connect('show-message', Lang.bind(this, this._showMessage));
+        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
+        this._userVerifier.connect('verification-failed', Lang.bind(this, this._onVerificationFailed));
+        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
+
+        this._userVerifier.connect('show-login-hint', Lang.bind(this, this._showLoginHint));
+        this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._hideLoginHint));
+
+        this._userWidget = new UserWidget.UserWidget(this._user);
+        this.contentLayout.add_actor(this._userWidget.actor);
+
+        this._promptLayout = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
+                                                vertical: true });
+
+        this._promptLabel = new St.Label({ style_class: 'login-dialog-prompt-label' });
+        this._promptLayout.add(this._promptLabel,
+                               { x_align: St.Align.START });
+
+        this._promptEntry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
+                                           can_focus: true });
+        this._promptEntry.clutter_text.connect('activate', Lang.bind(this, this._doUnlock));
+        this._promptEntry.clutter_text.set_password_char('\u25cf');
+        ShellEntry.addContextMenu(this._promptEntry, { isPassword: true });
+        this.setInitialKeyFocus(this._promptEntry);
+        this._promptEntry.clutter_text.connect('text-changed', Lang.bind(this, function() {
+            this._updateOkButtonSensitivity(this._promptEntry.text.length > 0);
+        }));
+
+        this._promptLayout.add(this._promptEntry,
+                               { expand: true,
+                                 x_fill: true });
+
+        this.contentLayout.add_actor(this._promptLayout);
+
+        this._promptMessage = new St.Label({ visible: false });
+        this.contentLayout.add(this._promptMessage, { x_fill: true });
+
+        this._promptLoginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint' });
+        this._promptLoginHint.hide();
+        this.contentLayout.add_actor(this._promptLoginHint);

        this.allowCancel = false;
+        this.buttonLayout.visible = true;
+        this.addButton({ label: _("Cancel"),
+                         action: Lang.bind(this, this._escape),
+                         key: Clutter.KEY_Escape },
+                       { expand: true,
+                         x_fill: false,
+                         y_fill: false,
+                         x_align: St.Align.START,
+                         y_align: St.Align.MIDDLE });
+        this.placeSpinner({ expand: false,
+                            x_fill: false,
+                            y_fill: false,
+                            x_align: St.Align.END,
+                            y_align: St.Align.MIDDLE });
+        this._okButton = this.addButton({ label: _("Unlock"),
+                                          action: Lang.bind(this, this._doUnlock),
+                                          default: true },
+                                        { expand: false,
+                                          x_fill: false,
+                                          y_fill: false,
+                                          x_align: St.Align.END,
+                                          y_align: St.Align.MIDDLE });

        let screenSaverSettings = new Gio.Settings({ schema: 'org.gnome.desktop.screensaver' });
        if (screenSaverSettings.get_boolean('user-switch-enabled')) {
@@ -70,100 +126,174 @@ const UnlockDialog = new Lang.Class({
                                                    x_align: St.Align.START,
                                                    x_fill: true });
            this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked));
-            this._promptBox.add_child(this._otherUserButton);
+            this.dialogLayout.add(this._otherUserButton,
+                                  { x_align: St.Align.START,
+                                    x_fill: false });
        } else {
            this._otherUserButton = null;
        }

-        this._authPrompt.reset();
        this._updateSensitivity(true);

-        Main.ctrlAltTabManager.addGroup(this.actor, _("Unlock Window"), 'dialog-password-symbolic');
+        let batch = new Batch.Hold();
+        this._userVerifier.begin(this._userName, batch);
+
+        Main.ctrlAltTabManager.addGroup(this.dialogLayout, _("Unlock Window"), 'dialog-password-symbolic');

        this._idleMonitor = new GnomeDesktop.IdleMonitor();
        this._idleWatchId = this._idleMonitor.add_idle_watch(IDLE_TIMEOUT * 1000, Lang.bind(this, this._escape));
    },

    _updateSensitivity: function(sensitive) {
-        this._authPrompt.updateSensitivity(sensitive);
-
+        this._promptEntry.reactive = sensitive;
+        this._promptEntry.clutter_text.editable = sensitive;
+        this._updateOkButtonSensitivity(sensitive && this._promptEntry.text.length > 0);
        if (this._otherUserButton) {
            this._otherUserButton.reactive = sensitive;
            this._otherUserButton.can_focus = sensitive;
        }
    },

-    _fail: function() {
-        this.emit('failed');
+    _updateOkButtonSensitivity: function(sensitive) {
+        this._okButton.reactive = sensitive;
+        this._okButton.can_focus = sensitive;
    },

-    _onReset: function(authPrompt, beginRequest) {
-        let userName;
-        if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) {
-            this._authPrompt.setUser(this._user);
-            userName = this._userName;
+    _showMessage: function(userVerifier, message, styleClass) {
+        if (message) {
+            this._promptMessage.text = message;
+            this._promptMessage.styleClass = styleClass;
+            GdmUtil.fadeInActor(this._promptMessage);
        } else {
-            userName = null;
+            GdmUtil.fadeOutActor(this._promptMessage);
+        }
+    },
+
+    _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
+        if (this._firstQuestion && this._firstQuestionAnswer) {
+            this._userVerifier.answerQuery(serviceName, this._firstQuestionAnswer);
+            this._firstQuestionAnswer = null;
+            this._firstQuestion = false;
+            return;
        }

-        this._authPrompt.begin({ userName: userName });
+        this._promptLabel.text = question;
+
+        if (!this._firstQuestion)
+            this._promptEntry.text = '';
+        else
+            this._firstQuestion = false;
+
+        this._promptEntry.clutter_text.set_password_char(passwordChar);
+        this._promptEntry.menu.isPassword = passwordChar != '';
+
+        this._currentQuery = serviceName;
+        this._updateSensitivity(true);
+        this.setWorking(false);
+    },
+
+    _showLoginHint: function(verifier, message) {
+        this._promptLoginHint.set_text(message)
+        GdmUtil.fadeInActor(this._promptLoginHint);
+    },
+
+    _hideLoginHint: function() {
+        GdmUtil.fadeOutActor(this._promptLoginHint);
+    },
+
+    _doUnlock: function() {
+        if (this._firstQuestion) {
+            // we haven't received a query yet, so stash the answer
+            // and make ourself non-reactive
+            // the actual reply to GDM will be sent as soon as asked
+            this._firstQuestionAnswer = this._promptEntry.text;
+            this._updateSensitivity(false);
+            this.setWorking(true);
+            return;
+        }
+
+        if (!this._currentQuery)
+            return;
+
+        let query = this._currentQuery;
+        this._currentQuery = null;
+
+        this._updateSensitivity(false);
+        this.setWorking(true);
+
+        this._userVerifier.answerQuery(query, this._promptEntry.text);
+    },
+
+    _finishUnlock: function() {
+        this._userVerifier.clear();
+        this.emit('unlocked');
+    },
+
+    _onVerificationComplete: function() {
+        this._userVerified = true;
+        if (!this._userVerifier.hasPendingMessages) {
+            this._finishUnlock();
+        } else {
+            let signalId = this._userVerifier.connect('no-more-messages',
+                                                      Lang.bind(this, function() {
+                                                          this._userVerifier.disconnect(signalId);
+                                                          this._finishUnlock();
+                                                      }));
+        }
+    },
+
+    _onReset: function() {
+        if (!this._userVerified) {
+            this._userVerifier.clear();
+            this.emit('failed');
+        }
+    },
+
+    _onVerificationFailed: function() {
+        this._currentQuery = null;
+        this._firstQuestion = true;
+        this._userVerified = false;
+
+        this._promptEntry.text = '';
+        this._promptEntry.clutter_text.set_password_char('\u25cf');
+        this._promptEntry.menu.isPassword = true;
+
+        this._updateSensitivity(false);
+        this.setWorking(false);
    },

    _escape: function() {
-        if (this.allowCancel)
-            this._authPrompt.cancel();
+        if (this.allowCancel) {
+            this._userVerifier.cancel();
+            this.emit('failed');
+        }
    },

    _otherUserClicked: function(button, event) {
        Gdm.goto_login_session_sync(null);

-        this._authPrompt.cancel();
+        this._userVerifier.cancel();
+        this.emit('failed');
    },

    destroy: function() {
-        this.popModal();
-        this.actor.destroy();
+        this._userVerifier.clear();

        if (this._idleWatchId) {
            this._idleMonitor.remove_watch(this._idleWatchId);
            this._idleWatchId = 0;
        }
+
+        this.parent();
    },

    cancel: function() {
-        this._authPrompt.cancel();
+        this._userVerifier.cancel(null);

        this.destroy();
    },

    addCharacter: function(unichar) {
-        this._authPrompt.addCharacter(unichar);
+        this._promptEntry.clutter_text.insert_unichar(unichar);
    },
-
-    finish: function(onComplete) {
-        this._authPrompt.finish(onComplete);
-    },
-
-    open: function(timestamp) {
-        this.actor.show();
-
-        if (this._isModal)
-            return true;
-
-        if (!Main.pushModal(this.actor, { timestamp: timestamp,
-                                          keybindingMode: Shell.KeyBindingMode.UNLOCK_SCREEN }))
-            return false;
-
-        this._isModal = true;
-
-        return true;
-    },
-
-    popModal: function(timestamp) {
-        if (this._isModal) {
-            Main.popModal(this.actor, timestamp);
-            this._isModal = false;
-        }
-    }
 });
-Signals.addSignalMethods(UnlockDialog.prototype);
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -0,0 +1,998 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const AccountsService = imports.gi.AccountsService;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Tp = imports.gi.TelepathyGLib;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+
+const BoxPointer = imports.ui.boxpointer;
+const GnomeSession = imports.misc.gnomeSession;
+const LoginManager = imports.misc.loginManager;
+const Main = imports.ui.main;
+const ModalDialog = imports.ui.modalDialog;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Params = imports.misc.params;
+const Util = imports.misc.util;
+
+const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
+const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
+const PRIVACY_SCHEMA = 'org.gnome.desktop.privacy'
+const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
+const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
+const DISABLE_LOG_OUT_KEY = 'disable-log-out';
+const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';
+const SHOW_FULL_NAME_IN_TOP_BAR_KEY = 'show-full-name-in-top-bar';
+
+const DIALOG_ICON_SIZE = 64;
+
+const MAX_USERS_IN_SESSION_DIALOG = 5;
+
+const IMStatus = {
+    AVAILABLE: 0,
+    BUSY: 1,
+    HIDDEN: 2,
+    AWAY: 3,
+    IDLE: 4,
+    OFFLINE: 5,
+    LAST: 6
+};
+
+
+const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
+    <property name="Id" type="s" access="read"/>
+    <property name="Remote" type="b" access="read"/>
+    <property name="Class" type="s" access="read"/>
+    <property name="Type" type="s" access="read"/>
+    <property name="State" type="s" access="read"/>
+</interface>;
+
+const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
+
+// Adapted from gdm/gui/user-switch-applet/applet.c
+//
+// Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
+// Copyright (C) 2008,2009 Red Hat, Inc.
+
+const UserAvatarWidget = new Lang.Class({
+    Name: 'UserAvatarWidget',
+
+    _init: function(user, params) {
+        this._user = user;
+        params = Params.parse(params, { reactive: false,
+                                        iconSize: DIALOG_ICON_SIZE,
+                                        styleClass: 'status-chooser-user-icon' });
+        this._iconSize = params.iconSize;
+
+        this.actor = new St.Bin({ style_class: params.styleClass,
+                                  track_hover: params.reactive,
+                                  reactive: params.reactive });
+    },
+
+    setSensitive: function(sensitive) {
+        this.actor.can_focus = sensitive;
+        this.actor.reactive = sensitive;
+    },
+
+    update: function() {
+        let iconFile = this._user.get_icon_file();
+        if (iconFile && !GLib.file_test(iconFile, GLib.FileTest.EXISTS))
+            iconFile = null;
+
+        if (iconFile) {
+            let file = Gio.File.new_for_path(iconFile);
+            this.actor.child = null;
+            this.actor.style = 'background-image: url("%s");'.format(iconFile);
+        } else {
+            this.actor.style = null;
+            this.actor.child = new St.Icon({ icon_name: 'avatar-default-symbolic',
+                                             icon_size: this._iconSize });
+        }
+    }
+});
+
+const IMStatusItem = new Lang.Class({
+    Name: 'IMStatusItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function(label, iconName) {
+        this.parent();
+
+        this.actor.add_style_class_name('status-chooser-status-item');
+
+        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
+        this.addActor(this._icon);
+
+        if (iconName)
+            this._icon.icon_name = iconName;
+
+        this.label = new St.Label({ text: label });
+        this.actor.label_actor = this.label;
+        this.addActor(this.label);
+    }
+});
+
+const IMUserNameItem = new Lang.Class({
+    Name: 'IMUserNameItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function() {
+        this.parent({ reactive: false,
+                      can_focus: false,
+                      style_class: 'status-chooser-user-name' });
+
+        this._wrapper = new Shell.GenericContainer();
+        this._wrapper.connect('get-preferred-width',
+                              Lang.bind(this, this._wrapperGetPreferredWidth));
+        this._wrapper.connect('get-preferred-height',
+                              Lang.bind(this, this._wrapperGetPreferredHeight));
+        this._wrapper.connect('allocate',
+                              Lang.bind(this, this._wrapperAllocate));
+        this.addActor(this._wrapper, { expand: true, span: -1 });
+
+        this.label = new St.Label();
+        this.label.clutter_text.set_line_wrap(true);
+        this.label.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE);
+        this._wrapper.add_actor(this.label);
+    },
+
+    _wrapperGetPreferredWidth: function(actor, forHeight, alloc) {
+        alloc.min_size = 1;
+        alloc.natural_size = 1;
+    },
+
+    _wrapperGetPreferredHeight: function(actor, forWidth, alloc) {
+        [alloc.min_size, alloc.natural_size] = this.label.get_preferred_height(forWidth);
+    },
+
+    _wrapperAllocate: function(actor, box, flags) {
+        this.label.allocate(box, flags);
+    }
+});
+
+const IMStatusChooserItem = new Lang.Class({
+    Name: 'IMStatusChooserItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function() {
+        this.parent({ reactive: false,
+                      can_focus: false,
+                      style_class: 'status-chooser' });
+
+        this._userManager = AccountsService.UserManager.get_default();
+        this._user = this._userManager.get_user(GLib.get_user_name());
+
+        this._avatar = new UserAvatarWidget(this._user, { reactive: true });
+        this._iconBin = new St.Button({ child: this._avatar.actor });
+        this.addActor(this._iconBin);
+
+        this._iconBin.connect('clicked', Lang.bind(this,
+            function() {
+                this.activate();
+            }));
+
+        this._section = new PopupMenu.PopupMenuSection();
+        this.addActor(this._section.actor);
+
+        this._name = new IMUserNameItem();
+        this._section.addMenuItem(this._name);
+
+        this._combo = new PopupMenu.PopupComboBoxMenuItem({ style_class: 'status-chooser-combo' });
+        this._section.addMenuItem(this._combo);
+
+        let item;
+
+        item = new IMStatusItem(_("Available"), 'user-available-symbolic');
+        this._combo.addMenuItem(item, IMStatus.AVAILABLE);
+
+        item = new IMStatusItem(_("Busy"), 'user-busy-symbolic');
+        this._combo.addMenuItem(item, IMStatus.BUSY);
+
+        item = new IMStatusItem(_("Invisible"), 'user-invisible-symbolic');
+        this._combo.addMenuItem(item, IMStatus.HIDDEN);
+
+        item = new IMStatusItem(_("Away"), 'user-away-symbolic');
+        this._combo.addMenuItem(item, IMStatus.AWAY);
+
+        item = new IMStatusItem(_("Idle"), 'user-idle-symbolic');
+        this._combo.addMenuItem(item, IMStatus.IDLE);
+
+        item = new IMStatusItem(_("Offline"), 'user-offline-symbolic');
+        this._combo.addMenuItem(item, IMStatus.OFFLINE);
+
+        this._combo.connect('active-item-changed',
+                            Lang.bind(this, this._changeIMStatus));
+
+        this._presence = new GnomeSession.Presence();
+        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
+            this._sessionStatusChanged(status);
+        }));
+
+        this._sessionPresenceRestored = false;
+        this._imPresenceRestored = false;
+        this._currentPresence = undefined;
+
+        this._accountMgr = Tp.AccountManager.dup();
+        this._accountMgr.connect('most-available-presence-changed',
+                                 Lang.bind(this, this._IMStatusChanged));
+        this._accountMgr.connect('account-enabled',
+                                 Lang.bind(this, this._IMAccountsChanged));
+        this._accountMgr.connect('account-disabled',
+                                 Lang.bind(this, this._IMAccountsChanged));
+        this._accountMgr.connect('account-removed',
+                                 Lang.bind(this, this._IMAccountsChanged));
+        this._accountMgr.connect('account-validity-changed',
+                                 Lang.bind(this, this._IMAccountsChanged));
+        this._accountMgr.prepare_async(null, Lang.bind(this,
+            function(mgr) {
+                this._IMAccountsChanged(mgr);
+
+                if (this._networkMonitor.network_available)
+                    this._restorePresence();
+                else
+                    this._setComboboxPresence(Tp.ConnectionPresenceType.OFFLINE);
+            }));
+
+        this._networkMonitor = Gio.NetworkMonitor.get_default();
+        this._networkMonitor.connect('network-changed',
+            Lang.bind(this, function(monitor, available) {
+                this._IMAccountsChanged(this._accountMgr);
+
+                if (available && !this._imPresenceRestored)
+                    this._restorePresence();
+            }));
+
+        this._userLoadedId = this._user.connect('notify::is-loaded',
+                                                Lang.bind(this,
+                                                          this._updateUser));
+        this._userChangedId = this._user.connect('changed',
+                                                 Lang.bind(this,
+                                                           this._updateUser));
+        this.actor.connect('notify::mapped', Lang.bind(this, function() {
+            if (this.actor.mapped)
+                this._updateUser();
+        }));
+
+        this.connect('sensitive-changed', function(sensitive) {
+            this._avatar.setSensitive(sensitive);
+        });
+    },
+
+    _restorePresence: function() {
+        let [presence, status, msg] = this._accountMgr.get_most_available_presence();
+
+        let savedPresence = global.settings.get_int('saved-im-presence');
+
+        if (savedPresence == presence) {
+            this._IMStatusChanged(this._accountMgr, presence, status, msg);
+        } else {
+            this._setComboboxPresence(savedPresence);
+            status = this._statusForPresence(savedPresence);
+            msg = msg ? msg : '';
+            this._accountMgr.set_all_requested_presences(savedPresence, status, msg);
+        }
+    },
+
+    destroy: function() {
+        // clean up signal handlers
+        if (this._userLoadedId != 0) {
+            this._user.disconnect(this._userLoadedId);
+            this._userLoadedId = 0;
+        }
+
+        if (this._userChangedId != 0) {
+            this._user.disconnect(this._userChangedId);
+            this._userChangedId = 0;
+        }
+
+        this.parent();
+    },
+
+    // Override getColumnWidths()/setColumnWidths() to make the item
+    // independent from the overall column layout of the menu
+    getColumnWidths: function() {
+        return [];
+    },
+
+    setColumnWidths: function(widths) {
+    },
+
+    _updateUser: function() {
+        if (this._user.is_loaded)
+            this._name.label.set_text(this._user.get_real_name());
+        else
+            this._name.label.set_text("");
+
+        this._avatar.update();
+    },
+
+    _statusForPresence: function(presence) {
+        switch(presence) {
+            case Tp.ConnectionPresenceType.AVAILABLE:
+                return 'available';
+            case Tp.ConnectionPresenceType.BUSY:
+                return 'busy';
+            case Tp.ConnectionPresenceType.OFFLINE:
+                return 'offline';
+            case Tp.ConnectionPresenceType.HIDDEN:
+                return 'hidden';
+            case Tp.ConnectionPresenceType.AWAY:
+                return 'away';
+            case Tp.ConnectionPresenceType.EXTENDED_AWAY:
+                return 'xa';
+            default:
+                return 'unknown';
+        }
+    },
+
+    _IMAccountsChanged: function(mgr) {
+        let accounts = mgr.get_valid_accounts().filter(function(account) {
+            return account.enabled;
+        });
+        let sensitive = accounts.length > 0 && this._networkMonitor.network_available;
+        this._combo.setSensitive(sensitive);
+    },
+
+    _IMStatusChanged: function(accountMgr, presence, status, message) {
+        if (!this._imPresenceRestored)
+            this._imPresenceRestored = true;
+
+        if (presence == this._currentPresence)
+            return;
+
+        this._currentPresence = presence;
+        this._setComboboxPresence(presence);
+
+        if (!this._sessionPresenceRestored) {
+            this._sessionStatusChanged(this._presence.status);
+            return;
+        }
+
+        if (presence == Tp.ConnectionPresenceType.AVAILABLE)
+            this._presence.status = GnomeSession.PresenceStatus.AVAILABLE;
+
+        // We ignore the actual value of _expectedPresence and never safe
+        // the first presence change after an "automatic" change, assuming
+        // that it is the response to our request; this is to account for
+        // mission control falling back to "similar" presences if an account
+        // type does not implement the requested presence.
+        if (!this._expectedPresence)
+            global.settings.set_int('saved-im-presence', presence);
+        else
+            this._expectedPresence = undefined;
+    },
+
+    _setComboboxPresence: function(presence) {
+        let activatedItem;
+
+        if (presence == Tp.ConnectionPresenceType.AVAILABLE)
+            activatedItem = IMStatus.AVAILABLE;
+        else if (presence == Tp.ConnectionPresenceType.BUSY)
+            activatedItem = IMStatus.BUSY;
+        else if (presence == Tp.ConnectionPresenceType.HIDDEN)
+            activatedItem = IMStatus.HIDDEN;
+        else if (presence == Tp.ConnectionPresenceType.AWAY)
+            activatedItem = IMStatus.AWAY;
+        else if (presence == Tp.ConnectionPresenceType.EXTENDED_AWAY)
+            activatedItem = IMStatus.IDLE;
+        else
+            activatedItem = IMStatus.OFFLINE;
+
+        this._combo.setActiveItem(activatedItem);
+        for (let i = 0; i < IMStatus.LAST; i++) {
+            if (i == IMStatus.AVAILABLE || i == IMStatus.OFFLINE)
+                continue;   // always visible
+
+            this._combo.setItemVisible(i, i == activatedItem);
+        }
+    },
+
+    _changeIMStatus: function(menuItem, id) {
+        let [presence, s, msg] = this._accountMgr.get_most_available_presence();
+        let newPresence, status;
+
+        if (id == IMStatus.AVAILABLE) {
+            newPresence = Tp.ConnectionPresenceType.AVAILABLE;
+        } else if (id == IMStatus.OFFLINE) {
+            newPresence = Tp.ConnectionPresenceType.OFFLINE;
+        } else
+            return;
+
+        status = this._statusForPresence(newPresence);
+        msg = msg ? msg : '';
+        this._accountMgr.set_all_requested_presences(newPresence, status, msg);
+    },
+
+    getIMPresenceForSessionStatus: function(sessionStatus) {
+        // Restore the last user-set presence when coming back from
+        // BUSY/IDLE (otherwise the last user-set presence matches
+        // the current one)
+        if (sessionStatus == GnomeSession.PresenceStatus.AVAILABLE)
+            return global.settings.get_int('saved-im-presence');
+
+        if (sessionStatus == GnomeSession.PresenceStatus.BUSY) {
+            // Only change presence if the current one is "more present" than
+            // busy, or if coming back from idle
+            if (this._currentPresence == Tp.ConnectionPresenceType.AVAILABLE ||
+                this._currentPresence == Tp.ConnectionPresenceType.EXTENDED_AWAY)
+                return Tp.ConnectionPresenceType.BUSY;
+        }
+
+        if (sessionStatus == GnomeSession.PresenceStatus.IDLE) {
+            // Only change presence if the current one is "more present" than
+            // idle
+            if (this._currentPresence != Tp.ConnectionPresenceType.OFFLINE &&
+                this._currentPresence != Tp.ConnectionPresenceType.HIDDEN)
+                return Tp.ConnectionPresenceType.EXTENDED_AWAY;
+        }
+
+        return this._currentPresence;
+    },
+
+    _sessionStatusChanged: function(sessionStatus) {
+        if (!this._imPresenceRestored)
+            return;
+
+        let savedStatus = global.settings.get_int('saved-session-presence');
+        if (!this._sessionPresenceRestored) {
+
+            // We should never save/restore a status other than AVAILABLE
+            // or BUSY
+            if (savedStatus != GnomeSession.PresenceStatus.AVAILABLE &&
+                savedStatus != GnomeSession.PresenceStatus.BUSY)
+                savedStatus = GnomeSession.PresenceStatus.AVAILABLE;
+
+            if (sessionStatus != savedStatus) {
+                this._presence.status = savedStatus;
+                return;
+            }
+            this._sessionPresenceRestored = true;
+        }
+
+        if ((sessionStatus == GnomeSession.PresenceStatus.AVAILABLE ||
+             sessionStatus == GnomeSession.PresenceStatus.BUSY) &&
+            savedStatus != sessionStatus)
+            global.settings.set_int('saved-session-presence', sessionStatus);
+
+        let [presence, s, msg] = this._accountMgr.get_most_available_presence();
+        let newPresence, status;
+
+        let newPresence = this.getIMPresenceForSessionStatus(sessionStatus);
+
+        if (!newPresence || newPresence == presence)
+            return;
+
+        status = this._statusForPresence(newPresence);
+        msg = msg ? msg : '';
+
+        this._expectedPresence = newPresence;
+        this._accountMgr.set_all_requested_presences(newPresence, status, msg);
+    }
+});
+
+
+const UserMenuButton = new Lang.Class({
+    Name: 'UserMenuButton',
+    Extends: PanelMenu.Button,
+
+    _init: function() {
+        this.parent(0.0);
+
+        this.actor.accessible_role = Atk.Role.MENU;
+
+        let box = new St.BoxLayout({ name: 'panelUserMenu' });
+        this.actor.add_actor(box);
+
+        this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
+        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
+        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
+
+        this._userManager = AccountsService.UserManager.get_default();
+
+        this._user = this._userManager.get_user(GLib.get_user_name());
+        this._presence = new GnomeSession.Presence();
+        this._session = new GnomeSession.SessionManager();
+        this._haveShutdown = true;
+        this._haveSuspend = true;
+
+        this._accountMgr = Tp.AccountManager.dup();
+
+        this._loginManager = LoginManager.getLoginManager();
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+
+        this._iconBox = new St.Bin();
+        box.add(this._iconBox, { y_align: St.Align.MIDDLE, y_fill: false });
+
+        let textureCache = St.TextureCache.get_default();
+        this._offlineIcon = new St.Icon({ icon_name: 'user-offline-symbolic',
+                                          style_class: 'popup-menu-icon' });
+        this._availableIcon = new St.Icon({ icon_name: 'user-available-symbolic',
+                                            style_class: 'popup-menu-icon' });
+        this._busyIcon = new St.Icon({ icon_name: 'user-busy-symbolic',
+                                       style_class: 'popup-menu-icon' });
+        this._invisibleIcon = new St.Icon({ icon_name: 'user-invisible-symbolic',
+                                            style_class: 'popup-menu-icon' });
+        this._awayIcon = new St.Icon({ icon_name: 'user-away-symbolic',
+                                       style_class: 'popup-menu-icon' });
+        this._idleIcon = new St.Icon({ icon_name: 'user-idle-symbolic',
+                                       style_class: 'popup-menu-icon' });
+        this._pendingIcon = new St.Icon({ icon_name: 'user-status-pending-symbolic',
+                                          style_class: 'popup-menu-icon' });
+        this._lockedIcon = new St.Icon({ icon_name: 'changes-prevent-symbolic',
+                                         style_class: 'popup-menu-icon' });
+
+        this._accountMgr.connect('most-available-presence-changed',
+                                  Lang.bind(this, this._updatePresenceIcon));
+        this._accountMgr.connect('account-enabled',
+                                  Lang.bind(this, this._onAccountEnabled));
+        this._accountMgr.connect('account-removed',
+                                  Lang.bind(this, this._onAccountRemoved));
+        this._accountMgr.prepare_async(null, Lang.bind(this,
+            function(mgr) {
+                let [presence, s, msg] = mgr.get_most_available_presence();
+                this._updatePresenceIcon(mgr, presence, s, msg);
+                this._setupAccounts();
+            }));
+
+        this._name = new St.Label();
+        this.actor.label_actor = this._name;
+        box.add(this._name, { y_align: St.Align.MIDDLE, y_fill: false });
+        this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUserName));
+        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUserName));
+        this._updateUserName();
+
+        this._createSubMenu();
+
+        this._updateSwitch(this._presence.status);
+        this._presence.connectSignal('StatusChanged', Lang.bind(this, function (proxy, senderName, [status]) {
+            this._updateSwitch(status);
+        }));
+
+        this._userManager.connect('notify::is-loaded',
+                                  Lang.bind(this, this._updateMultiUser));
+        this._userManager.connect('notify::has-multiple-users',
+                                  Lang.bind(this, this._updateMultiUser));
+        this._userManager.connect('user-added',
+                                  Lang.bind(this, this._updateMultiUser));
+        this._userManager.connect('user-removed',
+                                  Lang.bind(this, this._updateMultiUser));
+        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
+                                       Lang.bind(this, this._updateSwitchUser));
+        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
+                                       Lang.bind(this, this._updateLogout));
+        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
+                                       Lang.bind(this, this._updateLockScreen));
+        global.settings.connect('changed::' + ALWAYS_SHOW_LOG_OUT_KEY,
+                                Lang.bind(this, this._updateLogout));
+        this._screenSaverSettings.connect('changed::' + SHOW_FULL_NAME_IN_TOP_BAR_KEY,
+                                           Lang.bind(this, this._updateUserName));
+        this._privacySettings.connect('changed::' + SHOW_FULL_NAME_IN_TOP_BAR_KEY,
+                                      Lang.bind(this, this._updateUserName));
+        this._updateSwitchUser();
+        this._updateLogout();
+        this._updateLockScreen();
+
+        this._updatesFile = Gio.File.new_for_path('/var/lib/PackageKit/prepared-update');
+        this._updatesMonitor = this._updatesFile.monitor(Gio.FileMonitorFlags.NONE, null);
+        this._updatesMonitor.connect('changed', Lang.bind(this, this._updateInstallUpdates));
+
+        // Whether shutdown is available or not depends on both lockdown
+        // settings (disable-log-out) and Polkit policy - the latter doesn't
+        // notify, so we update the menu item each time the menu opens or
+        // the lockdown setting changes, which should be close enough.
+        this.menu.connect('open-state-changed', Lang.bind(this,
+            function(menu, open) {
+                if (!open)
+                    return;
+
+                this._updateHaveShutdown();
+                this._updateHaveSuspend();
+            }));
+        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
+                                       Lang.bind(this, this._updateHaveShutdown));
+
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+        if (Main.screenShield)
+            Main.screenShield.connect('locked-changed', Lang.bind(this, this._updatePresenceIcon));
+        this._sessionUpdated();
+    },
+
+    _sessionUpdated: function() {
+        this.actor.visible = !Main.sessionMode.isGreeter;
+
+        let allowSettings = Main.sessionMode.allowSettings;
+        this._statusChooser.setSensitive(allowSettings);
+        this._systemSettings.visible = allowSettings;
+
+        this.setSensitive(!Main.sessionMode.isLocked);
+        this._updatePresenceIcon();
+        this._updateUserName();
+    },
+
+    _onDestroy: function() {
+        this._user.disconnect(this._userLoadedId);
+        this._user.disconnect(this._userChangedId);
+    },
+
+    _updateUserName: function() {
+        let settings = this._privacySettings;
+        if (Main.sessionMode.isLocked)
+            settings = this._screenSaverSettings;
+        if (this._user.is_loaded && settings.get_boolean(SHOW_FULL_NAME_IN_TOP_BAR_KEY))
+            this._name.set_text(this._user.get_real_name());
+        else
+            this._name.set_text("");
+    },
+
+    _updateMultiUser: function() {
+        this._updateSwitchUser();
+        this._updateLogout();
+    },
+
+    _updateSwitchUser: function() {
+        let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
+        let multiUser = this._userManager.can_switch() && this._userManager.has_multiple_users;
+
+        this._loginScreenItem.actor.visible = allowSwitch && multiUser;
+    },
+
+    _updateLogout: function() {
+        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
+        let alwaysShow = global.settings.get_boolean(ALWAYS_SHOW_LOG_OUT_KEY);
+        let systemAccount = this._user.system_account;
+        let localAccount = this._user.local_account;
+        let multiUser = this._userManager.has_multiple_users;
+        let multiSession = Gdm.get_session_ids().length > 1;
+
+        this._logoutItem.actor.visible = allowLogout && (alwaysShow || multiUser || multiSession || systemAccount || !localAccount);
+    },
+
+    _updateLockScreen: function() {
+        let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
+        this._lockScreenItem.actor.visible = allowLockScreen && LoginManager.canLock();
+    },
+
+    _updateInstallUpdates: function() {
+        let haveUpdates = this._updatesFile.query_exists(null);
+        this._installUpdatesItem.actor.visible = haveUpdates && this._haveShutdown;
+    },
+
+    _updateHaveShutdown: function() {
+        this._session.CanShutdownRemote(Lang.bind(this,
+            function(result, error) {
+                if (!error) {
+                    this._haveShutdown = result[0];
+                    this._updateInstallUpdates();
+                    this._updateSuspendOrPowerOff();
+                }
+            }));
+    },
+
+    _updateHaveSuspend: function() {
+        this._loginManager.canSuspend(Lang.bind(this,
+            function(result) {
+                this._haveSuspend = result;
+                this._updateSuspendOrPowerOff();
+        }));
+    },
+
+    _updateSuspendOrPowerOff: function() {
+        if (!this._suspendOrPowerOffItem)
+            return;
+
+        this._suspendOrPowerOffItem.actor.visible = this._haveShutdown || this._haveSuspend;
+
+        // If we can't power off show Suspend instead
+        // and disable the alt key
+        if (!this._haveShutdown) {
+            this._suspendOrPowerOffItem.updateText(_("Suspend"), null);
+        } else if (!this._haveSuspend) {
+            this._suspendOrPowerOffItem.updateText(_("Power Off"), null);
+        } else {
+            this._suspendOrPowerOffItem.updateText(_("Power Off"), _("Suspend"));
+        }
+    },
+
+    _updateSwitch: function(status) {
+        let active = status == GnomeSession.PresenceStatus.AVAILABLE;
+        this._notificationsSwitch.setToggleState(active);
+    },
+
+    _updatePresenceIcon: function(accountMgr, presence, status, message) {
+        if (Main.sessionMode.isLocked)
+            this._iconBox.child = this._lockedIcon;
+        else if (presence == Tp.ConnectionPresenceType.AVAILABLE)
+            this._iconBox.child = this._availableIcon;
+        else if (presence == Tp.ConnectionPresenceType.BUSY)
+            this._iconBox.child = this._busyIcon;
+        else if (presence == Tp.ConnectionPresenceType.HIDDEN)
+            this._iconBox.child = this._invisibleIcon;
+        else if (presence == Tp.ConnectionPresenceType.AWAY)
+            this._iconBox.child = this._awayIcon;
+        else if (presence == Tp.ConnectionPresenceType.EXTENDED_AWAY)
+            this._iconBox.child = this._idleIcon;
+        else
+            this._iconBox.child = this._offlineIcon;
+
+        if (Main.sessionMode.isLocked)
+            this._iconBox.visible = Main.screenShield.locked;
+        else
+            this._iconBox.visible = true;
+    },
+
+    _setupAccounts: function() {
+        let accounts = this._accountMgr.get_valid_accounts();
+        for (let i = 0; i < accounts.length; i++) {
+            accounts[i]._changingId = accounts[i].connect('notify::connection-status',
+                                                          Lang.bind(this, this._updateChangingPresence));
+        }
+        this._updateChangingPresence();
+    },
+
+    _onAccountEnabled: function(accountMgr, account) {
+        if (!account._changingId)
+            account._changingId = account.connect('notify::connection-status',
+                                                  Lang.bind(this, this._updateChangingPresence));
+        this._updateChangingPresence();
+    },
+
+    _onAccountRemoved: function(accountMgr, account) {
+        if (account._changingId) {
+            account.disconnect(account._changingId);
+            account._changingId = 0;
+        }
+        this._updateChangingPresence();
+    },
+
+    _updateChangingPresence: function() {
+        let accounts = this._accountMgr.get_valid_accounts();
+        let changing = false;
+        for (let i = 0; i < accounts.length; i++) {
+            if (accounts[i].connection_status == Tp.ConnectionStatus.CONNECTING) {
+                changing = true;
+                break;
+            }
+        }
+
+        if (changing) {
+            this._iconBox.child = this._pendingIcon;
+        } else {
+            let [presence, s, msg] = this._accountMgr.get_most_available_presence();
+            this._updatePresenceIcon(this._accountMgr, presence, s, msg);
+        }
+    },
+
+    _createSubMenu: function() {
+        let item;
+
+        item = new IMStatusChooserItem();
+        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+        this.menu.addMenuItem(item);
+        this._statusChooser = item;
+
+        item = new PopupMenu.PopupSwitchMenuItem(_("Notifications"));
+        item.connect('toggled', Lang.bind(this, this._updatePresenceStatus));
+        this.menu.addMenuItem(item);
+        this._notificationsSwitch = item;
+
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("Settings"));
+        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
+        this.menu.addMenuItem(item);
+        this._systemSettings = item;
+
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("Switch User"));
+        item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
+        this.menu.addMenuItem(item);
+        this._loginScreenItem = item;
+
+        item = new PopupMenu.PopupMenuItem(_("Log Out"));
+        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
+        this.menu.addMenuItem(item);
+        this._logoutItem = item;
+
+        item = new PopupMenu.PopupMenuItem(_("Lock"));
+        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
+        this.menu.addMenuItem(item);
+        this._lockScreenItem = item;
+
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupAlternatingMenuItem(_("Power Off"),
+                                                      _("Suspend"));
+        this.menu.addMenuItem(item);
+        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
+        this._suspendOrPowerOffItem = item;
+        this._updateSuspendOrPowerOff();
+
+        item = new PopupMenu.PopupMenuItem(_("Install Updates & Restart"));
+        item.connect('activate', Lang.bind(this, this._onInstallUpdatesActivate));
+        this.menu.addMenuItem(item);
+        this._installUpdatesItem = item;
+    },
+
+    _updatePresenceStatus: function(item, event) {
+        let status;
+
+        if (item.state) {
+            status = GnomeSession.PresenceStatus.AVAILABLE;
+        } else {
+            status = GnomeSession.PresenceStatus.BUSY;
+
+            let [presence, s, msg] = this._accountMgr.get_most_available_presence();
+            let newPresence = this._statusChooser.getIMPresenceForSessionStatus(status);
+            if (newPresence != presence &&
+                newPresence == Tp.ConnectionPresenceType.BUSY)
+                Main.notify(_("Your chat status will be set to busy"),
+                            _("Notifications are now disabled, including chat messages. Your online status has been adjusted to let others know that you might not see their messages."));
+        }
+
+        this._presence.status = status;
+    },
+
+    _onMyAccountActivate: function() {
+        Main.overview.hide();
+        let app = Shell.AppSystem.get_default().lookup_app('gnome-user-accounts-panel.desktop');
+        app.activate();
+    },
+
+    _onPreferencesActivate: function() {
+        Main.overview.hide();
+        let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
+        app.activate();
+    },
+
+    _onLockScreenActivate: function() {
+        this.menu.close(BoxPointer.PopupAnimation.NONE);
+        Main.overview.hide();
+        Main.screenShield.lock(true);
+    },
+
+    _onLoginScreenActivate: function() {
+        this.menu.close(BoxPointer.PopupAnimation.NONE);
+        Main.overview.hide();
+        if (Main.screenShield)
+            Main.screenShield.lock(false);
+        Gdm.goto_login_session_sync(null);
+    },
+
+    _onQuitSessionActivate: function() {
+        Main.overview.hide();
+        this._session.LogoutRemote(0);
+    },
+
+    _onInstallUpdatesActivate: function() {
+        Main.overview.hide();
+        Util.spawn(['pkexec', '/usr/libexec/pk-trigger-offline-update']);
+
+        this._session.RebootRemote();
+    },
+
+    _openSessionWarnDialog: function(sessions) {
+        let dialog = new ModalDialog.ModalDialog();
+        let subjectLabel = new St.Label({ style_class: 'end-session-dialog-subject',
+                                          text: _("Other users are logged in.") });
+        dialog.contentLayout.add(subjectLabel, { y_fill: true,
+                                                 y_align: St.Align.START });
+
+        let descriptionLabel = new St.Label({ style_class: 'end-session-dialog-description'});
+        descriptionLabel.set_text(_("Shutting down might cause them to lose unsaved work."));
+        descriptionLabel.clutter_text.line_wrap = true;
+        dialog.contentLayout.add(descriptionLabel, { x_fill: true,
+                                                     y_fill: true,
+                                                     y_align: St.Align.START });
+
+        let scrollView = new St.ScrollView({ style_class: 'end-session-dialog-app-list' });
+        scrollView.add_style_class_name('vfade');
+        scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        dialog.contentLayout.add(scrollView, { x_fill: true, y_fill: true });
+
+        let userList = new St.BoxLayout({ vertical: true });
+        scrollView.add_actor(userList);
+
+        for (let i = 0; i < sessions.length; i++) {
+            let session = sessions[i];
+            let userEntry = new St.BoxLayout({ style_class: 'login-dialog-user-list-item',
+                                               vertical: false });
+            let avatar = new UserAvatarWidget(session.user);
+            avatar.update();
+            userEntry.add(avatar.actor);
+
+            let userLabelText = "";;
+            let userName = session.user.get_real_name() ?
+                           session.user.get_real_name() : session.username;
+
+            if (session.info.remote)
+                /* Translators: Remote here refers to a remote session, like a ssh login */
+                userLabelText = _("%s (remote)").format(userName);
+            else if (session.info.type == "tty")
+                /* Translators: Console here refers to a tty like a VT console */
+                userLabelText = _("%s (console)").format(userName);
+            else
+                userLabelText = userName;
+
+            let textLayout = new St.BoxLayout({ style_class: 'login-dialog-user-list-item-text-box',
+                                                vertical: true });
+            textLayout.add(new St.Label({ text: userLabelText }),
+                           { y_fill: false,
+                             y_align: St.Align.MIDDLE,
+                             expand: true });
+            userEntry.add(textLayout, { expand: true });
+            userList.add(userEntry, { x_fill: true });
+        }
+
+        let cancelButton = { label: _("Cancel"),
+                             action: function() { dialog.close(); },
+                             key: Clutter.Escape };
+
+        let powerOffButton = { label: _("Power Off"),  action: Lang.bind(this, function() {
+            dialog.close();
+            this._session.ShutdownRemote();
+        }), default: true };
+
+        dialog.setButtons([cancelButton, powerOffButton]);
+
+        dialog.open();
+    },
+
+    _onSuspendOrPowerOffActivate: function() {
+        Main.overview.hide();
+
+        if (this._haveShutdown &&
+            this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
+            this._loginManager.listSessions(Lang.bind(this,
+                function(result) {
+                    let sessions = [];
+                    let n = 0;
+                    for (let i = 0; i < result.length; i++) {
+                        let[id, uid, userName, seat, sessionPath] = result[i];
+                        let proxy = new SystemdLoginSession(Gio.DBus.system,
+                                                            'org.freedesktop.login1',
+                                                            sessionPath);
+
+                        if (proxy.Class != 'user')
+                            continue;
+
+                        if (proxy.State == 'closing')
+                            continue;
+
+                        if (proxy.Id == GLib.getenv('XDG_SESSION_ID'))
+                            continue;
+
+                        sessions.push({ user: this._userManager.get_user(userName),
+                                        username: userName,
+                                        info: { type: proxy.Type,
+                                                remote: proxy.Remote }
+                        });
+
+                        // limit the number of entries
+                        n++;
+                        if (n == MAX_USERS_IN_SESSION_DIALOG)
+                            break;
+                    }
+
+                    if (n != 0)
+                        this._openSessionWarnDialog(sessions);
+                    else
+                        this._session.ShutdownRemote();
+            }));
+        } else {
+            this.menu.close(BoxPointer.PopupAnimation.NONE);
+            this._loginManager.suspend();
+        }
+    }
+});
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@@ -3,56 +3,10 @@
 //
 // A widget showing the user avatar and name
 const AccountsService = imports.gi.AccountsService;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;

-const Params = imports.misc.params;
-
-const AVATAR_ICON_SIZE = 64;
-
-// Adapted from gdm/gui/user-switch-applet/applet.c
-//
-// Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
-// Copyright (C) 2008,2009 Red Hat, Inc.
-
-const Avatar = new Lang.Class({
-    Name: 'Avatar',
-
-    _init: function(user, params) {
-        this._user = user;
-        params = Params.parse(params, { reactive: false,
-                                        iconSize: AVATAR_ICON_SIZE,
-                                        styleClass: 'framed-user-icon' });
-        this._iconSize = params.iconSize;
-
-        this.actor = new St.Bin({ style_class: params.styleClass,
-                                  track_hover: params.reactive,
-                                  reactive: params.reactive });
-    },
-
-    setSensitive: function(sensitive) {
-        this.actor.can_focus = sensitive;
-        this.actor.reactive = sensitive;
-    },
-
-    update: function() {
-        let iconFile = this._user.get_icon_file();
-        if (iconFile && !GLib.file_test(iconFile, GLib.FileTest.EXISTS))
-            iconFile = null;
-
-        if (iconFile) {
-            let file = Gio.File.new_for_path(iconFile);
-            this.actor.child = null;
-            this.actor.style = 'background-image: url("%s");'.format(iconFile);
-        } else {
-            this.actor.style = null;
-            this.actor.child = new St.Icon({ icon_name: 'avatar-default-symbolic',
-                                             icon_size: this._iconSize });
-        }
-    }
-});
+const UserMenu = imports.ui.userMenu;

 const UserWidget = new Lang.Class({
    Name: 'UserWidget',
@@ -64,7 +18,7 @@ const UserWidget = new Lang.Class({
                                        vertical: false });
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

-        this._avatar = new Avatar(user);
+        this._avatar = new UserMenu.UserAvatarWidget(user);
        this.actor.add(this._avatar.actor,
                       { x_fill: true, y_fill: true });

--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -150,14 +150,6 @@ const ViewSelector = new Lang.Class({
                              Shell.KeyBindingMode.NORMAL |
                              Shell.KeyBindingMode.OVERVIEW,
                              Lang.bind(this, this._toggleAppsPage));
-
-        Main.wm.addKeybinding('toggle-overview',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
-                              Shell.KeyBindingMode.OVERVIEW,
-                              Lang.bind(Main.overview, Main.overview.toggle));
-
    },

    _toggleAppsPage: function() {
@@ -186,10 +178,6 @@ const ViewSelector = new Lang.Class({
            Main.overview.fadeInDesktop();
    },

-    setWorkspacesFullGeometry: function(geom) {
-        this._workspacesDisplay.setWorkspacesFullGeometry(geom);
-    },
-
    hide: function() {
        this._workspacesDisplay.hide();
    },
@@ -508,12 +496,12 @@ const ViewSelector = new Lang.Class({
            return;

        this._searchSystem.registerProvider(provider);
-        this._searchResults.createProviderDisplay(provider);
+        this._searchResults.createProviderMeta(provider);
    },

    removeSearchProvider: function(provider) {
        this._searchSystem.unregisterProvider(provider);
-        this._searchResults.destroyProviderDisplay(provider);
+        this._searchResults.destroyProviderMeta(provider);
    },

    getActivePage: function() {
--- a/js/ui/wanda.js
+++ b/js/ui/wanda.js
@@ -134,9 +134,9 @@ const WandaSearchProvider = new Lang.Class({

    getInitialResultSet: function(terms) {
        if (terms.join(' ') == MAGIC_FISH_KEY) {
-            this.searchSystem.setResults(this, [ FISH_NAME ]);
+            this.searchSystem.pushResults(this, [ FISH_NAME ]);
        } else {
-            this.searchSystem.setResults(this, []);
+            this.searchSystem.pushResults(this, []);
        }
    },

--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
@@ -67,209 +66,6 @@ function getWindowDimmer(actor) {
    }
 }

-/*
- * When the last window closed on a workspace is a dialog or splash
- * screen, we assume that it might be an initial window shown before
- * the main window of an application, and give the app a grace period
- * where it can map another window before we remove the workspace.
- */
-const LAST_WINDOW_GRACE_TIME = 1000;
-
-const WorkspaceTracker = new Lang.Class({
-    Name: 'WorkspaceTracker',
-
-    _init: function(wm) {
-        this._wm = wm;
-
-        this._workspaces = [];
-        this._checkWorkspacesId = 0;
-
-        let tracker = Shell.WindowTracker.get_default();
-        tracker.connect('startup-sequence-changed', Lang.bind(this, this._queueCheckWorkspaces));
-
-        global.screen.connect('notify::n-workspaces', Lang.bind(this, this._nWorkspacesChanged));
-
-        global.screen.connect('window-entered-monitor', Lang.bind(this, this._windowEnteredMonitor));
-        global.screen.connect('window-left-monitor', Lang.bind(this, this._windowLeftMonitor));
-        global.screen.connect('restacked', Lang.bind(this, this._windowsRestacked));
-
-        this._workspaceSettings = new Gio.Settings({ schema: Main.dynamicWorkspacesSchema });
-        this._workspaceSettings.connect('changed::dynamic-workspaces', Lang.bind(this, this._queueCheckWorkspaces));
-
-        this._nWorkspacesChanged();
-    },
-
-    _checkWorkspaces: function() {
-        let i;
-        let emptyWorkspaces = [];
-
-        if (!Meta.prefs_get_dynamic_workspaces()) {
-            this._checkWorkspacesId = 0;
-            return false;
-        }
-
-        for (i = 0; i < this._workspaces.length; i++) {
-            let lastRemoved = this._workspaces[i]._lastRemovedWindow;
-            if ((lastRemoved &&
-                 (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
-                  lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
-                  lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
-                this._workspaces[i]._keepAliveId)
-                emptyWorkspaces[i] = false;
-            else
-                emptyWorkspaces[i] = true;
-        }
-
-        let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
-        for (i = 0; i < sequences.length; i++) {
-            let index = sequences[i].get_workspace();
-            if (index >= 0 && index <= global.screen.n_workspaces)
-                emptyWorkspaces[index] = false;
-        }
-
-        let windows = global.get_window_actors();
-        for (i = 0; i < windows.length; i++) {
-            let win = windows[i];
-
-            if (win.get_meta_window().is_on_all_workspaces())
-                continue;
-
-            let workspaceIndex = win.get_workspace();
-            emptyWorkspaces[workspaceIndex] = false;
-        }
-
-        // If we don't have an empty workspace at the end, add one
-        if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
-            global.screen.append_new_workspace(false, global.get_current_time());
-            emptyWorkspaces.push(false);
-        }
-
-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
-                                        activeWorkspaceIndex < emptyWorkspaces.length - 1);
-        // Don't enter the overview when removing multiple empty workspaces at startup
-        let showOverview  = (removingCurrentWorkspace &&
-                             !emptyWorkspaces.every(function(x) { return x; }));
-
-        if (removingCurrentWorkspace) {
-            // "Merge" the empty workspace we are removing with the one at the end
-            this._wm.blockAnimations();
-        }
-
-        // Delete other empty workspaces; do it from the end to avoid index changes
-        for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
-            if (emptyWorkspaces[i])
-                global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
-        }
-
-        if (removingCurrentWorkspace) {
-            global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
-            this._wm.unblockAnimations();
-
-            if (!Main.overview.visible && showOverview)
-                Main.overview.show();
-        }
-
-        this._checkWorkspacesId = 0;
-        return false;
-    },
-
-    keepWorkspaceAlive: function(workspace, duration) {
-        if (workspace._keepAliveId)
-            Mainloop.source_remove(workspace._keepAliveId);
-
-        workspace._keepAliveId = Mainloop.timeout_add(duration, Lang.bind(this, function() {
-            workspace._keepAliveId = 0;
-            this._queueCheckWorkspaces();
-            return false;
-        }));
-    },
-
-    _windowRemoved: function(workspace, window) {
-        workspace._lastRemovedWindow = window;
-        this._queueCheckWorkspaces();
-        Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, Lang.bind(this, function() {
-            if (workspace._lastRemovedWindow == window) {
-                workspace._lastRemovedWindow = null;
-                this._queueCheckWorkspaces();
-            }
-            return false;
-        }));
-    },
-
-    _windowLeftMonitor: function(metaScreen, monitorIndex, metaWin) {
-        // If the window left the primary monitor, that
-        // might make that workspace empty
-        if (monitorIndex == Main.layoutManager.primaryIndex)
-            this._queueCheckWorkspaces();
-    },
-
-    _windowEnteredMonitor: function(metaScreen, monitorIndex, metaWin) {
-        // If the window entered the primary monitor, that
-        // might make that workspace non-empty
-        if (monitorIndex == Main.layoutManager.primaryIndex)
-            this._queueCheckWorkspaces();
-    },
-
-    _windowsRestacked: function() {
-        // Figure out where the pointer is in case we lost track of
-        // it during a grab. (In particular, if a trayicon popup menu
-        // is dismissed, see if we need to close the message tray.)
-        global.sync_pointer();
-    },
-
-    _queueCheckWorkspaces: function() {
-        if (this._checkWorkspacesId == 0)
-            this._checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, this._checkWorkspaces));
-    },
-
-    _nWorkspacesChanged: function() {
-        let oldNumWorkspaces = this._workspaces.length;
-        let newNumWorkspaces = global.screen.n_workspaces;
-
-        if (oldNumWorkspaces == newNumWorkspaces)
-            return false;
-
-        let lostWorkspaces = [];
-        if (newNumWorkspaces > oldNumWorkspaces) {
-            let w;
-
-            // Assume workspaces are only added at the end
-            for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
-                this._workspaces[w] = global.screen.get_workspace_by_index(w);
-
-            for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-                let workspace = this._workspaces[w];
-                workspace._windowAddedId = workspace.connect('window-added', Lang.bind(this, this._queueCheckWorkspaces));
-                workspace._windowRemovedId = workspace.connect('window-removed', Lang.bind(this, this._windowRemoved));
-            }
-
-        } else {
-            // Assume workspaces are only removed sequentially
-            // (e.g. 2,3,4 - not 2,4,7)
-            let removedIndex;
-            let removedNum = oldNumWorkspaces - newNumWorkspaces;
-            for (let w = 0; w < oldNumWorkspaces; w++) {
-                let workspace = global.screen.get_workspace_by_index(w);
-                if (this._workspaces[w] != workspace) {
-                    removedIndex = w;
-                    break;
-                }
-            }
-
-            let lostWorkspaces = this._workspaces.splice(removedIndex, removedNum);
-            lostWorkspaces.forEach(function(workspace) {
-                workspace.disconnect(workspace._windowAddedId);
-                workspace.disconnect(workspace._windowRemovedId);
-            });
-        }
-
-        this._queueCheckWorkspaces();
-
-        return false;
-    }
-});
-
 const WindowManager = new Lang.Class({
    Name: 'WindowManager',

@@ -340,90 +136,42 @@ const WindowManager = new Lang.Class({
                                        Shell.KeyBindingMode.NORMAL |
                                        Shell.KeyBindingMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-1',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-2',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-3',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-4',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-5',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-6',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-7',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-8',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-9',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-10',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-11',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-12',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-1',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-2',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-3',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-4',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-5',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-6',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-7',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-8',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-9',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-10',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-11',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-12',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.allowKeybinding('switch-to-workspace-1',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-2',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-3',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-4',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-5',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-6',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-7',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-8',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-9',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-10',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-11',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
+        this.allowKeybinding('switch-to-workspace-12',
+                             Shell.KeyBindingMode.NORMAL |
+                             Shell.KeyBindingMode.OVERVIEW);
        this.setCustomKeybindingHandler('switch-applications',
                                        Shell.KeyBindingMode.NORMAL,
                                        Lang.bind(this, this._startAppSwitcher));
@@ -472,19 +220,6 @@ const WindowManager = new Lang.Class({
            for (let i = 0; i < this._dimmedWindows.length; i++)
                this._dimWindow(this._dimmedWindows[i]);
        }));
-
-        if (Main.sessionMode.hasWorkspaces)
-            this._workspaceTracker = new WorkspaceTracker(this);
-
-        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
-                                                false, -1, 1);
-    },
-
-    keepWorkspaceAlive: function(workspace, duration) {
-        if (!this._workspaceTracker)
-            return;
-
-        this._workspaceTracker.keepWorkspaceAlive(workspace, duration);
    },

    setCustomKeybindingHandler: function(name, modes, handler) {
@@ -833,7 +568,7 @@ const WindowManager = new Lang.Class({
    },

    _switchWorkspace : function(shellwm, from, to, direction) {
-        if (!Main.sessionMode.hasWorkspaces || !this._shouldAnimate()) {
+        if (!this._shouldAnimate()) {
            shellwm.completed_switch_workspace();
            return;
        }
@@ -986,37 +721,22 @@ const WindowManager = new Lang.Class({
    },

    _showWorkspaceSwitcher : function(display, screen, window, binding) {
-        if (!Main.sessionMode.hasWorkspaces)
-            return;
-
        if (screen.n_workspaces == 1)
            return;

-        let [action,,,target] = binding.get_name().split('-');
+        let [action,,,direction] = binding.get_name().split('-');
+        let direction = Meta.MotionDirection[direction.toUpperCase()];
        let newWs;
-        let direction;

-        if (isNaN(target)) {
-            direction = Meta.MotionDirection[target.toUpperCase()];
-            newWs = screen.get_active_workspace().get_neighbor(direction);
-        } else if (target > 0) {
-            target--;
-            newWs = screen.get_workspace_by_index(target);
-
-            if (screen.get_active_workspace().index() > target)
-                direction = Meta.MotionDirection.UP;
-            else
-                direction = Meta.MotionDirection.DOWN;
-        }

        if (direction != Meta.MotionDirection.UP &&
            direction != Meta.MotionDirection.DOWN)
            return;

        if (action == 'switch')
-            this.actionMoveWorkspace(newWs);
+            newWs = this.actionMoveWorkspace(direction);
        else
-            this.actionMoveWindow(window, newWs);
+            newWs = this.actionMoveWindow(window, direction);

        if (!Main.overview.visible) {
            if (this._workspaceSwitcherPopup == null) {
@@ -1029,31 +749,31 @@ const WindowManager = new Lang.Class({
        }
    },

-    actionMoveWorkspace: function(workspace) {
-        if (!Main.sessionMode.hasWorkspaces)
-            return;
-
+    actionMoveWorkspace: function(direction) {
        let activeWorkspace = global.screen.get_active_workspace();
+        let toActivate = activeWorkspace.get_neighbor(direction);

-        if (activeWorkspace != workspace)
-            workspace.activate(global.get_current_time());
+        if (activeWorkspace != toActivate)
+            toActivate.activate(global.get_current_time());
+
+        return toActivate;
    },

-    actionMoveWindow: function(window, workspace) {
-        if (!Main.sessionMode.hasWorkspaces)
-            return;
-
+    actionMoveWindow: function(window, direction) {
        let activeWorkspace = global.screen.get_active_workspace();
+        let toActivate = activeWorkspace.get_neighbor(direction);

-        if (activeWorkspace != workspace) {
+        if (activeWorkspace != toActivate) {
            // This won't have any effect for "always sticky" windows
            // (like desktop windows or docks)

            this._movingWindow = window;
-            window.change_workspace(workspace);
+            window.change_workspace(toActivate);

            global.display.clear_mouse_mode();
-            workspace.activate_with_focus (window, global.get_current_time());
+            toActivate.activate_with_focus (window, global.get_current_time());
        }
+
+        return toActivate;
    },
 });
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -127,7 +127,7 @@ const WindowClone = new Lang.Class({
        if (this._stackAbove == null)
            return null;

-        if (this.inDrag) {
+        if (this.inDrag || this._zooming) {
            if (this._stackAbove._delegate)
                return this._stackAbove._delegate.getActualStackAbove();
            else
@@ -453,10 +453,6 @@ const WindowOverlay = new Lang.Class({
        metaWindow.delete(global.get_current_time());
    },

-    _windowCanClose: function() {
-        return this._windowClone.metaWindow.can_close();
-    },
-
    _onWindowAdded: function(workspace, win) {
        let metaWindow = this._windowClone.metaWindow;

@@ -492,14 +488,12 @@ const WindowOverlay = new Lang.Class({
    _animateVisible: function() {
        this._parentActor.raise_top();

-        if (this._windowCanClose()) {
-            this.closeButton.show();
-            this.closeButton.opacity = 0;
-            Tweener.addTween(this.closeButton,
-                             { opacity: 255,
-                               time: CLOSE_BUTTON_FADE_TIME,
-                               transition: 'easeOutQuad' });
-        }
+        this.closeButton.show();
+        this.closeButton.opacity = 0;
+        Tweener.addTween(this.closeButton,
+                         { opacity: 255,
+                           time: CLOSE_BUTTON_FADE_TIME,
+                           transition: 'easeOutQuad' });

        this.border.show();
        this.border.opacity = 0;
@@ -759,6 +753,13 @@ const LayoutStrategy = new Lang.Class({
        layout.space = space;
    },

+    _getDistance: function (row, actor) {
+        let dist_x = actor.x - row.x;
+        let dist_y = actor.y - row.y;
+
+        return Math.sqrt(Math.pow(dist_x, 2) + Math.pow(dist_y, 2));
+    },
+
    computeWindowSlots: function(layout, area) {
        this._computeRowSizes(layout);

@@ -766,36 +767,28 @@ const LayoutStrategy = new Lang.Class({

        let slots = [];

-        // Do this in three parts.
-        let height = 0;
-        for (let i = 0; i < rows.length; i++) {
-            let row = rows[i];
-            height += row.height + this._rowSpacing;
-        }
-
-        height -= this._rowSpacing;
-
        let y = 0;
-
        for (let i = 0; i < rows.length; i++) {
            let row = rows[i];
-
-            // If this window layout row doesn't fit in the actual
-            // geometry, then apply an additional scale to it.
-            row.additionalScale = Math.min(1, area.width / row.width, area.height / height);
-
-            row.x = area.x + (Math.max(area.width - row.width, 0) / 2) * row.additionalScale;
-            row.y = area.y + (y + Math.max(area.height - height, 0) / 2) * row.additionalScale;
+            row.x = area.x + (area.width - row.width) / 2;
+            row.y = area.y + y;
            y += row.height + this._rowSpacing;
+            row.windows.sort(Lang.bind(this, function(a, b) {
+                return this._getDistance(row, a.realWindow) - this._getDistance(row, b.realWindow);
+            }));
        }

+        let height = y - this._rowSpacing;
+        let baseY = (area.height - height) / 2;
+
        for (let i = 0; i < rows.length; i++) {
            let row = rows[i];
+            row.y += baseY;
            let x = row.x;
            for (let j = 0; j < row.windows.length; j++) {
                let window = row.windows[j];

-                let s = scale * this._computeWindowScale(window) * row.additionalScale;
+                let s = scale * this._computeWindowScale(window);
                let cellWidth = window.actor.width * s;
                let cellHeight = window.actor.height * s;

@@ -839,13 +832,6 @@ const UnalignedLayoutStrategy = new Lang.Class({
        return false;
    },

-    _sortRow: function(row) {
-        // Sort windows horizontally to minimize travel distance
-        row.windows.sort(function(a, b) {
-            return a.realWindow.x - b.realWindow.x;
-        });
-    },
-
    computeLayout: function(windows, layout) {
        let numRows = layout.numRows;

@@ -876,7 +862,6 @@ const UnalignedLayoutStrategy = new Lang.Class({
                    row.windows.push(window);
                    row.fullWidth += width;
                } else {
-                    this._sortRow(row);
                    break;
                }
            }
@@ -898,14 +883,6 @@ const UnalignedLayoutStrategy = new Lang.Class({
    }
 });

-function padArea(area, padding) {
-    return {
-        x: area.x + padding.left,
-        y: area.y + padding.top,
-        width: area.width - padding.left - padding.right,
-        height: area.height - padding.top - padding.bottom,
-    };
-}

 /**
 * @metaWorkspace: a #Meta.Workspace, or null
@@ -917,19 +894,10 @@ const Workspace = new Lang.Class({
        // When dragging a window, we use this slot for reserve space.
        this._reservedSlot = null;
        this.metaWorkspace = metaWorkspace;
-
-        // The full geometry is the geometry we should try and position
-        // windows for. The actual geometry we allocate may be less than
-        // this, like if the workspace switcher is slid out.
-        this._fullGeometry = null;
-
-        // The actual geometry is the geometry we need to arrange windows
-        // in. If this is a smaller area than the full geometry, we'll
-        // do some simple aspect ratio like math to fit the layout calculated
-        // for the full geometry into this area.
-        this._actualGeometry = null;
-
-        this._currentLayout = null;
+        this._x = 0;
+        this._y = 0;
+        this._width = 0;
+        this._height = 0;

        this.monitorIndex = monitorIndex;
        this._monitor = Main.layoutManager.monitors[this.monitorIndex];
@@ -942,7 +910,7 @@ const Workspace = new Lang.Class({
            this.actor.add_style_class_name('external-monitor');
        this.actor.set_size(0, 0);

-        this._dropRect = new Clutter.Actor({ opacity: 0 });
+        this._dropRect = new Clutter.Rectangle({ opacity: 0 });
        this._dropRect._delegate = this;

        this.actor.add_actor(this._dropRect);
@@ -979,29 +947,23 @@ const Workspace = new Lang.Class({

        this._positionWindowsFlags = 0;
        this._positionWindowsId = 0;
+
+        this._currentLayout = null;
    },

-    setFullGeometry: function(geom) {
-        this._fullGeometry = geom;
-        this._recalculateWindowPositions(WindowPositionFlags.NONE);
-    },
+    setGeometry: function(x, y, width, height) {
+        this._x = x;
+        this._y = y;
+        this._width = width;
+        this._height = height;

-    setActualGeometry: function(geom) {
-        this._actualGeometry = geom;
-
-        if (this._actualGeometryLater)
-            return;
-
-        this._actualGeometryLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            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;
+        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+            this._dropRect.set_position(x, y);
+            this._dropRect.set_size(width, height);
            return false;
        }));
+
+        this.positionWindows(WindowPositionFlags.NONE);
    },

    _lookupIndex: function (metaWindow) {
@@ -1029,32 +991,37 @@ const Workspace = new Lang.Class({
            clone = null;

        this._reservedSlot = clone;
-        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
+        this._currentLayout = null;
+        this.positionWindows(WindowPositionFlags.ANIMATE);
    },

-    _recalculateWindowPositions: function(flags) {
+    /**
+     * positionWindows:
+     * @flags:
+     *  INITIAL - this is the initial positioning of the windows.
+     *  ANIMATE - Indicates that we need animate changing position.
+     */
+    positionWindows: function(flags) {
        this._positionWindowsFlags |= flags;

        if (this._positionWindowsId > 0)
            return;

        this._positionWindowsId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            this._realRecalculateWindowPositions(this._positionWindowsFlags);
+            this._realPositionWindows(this._positionWindowsFlags);
            this._positionWindowsFlags = 0;
            this._positionWindowsId = 0;
            return false;
        }));
    },

-    _realRecalculateWindowPositions: function(flags) {
+    _realPositionWindows : function(flags) {
        if (this._repositionWindowsId > 0) {
            Mainloop.source_remove(this._repositionWindowsId);
            this._repositionWindowsId = 0;
        }

        let clones = this._windows.slice();
-        if (clones.length == 0)
-            return;

        clones.sort(function(a, b) {
            return a.metaWindow.get_stable_sequence() - b.metaWindow.get_stable_sequence();
@@ -1063,25 +1030,11 @@ const Workspace = new Lang.Class({
        if (this._reservedSlot)
            clones.push(this._reservedSlot);

-        this._currentLayout = this._computeLayout(clones);
-        this._updateWindowPositions(flags);
-    },
-
-    _updateWindowPositions: function(flags) {
-        if (this._currentLayout == null) {
-            this._recalculateWindowPositions(flags);
-            return;
-        }
-
        let initialPositioning = flags & WindowPositionFlags.INITIAL;
        let animate = flags & WindowPositionFlags.ANIMATE;

-        let layout = this._currentLayout;
-        let strategy = layout.strategy;
-
-        let [, , padding] = this._getSpacingAndPadding();
-        let area = padArea(this._actualGeometry, padding);
-        let slots = strategy.computeWindowSlots(layout, area);
+        // Start the animations
+        let slots = this._computeAllWindowSlots(clones);

        let currentWorkspace = global.screen.get_active_workspace();
        let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
@@ -1141,6 +1094,7 @@ const Workspace = new Lang.Class({
                Tweener.removeTweens(clone.actor);
                clone.actor.set_position(x, y);
                clone.actor.set_scale(scale, scale);
+                clone.actor.set_opacity(255);
                clone.overlay.relayout(false);
                this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
            }
@@ -1195,8 +1149,8 @@ const Workspace = new Lang.Class({
        let [x, y, mask] = global.get_pointer();

        let pointerHasMoved = (this._cursorX != x && this._cursorY != y);
-        let inWorkspace = (this._fullGeometry.x < x && x < this._fullGeometry.x + this._fullGeometry.width &&
-                           this._fullGeometry.y < y && y < this._fullGeometry.y + this._fullGeometry.height);
+        let inWorkspace = (this._x < x && x < this._x + this._width &&
+                           this._y < y && y < this._y + this._height);

        if (pointerHasMoved && inWorkspace) {
            // store current cursor position
@@ -1211,7 +1165,7 @@ const Workspace = new Lang.Class({
                return true;
        }

-        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
+        this.positionWindows(WindowPositionFlags.ANIMATE);
        return false;
    },

@@ -1316,7 +1270,7 @@ const Workspace = new Lang.Class({
        }

        this._currentLayout = null;
-        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
+        this.positionWindows(WindowPositionFlags.ANIMATE);
    },

    _windowAdded : function(metaWorkspace, metaWin) {
@@ -1353,8 +1307,13 @@ const Workspace = new Lang.Class({

    // Animate the full-screen to Overview transition.
    zoomToOverview : function() {
+        this._currentLayout = null;
+
        // Position and scale the windows.
-        this._recalculateWindowPositions(WindowPositionFlags.ANIMATE | WindowPositionFlags.INITIAL);
+        if (Main.overview.animationInProgress)
+            this.positionWindows(WindowPositionFlags.ANIMATE | WindowPositionFlags.INITIAL);
+        else
+            this.positionWindows(WindowPositionFlags.INITIAL);
    },

    // Animates the return from Overview mode
@@ -1478,7 +1437,7 @@ const Workspace = new Lang.Class({
                      }));
        clone.connect('size-changed',
                      Lang.bind(this, function() {
-                          this._recalculateWindowPositions(WindowPositionFlags.NONE);
+                          this.positionWindows(0);
                      }));

        this.actor.add_actor(clone.actor);
@@ -1527,14 +1486,12 @@ const Workspace = new Lang.Class({
        }
    },

-    _getBestLayout: function(windows, area, rowSpacing, columnSpacing) {
+    _computeLayout: function(windows, area, rowSpacing, columnSpacing) {
        // We look for the largest scale that allows us to fit the
        // largest row/tallest column on the workspace.

        let lastLayout = {};

-        let strategy = new UnalignedLayoutStrategy(this._monitor, rowSpacing, columnSpacing);
-
        for (let numRows = 1; ; numRows++) {
            let numColumns = Math.ceil(windows.length / numRows);

@@ -1544,6 +1501,8 @@ const Workspace = new Lang.Class({
            if (numColumns == lastLayout.numColumns)
                break;

+            let strategy = new UnalignedLayoutStrategy(this._monitor, rowSpacing, columnSpacing);
+
            let layout = { area: area, strategy: strategy, numRows: numRows, numColumns: numColumns };
            strategy.computeLayout(windows, layout);
            strategy.computeScaleAndSpace(layout);
@@ -1557,7 +1516,18 @@ const Workspace = new Lang.Class({
        return lastLayout;
    },

-    _getSpacingAndPadding: function() {
+    _rectEqual: function(one, two) {
+        if (one == two)
+            return true;
+
+        return (one.x == two.x &&
+                one.y == two.y &&
+                one.width == two.width &&
+                one.height == two.height);
+    },
+
+    _computeAllWindowSlots: function(windows) {
+        let totalWindows = windows.length;
        let node = this.actor.get_theme_node();

        // Window grid spacing
@@ -1570,14 +1540,21 @@ const Workspace = new Lang.Class({
            right: node.get_padding(St.Side.RIGHT),
        };

+        if (!totalWindows)
+            return [];
+
        let closeButtonHeight, captionHeight;
        let leftBorder, rightBorder;
-
-        // All of the overlays have the same chrome sizes,
-        // so just pick the first one.
-        let overlay = this._windowOverlays[0];
-        [closeButtonHeight, captionHeight] = overlay.chromeHeights();
-        [leftBorder, rightBorder] = overlay.chromeWidths();
+        if (this._windowOverlays.length) {
+            // All of the overlays have the same chrome sizes,
+            // so just pick the first one.
+            let overlay = this._windowOverlays[0];
+            [closeButtonHeight, captionHeight] = overlay.chromeHeights();
+            [leftBorder, rightBorder] = overlay.chromeWidths();
+        } else {
+            [closeButtonHeight, captionHeight] = [0, 0];
+            [leftBorder, rightBorder] = [0, 0];
+        }

        rowSpacing += captionHeight;
        columnSpacing += (rightBorder + leftBorder) / 2;
@@ -1586,13 +1563,25 @@ const Workspace = new Lang.Class({
        padding.left += leftBorder;
        padding.right += rightBorder;

-        return [rowSpacing, columnSpacing, padding];
-    },
+        let area = {
+            x: this._x + padding.left,
+            y: this._y + padding.top,
+            width: this._width - padding.left - padding.right,
+            height: this._height - padding.top - padding.bottom,
+        };

-    _computeLayout: function(windows) {
-        let [rowSpacing, columnSpacing, padding] = this._getSpacingAndPadding();
-        let area = padArea(this._fullGeometry, padding);
-        return this._getBestLayout(windows, area, rowSpacing, columnSpacing);
+        if (!this._currentLayout)
+            this._currentLayout = this._computeLayout(windows, area, rowSpacing, columnSpacing);
+
+        let layout = this._currentLayout;
+        let strategy = layout.strategy;
+
+        if (!this._rectEqual(area, layout.area)) {
+            layout.area = area;
+            strategy.computeScaleAndSpace(layout);
+        }
+
+        return strategy.computeWindowSlots(layout, area);
    },

    _onCloneSelected : function (clone, time) {
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -764,8 +764,8 @@ const ThumbnailsBox = new Lang.Class({
                // to open its first window within some time, as tracked by Shell.WindowTracker.
                // Here, we only add a very brief timeout to avoid the _immediate_ removal of the
                // workspace while we wait for the startup sequence to load.
-                Main.wm.keepWorkspaceAlive(global.screen.get_workspace_by_index(newWorkspaceIndex),
-                                           WORKSPACE_KEEP_ALIVE_TIME);
+                Main.keepWorkspaceAlive(global.screen.get_workspace_by_index(newWorkspaceIndex),
+                                        WORKSPACE_KEEP_ALIVE_TIME);
            }

            // Start the animation on the workspace (which is actually
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -23,18 +23,6 @@ const MAX_WORKSPACES = 16;

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

-function rectEqual(one, two) {
-    if (one == two)
-        return true;
-
-    if (!one || !two)
-        return false;
-
-    return (one.x == two.x &&
-            one.y == two.y &&
-            one.width == two.width &&
-            one.height == two.height);
-}

 const WorkspacesView = new Lang.Class({
    Name: 'WorkspacesView',
@@ -55,9 +43,10 @@ const WorkspacesView = new Lang.Class({
                this._updateWorkspaceActors(false);
            }));

-        this._fullGeometry = null;
-        this._actualGeometry = null;
-
+        this._width = 0;
+        this._height = 0;
+        this._x = 0;
+        this._y = 0;
        this._spacing = 0;
        this._animating = false; // tweening
        this._scrolling = false; // swipe-scrolling
@@ -96,8 +85,8 @@ const WorkspacesView = new Lang.Class({
        this._overviewShownId =
            Main.overview.connect('shown',
                                 Lang.bind(this, function() {
-                this.actor.set_clip(this._fullGeometry.x, this._fullGeometry.y,
-                                    this._fullGeometry.width, this._fullGeometry.height);
+                this.actor.set_clip(this._x, this._y,
+                                    this._width, this._height);
        }));

        this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
@@ -135,9 +124,11 @@ const WorkspacesView = new Lang.Class({
                continue;

            let ws = new Workspace.Workspace(null, i);
-            ws.setFullGeometry(monitors[i]);
-            ws.setActualGeometry(monitors[i]);
-            Main.layoutManager.overviewGroup.add_actor(ws.actor);
+            ws.setGeometry(monitors[i].x,
+                           monitors[i].y,
+                           monitors[i].width,
+                           monitors[i].height);
+            global.overlay_group.add_actor(ws.actor);
            this._extraWorkspaces.push(ws);
        }
    },
@@ -148,24 +139,18 @@ const WorkspacesView = new Lang.Class({
        this._extraWorkspaces = [];
    },

-    setFullGeometry: function(geom) {
-        if (rectEqual(this._fullGeometry, geom))
-            return;
+    setGeometry: function(x, y, width, height) {
+      if (this._x == x && this._y == y &&
+          this._width == width && this._height == height)
+          return;

-        this._fullGeometry = geom;
+        this._width = width;
+        this._height = height;
+        this._x = x;
+        this._y = y;

        for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setFullGeometry(geom);
-    },
-
-    setActualGeometry: function(geom) {
-        if (rectEqual(this._actualGeometry, geom))
-            return;
-
-        this._actualGeometry = geom;
-
-        for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setActualGeometry(geom);
+            this._workspaces[i].setGeometry(x, y, width, height);
    },

    _lookupWorkspaceForMetaWindow: function (metaWindow) {
@@ -225,7 +210,7 @@ const WorkspacesView = new Lang.Class({

            Tweener.removeTweens(workspace.actor);

-            let y = (w - active) * (this._fullGeometry.height + this._spacing);
+            let y = (w - active) * (this._height + this._spacing);

            if (showAnimation) {
                let params = { y: y,
@@ -296,9 +281,8 @@ const WorkspacesView = new Lang.Class({

        if (newNumWorkspaces > oldNumWorkspaces) {
            for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-                this._workspaces[w].setFullGeometry(this._fullGeometry);
-                if (this._actualGeometry)
-                    this._workspaces[w].setActualGeometry(this._actualGeometry);
+                this._workspaces[w].setGeometry(this._x, this._y,
+                                                this._width, this._height);
                this.actor.add_actor(this._workspaces[w].actor);
            }

@@ -446,7 +430,7 @@ const WorkspacesDisplay = new Lang.Class({

    _init: function() {
        this.actor = new St.Widget({ clip_to_allocation: true });
-        this.actor.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesActualGeometry));
+        this.actor.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesGeometry));
        this.actor.connect('parent-set', Lang.bind(this, this._parentSet));

        let clickAction = new Clutter.ClickAction()
@@ -500,8 +484,6 @@ const WorkspacesDisplay = new Lang.Class({

        this._notifyOpacityId = 0;
        this._scrollEventId = 0;
-
-        this._fullGeometry = null;
    },

    _onPan: function(action) {
@@ -590,11 +572,10 @@ const WorkspacesDisplay = new Lang.Class({
            this._workspacesViews.push(view);
        }

-        this._updateWorkspacesFullGeometry();
-        this._updateWorkspacesActualGeometry();
+        this._updateWorkspacesGeometry();

        for (let i = 0; i < this._workspacesViews.length; i++)
-            Main.layoutManager.overviewGroup.add_actor(this._workspacesViews[i].actor);
+            global.overlay_group.add_actor(this._workspacesViews[i].actor);
    },

    _scrollValueChanged: function() {
@@ -638,7 +619,7 @@ const WorkspacesDisplay = new Lang.Class({

                // This is kinda hackish - we want the primary view to
                // appear as parent of this.actor, though in reality it
-                // is added directly to Main.layoutManager.overviewGroup
+                // is added directly to overlay_group
                this._notifyOpacityId = newParent.connect('notify::opacity',
                    Lang.bind(this, function() {
                        let opacity = this.actor.get_parent().opacity;
@@ -651,48 +632,31 @@ const WorkspacesDisplay = new Lang.Class({
        }));
    },

-    // This geometry should always be the fullest geometry
-    // the workspaces switcher can ever be allocated, as if
-    // the sliding controls were never slid in at all.
-    setWorkspacesFullGeometry: function(geom) {
-        this._fullGeometry = geom;
-        this._updateWorkspacesFullGeometry();
-    },
-
-    _updateWorkspacesFullGeometry: function() {
+    _updateWorkspacesGeometry: function() {
        if (!this._workspacesViews.length)
            return;

-        let monitors = Main.layoutManager.monitors;
-        let m = 0;
-        for (let i = 0; i < monitors.length; i++) {
-            if (i == this._primaryIndex) {
-                this._workspacesViews[m].setFullGeometry(this._fullGeometry);
-                m++;
-            } else if (!this._workspacesOnlyOnPrimary) {
-                this._workspacesViews[m].setFullGeometry(monitors[i]);
-                m++;
-            }
-        }
-    },
+        let fullWidth = this.actor.allocation.x2 - this.actor.allocation.x1;
+        let fullHeight = this.actor.allocation.y2 - this.actor.allocation.y1;

-    _updateWorkspacesActualGeometry: function() {
-        if (!this._workspacesViews.length)
-            return;
+        let width = fullWidth;
+        let height = fullHeight;

        let [x, y] = this.actor.get_transformed_position();
-        let width = this.actor.allocation.x2 - this.actor.allocation.x1;
-        let height = this.actor.allocation.y2 - this.actor.allocation.y1;
-        let geometry = { x: x, y: y, width: width, height: height };
+
+        let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);

        let monitors = Main.layoutManager.monitors;
        let m = 0;
        for (let i = 0; i < monitors.length; i++) {
            if (i == this._primaryIndex) {
-                this._workspacesViews[m].setActualGeometry(geometry);
+                this._workspacesViews[m].setGeometry(x, y, width, height);
                m++;
            } else if (!this._workspacesOnlyOnPrimary) {
-                this._workspacesViews[m].setActualGeometry(monitors[i]);
+                this._workspacesViews[m].setGeometry(monitors[i].x,
+                                                     monitors[i].y,
+                                                     monitors[i].width,
+                                                     monitors[i].height);
                m++;
            }
        }
@@ -760,20 +724,15 @@ const WorkspacesDisplay = new Lang.Class({
    _onScrollEvent: function(actor, event) {
        if (!this.actor.mapped)
            return false;
-        let activeWs = global.screen.get_active_workspace();
-        let ws;
        switch (event.get_scroll_direction()) {
        case Clutter.ScrollDirection.UP:
-            ws = activeWs.get_neighbor(Meta.MotionDirection.UP);
-            break;
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+            return true;
        case Clutter.ScrollDirection.DOWN:
-            ws = activeWs.get_neighbor(Meta.MotionDirection.DOWN);
-            break;
-        default:
-            return false;
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
+            return true;
        }
-        Main.wm.actionMoveWorkspace(ws);
-        return true;
+        return false;
    }
 });
 Signals.addSignalMethods(WorkspacesDisplay.prototype);
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@@ -16,7 +16,7 @@ const XdndHandler = new Lang.Class({
        this._cursorWindowClone = null;

        // Used as a drag actor in case we don't have a cursor window clone
-        this._dummy = new Clutter.Actor({ width: 1, height: 1, opacity: 0 });
+        this._dummy = new Clutter.Rectangle({ width: 1, height: 1, opacity: 0 });
        Main.uiGroup.add_actor(this._dummy);
        Shell.util_set_hidden_from_pick(this._dummy, true);
        this._dummy.hide();
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -46,6 +46,7 @@ ms
 nb
 nl
 nn
+oc
 or
 pa
 pl
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,6 @@ data/gnome-shell.desktop.in.in
 data/gnome-shell-extension-prefs.desktop.in.in
 data/org.gnome.shell.gschema.xml.in.in
 js/extensionPrefs/main.js
-js/gdm/authPrompt.js
 js/gdm/loginDialog.js
 js/gdm/powerMenu.js
 js/gdm/util.js
@@ -49,9 +48,9 @@ js/ui/status/keyboard.js
 js/ui/status/lockScreenMenu.js
 js/ui/status/network.js
 js/ui/status/power.js
-js/ui/status/system.js
 js/ui/status/volume.js
 js/ui/unlockDialog.js
+js/ui/userMenu.js
 js/ui/viewSelector.js
 js/ui/wanda.js
 js/ui/windowAttentionHandler.js
--- a/po/as.po
+++ b/po/as.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.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
@@ -1244,7 +1244,7 @@ msgstr "Ezezaguna"
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
-msgstr[0] "Mezu berri &d"
+msgstr[0] "Mezu berri %d"
 msgstr[1] "%d mezu berri"

 #: ../js/ui/overview.js:84
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/gu.po
+++ b/po/gu.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/ia.po
+++ b/po/ia.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell master\n"
+"Project-Id-Version: gnome-shell 3.8\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-23 19:57+0000\n"
+"POT-Creation-Date: 2013-04-19 21:48+0000\n"
 "PO-Revision-Date: 2013-04-23 08:00+0400\n"
 "Last-Translator: Nik Kalach <nikka@fedoraproject.org>\n"
 "Language-Team: Interlingua <trans-ia@lists.fedoraproject.org>\n"
@@ -39,14 +39,10 @@ msgid "Focus the active notification"
 msgstr "Mitter foco al notificationes active"

 #: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Show the overview"
-msgstr "Monstrar le panorama"
-
-#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Show all applications"
 msgstr "Monstrar tote le applicationes"

-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Open the application menu"
 msgstr "Aperir le menu de applicationes"

@@ -226,52 +222,44 @@ msgstr ""
 "panorama de activitates."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-msgid "Keybinding to open the overview"
-msgstr "Association de claves pro aperir le panorama"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-msgid "Keybinding to open the Activities Overview."
-msgstr "Association de claves pro aperir le panorama de activitates"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr ""
 "Association de claves pro commutar le visibilitate del tiratorio de messages"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr ""
 "Association de claves pro commutar le visibilitate del tiratorio de messages."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to focus the active notification"
 msgstr "Association de claves pro mitter foco al notificationes active"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification."
 msgstr "Association de claves pro mitter foco al notificationes active."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Association de claves pro commutar le registrator de schermo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "Association de claves pro initiar/arrestar le registration de schermo."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "Que claviero usar"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "Le typo de claviero a usar."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Framerate used for recording screencasts."
 msgstr "Rata de quadros usate pro registrar le video de schermo."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -279,11 +267,11 @@ msgstr ""
 "Le numero de imagines per secunda in le video de schermo registrate per le "
 "registrator incorporate in GNOME Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Le catena usante per gstreamer pro codificar video de schermo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -309,11 +297,11 @@ msgstr ""
 "queue ! webmmux' e registra in WEBM usante le codec VP8. %T designa le "
 "numero de filos optimal pro le systema."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "File extension used for storing the screencast"
 msgstr "Extension de file a usar pro slaveguardar le video de schermo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -323,11 +311,11 @@ msgstr ""
 "currente e iste extension. Illo deberea esser modificate si le formato de "
 "container usate pro registar le video es differente."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "The application icon mode."
 msgstr "Le modo de icone in le selector de applicationes."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
@@ -338,22 +326,22 @@ msgstr ""
 "fenestra), 'app-icon-only' (monstrar solmente un icone del application) o "
 "'both' (monstrar tote le duo)."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Attach modal dialog to the parent window"
 msgstr "Attaccar le dialogo modal al fenestra parental"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Iste clave supplanta le clave in org.gnome.mutter quando GNOME Shell es "
 "lanceate."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
 msgid "Arrangement of buttons on the titlebar"
 msgstr "Arrangiamento de buttones sur le barra de titulo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
@@ -361,15 +349,15 @@ msgstr ""
 "Iste clave supplanta le clave in org.gnome.desktop.wm.preferences quando "
 "GNOME Shell es lanceate."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Activar le tegulage de fenestras depositate sur le bordos del schermo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:49
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
 msgid "Workspaces are managed dynamically"
 msgstr "Le spatios de travalio se gere dynamicamente"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:50
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
 msgid "Workspaces only on primary monitor"
 msgstr "Le spatios de travalio es solmente sur le schermo principal"

@@ -475,23 +463,23 @@ msgstr "Impossibile de analysar le commando:"
 msgid "Execution of '%s' failed:"
 msgstr "Falta al execution de '%s':"

-#: ../js/ui/appDisplay.js:351
+#: ../js/ui/appDisplay.js:349
 msgid "Frequent"
 msgstr "Frequente"

-#: ../js/ui/appDisplay.js:358
+#: ../js/ui/appDisplay.js:356
 msgid "All"
 msgstr "Tote"

-#: ../js/ui/appDisplay.js:916
+#: ../js/ui/appDisplay.js:914
 msgid "New Window"
 msgstr "Nove fenestra"

-#: ../js/ui/appDisplay.js:919 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Remover del favoritos"

-#: ../js/ui/appDisplay.js:920
+#: ../js/ui/appDisplay.js:918
 msgid "Add to Favorites"
 msgstr "Adder al favoritos"

@@ -1238,35 +1226,35 @@ msgstr "Expunger messages"
 msgid "Notification Settings"
 msgstr "Parametros de notificationes"

-#: ../js/ui/messageTray.js:1710
+#: ../js/ui/messageTray.js:1709
 msgid "No Messages"
 msgstr "Necun message"

-#: ../js/ui/messageTray.js:1783
+#: ../js/ui/messageTray.js:1785
 msgid "Message Tray"
 msgstr "Tiratorio de messages"

-#: ../js/ui/messageTray.js:2801
+#: ../js/ui/messageTray.js:2813
 msgid "System Information"
 msgstr "Information de systema"

-#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:378
+#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Incognite"

-#: ../js/ui/overviewControls.js:472 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nove message"
 msgstr[1] "%d nove messages"

-#: ../js/ui/overview.js:82
+#: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Disfacer"

-#: ../js/ui/overview.js:127
+#: ../js/ui/overview.js:129
 msgid "Overview"
 msgstr "Panorama"

@@ -1274,21 +1262,21 @@ msgstr "Panorama"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:260
+#: ../js/ui/overview.js:271
 msgid "Type to search…"
 msgstr "Scribe pro cercar…"

-#: ../js/ui/panel.js:641
+#: ../js/ui/panel.js:633
 msgid "Quit"
 msgstr "Quitar"

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

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

@@ -1297,7 +1285,7 @@ msgstr "Barra superior"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:718
+#: ../js/ui/popupMenu.js:727
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

@@ -1932,7 +1920,7 @@ msgstr "Usar un modo specific, per ex. \"gdm\" pro le schermo de accesso"
 msgid "List possible modes"
 msgstr "Monstrar le lista del modos possibile"

-#: ../src/shell-app.c:626
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Impossibile de lancear '%s'"
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/kk.po
+++ b/po/kk.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,9 +11,9 @@ 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: 2013-03-23 11:49+0000\n"
-"PO-Revision-Date: 2013-03-26 22:43+0200\n"
-"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
+"POT-Creation-Date: 2013-12-20 16:10+0000\n"
+"PO-Revision-Date: 2013-12-21 16:31+0200\n"
+"Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
@@ -360,7 +360,7 @@ msgstr "Darbalaukiai tik pagrindiniame monitoriuje"
 #: ../js/extensionPrefs/main.js:125
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
-msgstr "Įvyko klaida įkeliant %s nustatymų dialogą:"
+msgstr "Kilo klaida įkeliant %s nustatymų dialogą:"

 #: ../js/extensionPrefs/main.js:165
 msgid "Extension"
@@ -370,43 +370,50 @@ msgstr "Plėtinys"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Išskleidžiamajame sąraše pasirinkite konfigūruotiną plėtinį."

-#: ../js/gdm/loginDialog.js:405
+#: ../js/gdm/loginDialog.js:371
 msgid "Session…"
 msgstr "Seansas…"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:630
+#: ../js/gdm/loginDialog.js:601
 msgid "Not listed?"
 msgstr "Nėra sąraše?"

-#: ../js/gdm/loginDialog.js:786 ../js/ui/components/networkAgent.js:137
-#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
+#: ../js/gdm/loginDialog.js:776 ../js/ui/components/networkAgent.js:137
+#: ../js/ui/components/polkitAgent.js:161 ../js/ui/endSessionDialog.js:376
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:99
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:96
 #: ../js/ui/userMenu.js:938
 msgid "Cancel"
 msgstr "Atsisakyti"

-#: ../js/gdm/loginDialog.js:802
+#: ../js/gdm/loginDialog.js:791
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prisijungti"

-#: ../js/gdm/loginDialog.js:802
+#: ../js/gdm/loginDialog.js:791
 msgid "Next"
 msgstr "Kitas"

+#. Translators: this message is shown below the username entry field
+#. to clue the user in on how to login to the local network realm
+#: ../js/gdm/loginDialog.js:888
+#, c-format
+msgid "(e.g., user or %s)"
+msgstr "(pvz., naudotojas arba %s)"
+
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:917 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:892 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
 msgstr "Naudotojo vardas: "

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1158
 msgid "Login Window"
 msgstr "Prisijungimo langas"

@@ -429,21 +436,16 @@ msgstr "Paleisti iš naujo"
 msgid "Power Off"
 msgstr "Išjungti"

-#: ../js/gdm/util.js:249
+#: ../js/gdm/util.js:248
 msgid "Authentication error"
 msgstr "Tapatybės patvirtinimo klaida"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:366
+#: ../js/gdm/util.js:365
 msgid "(or swipe finger)"
 msgstr "(arba perbraukite pirštu)"

-#: ../js/gdm/util.js:391
-#, c-format
-msgid "(e.g., user or %s)"
-msgstr "(pvz., naudotojas arba %s)"
-
 #: ../js/misc/util.js:97
 msgid "Command not found"
 msgstr "Komanda nerasta"
@@ -459,23 +461,23 @@ msgstr "Nepavyko perskaityti komandos:"
 msgid "Execution of '%s' failed:"
 msgstr "Nepavyko įvykdyti „%s“:"

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

-#: ../js/ui/appDisplay.js:356
+#: ../js/ui/appDisplay.js:399
 msgid "All"
 msgstr "Visos"

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

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

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

@@ -512,7 +514,7 @@ msgctxt "event list time"
 msgid "%H\\u2236%M"
 msgstr "%H\\u2236%M"

-#. Transators: Shown in calendar event list, if 12h format,
+#. Translators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space
 #: ../js/ui/calendar.js:77
@@ -667,11 +669,11 @@ msgstr "Atverti su %s"
 msgid "Eject"
 msgstr "Išimti"

-#: ../js/ui/components/keyring.js:82 ../js/ui/components/polkitAgent.js:268
+#: ../js/ui/components/keyring.js:88 ../js/ui/components/polkitAgent.js:280
 msgid "Password:"
 msgstr "Slaptažodis:"

-#: ../js/ui/components/keyring.js:101
+#: ../js/ui/components/keyring.js:107
 msgid "Type again:"
 msgstr "Įveskite dar kartą:"

@@ -751,15 +753,15 @@ msgstr "Mobiliojo plačiajuosčio tinklo slaptažodis"
 msgid "A password is required to connect to '%s'."
 msgstr "Būtinas slaptažodis norint prisijungti prie „%s“"

-#: ../js/ui/components/polkitAgent.js:55
+#: ../js/ui/components/polkitAgent.js:54
 msgid "Authentication Required"
 msgstr "Reikia patvirtinti tapatybę"

-#: ../js/ui/components/polkitAgent.js:93
+#: ../js/ui/components/polkitAgent.js:92
 msgid "Administrator"
 msgstr "Administratorius"

-#: ../js/ui/components/polkitAgent.js:165
+#: ../js/ui/components/polkitAgent.js:170
 msgid "Authenticate"
 msgstr "Patvirtinti tapatybę"

@@ -767,12 +769,12 @@ msgstr "Patvirtinti tapatybę"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: ../js/ui/components/polkitAgent.js:256 ../js/ui/shellMountOperation.js:383
+#: ../js/ui/components/polkitAgent.js:266 ../js/ui/shellMountOperation.js:383
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Atsiprašome, tai nesuveikė. Bandykite dar kartą."

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/components/recorder.js:48
+#: ../js/ui/components/recorder.js:47
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "Ekrano vaizdo įrašas iš %d %t"
@@ -831,14 +833,14 @@ msgstr "<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> "

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:985
+#: ../js/ui/components/telepathyClient.js:986
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s nuo šiol vadinasi %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1089
 #, c-format
 msgid "Invitation to %s"
 msgstr "Kvietimas į %s"
@@ -846,38 +848,38 @@ msgstr "Kvietimas į %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1097
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s jus kviečia prisijungti prie %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1137
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1099
+#: ../js/ui/components/telepathyClient.js:1138
+#: ../js/ui/components/telepathyClient.js:1178
+#: ../js/ui/components/telepathyClient.js:1241
 msgid "Decline"
 msgstr "Atmesti"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Accept"
 msgstr "Priimti"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1130
 #, c-format
 msgid "Video call from %s"
 msgstr "Vaizdo skambutis nuo %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1133
 #, c-format
 msgid "Call from %s"
 msgstr "Skambutis nuo %s"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1140
 msgid "Answer"
 msgstr "Atsiliepti"

@@ -886,110 +888,110 @@ msgstr "Atsiliepti"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1172
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s jums siunčia %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1207
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s pageidauja matyti, kai esate prisijungę prie interneto"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1299
 msgid "Network error"
 msgstr "Tinklo klaida"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1301
 msgid "Authentication failed"
 msgstr "Nepavyko patvirtinti tapatybės"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1303
 msgid "Encryption error"
 msgstr "Šifravimo klaida"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1305
 msgid "Certificate not provided"
 msgstr "Liudijimas nepateiktas"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1307
 msgid "Certificate untrusted"
 msgstr "Liudijimas nepatikimas"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1309
 msgid "Certificate expired"
 msgstr "Liudijimo galiojimas pasibaigęs"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1311
 msgid "Certificate not activated"
 msgstr "Liudijimas neaktyvuotas"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1313
 msgid "Certificate hostname mismatch"
 msgstr "Liudijimo serverio vardo nesutapimas"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1315
 msgid "Certificate fingerprint mismatch"
 msgstr "Liudijimo piršto atspaudo nesutapimas"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1317
 msgid "Certificate self-signed"
 msgstr "Liudijimas pačių pasirašytas"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1319
 msgid "Status is set to offline"
 msgstr "Nustatyta atsijungimo būsena"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1321
 msgid "Encryption is not available"
 msgstr "Šifravimas negalimas"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1323
 msgid "Certificate is invalid"
 msgstr "Liudijimas netinkamas"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1325
 msgid "Connection has been refused"
 msgstr "Ryšys atmestas"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1327
 msgid "Connection can't be established"
 msgstr "Nepavyko užmegzti ryšio"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1329
 msgid "Connection has been lost"
 msgstr "Ryšys nutrūko"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1331
 msgid "This account is already connected to the server"
 msgstr "Ši paskyra jau prijungta prie serverio"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1333
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Ryšys pakeistas nauju ryšiu naudojant tą patį išteklių"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1335
 msgid "The account already exists on the server"
 msgstr "Tokia paskyra serveryje jau yra"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1337
 msgid "Server is currently too busy to handle the connection"
 msgstr "Šiuo metu serveris per daug užimtas šiai užklausai apdoroti"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1339
 msgid "Certificate has been revoked"
 msgstr "Liudijimas atšauktas"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1341
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Liudijimui naudojamas nesaugus šifravimo algoritmas arba jis kriptografiškai "
 "silpnas"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1343
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -997,22 +999,22 @@ msgstr ""
 "Serverio liudijimo ilgis arba liudijimų eilės dydis viršija kriptografijos "
 "bibliotekos apribojimus"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1345
 msgid "Internal error"
 msgstr "Vidinė klaida"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1355
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Nepavyksta prisijungti prie %s"

-#: ../js/ui/components/telepathyClient.js:1359
+#: ../js/ui/components/telepathyClient.js:1360
 msgid "View account"
 msgstr "Rodyti paskyrą"

-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1399
 msgid "Unknown reason"
 msgstr "Nežinoma priežastis"

@@ -1026,7 +1028,7 @@ msgstr "Paleisti programas"

 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/dash.js:435
+#: ../js/ui/dash.js:445
 msgid "Dash"
 msgstr "Paleidimo sritis"

@@ -1038,14 +1040,14 @@ msgstr "Atverti kalendorių"
 msgid "Open Clocks"
 msgstr "Atverti laikrodžius"

-#: ../js/ui/dateMenu.js:105
+#: ../js/ui/dateMenu.js:104
 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:215
+#: ../js/ui/dateMenu.js:216
 msgid "%A %B %e, %Y"
 msgstr "%A, %Y m. %B %d d."

@@ -1156,7 +1158,7 @@ msgstr "Įdiegti"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Atsiųsti ir įdiegti „%s“ iš extensions.gnome.org?"

-#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:314
+#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:333
 #: ../js/ui/status/power.js:211
 msgid "Keyboard"
 msgstr "Klaviatūra"
@@ -1183,7 +1185,9 @@ msgstr "Rodyti klaidas"
 msgid "Enabled"
 msgstr "Įjungta"

-#: ../js/ui/lookingGlass.js:769
+#. translators:
+#. * The device has been disabled
+#: ../js/ui/lookingGlass.js:769 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Išjungta"

@@ -1223,19 +1227,19 @@ msgstr "Išvalyti pranešimus"
 msgid "Notification Settings"
 msgstr "Pranešimų nustatymai"

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

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

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

-#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:374
+#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:392
 msgctxt "program"
 msgid "Unknown"
 msgstr "Nežinoma"
@@ -1264,17 +1268,17 @@ msgstr "Apžvalga"
 msgid "Type to search…"
 msgstr "Rašykite, ko ieškote…"

-#: ../js/ui/panel.js:612
+#: ../js/ui/panel.js:636
 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:636
+#: ../js/ui/panel.js:687
 msgid "Activities"
 msgstr "Apžvalga"

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

@@ -1283,15 +1287,15 @@ msgstr "Viršutinė juosta"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:727
+#: ../js/ui/popupMenu.js:740
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

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

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

@@ -1313,7 +1317,7 @@ msgstr[2] "%d naujų pranešimų"
 msgid "Lock"
 msgstr "Užrakinti"

-#: ../js/ui/screenShield.js:637
+#: ../js/ui/screenShield.js:642
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME aplinkai reikia užrakinti ekraną"

@@ -1324,11 +1328,11 @@ msgstr "GNOME aplinkai reikia užrakinti ekraną"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1194
+#: ../js/ui/screenShield.js:765 ../js/ui/screenShield.js:1201
 msgid "Unable to lock"
 msgstr "Nepavyksta užrakinti"

-#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1195
+#: ../js/ui/screenShield.js:766 ../js/ui/screenShield.js:1202
 msgid "Lock was blocked by an application"
 msgstr "Programa užblokavo užrakinimą"

@@ -1340,19 +1344,19 @@ msgstr "Ieškoma…"
 msgid "No results."
 msgstr "Nerasta atitikmenų."

-#: ../js/ui/shellEntry.js:29
+#: ../js/ui/shellEntry.js:27
 msgid "Copy"
 msgstr "Kopijuoti"

-#: ../js/ui/shellEntry.js:34
+#: ../js/ui/shellEntry.js:32
 msgid "Paste"
 msgstr "Įdėti"

-#: ../js/ui/shellEntry.js:106
+#: ../js/ui/shellEntry.js:99
 msgid "Show Text"
 msgstr "Rodyti tekstą"

-#: ../js/ui/shellEntry.js:108
+#: ../js/ui/shellEntry.js:101
 msgid "Hide Text"
 msgstr "Slėpti tekstą"

@@ -1364,7 +1368,7 @@ msgstr "Slaptažodis"
 msgid "Remember Password"
 msgstr "Atsiminti slaptažodį"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:113
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:109
 msgid "Unlock"
 msgstr "Atrakinti"

@@ -1533,11 +1537,12 @@ msgstr "Įveskite PIN, nurodytą įrenginyje."
 msgid "OK"
 msgstr "Gerai"

-#: ../js/ui/status/keyboard.js:368
+#: ../js/ui/status/keyboard.js:396
 msgid "Show Keyboard Layout"
 msgstr "Rodyti klaviatūros išdėstymą"

-#: ../js/ui/status/keyboard.js:373
+#: ../js/ui/status/keyboard.js:401
+#| msgid "Date & Time Settings"
 msgid "Region & Language Settings"
 msgstr "Regiono ir kalbos nustatymai"

@@ -1655,7 +1660,7 @@ msgstr "Nepavyko prisijungti"
 msgid "Activation of network connection failed"
 msgstr "Tinklo ryšio nepavyko aktyvuoti"

-#: ../js/ui/status/network.js:2276
+#: ../js/ui/status/network.js:2282
 msgid "Networking is disabled"
 msgstr "Tinklas išjungtas"

@@ -1773,11 +1778,11 @@ msgstr "Garsumas"
 msgid "Microphone"
 msgstr "Mikrofonas"

-#: ../js/ui/unlockDialog.js:124
+#: ../js/ui/unlockDialog.js:120
 msgid "Log in as another user"
 msgstr "Prisijungti kitu naudotoju"

-#: ../js/ui/unlockDialog.js:145
+#: ../js/ui/unlockDialog.js:141
 msgid "Unlock Window"
 msgstr "Atrakinimo langas"

@@ -1885,32 +1890,56 @@ msgstr "„%s“ yra pasirengusi"
 msgid "Evolution Calendar"
 msgstr "Evolution kalendorius"

-#: ../src/main.c:347
+#. translators:
+#. * The number of sound outputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1837
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u išvestis"
+msgstr[1] "%u išvestys"
+msgstr[2] "%u išvesčių"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1847
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u įvestis"
+msgstr[1] "%u įvestys"
+msgstr[2] "%u įvesčių"
+
+#: ../src/gvc/gvc-mixer-control.c:2373
+msgid "System Sounds"
+msgstr "Sistemos garsai"
+
+#: ../src/main.c:328
 msgid "Print version"
 msgstr "Išvesti versijos numerį"

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

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

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

-#: ../src/shell-app.c:622
+#: ../src/shell-app.c:640
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Nepavyko paleisti „%s“"

-#: ../src/shell-keyring-prompt.c:708
+#: ../src/shell-keyring-prompt.c:714
 msgid "Passwords do not match."
 msgstr "Slaptažodžiai nesutampa."

-#: ../src/shell-keyring-prompt.c:716
+#: ../src/shell-keyring-prompt.c:722
 msgid "Password cannot be blank"
 msgstr "Slaptažodis negali būti tuščias"

@@ -1918,17 +1947,17 @@ msgstr "Slaptažodis negali būti tuščias"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Naudotojas užvėrė tapatybės patvirtinimo dialogą"

-#~ msgid "%u Output"
-#~ msgid_plural "%u Outputs"
-#~ msgstr[0] "%u išvestis"
-#~ msgstr[1] "%u išvestys"
-#~ msgstr[2] "%u išvesčių"
+#~ msgctxt "event list time"
+#~ msgid "%H∶%M"
+#~ msgstr "%H∶%M"

-#~ msgid "%u Input"
-#~ msgid_plural "%u Inputs"
-#~ msgstr[0] "%u įvestis"
-#~ msgstr[1] "%u įvestys"
-#~ msgstr[2] "%u įvesčių"
+#~ msgctxt "event list time"
+#~ msgid "%l∶%M %p"
+#~ msgstr "%l∶%M"

-#~ msgid "System Sounds"
-#~ msgstr "Sistemos garsai"
+#~ msgid "calendar:MY"
+#~ msgstr "calendar:YM"
+
+#~| msgid "Network error"
+#~ msgid "Network"
+#~ msgstr "Tinklas"
--- a/po/ml.po
+++ b/po/ml.po
@@ -10,9 +10,9 @@ 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: 2013-04-24 18:23+0000\n"
-"PO-Revision-Date: 2013-04-25 00:32+0530\n"
-"Last-Translator: Balasankar C <c.balasankar@gmail.com>\n"
+"POT-Creation-Date: 2013-03-23 11:49+0000\n"
+"PO-Revision-Date: 2013-03-25 14:57+0530\n"
+"Last-Translator: Ani Peter <peter.ani@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: ml\n"
 "MIME-Version: 1.0\n"
@@ -44,14 +44,10 @@ msgid "Focus the active notification"
 msgstr "സജീവമായ അറിയിപ്പിനെ കേന്ദ്രീകരിക്കുക"

 #: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Show the overview"
-msgstr "പൊതുവായ അവലോകനം കാണിക്കുക"
-
-#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Show all applications"
 msgstr "എല്ലാ പ്രയോഗങ്ങളും കാണിയ്ക്കുക"

-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: ../data/50-gnome-shell-system.xml.in.h:5
 msgid "Open the application menu"
 msgstr "പ്രയോഗത്തിന്റെ മെനു തുറക്കുക"

@@ -75,7 +71,8 @@ msgstr "ഗ്നോം ഷെല്‍ എക്സ്റ്റെന്‍ഷ
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
-"Alt-F2-ല്‍ ഡവലപ്പര്‍മാര്‍ക്കും ടെസ്റ്റേര്‍സിനും പ്രയോജനകരമായ ആന്തരിക പ്രയോഗങ്ങള്‍ പ്രവര്‍ത്തന "
+"Alt-F2-ല്‍ ഡവലപ്പര്‍മാര്‍ക്കും ടെസ്റ്റേര്‍സിനും പ്രയോജനകരമായ ആന്തരിക "
+"പ്രയോഗങ്ങള്‍ പ്രവര്‍ത്തന "
 "സജ്ജമാക്കുന്നു"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
@@ -83,7 +80,8 @@ msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr ""
-"Alt-F2 ഡയലോഗ് ഉപയോഗിച്ചു് ആന്തരിക ഡീബഗ്ഗിലേക്കും നീരീക്ഷണ പ്രയോഗങ്ങളിലേക്കും പ്രവേശനം "
+"Alt-F2 ഡയലോഗ് ഉപയോഗിച്ചു് ആന്തരിക ഡീബഗ്ഗിലേക്കും നീരീക്ഷണ പ്രയോഗങ്ങളിലേക്കും "
+"പ്രവേശനം "
 "അനുവദിയ്ക്കുക."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
@@ -97,14 +95,19 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
-"ഗ്നോം ഷെല്‍ എക്സ്റ്റെന്‍ഷനുകള്‍ക്കു് ഒരു യുയുഐഡി വിശേഷതയുണ്ടു്; ലഭ്യമാക്കേണ്ട എക്സ്റ്റെന്‍ഷനുകള്‍ ഈ കീ പട്ടിക "
-"ലഭ്യമാക്കുന്നു. ലഭ്യമാക്കേണ്ട ഏതു് എക്സ്റ്റെന്‍ഷനും ഈ പട്ടികയിലുണ്ടാവണം. org.gnome.Shell-ല്‍ "
-"നിങ്ങള്‍ക്കു് EnableExtension, DisableExtension എന്നീ ഡീബസ് രീതികളിലൂടെ ഈ പട്ടിക "
+"ഗ്നോം ഷെല്‍ എക്സ്റ്റെന്‍ഷനുകള്‍ക്കു് ഒരു യുയുഐഡി വിശേഷതയുണ്ടു്; ലഭ്യമാക്കേണ്ട "
+"എക്സ്റ്റെന്‍ഷനുകള്‍ ഈ കീ പട്ടിക "
+"ലഭ്യമാക്കുന്നു. ലഭ്യമാക്കേണ്ട ഏതു് എക്സ്റ്റെന്‍ഷനും ഈ പട്ടികയിലുണ്ടാവണം. "
+"org.gnome.Shell-ല്‍ "
+"നിങ്ങള്‍ക്കു് EnableExtension, DisableExtension എന്നീ ഡീബസ് രീതികളിലൂടെ ഈ "
+"പട്ടിക "
 "കൈകാര്യം ചെയ്യുവാനും സാധിയ്ക്കുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Whether to collect stats about applications usage"
-msgstr "പ്രയോഗങ്ങളുടെ ഉപയോഗത്തെപ്പറ്റിയുള്ള സ്ഥിതിവിവരക്കണക്കുകള്‍ ശേഖരിയ്ക്കണമോ എന്നു്"
+msgstr ""
+"പ്രയോഗങ്ങളുടെ ഉപയോഗത്തെപ്പറ്റിയുള്ള സ്ഥിതിവിവരക്കണക്കുകള്‍ ശേഖരിയ്ക്കണമോ "
+"എന്നു്"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
 msgid ""
@@ -113,9 +116,12 @@ msgid ""
 "want to disable this for privacy reasons. Please note that doing so won't "
 "remove already saved data."
 msgstr ""
-"ഏറ്റവും കൂടുതല്‍ തവണ ഉപയോഗിയ്ക്കുന്ന പ്രയോഗങ്ങള്‍ ലഭ്യമാക്കുന്നതിനായി ഷെല്‍ സാധാരണയായി സജീവമായ "
-"പ്രയോഗങ്ങളെ നിരീക്ഷിയ്ക്കുന്നു. (ഉദാഹരണത്തിനു്, ലോഞ്ചേര്‍സ്). ഈ ഡേറ്റാ സ്വകാര്യമായി "
-"സൂക്ഷിയ്ക്കുന്നെങ്കിലും, ചില കാരണങ്ങളാല്‍ ഇതു് പ്രവര്‍ത്തന രഹിതമാക്കേണ്ടതുണ്ടു്. ഇങ്ങനെ ചെയ്യുന്നതു് "
+"ഏറ്റവും കൂടുതല്‍ തവണ ഉപയോഗിയ്ക്കുന്ന പ്രയോഗങ്ങള്‍ ലഭ്യമാക്കുന്നതിനായി ഷെല്‍ "
+"സാധാരണയായി സജീവമായ "
+"പ്രയോഗങ്ങളെ നിരീക്ഷിയ്ക്കുന്നു. (ഉദാഹരണത്തിനു്, ലോഞ്ചേര്‍സ്). ഈ ഡേറ്റാ "
+"സ്വകാര്യമായി "
+"സൂക്ഷിയ്ക്കുന്നെങ്കിലും, ചില കാരണങ്ങളാല്‍ ഇതു് പ്രവര്‍ത്തന "
+"രഹിതമാക്കേണ്ടതുണ്ടു്. ഇങ്ങനെ ചെയ്യുന്നതു് "
 "നിങ്ങള്‍ സൂക്ഷിച്ച ഡേറ്റയെ ബാധിയ്ക്കുന്നതല്ല."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
@@ -126,7 +132,8 @@ msgstr "ഇഷ്ടമുള്ള പ്രയോഗങ്ങള്‍ക്
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
-msgstr "ഈ ഐഡന്റിഫയറുകള്‍ക്കുള്ള പ്രയോഗങ്ങള്‍ ഉചിതമായ സ്ഥലങ്ങളില്‍ കാണിയ്ക്കുന്നു."
+msgstr ""
+"ഈ ഐഡന്റിഫയറുകള്‍ക്കുള്ള പ്രയോഗങ്ങള്‍ ഉചിതമായ സ്ഥലങ്ങളില്‍ കാണിയ്ക്കുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "List of categories that should be displayed as folders"
@@ -137,8 +144,8 @@ msgid ""
 "Each category name in this list will be represented as folder in the "
 "application view, rather than being displayed inline in the main view."
 msgstr ""
-"ഈ പട്ടികയിലുള്ള ഓരോ വിഭാഗത്തിന്റെ പേരും, പ്രധാന കാഴ്ചയില്‍ ഓരോ വരിയായി കാണിയ്ക്കുന്നതിനു് "
-"പകരം പ്രയോഗങ്ങളുടെ കാഴ്ചയില്‍ ഫോള്‍ഡറായി കാണിയ്ക്കുന്നു. "
+"ഈ പട്ടികയിലുള്ള ഓരോ വിഭാഗത്തിന്റെ പേരും, പ്രധാന കാഴ്ചയില്‍ ഓരോ വരിയായി "
+"കാണിയ്ക്കുന്നതിനു് പകരം പ്രയോഗങ്ങളുടെ കാഴ്ചയില്‍ ഫോള്‍ഡറായി കാണിയ്ക്കുന്നു. "

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
@@ -153,7 +160,8 @@ msgid ""
 "Internally used to store the last IM presence explicitly set by the user. "
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""
-"ഉപയോക്താവു് സജ്ജമാക്കിയ അവസാന ഐഎം ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
+"ഉപയോക്താവു് സജ്ജമാക്കിയ അവസാന ഐഎം ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് "
+"ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
 "TpConnectionPresenceType തരത്തിലുള്ളതാകുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:14
@@ -161,7 +169,8 @@ msgid ""
 "Internally used to store the last session presence status for the user. The "
 "value here is from the GsmPresenceStatus enumeration."
 msgstr ""
-"ഉപയോക്താവിനുള്ള അവസാന സെഷന്‍ അവസ്ഥ ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
+"ഉപയോക്താവിനുള്ള അവസാന സെഷന്‍ അവസ്ഥ ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് "
+"ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
 "GsmPresenceStatus തരത്തിലുള്ളതാകുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
@@ -173,13 +182,15 @@ msgid ""
 "This key overrides the automatic hiding of the 'Log out' menuitem in single-"
 "user, single-session situations."
 msgstr ""
-"സിംഗിള്‍ യൂസര്‍, സിംഗിള്‍ സെഷനില്‍ 'ലോഗൌട്ട്' മെനുവസ്തു അദൃശ്യമാക്കുന്നതിനായി ഈ കീ ഉപയോഗിയ്ക്കുന്നു"
+"സിംഗിള്‍ യൂസര്‍, സിംഗിള്‍ സെഷനില്‍ 'ലോഗൌട്ട്' മെനുവസ്തു അദൃശ്യമാക്കുന്നതിനായി "
+"ഈ കീ ഉപയോഗിയ്ക്കുന്നു"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
-"എന്‍ക്രിപ്റ്റ് ചെയ്തതോ വിദൂരമോ ആയ ഫയല്‍സിസ്റ്റങ്ങള്‍ മൌണ്ട് ചെയ്യുമ്പോഴുള്ള രഹസ്യവാക്ക് ഓര്‍മ്മിക്കണോ എന്ന്"
+"എന്‍ക്രിപ്റ്റ് ചെയ്തതോ വിദൂരമോ ആയ ഫയല്‍സിസ്റ്റങ്ങള്‍ മൌണ്ട് ചെയ്യുമ്പോഴുള്ള "
+"രഹസ്യവാക്ക് ഓര്‍മ്മിക്കണോ എന്ന്"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid ""
@@ -188,9 +199,10 @@ msgid ""
 "'Remember Password' checkbox will be present. This key sets the default "
 "state of the checkbox."
 msgstr ""
-"ഒരു എന്‍ക്രിപ്റ്റ് ചെയ്ത ഡിവൈസ് അല്ലെങ്കില്‍ വിദൂര ഫയല്‍സിസ്റ്റം മൌണ്ട് ചെയ്യുമ്പോള്‍ ഷെല്‍ ഒരു രഹസ്യവാക്ക് "
-"ആവശ്യപ്പെടുന്നു. രഹസ്യവാക്ക് സൂക്ഷിയ്ക്കുവാന്‍ സാധ്യമെങ്കില്‍,  'രഹസ്യവാക്ക് ഓര്‍ത്തു്വയ്ക്കുക' ചെക്ക്ബോക്സ് "
-"കാണാം. ഈ കീ ചെക്ക്ബോക്സിന്റെ സ്വതവേയുള്ള അവസ്ഥ സജ്ജമാക്കുന്നു."
+"ഒരു എന്‍ക്രിപ്റ്റ് ചെയ്ത ഡിവൈസ് അല്ലെങ്കില്‍ വിദൂര ഫയല്‍സിസ്റ്റം മൌണ്ട് "
+"ചെയ്യുമ്പോള്‍ ഷെല്‍ ഒരു രഹസ്യവാക്ക് ആവശ്യപ്പെടുന്നു. രഹസ്യവാക്ക് "
+"സൂക്ഷിയ്ക്കുവാന്‍ സാധ്യമെങ്കില്‍,  'രഹസ്യവാക്ക് ഓര്‍ത്തു്വയ്ക്കുക' "
+"ചെക്ക്ബോക്സ് കാണാം. ഈ കീ ചെക്ക്ബോക്സിന്റെ സ്വതവേയുള്ള അവസ്ഥ സജ്ജമാക്കുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Show the week date in the calendar"
@@ -216,65 +228,61 @@ msgstr "\"പ്രയോഗങ്ങള്‍ കാണിയ്ക്കുക
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
-"പ്രവര്‍ത്തികളുടെ അവലോകനത്തിന്റെ \"പ്രയോഗങ്ങള്‍ കാണിയ്ക്കുക\" എന്ന കാഴ്ച തുറക്കുന്നതിനുള്ള കീബൈന്‍ഡിങ്"
+"പ്രവര്‍ത്തികളുടെ അവലോകനത്തിന്റെ \"പ്രയോഗങ്ങള്‍ കാണിയ്ക്കുക\" എന്ന കാഴ്ച "
+"തുറക്കുന്നതിനുള്ള കീബൈന്‍ഡിങ്"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-msgid "Keybinding to open the overview"
-msgstr "പൊതുവായ അവലോകനം  തുറക്കുന്നതിനുള്ള കീബൈന്‍ഡിങ്"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-msgid "Keybinding to open the Activities Overview."
-msgstr "പ്രയോഗങ്ങളുടെ പൊതുവായ അവലോകനം എന്ന കാഴ്ച തുറക്കുന്നതിനുള്ള കീബൈന്‍ഡിങ്"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "സന്ദേശ ട്രേയുടെ ദൃശ്യത ടൊഗ്ഗിള്‍ ചെയ്യുന്നതിനുള്ള കീക്കൂട്ടം"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "സന്ദേശ ട്രേയുടെ ദൃശ്യത ടൊഗ്ഗിള്‍ ചെയ്യുന്നതിനുള്ള കീക്കൂട്ടം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to focus the active notification"
 msgstr "സജീവമായ അറിയിപ്പിനുള്ള കീബൈന്‍ഡിങ്"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification."
 msgstr "സജീവമായ അറിയിപ്പിനുള്ള കീബൈന്‍ഡിങ്."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to toggle the screen recorder"
 msgstr "സ്ക്രീന്‍ റിക്കോര്‍ഡര്‍ ടൊഗ്ഗിള്‍ ചെയ്യുന്നതിനുള്ള കീക്കൂട്ടം"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Keybinding to start/stop the builtin screen recorder."
-msgstr "ബിള്‍ട്ടിന്‍ സ്ക്രീന്‍ റിക്കോര്‍ഡര്‍ തുടങ്ങുവാന്‍/നിര്‍ത്തുന്നതിനുള്ള കീക്കൂട്ടം."
+msgstr ""
+"ബിള്‍ട്ടിന്‍ സ്ക്രീന്‍ റിക്കോര്‍ഡര്‍ തുടങ്ങുവാന്‍/നിര്‍ത്തുന്നതിനുള്ള "
+"കീക്കൂട്ടം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "ഏതു് കീബോര്‍ഡ് ഉപയോഗിയ്ക്കണം"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "ഏതു് തരം കീബോര്‍ഡ് ഉപയോഗിയ്ക്കണം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Framerate used for recording screencasts."
 msgstr "സ്ക്രീന്‍കാസ്റ്റുകള്‍ റിക്കോര്‍ഡ് ചെയ്യുന്നതിനുള്ള ഫ്രെയിം റേറ്റ്."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
 msgstr ""
-"ഗ്നോം ഷെല്ലിന്റെ സ്ക്രീന്‍കാസ്റ്റ് റിക്കോര്‍ഡര്‍ റീക്കോര്‍ഡ് ചെയ്തിട്ടുള്ള സ്ക്രീന്‍കാസ്റ്റിന്റെ "
+"ഗ്നോം ഷെല്ലിന്റെ സ്ക്രീന്‍കാസ്റ്റ് റിക്കോര്‍ഡര്‍ റീക്കോര്‍ഡ് ചെയ്തിട്ടുള്ള "
+"സ്ക്രീന്‍കാസ്റ്റിന്റെ "
 "ഫ്രെയിംറേറ്റ്, ഒരു സെക്കന്‍ഡില്‍ ഒരു ഫ്രെയിം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "സ്ക്രീന്‍കാസ്റ്റ് എന്‍കോഡ് ചെയ്യുന്നതിനുള്ള gstreamer പൈപ്പ്‌ലൈന്‍"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -288,68 +296,78 @@ msgid ""
 "threads=%T ! queue ! webmmux' and records to WEBM using the VP8 codec. %T is "
 "used as a placeholder for a guess at the optimal thread count on the system."
 msgstr ""
-"റിക്കോര്‍ഡിങുകള്‍ എന്‍കോഡ് ചെയ്യുന്നതിനായി GStreamer പൈപ്പ് ലൈന്‍ ഉപയോഗിയ്ക്കുന്നു. gst-launch-"
-"നുള്ള സിന്റാക്സ് ഉപയോഗിയ്ക്കുന്നു. കാലിയായി സജ്ജമാക്കുമ്പോള്‍ കാലിയാകുന്നു.ഇതു് നിലവില്‍ 'vp8enc "
+"റിക്കോര്‍ഡിങുകള്‍ എന്‍കോഡ് ചെയ്യുന്നതിനായി GStreamer പൈപ്പ് ലൈന്‍ "
+"ഉപയോഗിയ്ക്കുന്നു. gst-launch-"
+"നുള്ള സിന്റാക്സ് ഉപയോഗിയ്ക്കുന്നു. കാലിയായി സജ്ജമാക്കുമ്പോള്‍ "
+"കാലിയാകുന്നു.ഇതു് നിലവില്‍ 'vp8enc "
 "min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! "
 "queue ! webmmux' ആകുന്നുസ WEBM VP8 കോഡ് ഉപയോഗിച്ചു് റിക്കോര്‍ഡ് ചെയ്യുന്നു."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "File extension used for storing the screencast"
 msgstr "സ്ക്രീന്‍കാസ്റ്റ് സൂക്ഷിയ്ക്കുന്നതിനുള്ള ഫയല്‍ എക്സ്റ്റെന്‍ഷന്‍"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
 "a different container format."
 msgstr ""
-"റിക്കോര്‍ഡ് ചെയ്ത സ്ക്രീന്‍കാസ്റ്റുകള്‍ക്കുള്ള ഫയല്‍നാമം നിലവിലുള്ള തീയതി, എക്സ്റ്റെന്‍ഷന്‍ എന്നിവ "
-"അനുസരിച്ചാകുന്നു. മറ്റൊരു ശൈലിയിലേക്കു് റിക്കോര്‍ഡ് ചെയ്യുമ്പോള്‍ ഇതു് മാറ്റണം."
+"റിക്കോര്‍ഡ് ചെയ്ത സ്ക്രീന്‍കാസ്റ്റുകള്‍ക്കുള്ള ഫയല്‍നാമം നിലവിലുള്ള തീയതി, "
+"എക്സ്റ്റെന്‍ഷന്‍ എന്നിവ "
+"അനുസരിച്ചാകുന്നു. മറ്റൊരു ശൈലിയിലേക്കു് റിക്കോര്‍ഡ് ചെയ്യുമ്പോള്‍ ഇതു് "
+"മാറ്റണം."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "The application icon mode."
 msgstr "പ്രയോഗത്തിന്റെ ഐക്കണ്‍ മോഡ്."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
 "only' (shows only the application icon) or 'both'."
 msgstr ""
-"സ്വിച്ചറില്‍ ജാലകങ്ങള്‍ എങ്ങനെ കാണിയ്ക്കുന്നു എന്നു് ക്രമീകരിയ്ക്കുന്നു. ശരിയായ സാധ്യതകള്‍: "
-"'thumbnail-only' (ജാലകത്തിന്റെ പ്രതിരൂപം കാണിയ്ക്കുന്നു), 'app-icon-"
+"സ്വിച്ചറില്‍ ജാലകങ്ങള്‍ എങ്ങനെ കാണിയ്ക്കുന്നു എന്നു് ക്രമീകരിയ്ക്കുന്നു. "
+"ശരിയായ "
+"സാധ്യതകള്‍: 'thumbnail-only' (ജാലകത്തിന്റെ പ്രതിരൂപം കാണിയ്ക്കുന്നു), "
+"'app-icon-"
 "only' (പ്രയോഗത്തിന്റെ പ്രതിരൂപം കാണിയ്ക്കുന്നു) അല്ലെങ്കില്‍ 'both'."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Attach modal dialog to the parent window"
 msgstr "പേരന്റ് ജാലകത്തിലേക്കു് ഡയലോഗ് ചേര്‍ക്കുക"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "ഗ്നോം ഷെല്‍ പ്രവര്‍ത്തിയ്ക്കുമ്പോള്‍ org.gnome.mutter-ലുള്ള കീ ഈ കീ തിരുത്തിയെഴുതുന്നു."
+msgstr ""
+"ഗ്നോം ഷെല്‍ പ്രവര്‍ത്തിയ്ക്കുമ്പോള്‍ org.gnome.mutter-ലുള്ള കീ ഈ കീ "
+"തിരുത്തിയെഴുതുന്നു."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
 msgid "Arrangement of buttons on the titlebar"
 msgstr "തലക്കെട്ടിനുള്ള ബാറില്‍ ബട്ടണുകളുടെ ക്രമീകരണം"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"ഗ്നോം ഷെല്‍ പ്രവര്‍ത്തിയ്ക്കുമ്പോള്‍ org.gnome.desktop.wm.preferences-ലുള്ള കീ ഈ കീ "
-"തിരുത്തിയെഴുതുന്നു."
+"ഗ്നോം ഷെല്‍ പ്രവര്‍ത്തിയ്ക്കുമ്പോള്‍ org.gnome.desktop.wm.preferences-ലുള്ള "
+"കീ ഈ കീ തിരുത്തിയെഴുതുന്നു."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:46
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "സ്ക്രീന്‍ കോണുകളില്‍ ജാലകങ്ങള്‍ എത്തിയ്ക്കുമ്പോള്‍ കോണ്‍ ചരിയ്ക്കുന്നതിനായി പ്രവര്‍ത്തന സജ്ജമാക്കുക"
+msgstr ""
+"സ്ക്രീന്‍ കോണുകളില്‍ ജാലകങ്ങള്‍ എത്തിയ്ക്കുമ്പോള്‍ കോണ്‍ ചരിയ്ക്കുന്നതിനായി "
+"പ്രവര്‍ത്തന സജ്ജമാക്കുക"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:49
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:47
 msgid "Workspaces are managed dynamically"
 msgstr "പണിയിടങ്ങള്‍ ഡയനാമിക്കായി കൈകാര്യം ചെയ്തിരിക്കുന്നു"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:50
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:48
 msgid "Workspaces only on primary monitor"
 msgstr "പ്രധാന മോണിറ്ററില്‍ മാത്രം പണിയിടങ്ങള്‍"

@@ -364,9 +382,12 @@ msgstr "എക്സ്റ്റെന്‍ഷന്‍"

 #: ../js/extensionPrefs/main.js:189
 msgid "Select an extension to configure using the combobox above."
-msgstr "മുകളിലുള്ള കോമ്പോ ബോക്സ് ഉപയോഗിച്ചു് ക്രമീകരിയ്ക്കുന്നതിനുള്ളൊരു എക്സ്റ്റെന്‍ഷന്‍ തെര‍ഞ്ഞെടുക്കുക."
+msgstr ""
+"മുകളിലുള്ള കോമ്പോ ബോക്സ് ഉപയോഗിച്ചു് ക്രമീകരിയ്ക്കുന്നതിനുള്ളൊരു "
+"എക്സ്റ്റെന്‍ഷന്‍ തെര‍ഞ്ഞെടുക്കുക."

 #: ../js/gdm/loginDialog.js:405
+#| msgid "Session..."
 msgid "Session…"
 msgstr "പ്രവര്‍ത്തനവേള..."

@@ -377,32 +398,32 @@ msgstr "പ്രവര്‍ത്തനവേള..."
 msgid "Not listed?"
 msgstr "ലഭ്യമല്ലേ?"

-#: ../js/gdm/loginDialog.js:787 ../js/ui/components/networkAgent.js:137
-#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:376
+#: ../js/gdm/loginDialog.js:786 ../js/ui/components/networkAgent.js:137
+#: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:100
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:99
 #: ../js/ui/userMenu.js:938
 msgid "Cancel"
 msgstr "വേണ്ട"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:802
 msgctxt "button"
 msgid "Sign In"
 msgstr "അകത്തുകയറുക"

-#: ../js/gdm/loginDialog.js:803
+#: ../js/gdm/loginDialog.js:802
 msgid "Next"
 msgstr "അടുത്തത്"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:918 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:917 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
 msgstr "ഉപയോക്തൃ നാമം: "

-#: ../js/gdm/loginDialog.js:1174
+#: ../js/gdm/loginDialog.js:1173
 msgid "Login Window"
 msgstr "പ്രവേശന ജാലകം"

@@ -455,23 +476,23 @@ msgstr "ആജ്ഞ പ്രാവര്‍ത്തികമാക്കാ
 msgid "Execution of '%s' failed:"
 msgstr "'%s' നടപ്പിലാക്കുന്നതില്‍ പരാജയപ്പെട്ടു:"

-#: ../js/ui/appDisplay.js:351
+#: ../js/ui/appDisplay.js:349
 msgid "Frequent"
 msgstr "ഇടയ്ക്കിടെ"

-#: ../js/ui/appDisplay.js:358
+#: ../js/ui/appDisplay.js:356
 msgid "All"
 msgstr "എല്ലാം"

-#: ../js/ui/appDisplay.js:916
+#: ../js/ui/appDisplay.js:914
 msgid "New Window"
 msgstr "പുതിയ വിന്‍ഡോ"

-#: ../js/ui/appDisplay.js:919 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "ഇഷ്ടപ്പെട്ടവയില്‍ നിന്നും നീക്കം ചെയ്യുക"

-#: ../js/ui/appDisplay.js:920
+#: ../js/ui/appDisplay.js:918
 msgid "Add to Favorites"
 msgstr "ഇഷ്ടപ്പെട്ടവയിലേക്ക് ചേര്‍ക്കുക"

@@ -508,7 +529,7 @@ msgctxt "event list time"
 msgid "%H\\u2236%M"
 msgstr "%H\\u2236%M"

-#. Translators: Shown in calendar event list, if 12h format,
+#. Transators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space
 #: ../js/ui/calendar.js:77
@@ -711,7 +732,8 @@ msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr ""
-"വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്ക് '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി രഹസ്യവാക്കുകള്‍ അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
+"വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്ക് '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി രഹസ്യവാക്കുകള്‍ "
+"അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
 "ആവശ്യമുണ്ടു്."

 #: ../js/ui/components/networkAgent.js:314
@@ -768,7 +790,7 @@ msgid "Sorry, that didn't work. Please try again."
 msgstr "ക്ഷമിക്കണം, അതു ശരിയല്ല. ദയവായി വീണ്ടും ശ്രമിക്കുക."

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/components/recorder.js:47
+#: ../js/ui/components/recorder.js:48
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "%d-ല്‍ നിന്നുള്ള സ്ക്രീന്‍കാസ്റ്റ്, %t-ല്‍"
@@ -891,7 +913,8 @@ msgstr "%s നിങ്ങള്‍ക്കു് %s അയച്ചിരി
 #: ../js/ui/components/telepathyClient.js:1206
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr "നിങ്ങള്‍ ഓണ്‍ലൈന്‍ ആകുമ്പോള്‍ കാണുന്നതിനുള്ള അനുമതി %s-നു് ആവശ്യമുണ്ടു്"
+msgstr ""
+"നിങ്ങള്‍ ഓണ്‍ലൈന്‍ ആകുമ്പോള്‍ കാണുന്നതിനുള്ള അനുമതി %s-നു് ആവശ്യമുണ്ടു്"

 #: ../js/ui/components/telepathyClient.js:1298
 msgid "Network error"
@@ -964,7 +987,9 @@ msgstr "ഈ അക്കൌണ്ട് നിലവില്‍ സര്‍വ
 #: ../js/ui/components/telepathyClient.js:1332
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr "അതേ ശ്രോതസ്സ് ഉപയോഗിച്ചു് ഒരു പുതിയ കണക്ഷന്‍ ഉപയോഗിച്ചു് ഈ കണക്ഷന്‍ മാറ്റിസ്ഥാപിയ്ക്കുന്നു"
+msgstr ""
+"അതേ ശ്രോതസ്സ് ഉപയോഗിച്ചു് ഒരു പുതിയ കണക്ഷന്‍ ഉപയോഗിച്ചു് ഈ കണക്ഷന്‍ "
+"മാറ്റിസ്ഥാപിയ്ക്കുന്നു"

 #: ../js/ui/components/telepathyClient.js:1334
 msgid "The account already exists on the server"
@@ -981,14 +1006,17 @@ msgstr "സമ്മതപത്രം വീണ്ടും ആവശ്യപ
 #: ../js/ui/components/telepathyClient.js:1340
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "സമ്മതപത്രം സുരക്ഷിതമല്ലാത്തൊരു സിഫര്‍ ആല്‍ഗോരിഥം ഉപയോഗിയ്ക്കുന്നു അല്ലെങ്കില്‍ ഉചിതമല്ല"
+msgstr ""
+"സമ്മതപത്രം സുരക്ഷിതമല്ലാത്തൊരു സിഫര്‍ ആല്‍ഗോരിഥം ഉപയോഗിയ്ക്കുന്നു "
+"അല്ലെങ്കില്‍ ഉചിതമല്ല"

 #: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
-"സര്‍വറിന്റെ സമ്മതപത്രത്തിന്റെ വ്യാപ്തി, അല്ലെങ്കില്‍ സര്‍വര്‍ സമ്മതപത്ര ചെയിന്റെ വ്യാപ്തി, എന്നിവ "
+"സര്‍വറിന്റെ സമ്മതപത്രത്തിന്റെ വ്യാപ്തി, അല്ലെങ്കില്‍ സര്‍വര്‍ സമ്മതപത്ര "
+"ചെയിന്റെ വ്യാപ്തി, എന്നിവ "
 "പരിധിയില്‍ കൂടുന്നു"

 #: ../js/ui/components/telepathyClient.js:1344
@@ -1057,7 +1085,8 @@ msgstr "പുറത്ത് കടക്കുക"
 #: ../js/ui/endSessionDialog.js:65
 msgid "Click Log Out to quit these applications and log out of the system."
 msgstr ""
-"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പുറത്തു കടക്കുക ക്ലിക്ക് ചെയ്തു് സിസ്റ്റത്തില്‍ നിന്നും "
+"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പുറത്തു കടക്കുക ക്ലിക്ക് "
+"ചെയ്തു് സിസ്റ്റത്തില്‍ നിന്നും "
 "പുറത്തു് കടക്കുക."

 #: ../js/ui/endSessionDialog.js:67
@@ -1091,7 +1120,8 @@ msgstr "നിര്‍ത്തുക"
 #: ../js/ui/endSessionDialog.js:84
 msgid "Click Power Off to quit these applications and power off the system."
 msgstr ""
-"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പവര്‍ ഓഫ് ചെയ്യുക ക്ലിക്ക് ചെയ്തു സിസ്റ്റിന്റെ പവര്‍ "
+"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പവര്‍ ഓഫ് ചെയ്യുക ക്ലിക്ക് "
+"ചെയ്തു സിസ്റ്റിന്റെ പവര്‍ "
 "ഓഫ് ചെയ്യുക."

 #: ../js/ui/endSessionDialog.js:86
@@ -1122,7 +1152,8 @@ msgstr "പുനരാരംഭിക്കുക"

 #: ../js/ui/endSessionDialog.js:101
 msgid "Click Restart to quit these applications and restart the system."
-msgstr "ഈ പ്രയോഗങ്ങള്‍ നിറുത്തി സിസ്റ്റം പുനരാരംഭിക്കുവാന്‍ പുനരാരംഭിക്കൂ അമര്‍ത്തുക"
+msgstr ""
+"ഈ പ്രയോഗങ്ങള്‍ നിറുത്തി സിസ്റ്റം പുനരാരംഭിക്കുവാന്‍ പുനരാരംഭിക്കൂ അമര്‍ത്തുക"

 #: ../js/ui/endSessionDialog.js:103
 #, c-format
@@ -1142,7 +1173,9 @@ msgstr "ഇന്‍സ്റ്റോള്‍"
 #: ../js/ui/extensionDownloader.js:204
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
-msgstr "extensions.gnome.org ഇല്‍ നിന്നും '%s' ഡൗണ്‍ലോട് ചെയ്ത് ഇന്‍സ്റ്റോള്‍ ചെയ്യേണമോ?"
+msgstr ""
+"extensions.gnome.org ഇല്‍ നിന്നും '%s' ഡൗണ്‍ലോട് ചെയ്ത് ഇന്‍സ്റ്റോള്‍ "
+"ചെയ്യേണമോ?"

 #: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:314
 #: ../js/ui/status/power.js:211
@@ -1171,9 +1204,7 @@ msgstr "പിശകുകള്‍ കാണിക്കുക"
 msgid "Enabled"
 msgstr "പ്രവര്‍ത്തനക്ഷമമാക്കി"

-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:769 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:769
 msgid "Disabled"
 msgstr "പ്രവര്‍ത്തനരഹിതമാക്കി"

@@ -1206,6 +1237,7 @@ msgid "Remove"
 msgstr "നീക്കം ചെയ്യുക"

 #: ../js/ui/messageTray.js:1501
+#| msgid "No Messages"
 msgid "Clear Messages"
 msgstr "സന്ദേശങ്ങള്‍ വെടിപ്പാക്കുക"

@@ -1213,35 +1245,35 @@ msgstr "സന്ദേശങ്ങള്‍ വെടിപ്പാക്ക
 msgid "Notification Settings"
 msgstr "അറിയിപ്പു് ക്രമീകരണങ്ങള്‍"

-#: ../js/ui/messageTray.js:1710
+#: ../js/ui/messageTray.js:1709
 msgid "No Messages"
 msgstr "സന്ദേശങ്ങളില്ല"

-#: ../js/ui/messageTray.js:1783
+#: ../js/ui/messageTray.js:1782
 msgid "Message Tray"
 msgstr "സന്ദേശത്തിന്റെ ട്രേ"

-#: ../js/ui/messageTray.js:2801
+#: ../js/ui/messageTray.js:2810
 msgid "System Information"
 msgstr "സിസ്റ്റത്തെക്കുറിച്ചുള്ള വിവരം"

-#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:378
+#: ../js/ui/notificationDaemon.js:629 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "അജ്ഞാതം"

-#: ../js/ui/overviewControls.js:472 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d പുതിയ സന്ദേശം"
 msgstr[1] "%d പുതിയ സന്ദേശങ്ങള്‍"

-#: ../js/ui/overview.js:82
+#: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "വേണ്ട"

-#: ../js/ui/overview.js:127
+#: ../js/ui/overview.js:129
 msgid "Overview"
 msgstr "അവലോകനം"

@@ -1249,21 +1281,22 @@ msgstr "അവലോകനം"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:260
+#: ../js/ui/overview.js:271
+#| msgid "Type to search..."
 msgid "Type to search…"
 msgstr "തെരയുന്നതിനായി ടൈപ്പ് ചെയ്യുക..."

-#: ../js/ui/panel.js:641
+#: ../js/ui/panel.js:612
 msgid "Quit"
 msgstr "നിര്‍ത്തുക"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:692
+#: ../js/ui/panel.js:636
 msgid "Activities"
 msgstr "പ്രവര്‍ത്തനങ്ങള്‍"

-#: ../js/ui/panel.js:989
+#: ../js/ui/panel.js:933
 msgid "Top Bar"
 msgstr "മുകളിലുള്ള ബാര്‍"

@@ -1272,15 +1305,15 @@ msgstr "മുകളിലുള്ള ബാര്‍"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:718
+#: ../js/ui/popupMenu.js:727
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"

-#: ../js/ui/runDialog.js:74
+#: ../js/ui/runDialog.js:73
 msgid "Enter a Command"
 msgstr "ഒരു കമാന്‍ഡ് നല്‍കുക"

-#: ../js/ui/runDialog.js:110
+#: ../js/ui/runDialog.js:109
 msgid "Close"
 msgstr "അടക്കുക"

@@ -1301,7 +1334,7 @@ msgstr[1] "%d പുതിയ അറിയിപ്പുകള്‍"
 msgid "Lock"
 msgstr "പൂട്ടുക"

-#: ../js/ui/screenShield.js:641
+#: ../js/ui/screenShield.js:637
 msgid "GNOME needs to lock the screen"
 msgstr "ഗ്നോമിന് സ്ക്രീന്‍ പൂട്ടണം"

@@ -1312,15 +1345,17 @@ msgstr "ഗ്നോമിന് സ്ക്രീന്‍ പൂട്ടണ
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:762 ../js/ui/screenShield.js:1198
+#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1194
+#| msgid "Unable to connect to %s"
 msgid "Unable to lock"
 msgstr "പൂട്ടുവാന്‍ സാധ്യമല്ല"

-#: ../js/ui/screenShield.js:763 ../js/ui/screenShield.js:1199
+#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1195
 msgid "Lock was blocked by an application"
 msgstr "പൂട്ടുന്ന സംവിധാനം ഒരു പ്രയോഗം തടസ്സപ്പെടുത്തിയിരിയ്ക്കുന്നു"

 #: ../js/ui/searchDisplay.js:453
+#| msgid "Searching..."
 msgid "Searching…"
 msgstr "തെരയുന്നു..."

@@ -1336,11 +1371,11 @@ msgstr "പകര്‍ത്തുക"
 msgid "Paste"
 msgstr "ഒട്ടിയ്ക്കുക"

-#: ../js/ui/shellEntry.js:101
+#: ../js/ui/shellEntry.js:106
 msgid "Show Text"
 msgstr "പദാവലി കാണിക്കുക"

-#: ../js/ui/shellEntry.js:103
+#: ../js/ui/shellEntry.js:108
 msgid "Hide Text"
 msgstr "പദാവലി മറക്കുക"

@@ -1352,7 +1387,7 @@ msgstr "രഹസ്യവാക്ക്"
 msgid "Remember Password"
 msgstr "രഹസ്യവാക്ക് ഓര്‍ത്തു് വയ്ക്കുക"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:114
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:113
 msgid "Unlock"
 msgstr "പൂട്ട് തുറക്കുക"

@@ -1416,10 +1451,12 @@ msgid "Visibility"
 msgstr "കാഴ്ച"

 #: ../js/ui/status/bluetooth.js:59
+#| msgid "Send Files to Device..."
 msgid "Send Files to Device…"
 msgstr "ഡിവൈസിലേക്കു് ഫയലുകള്‍ അയയ്ക്കുക..."

 #: ../js/ui/status/bluetooth.js:60
+#| msgid "Set Up a New Device..."
 msgid "Set Up a New Device…"
 msgstr "പുതിയൊരു ഡിവൈസ് സജ്ജമാക്കുക..."

@@ -1446,6 +1483,7 @@ msgid "connecting..."
 msgstr "ബന്ധിപ്പിയ്ക്കുന്നു...."

 #: ../js/ui/status/bluetooth.js:239
+#| msgid "Send Files..."
 msgid "Send Files…"
 msgstr "ഫയലുകള്‍ അയയ്ക്കുക..."

@@ -1658,6 +1696,7 @@ msgstr "ഊര്‍ജ്ജ ക്രമീകരണങ്ങള്‍"
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
 #: ../js/ui/status/power.js:99
+#| msgid "Estimating..."
 msgid "Estimating…"
 msgstr "കണക്കുകൂട്ടുന്നു..."

@@ -1757,11 +1796,11 @@ msgstr "ഒച്ച"
 msgid "Microphone"
 msgstr "മൈക്രോഫോണ്‍"

-#: ../js/ui/unlockDialog.js:125
+#: ../js/ui/unlockDialog.js:124
 msgid "Log in as another user"
 msgstr "മറ്റൊരു ഉപയോക്താവായി പ്രവേശിയ്ക്കുക"

-#: ../js/ui/unlockDialog.js:146
+#: ../js/ui/unlockDialog.js:145
 msgid "Unlock Window"
 msgstr "ജാലകത്തിന്റെ പൂട്ടു തുറക്കുക"

@@ -1814,8 +1853,10 @@ msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
 msgstr ""
-"ചാറ്റ് സന്ദേശങ്ങള്‍ എന്ന പോലെ അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നു. മറ്റുള്ളവരുടെ ചാറ്റ് സന്ദേശങ്ങള്‍ "
-"നിങ്ങള്‍ക്കു് കാണുവാന്‍ സാധ്യമല്ല എന്നു് നിങ്ങളുടെ ഓണ്‍ലൈന്‍ അവസ്ഥയില്‍ വ്യക്തമാക്കുന്നു."
+"ചാറ്റ് സന്ദേശങ്ങള്‍ എന്ന പോലെ അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നു. "
+"മറ്റുള്ളവരുടെ ചാറ്റ് സന്ദേശങ്ങള്‍ "
+"നിങ്ങള്‍ക്കു് കാണുവാന്‍ സാധ്യമല്ല എന്നു് നിങ്ങളുടെ ഓണ്‍ലൈന്‍ അവസ്ഥയില്‍ "
+"വ്യക്തമാക്കുന്നു."

 #: ../js/ui/userMenu.js:888
 msgid "Other users are logged in."
@@ -1868,28 +1909,6 @@ msgstr "'%s' തയ്യാറാണ്"
 msgid "Evolution Calendar"
 msgstr "ഇവല്യൂഷന്‍ കലണ്ടര്‍"

-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1837
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u ഔട്ട്പുട്ട്"
-msgstr[1] "%u ഔട്ട്പുട്ടുകള്‍"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1847
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u ഇന്‍പുട്ട്"
-msgstr[1] "%u ഇന്‍പുട്ടുകള്‍"
-
-#: ../src/gvc/gvc-mixer-control.c:2371
-msgid "System Sounds"
-msgstr "സിസ്റ്റം ശബ്ദങ്ങള്‍"
-
 #: ../src/main.c:347
 msgid "Print version"
 msgstr "പ്രിന്റ് ചെയ്യുവാന്‍ സാധിയ്ക്കുന്ന പതിപ്പു്"
@@ -1906,7 +1925,7 @@ msgstr "ഒരു പ്രത്യേക മോഡ് ഉപയോഗിയ്
 msgid "List possible modes"
 msgstr "സാധ്യമായ മോഡുകള്‍ ലഭ്യമാക്കുക"

-#: ../src/shell-app.c:626
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "'%s' ലഭ്യമാക്കുന്നതില്‍ പരാജയം"
@@ -1936,6 +1955,19 @@ msgstr "ഉപയോക്താവു് ആധികാരികത ഉറപ
 #~ msgid "More..."
 #~ msgstr "കൂടുതല്‍..."

+#~ msgid "%u Output"
+#~ msgid_plural "%u Outputs"
+#~ msgstr[0] "%u ഔട്ട്പുട്ട്"
+#~ msgstr[1] "%u ഔട്ട്പുട്ടുകള്‍"
+
+#~ msgid "%u Input"
+#~ msgid_plural "%u Inputs"
+#~ msgstr[0] "%u ഇന്‍പുട്ട്"
+#~ msgstr[1] "%u ഇന്‍പുട്ടുകള്‍"
+
+#~ msgid "System Sounds"
+#~ msgstr "സിസ്റ്റം ശബ്ദങ്ങള്‍"
+
 #~ msgctxt "event list time"
 #~ msgid "%H:%M"
 #~ msgstr "%H:%M"
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/oc.po
+++ b/po/oc.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/tg.po
+++ b/po/tg.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/Show More
+++ b/Show More