wip center layout garbage

overview, viewSelector: Don't use two signals for checking the app button
Just one will do.
2012-11-01 12:58:12 -04:00 · 2012-11-01 12:58:12 -04:00 · 2012-11-01 12:58:12 -04:00 · 2012-11-01 12:58:12 -04:00 · 2012-11-01 12:58:12 -04:00 · 2012-11-01 12:58:12 -04:00
261 changed files with 43347 additions and 58372 deletions
--- a/.gitignore
+++ b/.gitignore
@ -38,7 +38,6 @@ docs/reference/*/*.txt
 docs/reference/*/*.types
 docs/reference/*/html/
 docs/reference/*/xml/
-docs/reference/shell/doc-gen-*
 gtk-doc.make
 js/misc/config.js
 intltool-extract.in
@ -46,7 +45,6 @@ intltool-merge.in
 intltool-update.in
 libtool
 m4/
-man/gnome-shell.1
 omf.make
 po/*.gmo
 po/gnome-shell.pot
@ -86,8 +84,6 @@ src/test-theme
 src/st.h
 src/stamp-st.h
 src/stamp-st.h.tmp
-src/st-scroll-view-fade-generated.c
-src/stamp-st-scroll-view-fade-generated.c
 stamp-h1
 tests/run-test.sh
 xmldocs.make
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "src/gvc"]
-	path = src/gvc
-	url = git://git.gnome.org/libgnome-volume-control
--- a/Makefile.am
+++ b/Makefile.am
@ -1,11 +1,7 @@
 # Point to our macro directory and pick up user flags from the environment
 ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}

-SUBDIRS = data js src browser-plugin tests po docs
-
-if ENABLE_MAN
-SUBDIRS += man
-endif
+SUBDIRS = data js src browser-plugin tests po man docs

 EXTRA_DIST =		\
 	.project	\
@ -16,7 +12,6 @@ EXTRA_DIST =		\
 # These are files checked into Git that we don't want to distribute
 DIST_EXCLUDE =					\
 	.gitignore				\
-	.gitmodules				\
 	gnome-shell.doap			\
 	HACKING					\
 	MAINTAINERS				\
@ -26,4 +21,4 @@ distcheck-hook:
 	@echo "Checking disted files against files in git"
 	@$(srcdir)/tools/check-for-missing.py $(srcdir) $(distdir) $(DIST_EXCLUDE)

-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--- a/402
+++ b/402
@ -1,405 +1,3 @@
-3.8.1
-=====
-* Clip window group during startup animation [Jasper; #696323]
-* Check for logind rather than systemd [Martin; #696252]
-* Don't special-case last remote search provider position [Giovanni; #694974]
-* Fix memory leaks [Ray, Jasper; ##697119, #697295, #697300, #697395]
-* AppSwitcherPopup: Activate only the selected window if any [Rui; #697480]
-* Enable screen recorder keybinding in all modes [Florian; #696200]
-* Remove box-shadow from screen shield for performance reasons [Adel; #697274]
-* Add support for -st-natural-width/height CSS properties [Giovanni; #664411]
-* Remove excessive padding from notification buttons [Allan; #664411]
-* Fix thumbnail dragging in overview [Jasper; #697504]
-* theme-node: Add get_url()/lookup_url() methods [Florian; #693688]
-* Misc bug fixes and cleanups [Jasper, Rui, Colin, David, Ray, Matthias:
-  #695859, #696259, #696585, #696436, #697432, #697435, #697560, #697722,
-  #697709]
-
-Contributors:
-  Giovanni Campagna, Matthias Clasen, Allan Day, Adel Gadllah, David Gumberg,
-  Rui Matos, Florian Müllner, Martin Pitt, Jasper St. Pierre, Ray Strode,
-  Colin Walters
-
-Translations:
-  Daniel Martinez [an], Bruce Cowan [en_GB], Khaled Hosny [ar],
-  Ihar Hrachyshka [be], Aron Xu [zh_CN], Wojciech Szczęsny [pl],
-  Inaki Larranaga Murgoitio [eu], Kjartan Maraas [nb],
-  Милош Поповић [sr, sr@latin], Trần Ngọc Quân [vi]
-
-3.8.0.1
-=======
-* Background bug fixes [Ray; #696712]
-
-3.8.0
-=====
-* Remove blur and desaturation from lock screen [Jasper; #696322]
-* Remove scroll view fade near edges [Adel; #696404]
-* dateMenu: Open calendar component when using Evolution [Florian; #696432]
-* Fix unlocking on fast user switch [Cosimo; #696287]
-* Tweak screen shield animation [Rui; #696380]
-* Fix major memory leak when changing backgrounds [Ray; #696157]
-* Miscellaneous bug fixes [Jasper, Adel, Florian; #696199, #696212, #696422,
-  #696447, #696235]
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Adel Gadllah, Rui Matos, Florian Müllner,
-  Jasper St. Pierre, Ray Strode
-
-Translations:
-  Alexandre Franke [fr], Victor Ibragimov [tg], Arash Mousavi [fa],
-  Gabor Kelemen [hu], Sandeep Sheshrao Shedmake [mr], ManojKumar Giri [or],
-  Shantha kumar [ta], Rajesh Ranjan [hi], Stas Solovey [ru],
-  Shankar Prasad [kn], Dušan Kazik [sk], Ihar Hrachyshka [be],
-  Wouter Bolsterlee [nl], Kris Thomsen [da], Jiro Matsuzawa [ja],
-  Daniel Korostil [uk], Ani Peter [ml], Krishnababu Krothapalli [te],
-  Mantas Kriaučiūnas [lt], Praveen Illa [te]
-
-3.7.92
-======
-* Drop fallback lock implementation [Florian; #693403]
-* Don't let the user trigger message-tray when in fullscreen [Jasper; #694997]
-* Scroll search results when using keynav [Jasper; #689681]
-* Allow raising the shield by starting to type the password [Jasper; #686740]
-* Improve tracking of fullscreen windows [Owen; #649748]
-* Improve animation of new windows in overview [Giovanni; #695582]
-* workspace switcher: Animate new workspaces created by DND [Giovanni; #685285]
-* Give user time to read messages on login screen [Ray; #694688]
-* Misc bug fixes and cleanups [Jasper, Ray, Florian, Cosimo, Giovanni, Adel,
-  Stef, Takao, Rui, Neil; #695154, #694993, #695272, #691578, #694321, #695338,
-  #695409, #695458, #695526, #695601, #695471, #695324, #695650, #695656,
-  #695659, #695485, #695395, #694951, #695824, #695841, #695801, #694321,
-  #693708, #695800, #695607, #695882, #691578, #685851, #694371, #690857,
-  #694092, #695747, #696007, #693438, #696064, #696102
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Allan Day, Takao Fujiwara, Adel Gadllah,
-  Tim Lunn, Rui Matos, Florian Müllner, Neil Roberts, Jasper St. Pierre,
-  Ray Strode, Stef Walter, Colin Walters, Owen W. Taylor
-
-Translations:
-  Nilamdyuti Goswami [as], Chao-Hsiung Liao [zh_HK, zh_TW],
-  Yuri Myasoedov [ru], Gheyret Kenji [ug], Baurzhan Muftakhidinov [kk],
-  Ville-Pekka Vainio [fi], Matej Urbančič [sl],
-  Мирослав Николић [sr, sr@latin], Rūdolfs Mazurs [lv], Christian Kirbach [de],
-  Andika Triwidada [id], Gil Forcada [ca], Mattias Põldaru [et],
-  Duarte Loreto [pt], Adam Matoušek [cs], Changwoo Ryu [ko],
-  Ihar Hrachyshka [be], Carles Ferrando [ca@valencia], Sweta Kothari [gu]
-
-3.7.91
-======
-* overview: Fade out controls during DND that are not targets [Cosimo; #686984]
-* overview: Keep open when a Control key is held [Florian; #686984]
-* Improve login screen => session transition [Ray; #694321]
-* Center application grid horizontally [Florian; #694261]
-* Fix hiding panel when fullscreen windows span multiple monitors [Adel; 646861]
-* Tweak thresholds of pressure barrier [Jasper; #694467]
-* Tweak window picker layout [Jasper; #694902]
-* Expose key grab DBus API to gnome-settings-daemon [Florian; #643111]
-* Don't always show message tray in overview, add message indicator
-  [Cosimo; #687787]
-* Tweak startup animation [Ray; #694326]
-* Add OSD popups and expose them to gnome-settings-daemon [Florian; #613543]
-* Move loupe icon to the start of the search entry [Jasper; #695069]
-* Don't show the input switcher with less than 2 items [Rui; 695000]
-* Fix auto-completion of system modals immediately upon display [Stef; #692937]
-* Ignore workspaces in alt-tab [Florian; #661156]
-* Disable copying text from password entries [Florian; #695104]
-* Use standard styling for ibus candidate popups [Allan; #694796]
-* Fix calendar changing height on month changes [Giovanni; #641383]
-* Port the hot corner to use pressure barriers [Jasper; #663661]
-* Misc bug fixes and cleanups: [Hashem, Giovanni, Alban, Jasper, Cosimo,
-  Florian, Adel, Daniel, Matthias, Ray, Rui, Guillaume, Stef; #685849, #690643,
-  #694292, #693814, #694234, #694365, #694287, #694336, #694256, #694261,
-  #663601, #694441, #694284, #694463, #694475, #687248, #694394, #694320,
-  #694701, #694784, #694858, #694906, #694327, #694876, #694905, #694969,
-  #694970, #694988, #695006, #695001, #694998, #695023, #695002, #695073,
-  #695126, #687748, #694837, #693907, #679851, #694988]
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Alban Crequy, Allan Day,
-  Guillaume Desmottes, Adel Gadllah, Rui Matos, Daniel Mustieles,
-  Hashem Nasarat, Jasper St. Pierre, Ray Strode, Stef Walter
-
-Translations:
-  Yuri Myasoedov [ru], Adam Matoušek [cs], Piotr Drąg [pl], Matej Urbančič [sl],
-  Sweta Kothari [gu], Kjartan Maraas [nb], Nguyễn Thái Ngọc Duy [vi],
-  Chao-Hsiung Liao [zh_HK, zh_TW], Dimitris Spingos [el],
-  Inaki Larranaga Murgoitio [eu], Luca Ferretti [it], A S Alam [pa],
-  Gheyret Kenji [ug], Stas Solovey [ru], Enrico Nicoletto [pt_BR],
-  Fran Diéguez [gl], Daniel Mustieles [es], Aurimas Černius [lt]
-
-3.7.90
-======
-* Let GNOME Shell work on EGL and GLES2 [Neil; #693225, #693438, #693339]
-* Implement middle-click paste [Jasper; #645019]
-* Fix top bar transition between session modes [Rui; #692966]
-* Trigger the message tray with downward pressure [Jasper; #677215]
-* Don't ask for a password on shutdown [Adel; #693385]
-* Add a context menu to the message tray [Adel; #691035, #693887]
-* Use unicode formatting in the date menu [Matthias; #689251]
-* Use proper ellipsis instead of three dots [Jeremy; #689542]
-* Tweak screen shield animation [Giovanni; #691964]
-* Always hide the OSK when showing the message tray [Florian; #662687]
-* Support sound in notifications [Giovanni; #642831]
-* Place application popup menus above chrome [Jasper; #633620]
-* Hide overview elements while searching [Cosimo; #682050]
-* Implement updated IBus candidate popup designs [Rui; #691902]
-* Add support for enable-animations preference [Cosimo; #655746]
-* Don't always show the message tray in the overview [Cosimo; #693987]
-* Improve arrangement of window previews [Adel; #690313]
-* Remove builtin settings provider [Giovanni; #690824]
-* Minimize fullscreen windows when they end up in the background [Adel; #693991]
-* Add context menu to the background actor [Jasper; #681540]
-* Handle backgrounds in the shell, improve startup animation [Ray; #682429]
-* Hide universal access menu when not needed [Giovanni; #681528]
-* Implement updated app picker designs [Florian; #694192]
-* Improve login manager -> session transition [Ray; #694062]
-* Don't use a grid layout in window picker [Adel; #694210]
-* Use scroll wheel for workspace switching rather than zoom [Florian; #686639]
-* Misc bug fixes and cleanups: [Jasper, Florian, Debarshi, Adel, Matthias,
-  Giovanni, Daiki, Rico, Bastien, Cosimo, Ray, Allan, Antonio; #693284,
-  #692680, #691746, #693303, #693162, #693161, #693522, #693385, #691715,
-  #688915, #689106, #682429, #693570, #693737, #693458, #692845, 693836,
-  #681540, #679925, #688227, #692773, #693909, #683288, #693854, #693746,
-  #693931, #693924, #693940, #693970, #693935, #693937, #693974, #693936,
-  #693975, #693822, #694030, #685849, #694052, #694035, #694038, #694079,
-  #694064, #681735, #694100, #694057, #694070, #693572, #693896, #686984,
-  #694123, #694125, #693756, #693757, #687556, #694215, 694062, #694227,
-  #694240, #694234, #694264, 694276, 694282, #694241, #689394, #694202,
-  #694265, #694289, #691806, #694290, #694296]
-
-Contributors:
-  Jeremy Bicha, Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Allan Day,
-  António Fernandes, Adel Gadllah, Rui Matos, Florian Müllner, Bastien Nocera,
-  Debarshi Ray, Neil Roberts, Jasper St. Pierre, Ray Strode, Rico Tzschichholz,
-  Daiki Ueno
-
-Translations:
-  Yasumichi Akahoshi [ja], Yoji TOYODA [ja], Dušan Kazik [sk],
-  Wouter Bolsterlee [nl], Matej Urbančič [sl], Gheyret Kenji [ug],
-  Ivaylo Valkov [bg], Daniel Korostil [uk], Gheyret Kenji [ug],
-  Daniel Mustieles [es], Anish A [ml], Gil Forcada [ca],
-  Carles Ferrando [ca@valencia], Мирослав Николић [sr, sr@latin],
-  Aurimas Černius [lt], Rafael Ferreira [pt_BR], Fran Diéguez [gl],
-  Piotr Drąg [pl], Luca Ferretti [it], A S Alam [pa]
-
-3.7.5
-=====
-* MessageTray: pass keyboard events to tray icons [Giovanni; #687425]
-* network: add support for virtual devices (vlan, bond, bridge) [Dan; #677144]
-* gdm: Allow right-clicking buttons for left-handed users [Jasper; #688748]
-* Make list search results span all available horizontal space [Tanner; #691967]
-* Make Show-Applications button depress when held down [Hashem; #692319]
-* Set a max width on search results [Cosimo; #692453]
-* Reserve scrollbar allocation for automatic policy [Cosimo; #686881]
-* Improve scaling algorithm for window thumbnails [Jasper; #686944]
-* Fix launching settings panels after g-c-c changes [Jasper; #692483]
-* Stop launching applications from empty searches [Hashem; #692391]
-* Implement per-source notification filtering [Giovanni; #685926]
-* ScreenShield: Omit ActiveChanged() signal at end of fade [Giovanni; #691964]
-* ScreenShield: Lower the shield on idle before locking [Giovanni; #692560]
-* Make previews of minimized windows translucent in overview [Florian; #692999]
-* windowManager: Respect icon geometry when minimizing [Florian; #692997]
-* ScreenShield: Only show lock icon when actually locked [Giovanni; #693007]
-* general: Use & instead of 'and' for Settings panels [Jeremy; #689590]
-* network: Add support for new ModemManager1 interface [Aleksander; #687359]
-* network: Handle LTE-only modems as GSM ones [Aleksander; #688144]
-* mobile-providers: Port to libnm-gtk [Aleksander; #688943]
-* general: Consistently use Title Case in top bar [Jeremy; #689589]
-* panel: Add :overview pseudo class while in overview [Florian; #693218]
-* sessionMode: Add support for mode-specific styling [Florian; #693219]
-* loginManager: Make suspend a NOP in the ConsoleKit patch [Florian; #693162]
-* screenShield: Inhibit suspend until the screen is locked [Florian; #686482]
-* Misc bug fixes and cleanups [Jasper, Giovanni, Rui, Cosimo, Florian, Stefano,
-  Adel, Yanko; #691745, #691731, #690171, #689091, #691976, #691963, #684279,
-  #692052, #692091, #642831, #692454, #692715, #692678, #692723, #692677,
-  #683986, #692693, #692749, #692948, #692995, #692996, #692994, #677215,
-  #692586, #693067, #693031, #693049, #643111, #693161, #693220]
-
-Contributors:
-  Jeremy Bicha, Giovanni Campagna, Cosimo Cecchi, Tanner Doshier,
-  Stefano Facchini, Adel Gadllah, Yanko Kaneti, Rui Matos, Aleksander Morgado,
-  Florian Müllner, Hashem Nasarat, Jasper St. Pierre, Dan Winship
-
-Translations:
-  Duarte Loreto [pt], Daniel Mustieles [es], Kjartan Maraas [nb],
-  Nilamdyuti Goswami [as], Мирослав Николић [sr,sr@latin],
-  Tobias Endrigkeit [de], Fabio Tomat [fur], Matej Urbančič [sl], A S Alam [pa],
-  Inaki Larranaga Murgoitio [eu], Piotr Drąg [pl], Wouter Bolsterlee [nl],
-  Gheyret Kenji [ug], Yaron Shahrabani [he], Chao-Hsiung Liao [zh_HK,zh_TW],
-  Milo Casagrande [it], Benjamin Steinwender [de]
-
-3.7.4.1
-=======
-* userMenu: Use show-full-name-in-top-bar setting [Bastien; #689561]
-* dateMenu: Add "Open Clocks" entry [Mathieu; #644390]
-* screenshot: Immediately show the flash spot [Jasper; #691875]
-* Misc. bug fixes [Rico, Jeremy]
-
-Contributors:
-  Jeremy Bicha, Mathieu Bridon, Bastien Nocera, Jasper St. Pierre,
-  Rico Tzschichholz
-
-Translations:
-  Ihar Hrachyshka [be]
-
-3.7.4
-=====
-* Make menu separators crisp [Giovanni, Allan; #641745]
-* power: Update for new D-Bus name [Bastien; #690506]
-* Add smooth scrolling support [Jasper; #687573]
-* Tweak notification layout [Allan; #688506]
-* Ping the active window when using the app menu [Giovanni; #684340]
-* Make password entries insensitive after submission [Jasper; #690594, #690895]
-* Honor lock-delay GSettings key [Giovanni, Matthias; #690766, #691170]
-* Use text/calendar preferred app as the calendar app [Giovanni; #690767]
-* lookingGlass: Move to an inspect() function [Jasper; #690726]
-* Make OSK animation quicker, snappier [Rui; #688642]
-* Allow to close chat notifications with Escape [Jasper; #690897]
-* Honor org.gnome.desktop.screensaver.user-switch-enabled [Giovanni; #691042]
-* Add a SelectArea() DBus method [Cosimo; #687954]
-* Support non-absolute paths when saving screenshots [Cosimo; #688004]
-* OSK: Fix extended keys popups [Rui; #674955]
-* Don't hide or show the keyboard immediately [Rui; #688646]
-* Improve padding in power menu [Giovanni; #689297]
-* Add per-window input source switching [Rui; #691414]
-* Misc bug fixes and cleanups [Rico, Jasper, Giovanni, Rui, Florian, Dan;
-  #690608, #690589, #690539, #687081, #690667, #690665, #690666, #685856,
-  #690858, #690895, #680414, #690965, #691019, #690590, #681376, #690180,
-  #685513, #689263, #691553, #691720, #691743, #691750]
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Allan Day, Rui Matos,
-  Florian Müllner, Bastien Nocera, Jasper St. Pierre, Rico Tzschichholz,
-  Dan Winship
-
-Translations:
-  Matej Urbančič [sl], Kjartan Maraas [nb], Mattias Põldaru [et],
-  Yaron Shahrabani [he], Aurimas Černius [lt], Khaled Hosny [ar],
-  Fran Diéguez [gl], Daniel Mustieles [es], Piotr Drąg [pl], Balázs Úr [hu],
-  Baurzhan Muftakhidinov [kk], Tobias Endrigkeit [de], Dušan Kazik [sk],
-  Aron Xu [zh_CN], Gheyret Kenji [ug]
-
-3.7.3
-=====
-* Add 'No Messages' label when message tray is empty [Victoria; #686738]
-* Use better icons in Ctrl-Alt-Tab popup [Stéphane; #641303]
-* Show the OSK on the monitor where the focused window lives [Giovanni; #685856]
-* Highlight window clone and caption when hovered [Giovanni, Marc; #665310]
-* Improve login process indication [Stéphane; #687113]
-* Omit empty categories in apps view [Stéphane; #687970]
-* Style panel differently according to mode [Florian; #684573]
-* Make it possible to hide the user name [Matthias; #688577]
-* Consolidate and improve chat connection notifications [Giovanni; #687213]
-* Improve notification scrollbar appearance [Carlos; #688393]
-* Fade scroll view fade near scrolling edges [Jasper; #689249]
-* Add a read-only org.gnome.Shell.Mode property [Debarshi; #689300]
-* Don't close message tray after using context menus [Giovanni; #689296]
-* Port swipe-scrolling to ClutterPanAction [Jasper, Florian; #689062, #689552]
-* Remember state of 'Remember Password' checkbox [Ron; #688039]
-* Improve timestamp format in chat notifications [Carlos; #680989]
-* Improve style of missed-messages counter [Carlos; #686472]
-* Omit connection failure notifications if cancelled by user [Giovanni; #684823]
-* Add window-based Alt-Tab popup [Florian; #688913]
-* Support external session mode definitions [Florian; #689304]
-* Support session-mode-specific extensions [Florian; #689305]
-* Support 'parentMode' property in session modes [Florian; #689308]
-* Support a new org.gnome.ShellSearchProvider2 DBus interface
-  [Cosimo; #689735, #690009]
-* Add "windows" to Ctrl-Alt-Tab popup [Jasper; #689653]
-* Port PopupMenu to GrabHelper [Jasper; #689109, #689954]
-* Show headphone icon when headphones are plugged in [Giovanni; #675902]
-* Display (non-app) search results as list [Tanner, Cosimo; #681797]
-* Skip diacritical marks in search terms [Aleksander; #648587]
-* Expose all engine options in input sources [Giovanni, Rui; #682318]
-* Add input source switcher popup [Rui; #682315]
-* Add minimal support for InfiniBand in network menu [Dan; #677150]
-* Misc bug fixes and cleanups [Sebastian, Aleksander, Giovanni, Tim, Cosimo,
-  Florian, Matthias, Rui, Lionel, Colin, Piotr, Guillaume, Bastien, Tanner,
-  Carlos, Stéphane, Jakub; #688422, #688379, #688750, #688771, #686800,
-  #688133, #688895, #688966, #683986, #688004, #689108, #689029, #683449,
-  #688196, #689304, #689243, #689295, #689325, #689400, #679168, #689568,
-  #689537, #689528, #689749, #689789, #689353, #689820, #689868, #689778,
-  #689959, #688589, #688589, #689955, #687250, #689965, #690046, #690049,
-  #689884, #682286, #690173, #690174, #672941, #689876, #687881, #690171,
-  #690241, #690312, #690175, #687955, #650843, #688234, #690427
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Stéphane Démurget,
-  Guillaume Desmottes, Tanner Doshier, Piotr Drąg, Sebastian Keller,
-  Lionel Landwerlin, Tim Lunn, Victoria Martínez de la Cruz, Aleksander Morgado,
-  Florian Müllner, Bastien Nocera, Marc Plano-Lesay, Carlos Soriano Sánchez,
-  Jakub Steiner, Jasper St. Pierre, Colin Walters, Dan Winship, Ron Yorston
-
-Translations:
-  Yuri Myasoedov [ru], Wouter Bolsterlee [nl], Yaron Shahrabani [he],
-  Nilamdyuti Goswami [as], Ani Peter [ml], Kjartan Maraas [nb],
-  Dr.T.Vasudevan [ta], A S Alam [pa], Shankar Prasad [kn], Khaled Hosny [ar],
-  Daniel Mustieles [es], Dušan Kazik [sk]
-
-3.7.2
-=====
-* Enforce RTL in he for messages that might end up as LTR [Florian; #686630]
-* gdm: Move logo into the panel [Florian; #685852]
-* Hide notifications when closed button is clicked [Jasper, Florian; #682237]
-* Tweak screenShield animations [Rui; #686745]
-* Restore Fittsability of summary items in message tray [Florian; #686474]
-* Save screencasts as recent item [Ray; #680647]
-* overview: Resize window captions on content change [Giovanni, Alex; #620874]
-* App search: Match GenericName too [Matthias; #687121]
-* runDialog: Better match style of other modal dialogs [Florian, Allan; #687127]
-* Improve the button insensitive style [Stéphane; #687110]
-* network: Don't use a global switch for all VPN connections [Giovanni; #682929]
-* appMenu: Update on icon theme changes [Florian; #687224]
-* Show 'Log out' in more situations [Matthias; #686736]
-* Add a setting to force the 'Log out' menuitem [Matthias; #686057]
-* overview: Improve styling of search box [Stéphane; #686479]
-* Implement 'disable-user-list' in login screen [Ray; #660660]
-* Fix auto-scroll to bottom in chat notifications [Sjoerd; #686571]
-* Show feedback notifications when user is busy [Stéphane; #662900]
-* Disable login button when there is no input [Stéphane; #687112]
-* Use non-linear overview shade for background [Giovanni, Pierre-Eric; #669798]
-* Reduce blocking in compositor thread [Simon, Jasper; #687465]
-* network: new country-specific type to gather providers [Aleksander; #687356]
-* Update man page [Matthias; #680601]
-* st-entry: Change the pointer cursor on enter/leave events [Thomas; #687130]
-* screenShield: Blur and desaturate the background [Giovanni, Cosimo; #682536]
-* Change height of chat notifications to have more context [Carlos; #665255]
-* screenShield: Account for motion velocity when hiding [Giovanni; #682537]
-* screenShield: hide the cursor while the lock screen is on [Giovanni; #682535]
-* Support remote search provider settings [Cosimo; #687491]
-* unlockDialog: Improve label of confirmation button [Stéphane; #687656]
-* userMenu: Rename "System Settings" item to "Settings" [Elad; #687738]
-* messageTray: Add keybinding to focus current notification [Stéphane; #652082]
-* Remove shell-screen-grabber [Neil; #685915]
-* main: Stop using Metacity's keybinding files [Florian; #687672]
-* Bluetooth: Remove ObexFTP functionality [Bastien; #688160]
-* a11y: Also set WM theme when HighContrast is switched on [Cosimo; #688256]
-* network: Rework multiple NIC support [Giovanni; #677142]
-* Rework keybindings to allow selective blocking/processing [Florian; #688202]
-* recorder: Show indicator on primary monitor [Adel; #688470]
-* recorder: Set frame duration to fix broken video headers [Adel; #688487]
-* Misc. bugfixes and cleanups [Florian, Jasper, Giovanni, Matthew, Stéphane,
-  Allan, Daiki, Owen, Alejandro, Jean-François, Cosimo, Sebastian, Adel, Alban;
-  #686484, #686728, #686805, #686574, #686763, #682428, #687132, #685239,
-  #687189, #687226, #658091, #670687, #687457, #687242, #687287, #687020,
-  #686583, #661194, #687491, #657315, #687958, #683986, #688089, #687708,
-  #686530, #684810, #688181, #688475, #688557, #688507, #638351]
-
-Contributors:
-  Elad Alfassa, Matthew Barnes, Alban Browaeys, Giovanni Campagna,
-  Cosimo Cecchi, Matthias Clasen, Allan Day, Stéphane Démurget,
-  Jean-François Fortin Tam, Adel Gadllah, Alex Hultman, Sebastian Keller,
-  Rui Matos, Simon McVittie, Aleksander Morgado, Florian Müllner,
-  Bastien Nocera, Pierre-Eric Pelloux-Prayer, Alejandro Piñeiro, Neil Roberts,
-  Sjoerd Simons, Carlos Soriano Sánchez, Jasper St. Pierre, Ray Strode,
-  Owen Taylor, Daiki Ueno, Thomas Wood
-
-Translations:
-  Dušan Kazik [sk], Pavol Klačanský [sk], Piotr Drąg [pl], Yuri Myasoedov [ru],
-  Marek Černocký [cs], Kjartan Maraas [nb], Wolfgang Stöggl [de],
-  Yaron Shahrabani [he], Fran Diéguez [gl], Mattias Põldaru [et]
-
 3.7.1
 =====
 * Add shortcut to open application view directly [Jeremy; #685738]
--- a/autogen.sh
+++ b/autogen.sh
@ -13,14 +13,6 @@ PKG_NAME="gnome-shell"
    exit 1
 }

-# Fetch submodules if needed
-if test ! -f src/gvc/Makefile.am;
-then
-  echo "+ Setting up submodules"
-  git submodule init
-fi
-git submodule update
-
 which gnome-autogen.sh || {
    echo "You need to install gnome-common from GNOME Git (or from"
    echo "your OS vendor's package manager)."
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.8.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.7.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -16,6 +16,8 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

 # Checks for programs.
 AC_PROG_CC
+# Needed for per-target cflags, like in gnomeshell-taskpanel
+AM_PROG_CC_C_O

 # Initialize libtool
 LT_PREREQ([2.2.6])
@ -34,8 +36,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",

 PKG_PROG_PKG_CONFIG([0.22])

-AC_PATH_PROG([XSLTPROC], [xsltproc])
-
 GLIB_GSETTINGS

 # Get a value to substitute into gnome-shell.in
@ -53,29 +53,29 @@ if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
   AC_MSG_RESULT(yes)
   build_recorder=true
   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11 gtk+-3.0"
-   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes gl)
 else
   AC_MSG_RESULT(no)
 fi

 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

-CLUTTER_MIN_VERSION=1.13.4
+CLUTTER_MIN_VERSION=1.11.11
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=1.35.4
-MUTTER_MIN_VERSION=3.8.1
-GTK_MIN_VERSION=3.7.9
+GJS_MIN_VERSION=1.33.2
+MUTTER_MIN_VERSION=3.7.1
+GTK_MIN_VERSION=3.3.9
 GIO_MIN_VERSION=2.35.0
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.5.3
+LIBEDATASERVERUI_MIN_VERSION=3.5.3
 TELEPATHY_GLIB_MIN_VERSION=0.17.5
+TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
 GCR_MIN_VERSION=3.3.90
-GNOME_DESKTOP_REQUIRED_VERSION=3.7.90
+GNOME_DESKTOP_REQUIRED_VERSION=3.7.1
 GNOME_MENUS_REQUIRED_VERSION=3.5.3
-NETWORKMANAGER_MIN_VERSION=0.9.6
-PULSE_MIN_VERS=2.0

 # Collect more than 20 libraries for a prize!
 PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
@ -87,26 +87,42 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
 			       libgnome-menu-3.0 >= $GNOME_MENUS_REQUIRED_VERSION
                               $recorder_modules
                               gdk-x11-3.0 libsoup-2.4
+                               gl
 			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
 			       clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
                               libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
                               gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
-			       libcanberra libcanberra-gtk3
+			       libcanberra
                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
+                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
-                               libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
-                               libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
-                               libsecret-unstable gcr-3 >= $GCR_MIN_VERSION)
+                               libnm-glib libnm-util gnome-keyring-1
+                               gcr-3 >= $GCR_MIN_VERSION)
+
+PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
+
+PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
+
+PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
+
+GNOME_KEYBINDINGS_KEYSDIR=`$PKG_CONFIG --variable keysdir gnome-keybindings`
+AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
+
+GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
+
+saved_CFLAGS=$CFLAGS
+saved_LIBS=$LIBS
+CFLAGS=$GNOME_SHELL_CFLAGS
+LIBS=$GNOME_SHELL_LIBS
+AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
+CFLAGS=$saved_CFLAGS
+LIBS=$saved_LIBS

 PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
-PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
-PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
-PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
-PKG_CHECK_MODULES(GVC, libpulse >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
-PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)
+PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.5.4)

 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
@ -126,10 +142,32 @@ PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedatas
 AC_SUBST(CALENDAR_SERVER_CFLAGS)
 AC_SUBST(CALENDAR_SERVER_LIBS)

-GNOME_KEYBINDINGS_KEYSDIR=`$PKG_CONFIG --variable keysdir gnome-keybindings`
-AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
+AC_ARG_WITH(systemd,
+            AS_HELP_STRING([--with-systemd],
+                           [Add systemd support]),
+            [with_systemd=$withval], [with_systemd=auto])

-GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
+PKG_CHECK_MODULES(SYSTEMD,
+                  [libsystemd-login libsystemd-daemon],
+                  [have_systemd=yes], [have_systemd=no])
+
+if test "x$with_systemd" = "xauto" ; then
+        if test x$have_systemd = xno ; then
+                use_systemd=no
+        else
+                use_systemd=yes
+        fi
+else
+        use_systemd=$with_systemd
+fi
+
+if test "x$use_systemd" = "xyes"; then
+        if test "x$have_systemd" = "xno"; then
+                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
+        fi
+
+        AC_DEFINE(WITH_SYSTEMD, 1, [systemd support])
+fi

 MUTTER_GIR_DIR=`$PKG_CONFIG --variable=girdir libmutter`
 MUTTER_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter`
@ -156,22 +194,45 @@ fi

 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()
+G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+AC_SUBST(G_IR_SCANNER)
+G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+AC_SUBST(G_IR_COMPILER)
+G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+AC_SUBST(G_IR_GENERATE)
+GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+AC_SUBST(GIRDIR)
+TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+AC_SUBST(TYPELIBDIR)

 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])

-AC_ARG_ENABLE(man,
-              [AS_HELP_STRING([--enable-man],
-                              [generate man pages [default=yes]])],,
-              enable_man=yes)
-if test "$enable_man" != no; then
-  AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    AC_MSG_ERROR([xsltproc is required for --enable-man])
+# Stay command-line compatible with the gnome-common configure option. Here
+# minimum/yes/maximum are the same, however.
+AC_ARG_ENABLE(compile_warnings,
+  AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],[Turn on compiler warnings]),,
+  enable_compile_warnings=error)
+
+changequote(,)dnl
+if test "$enable_compile_warnings" != no ; then
+  if test "x$GCC" = "xyes"; then
+    case " $CFLAGS " in
+    *[\ \	]-Wall[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wall" ;;
+    esac
+    case " $CFLAGS " in
+    *[\ \	]-Wmissing-prototypes[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
+    esac
+    if test "$enable_compile_warnings" = error ; then
+      case " $CFLAGS " in
+      *[\ \	]-Werror[\ \	]*) ;;
+      *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
+      esac
+    fi
  fi
 fi
-AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
-
-GNOME_COMPILE_WARNINGS([error])
+changequote([,])dnl

 AC_ARG_ENABLE(jhbuild-wrapper-script,
  AS_HELP_STRING([--enable-jhbuild-wrapper-script],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
@ -192,7 +253,6 @@ AC_CONFIG_FILES([
  js/Makefile
  src/calendar-server/evolution-calendar.desktop.in
  src/Makefile
-  src/gvc/Makefile
  browser-plugin/Makefile
  tests/Makefile
  po/Makefile.in
--- a/data/50-gnome-shell-system.xml.in
+++ b/data/50-gnome-shell-system.xml.in
@ -8,9 +8,6 @@
 	<KeyListEntry name="toggle-message-tray"
                      _description="Show the message tray"/>

-	<KeyListEntry name="focus-active-notification"
-                      _description="Focus the active notification"/>
-
 	<KeyListEntry name="toggle-application-view"
                      _description="Show all applications"/>

--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -1,6 +1,3 @@
-wandadir = $(pkgdatadir)
-dist_wanda_DATA = wanda.png
-
 desktopdir=$(datadir)/applications
 desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop

@ -14,10 +11,7 @@ desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
@INTLTOOL_DESKTOP_RULE@

 introspectiondir = $(datadir)/dbus-1/interfaces
-introspection_DATA =				\
-	org.gnome.Shell.Screenshot.xml		\
-	org.gnome.ShellSearchProvider.xml	\
-	org.gnome.ShellSearchProvider2.xml
+introspection_DATA = org.gnome.ShellSearchProvider.xml

 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
@ -38,7 +32,6 @@ dist_theme_DATA =				\
 	theme/gnome-shell.css			\
 	theme/logged-in-indicator.svg		\
 	theme/message-tray-background.png	\
-	theme/more-results.svg			\
 	theme/noise-texture.png			\
 	theme/panel-button-border.svg		\
 	theme/panel-button-highlight-narrow.svg	\
--- a/data/org.gnome.Shell.Screenshot.xml
+++ b/data/org.gnome.Shell.Screenshot.xml
@ -1,128 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Shell.Screenshot:
-      @short_description: Screenshot interface
-
-      The interface used to capture pictures of the screen contents.
-  -->
-  <interface name="org.gnome.Shell.Screenshot">
-
-    <!--
-        Screenshot:
-        @filename: The filename for the screenshot
-        @include_cursor: Whether to include the cursor image or not
-        @flash: Whether to flash the screen or not
-        @success: whether the screenshot was captured
-        @filename_used: the file where the screenshot was saved
-
-        Takes a screenshot of the whole screen and saves it
-        in @filename as png image, it returns a boolean
-        indicating whether the operation was successful or not.
-        @filename can either be an absolute path or a basename, in
-        which case the screenshot will be saved in the $XDG_PICTURES_DIR
-        or the home directory if it doesn't exist. The filename used
-        to save the screenshot will be returned in @filename_used.
-    -->
-    <method name="Screenshot">
-      <arg type="b" direction="in" name="include_cursor"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="s" direction="in" name="filename"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        ScreenshotWindow:
-        @include_frame: Whether to include the frame or not
-        @include_cursor: Whether to include the cursor image or not
-        @flash: Whether to flash the window area or not
-        @filename: The filename for the screenshot
-        @success: whether the screenshot was captured
-        @filename_used: the file where the screenshot was saved
-
-        Takes a screenshot of the focused window (optionally omitting the frame)
-        and saves it in @filename as png image, it returns a boolean
-        indicating whether the operation was successful or not.
-        @filename can either be an absolute path or a basename, in
-        which case the screenshot will be saved in the $XDG_PICTURES_DIR
-        or the home directory if it doesn't exist. The filename used
-        to save the screenshot will be returned in @filename_used.
-    -->
-    <method name="ScreenshotWindow">
-      <arg type="b" direction="in" name="include_frame"/>
-      <arg type="b" direction="in" name="include_cursor"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="s" direction="in" name="filename"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        ScreenshotArea:
-        @x: the X coordinate of the area to capture
-        @y: the Y coordinate of the area to capture
-        @width: the width of the area to capture
-        @height: the height of the area to capture
-        @flash: whether to flash the area or not
-        @filename: the filename for the screenshot
-        @success: whether the screenshot was captured
-        @filename_used: the file where the screenshot was saved
-
-        Takes a screenshot of the passed in area and saves it
-        in @filename as png image, it returns a boolean
-        indicating whether the operation was successful or not.
-        @filename can either be an absolute path or a basename, in
-        which case the screenshot will be saved in the $XDG_PICTURES_DIR
-        or the home directory if it doesn't exist. The filename used
-        to save the screenshot will be returned in @filename_used.
-    -->
-    <method name="ScreenshotArea">
-      <arg type="i" direction="in" name="x"/>
-      <arg type="i" direction="in" name="y"/>
-      <arg type="i" direction="in" name="width"/>
-      <arg type="i" direction="in" name="height"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="s" direction="in" name="filename"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        FlashArea:
-        @x: the X coordinate of the area to flash
-        @y: the Y coordinate of the area to flash
-        @width: the width of the area to flash
-        @height: the height of the area to flash
-
-        Renders a flash spot effect in the specified rectangle of the screen.
-    -->
-    <method name="FlashArea">
-      <arg type="i" direction="in" name="x"/>
-      <arg type="i" direction="in" name="y"/>
-      <arg type="i" direction="in" name="width"/>
-      <arg type="i" direction="in" name="height"/>
-    </method>
-
-    <!--
-        SelectArea:
-        @x: the X coordinate of the selected area
-        @y: the Y coordinate of the selected area
-        @width: the width of the selected area
-        @height: the height of the selected area
-
-        Interactively allows the user to select a rectangular area of
-        the screen, and returns its coordinates.
-    -->
-    <method name="SelectArea">
-      <arg type="i" direction="out" name="x"/>
-      <arg type="i" direction="out" name="y"/>
-      <arg type="i" direction="out" name="width"/>
-      <arg type="i" direction="out" name="height"/>
-    </method>
-
-  </interface>
-</node>
--- a/data/org.gnome.ShellSearchProvider.xml
+++ b/data/org.gnome.ShellSearchProvider.xml
@ -2,72 +2,170 @@
 '-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
 'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
 <node>
-
-  <!--
-      org.gnome.Shell.SearchProvider:
-      @short_description: Search provider interface
-
-      The interface used for integrating into GNOME Shell's search
-      interface. This interface is deprecated, and org.gnome.Shell.SearchProvider2 should be used instead.
-  -->
  <interface name="org.gnome.Shell.SearchProvider">
+    <doc:doc>
+      <doc:description>
+        <doc:para>
+          The interface used for integrating into GNOME Shell's search
+          interface.
+        </doc:para>
+      </doc:description>
+    </doc:doc>

-    <!--
-        GetInitialResultSet:
-        @terms: Array of search terms, which the provider should treat as logical AND.
-        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
-
-        Called when the user first begins a search.
-    -->
    <method name="GetInitialResultSet">
-      <arg type="as" name="terms" direction="in" />
-      <arg type="as" name="results" direction="out" />
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Called when the user first begins a search.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="as" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              Array of search terms, which the provider should treat as
+              logical AND.
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="as" direction="out">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              An array of result identifier strings representing items which
+              match the given search terms. Identifiers must be unique within
+              the provider's domain, but other than that may be chosen freely
+              by the provider.
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
    </method>

-    <!--
-        GetSubsearchResultSet:
-        @previous_results: Array of results previously returned by GetInitialResultSet().
-        @terms: Array of updated search terms, which the provider should treat as logical AND.
-        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
-
-        Called when a search is performed which is a "subsearch" of
-        the previous search, e.g. the method may return less results, but
-        not more or different results.
-
-        This allows search providers to only search through the previous
-        result set, rather than possibly performing a full re-query.
-    -->
    <method name="GetSubsearchResultSet">
-      <arg type="as" name="previous_results" direction="in" />
-      <arg type="as" name="terms" direction="in" />
-      <arg type="as" name="results" direction="out" />
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Called when a search is performed which is a "subsearch" of
+            the previous search, e.g. the method may return less results, but
+            not more or different results.
+
+            This allows search providers to only search through the previous
+            result set, rather than possibly performing a full re-query.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="as" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              Array of item identifiers
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="as" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              Array of updated search terms, which the provider should treat as
+              logical AND.
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="as" direction="out">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              An array of result identifier strings representing items which
+              match the given search terms. Identifiers must be unique within
+              the provider's domain, but other than that may be chosen freely
+              by the provider.
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
    </method>

-    <!--
-        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, 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
-    -->
    <method name="GetResultMetas">
-      <arg type="as" name="identifiers" direction="in" />
-      <arg type="aa{sv}" name="metas" direction="out" />
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Return an array of meta data used to display each given result
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="as" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              An array of result identifiers as returned by
+              GetInitialResultSet() or GetSubsearchResultSet()
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="aa{sv}" direction="out">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              A dictionary describing the given search result, containing
+              'id' and 'name' (both strings). 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.
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
    </method>

-    <!--
-        ActivateResult:
-        @identifier: A result identifier as returned by GetInitialResultSet() or GetSubsearchResultSet()
-
-        Called when the users chooses a given result. The result should
-        be displayed in the application associated with the corresponding
-        provider.
-
-        This method is deprecated, and providers should implement ActivateResult2()
-        instead.
-    -->
    <method name="ActivateResult">
-      <arg type="s" name="identifier" direction="in" />
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Called when the users chooses a given result. The result should
+            be displayed in the application associated with the corresponding
+            provider.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="s" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              A result identifier as returned by GetInitialResultSet() or
+              GetSubsearchResultSet()
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+    </method>
+
+    <method name="LaunchSearch">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Called when the user clicks on the provider icon. The provider
+            application should open and run the active search term itself.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="as" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              The current search term(s).
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
    </method>
  </interface>
 </node>
--- a/data/org.gnome.ShellSearchProvider2.xml
+++ b/data/org.gnome.ShellSearchProvider2.xml
@ -1,87 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Shell.SearchProvider2:
-      @short_description: Search provider interface
-
-      The interface used for integrating into GNOME Shell's search
-      interface (version 2).
-  -->
-  <interface name="org.gnome.Shell.SearchProvider2">
-
-    <!--
-        GetInitialResultSet:
-        @terms: Array of search terms, which the provider should treat as logical AND.
-        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
-
-        Called when the user first begins a search.
-    -->
-    <method name="GetInitialResultSet">
-      <arg type="as" name="terms" direction="in" />
-      <arg type="as" name="results" direction="out" />
-    </method>
-
-    <!--
-        GetSubsearchResultSet:
-        @previous_results: Array of results previously returned by GetInitialResultSet().
-        @terms: Array of updated search terms, which the provider should treat as logical AND.
-        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
-
-        Called when a search is performed which is a "subsearch" of
-        the previous search, e.g. the method may return less results, but
-        not more or different results.
-
-        This allows search providers to only search through the previous
-        result set, rather than possibly performing a full re-query.
-    -->
-    <method name="GetSubsearchResultSet">
-      <arg type="as" name="previous_results" direction="in" />
-      <arg type="as" name="terms" direction="in" />
-      <arg type="as" name="results" direction="out" />
-    </method>
-
-    <!--
-        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, 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
-    -->
-    <method name="GetResultMetas">
-      <arg type="as" name="identifiers" direction="in" />
-      <arg type="aa{sv}" name="metas" direction="out" />
-    </method>
-
-    <!--
-        ActivateResult:
-        @identifier: A result identifier as returned by GetInitialResultSet() or GetSubsearchResultSet()
-        @terms: Array of search terms, which the provider should treat as logical AND.
-        @timestamp: A timestamp of the user interaction that triggered this call
-
-        Called when the users chooses a given result. The result should
-        be displayed in the application associated with the corresponding
-        provider. The provided search terms can be used to allow launching a full search in
-        the application.
-    -->
-    <method name="ActivateResult">
-      <arg type="s" name="identifier" direction="in" />
-      <arg type="as" name="terms" direction="in" />
-      <arg type="u" name="timestamp" direction="in" />
-    </method>
-
-    <!--
-        LaunchSearch:
-        @terms: Array of search terms, which the provider should treat as logical AND.
-        @timestamp: A timestamp of the user interaction that triggered this call
-
-        Asks the search provider to launch a full search in the application for the provided terms.
-    -->
-    <method name="LaunchSearch">
-      <arg type="as" name="terms" direction="in" />
-      <arg type="u" name="timestamp" direction="in" />
-    </method>
-  </interface>
-</node>
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@ -39,14 +39,6 @@
        will be displayed in the favorites area.
      </_description>
    </key>
-    <key name="app-folder-categories" type="as">
-      <default>[ 'Utilities', 'Sundry' ]</default>
-      <_summary>List of categories that should be displayed as folders</_summary>
-      <_description>
-        Each category name in this list will be represented as folder in the
-        application view, rather than being displayed inline in the main view.
-      </_description>
-    </key>
    <key name="command-history" type="as">
      <default>[]</default>
      <_summary>History for command (Alt-F2) dialog</_summary>
@ -73,16 +65,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
        menuitem in single-user, single-session situations.
      </_description>
    </key>
-    <key name="remember-mount-password" type="b">
-      <default>false</default>
-      <_summary>Whether to remember password for mounting encrypted or remote filesystems</_summary>
-      <_description>
-        The shell will request a password when an encrypted device or a
-        remote filesystem is mounted.  If the password can be saved for
-        future use a 'Remember Password' checkbox will be present.
-        This key sets the default state of the checkbox.
-      </_description>
-    </key>
    <child name="calendar" schema="org.gnome.shell.calendar"/>
    <child name="recorder" schema="org.gnome.shell.recorder"/>
    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
@ -124,13 +106,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
        Keybinding to toggle the visibility of the message tray.
      </_description>
    </key>
-    <key name="focus-active-notification" type="as">
-      <default>["&lt;Super&gt;n"]</default>
-      <_summary>Keybinding to focus the active notification</_summary>
-      <_description>
-        Keybinding to focus the active notification.
-      </_description>
-    </key>
    <key name="toggle-recording" type="as">
      <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
      <_summary>Keybinding to toggle the screen recorder</_summary>
@ -189,33 +164,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
    </key>
  </schema>

-  <enum id="org.gnome.shell.window-switcher.AppIconMode">
-    <value value="1" nick="thumbnail-only"/>
-    <value value="2" nick="app-icon-only"/>
-    <value value="3" nick="both"/>
-  </enum>
-  <schema id="org.gnome.shell.window-switcher"
-          path="/org/gnome/shell/window-switcher/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="app-icon-mode" enum="org.gnome.shell.window-switcher.AppIconMode">
-      <default>'both'</default>
-      <_summary>The application icon mode.</_summary>
-      <_description>
-	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'.
-      </_description>
-    </key>
-    <key type="b" name="current-workspace-only">
-      <default>false</default>
-      <summary>Limit switcher to current workspace.</summary>
-      <description>
-	If true, only windows from the current workspace are shown in the switcher.
-	Otherwise, all windows are included.
-      </description>
-    </key>
-  </schema>
-
  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
 	  gettext-domain="@GETTEXT_PACKAGE@">
    <key name="attach-modal-dialogs" type="b">
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
--- a/data/theme/more-results.svg
+++ b/data/theme/more-results.svg
@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg12430"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="more-results.svg">
-  <defs
-     id="defs12432" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#7a7a7a"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="8.3155237"
-     inkscape:cy="0.89548874"
-     inkscape:document-units="px"
-     inkscape:current-layer="g14642-3-0"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
-     inkscape:window-x="1200"
-     inkscape:window-y="187"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid13002" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata12435">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       style="display:inline"
-       transform="translate(-141.99984,638.37113)"
-       inkscape:label="zoom-in"
-       id="g14642-3-0">
-      <path
-         sodipodi:type="inkscape:offset"
-         inkscape:radius="0"
-         inkscape:original="M 145.1875 400 C 144.5248 400 144 400.54899 144 401.21875 L 144 410.78125 C 144 411.45101 144.5248 412 145.1875 412 L 154.8125 412 C 155.4752 412 156 411.45101 156 410.78125 L 156 401.21875 C 156 400.54899 155.4752 400 154.8125 400 L 145.1875 400 z M 149 403 L 151 403 L 151 405 L 153 405 L 153 407 L 151 407 L 151 409 L 149 409 L 149 407 L 147 407 L 147 405 L 149 405 L 149 403 z "
-         xlink:href="#rect11749-5-0-1-8"
-         style="color:#bebebe;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;opacity:0.8"
-         id="path13004"
-         inkscape:href="#rect11749-5-0-1-8"
-         d="M 145.1875,400 C 144.5248,400 144,400.54899 144,401.21875 l 0,9.5625 c 0,0.66976 0.5248,1.21875 1.1875,1.21875 l 9.625,0 c 0.6627,0 1.1875,-0.54899 1.1875,-1.21875 l 0,-9.5625 C 156,400.54899 155.4752,400 154.8125,400 L 145.1875,400 z m 3.8125,3 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 L 149,403 Z"
-         transform="translate(0,1)" />
-      <use
-         x="0"
-         y="0"
-         xlink:href="#path13004"
-         id="use11960"
-         transform="translate(1,-1)"
-         width="16"
-         height="16" />
-      <use
-         x="0"
-         y="0"
-         xlink:href="#use11960"
-         id="use11962"
-         transform="translate(-2,0)"
-         width="16"
-         height="16" />
-      <path
-         inkscape:connector-curvature="0"
-         style="color:#bebebe;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
-         d="M 145.1875,400 C 144.5248,400 144,400.54899 144,401.21875 l 0,9.5625 c 0,0.66976 0.5248,1.21875 1.1875,1.21875 l 9.625,0 c 0.6627,0 1.1875,-0.54899 1.1875,-1.21875 l 0,-9.5625 C 156,400.54899 155.4752,400 154.8125,400 L 145.1875,400 z m 3.8125,3 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 L 149,403 Z"
-         id="rect11749-5-0-1-8" />
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3620-5-4"
-         width="15.981825"
-         height="16"
-         x="142"
-         y="398"
-         rx="0"
-         ry="0" />
-    </g>
-  </g>
-</svg>
--- a/data/wanda.png
+++ b/data/wanda.png
--- a/docs/reference/shell/Makefile.am
+++ b/docs/reference/shell/Makefile.am
@ -76,30 +76,9 @@ endif
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=

-doc-gen-org.gnome.Shell.SearchProvider.xml: $(top_srcdir)/data/org.gnome.ShellSearchProvider.xml
-	gdbus-codegen 						\
-	--interface-prefix org.gnome.ShellSearchProvider. 	\
-	--generate-docbook doc-gen				\
-	$(top_srcdir)/data/org.gnome.ShellSearchProvider.xml
-
-doc-gen-org.gnome.Shell.SearchProvider2.xml: $(top_srcdir)/data/org.gnome.ShellSearchProvider2.xml
-	gdbus-codegen 						\
-	--interface-prefix org.gnome.ShellSearchProvider2. 	\
-	--generate-docbook doc-gen				\
-	$(top_srcdir)/data/org.gnome.ShellSearchProvider2.xml
-
-doc-gen-org.gnome.Shell.Screenshot.xml: $(top_srcdir)/data/org.gnome.Shell.Screenshot.xml
-	gdbus-codegen 						\
-	--interface-prefix org.gnome.Shell.Screenshot.		\
-	--generate-docbook doc-gen				\
-	$(top_srcdir)/data/org.gnome.Shell.Screenshot.xml
-
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files= \
-	doc-gen-org.gnome.Shell.SearchProvider.xml	\
-	doc-gen-org.gnome.Shell.SearchProvider2.xml	\
-	doc-gen-org.gnome.Shell.Screenshot.xml
+content_files=

 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
--- a/docs/reference/shell/shell-docs.sgml.in
+++ b/docs/reference/shell/shell-docs.sgml.in
@ -43,13 +43,12 @@
  </chapter>
  <chapter>
    <title>Integration helpers and utilities</title>
-    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider.xml"/>
-    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider2.xml"/>
    <xi:include href="xml/shell-global.xml"/>
    <xi:include href="xml/shell-wm.xml"/>
    <xi:include href="xml/shell-xfixes-cursor.xml"/>
    <xi:include href="xml/shell-util.xml"/>
    <xi:include href="xml/shell-mount-operation.xml"/>
+    <xi:include href="xml/shell-mobile-providers.xml"/>
    <xi:include href="xml/shell-network-agent.xml"/>
    <xi:include href="xml/shell-polkit-authentication-agent.xml"/>
    <xi:include href="xml/shell-tp-client.xml"/>
--- a/gnome-shell.doap
+++ b/gnome-shell.doap
@ -52,6 +52,13 @@ its dependencies to build from tarballs.</description>
      <gnome:userid>walters</gnome:userid>
    </foaf:Person>
  </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Dan Winship</foaf:name>
+      <foaf:mbox rdf:resource="mailto:danw@gnome.org" />
+      <gnome:userid>danw</gnome:userid>
+    </foaf:Person>
+  </maintainer>
  <maintainer>
    <foaf:Person>
      <foaf:name>Marina Zhurakhinskaya</foaf:name>
--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -28,7 +28,6 @@ nobase_dist_js_DATA = 	\
 	misc/extensionUtils.js	\
 	misc/fileUtils.js	\
 	misc/gnomeSession.js	\
-	misc/hash.js		\
 	misc/history.js		\
 	misc/jsParse.js		\
 	misc/loginManager.js	\
@ -39,11 +38,10 @@ nobase_dist_js_DATA = 	\
 	ui/altTab.js		\
 	ui/appDisplay.js	\
 	ui/appFavorites.js	\
-	ui/backgroundMenu.js	\
-	ui/background.js	\
 	ui/boxpointer.js	\
 	ui/calendar.js		\
 	ui/checkBox.js		\
+	ui/centerLayout.js	\
 	ui/ctrlAltTab.js	\
 	ui/dash.js		\
 	ui/dateMenu.js		\
@ -52,6 +50,7 @@ nobase_dist_js_DATA = 	\
 	ui/extensionSystem.js	\
 	ui/extensionDownloader.js \
 	ui/environment.js	\
+	ui/flashspot.js		\
 	ui/ibusCandidatePopup.js\
 	ui/grabHelper.js	\
 	ui/iconGrid.js		\
@ -64,21 +63,17 @@ nobase_dist_js_DATA = 	\
 	ui/main.js		\
 	ui/messageTray.js	\
 	ui/modalDialog.js	\
-	ui/separator.js		\
 	ui/sessionMode.js	\
 	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
 	ui/notificationDaemon.js \
-	ui/osdWindow.js		\
 	ui/overview.js		\
-	ui/overviewControls.js	\
 	ui/panel.js		\
 	ui/panelMenu.js		\
 	ui/pointerWatcher.js    \
 	ui/popupMenu.js		\
 	ui/remoteSearch.js	\
 	ui/runDialog.js		\
-	ui/screenshot.js	\
        ui/screenShield.js	\
 	ui/scripting.js		\
 	ui/search.js		\
@ -91,11 +86,9 @@ nobase_dist_js_DATA = 	\
 	ui/status/power.js	\
 	ui/status/volume.js	\
 	ui/status/bluetooth.js	\
-	ui/switcherPopup.js	\
 	ui/tweener.js		\
 	ui/unlockDialog.js	\
 	ui/userMenu.js		\
-	ui/userWidget.js	\
 	ui/viewSelector.js	\
 	ui/wanda.js		\
 	ui/windowAttentionHandler.js	\
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@ -45,7 +45,6 @@ const Application = new Lang.Class({
        this._extensionPrefsModules = {};

        this._extensionIters = {};
-        this._startupUuid = null;
    },

    _buildModel: function() {
@ -204,7 +203,6 @@ const Application = new Lang.Class({
    _scanExtensions: function() {
        let finder = new ExtensionUtils.ExtensionFinder();
        finder.connect('extension-found', Lang.bind(this, this._extensionFound));
-        finder.connect('extensions-loaded', Lang.bind(this, this._extensionsLoaded));
        finder.scanExtensions();
    },

@ -214,11 +212,6 @@ const Application = new Lang.Class({
        this._extensionIters[extension.uuid] = iter;
    },

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

    _onActivate: function() {
        this._window.present();
@ -239,10 +232,10 @@ const Application = new Lang.Class({
            // Strip off "extension:///" prefix which fakes a URI, if it exists
            uuid = stripPrefix(uuid, "extension:///");

-            if (this._extensionAvailable(uuid))
-                this._selectExtension(uuid);
-            else
-                this._startupUuid = uuid;
+            if (!this._extensionAvailable(uuid))
+                return 1;
+
+            this._selectExtension(uuid);
        }
        return 0;
    }
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -39,23 +39,50 @@ const GdmUtil = imports.gdm.util;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
-const Panel = imports.ui.panel;
 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;
+const _RESIZE_ANIMATION_TIME = 0.25;
 const _SCROLL_ANIMATION_TIME = 0.5;
 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
 const _LOGO_ICON_HEIGHT = 16;

-const WORK_SPINNER_ICON_SIZE = 24;
-const WORK_SPINNER_ANIMATION_DELAY = 1.0;
-const WORK_SPINNER_ANIMATION_TIME = 0.3;
-
 let _loginDialog = null;

+function _smoothlyResizeActor(actor, width, height) {
+    let finalWidth;
+    let finalHeight;
+
+    if (width < 0)
+        finalWidth = actor.width;
+    else
+        finalWidth = width;
+
+    if (height < 0)
+        finalHeight = actor.height;
+    else
+        finalHeight = height;
+
+    actor.set_size(actor.width, actor.height);
+
+    if (actor.width == finalWidth && actor.height == finalHeight)
+        return null;
+
+    let hold = new Batch.Hold();
+
+    Tweener.addTween(actor,
+                     { width: finalWidth,
+                       height: finalHeight,
+                       time: _RESIZE_ANIMATION_TIME,
+                       transition: 'easeOutQuad',
+                       onComplete: Lang.bind(this, function() {
+                                       hold.release();
+                                   })
+                     });
+    return hold;
+}
+
 const LogoMenuButton = new Lang.Class({
    Name: 'LogoMenuButton',
    Extends: PanelMenu.Button,
@ -96,7 +123,6 @@ const UserListItem = new Lang.Class({

        let layout = new St.BoxLayout({ vertical: false });
        this.actor = new St.Button({ style_class: 'login-dialog-user-list-item',
-                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                     can_focus: true,
                                     child: layout,
                                     reactive: true,
@ -214,23 +240,155 @@ const UserList = new Lang.Class({
        }
    },

+    _showItem: function(item) {
+        let tasks = [function() {
+                         return GdmUtil.fadeInActor(item.actor);
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        return batch.run();
+    },
+
    _onItemActivated: function(activatedItem) {
        this.emit('activate', activatedItem);
    },

-    updateStyle: function(isExpanded) {
+    giveUpWhitespace: function() {
+        let container = this.actor.get_parent();
+
+        container.child_set(this.actor, { expand: false });
+    },
+
+    takeOverWhitespace: function() {
+        let container = this.actor.get_parent();
+
+        container.child_set(this.actor, { expand: true });
+    },
+
+    pinInPlace: function() {
+        this._box.set_size(this._box.width, this._box.height);
+    },
+
+    shrinkToNaturalHeight: function() {
+        let oldWidth = this._box.width;
+        let oldHeight = this._box.height;
+        this._box.set_size(-1, -1);
+        let [minHeight, naturalHeight] = this._box.get_preferred_height(-1);
+        this._box.set_size(oldWidth, oldHeight);
+
+        let batch = new Batch.ConsecutiveBatch(this,
+                                               [function() {
+                                                    return _smoothlyResizeActor(this._box, -1, naturalHeight);
+                                                },
+
+                                                function() {
+                                                    this._box.set_size(-1, -1);
+                                                }
+                                               ]);
+
+        return batch.run();
+    },
+
+    hideItemsExcept: function(exception) {
        let tasks = [];

-        if (isExpanded)
-            this._box.add_style_pseudo_class('expanded');
-        else
-            this._box.remove_style_pseudo_class('expanded');
+        for (let userName in this._items) {
+            let item = this._items[userName];
+
+            item.actor.set_hover(false);
+            item.actor.reactive = false;
+            item.actor.can_focus = false;
+            item.syncStyleClasses();
+            item._timedLoginIndicator.scale_x = 0.;
+            if (item != exception)
+                tasks.push(function() {
+                    return GdmUtil.fadeOutActor(item.actor);
+                });
+        }
+
+        let batch = new Batch.ConsecutiveBatch(this,
+                                               [function() {
+                                                    return GdmUtil.fadeOutActor(this.actor.vscroll);
+                                                },
+
+                                                new Batch.ConcurrentBatch(this, tasks),
+
+                                                function() {
+                                                    this._box.remove_style_pseudo_class('expanded');
+                                                }
+                                               ]);
+
+        return batch.run();
+    },
+
+    hideItems: function() {
+        return this.hideItemsExcept(null);
+    },
+
+    _getExpandedHeight: function() {
+        let hiddenActors = [];
+        for (let userName in this._items) {
+            let item = this._items[userName];
+            if (!item.actor.visible) {
+                item.actor.show();
+                hiddenActors.push(item.actor);
+            }
+        }
+
+        if (!this._box.visible) {
+            this._box.show();
+            hiddenActors.push(this._box);
+        }
+
+        this._box.set_size(-1, -1);
+        let [minHeight, naturalHeight] = this._box.get_preferred_height(-1);
+
+        for (let i = 0; i < hiddenActors.length; i++) {
+            let actor = hiddenActors[i];
+            actor.hide();
+        }
+
+        return naturalHeight;
+    },
+
+    showItems: function() {
+        let tasks = [];

        for (let userName in this._items) {
            let item = this._items[userName];
            item.actor.sync_hover();
+            item.actor.reactive = true;
+            item.actor.can_focus = true;
            item.syncStyleClasses();
+            tasks.push(function() {
+                return this._showItem(item);
+            });
        }
+
+        let batch = new Batch.ConsecutiveBatch(this,
+                                               [function() {
+                                                    this.takeOverWhitespace();
+                                                },
+
+                                                function() {
+                                                    let fullHeight = this._getExpandedHeight();
+                                                    return _smoothlyResizeActor(this._box, -1, fullHeight);
+                                                },
+
+                                                function() {
+                                                    this._box.add_style_pseudo_class('expanded');
+                                                },
+
+                                                new Batch.ConcurrentBatch(this, tasks),
+
+                                                function() {
+                                                    this.actor.set_size(-1, -1);
+                                                },
+
+                                                function() {
+                                                    return GdmUtil.fadeInActor(this.actor.vscroll);
+                                                }]);
+        return batch.run();
    },

    scrollToItem: function(item) {
@ -329,7 +487,6 @@ const SessionListItem = new Lang.Class({
        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,
@ -370,7 +527,6 @@ const SessionListItem = new Lang.Class({
                          color.alpha / 255);
        cr.arc(width / 2, height / 2, width / 3, 0, 2 * Math.PI);
        cr.fill();
-        cr.$dispose();
    },

    _onClicked: function() {
@ -390,7 +546,6 @@ const SessionList = new Lang.Class({
        this.actor.child = this._box;

        this._button = new St.Button({ style_class: 'login-dialog-session-list-button',
-                                       button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                       can_focus: true,
                                       x_fill: true,
                                       y_fill: true });
@ -402,7 +557,7 @@ const SessionList = new Lang.Class({
        box.add_actor(this._triangle);

        let label = new St.Label({ style_class: 'login-dialog-session-list-label',
-                                   text: _("Session…") });
+                                   text: _("Session...") });
        box.add_actor(label);

        this._button.connect('clicked',
@ -449,14 +604,6 @@ const SessionList = new Lang.Class({
            this.close();
    },

-    updateSensitivity: function(sensitive) {
-        this._button.reactive = sensitive;
-        this._button.can_focus = sensitive;
-
-        for (let id in this._items)
-            this._items[id].actor.reactive = sensitive;
-    },
-
    setActiveSession: function(sessionId) {
         if (sessionId == this._activeSessionId)
             return;
@ -513,7 +660,6 @@ const LoginDialog = new Lang.Class({
        this.parent({ shellReactive: true,
                      styleClass: 'login-dialog',
                      parentActor: parentActor,
-                      keybindingMode: Shell.KeyBindingMode.LOGIN_SCREEN,
                      shouldFadeIn: false });
        this.connect('destroy',
                     Lang.bind(this, this._onDestroy));
@ -538,11 +684,9 @@ const LoginDialog = new Lang.Class({
        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('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._verifyingUser = false;

        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });

@ -550,23 +694,24 @@ const LoginDialog = new Lang.Class({
                               Lang.bind(this, this._updateBanner));
        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,
                               Lang.bind(this, this._updateBanner));
-        this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,
-                               Lang.bind(this, this._updateDisableUserList));
-
-        this._userSelectionBox = new St.BoxLayout({ style_class: 'login-dialog-user-selection-box',
-                                                    vertical: true });
-        this.contentLayout.add(this._userSelectionBox);

        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
                                           text: '' });
-        this._userSelectionBox.add(this._bannerLabel);
+        this.contentLayout.add(this._bannerLabel);
        this._updateBanner();

+        this._titleLabel = new St.Label({ style_class: 'login-dialog-title',
+                                          text: C_("title", "Sign In") });
+
+        this.contentLayout.add(this._titleLabel,
+                              { y_fill: false,
+                                y_align: St.Align.START });
+
        this._userList = new UserList();
-        this._userSelectionBox.add(this._userList.actor,
-                                   { expand: true,
-                                     x_fill: true,
-                                     y_fill: true });
+        this.contentLayout.add(this._userList.actor,
+                               { expand: true,
+                                 x_fill: true,
+                                 y_fill: true });

        this.setInitialKeyFocus(this._userList.actor);

@ -577,13 +722,6 @@ const LoginDialog = new Lang.Class({
                                 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._promptBox.add(this._promptLabel,
@ -593,8 +731,6 @@ const LoginDialog = new Lang.Class({
                              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,
@ -608,9 +744,6 @@ const LoginDialog = new Lang.Class({
        this._promptLoginHint.hide();
        this._promptBox.add(this._promptLoginHint);

-        this._signInButton = null;
-        this._workSpinner = null;
-
        this._sessionList = new SessionList();
        this._sessionList.connect('session-activated',
                                  Lang.bind(this, function(list, sessionId) {
@ -630,19 +763,18 @@ const LoginDialog = new Lang.Class({
        let notListedLabel = new St.Label({ text: _("Not listed?"),
                                            style_class: 'login-dialog-not-listed-label' });
        this._notListedButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
-                                                button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                                can_focus: true,
                                                child: notListedLabel,
                                                reactive: true,
                                                x_align: St.Align.START,
                                                x_fill: true });

-        this._notListedButton.connect('clicked', Lang.bind(this, this._hideUserListAndLogIn));
+        this._notListedButton.connect('clicked', Lang.bind(this, this._onNotListedClicked));

-        this._userSelectionBox.add(this._notListedButton,
-                                   { expand: false,
-                                     x_align: St.Align.START,
-                                     x_fill: true });
+        this.contentLayout.add(this._notListedButton,
+                               { expand: false,
+                                 x_align: St.Align.START,
+                                 x_fill: true });

        if (!this._userManager.is_loaded)
            this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',
@ -663,52 +795,43 @@ const LoginDialog = new Lang.Class({

   },

-    _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._verifyingUser)
-                this._reset();
-        }
-    },
-
    _updateBanner: function() {
        let enabled = this._settings.get_boolean(GdmUtil.BANNER_MESSAGE_KEY);
        let text = this._settings.get_string(GdmUtil.BANNER_MESSAGE_TEXT_KEY);

        if (enabled && text) {
            this._bannerLabel.set_text(text);
-            this._bannerLabel.show();
+            this._fadeInBanner();
        } else {
-            this._bannerLabel.hide();
+            this._fadeOutBanner();
        }
    },

-    _reset: function() {
-        this._userVerifier.clear();
-
-        this._updateSensitivity(true);
+    _onReset: function(client, serviceName) {
        this._promptMessage.hide();
+
+        let tasks = [this._hidePrompt,
+
+                     new Batch.ConcurrentBatch(this, [this._fadeInTitleLabel,
+                                                      this._fadeInNotListedButton]),
+
+                     function() {
+                         this._sessionList.close();
+                         this._promptLoginHint.hide();
+                         this._userList.actor.show();
+                         this._userList.actor.opacity = 255;
+                         return this._userList.showItems();
+                     },
+
+                     function() {
+                         this._userList.actor.reactive = true;
+                         this._userList.actor.grab_key_focus();
+                     }];
+
        this._user = null;
-        this._verifyingUser = false;

-        if (this._disableUserList)
-            this._hideUserListAndLogIn();
-        else
-            this._showUserList();
-    },
-
-    _verificationFailed: function() {
-        this._promptEntry.text = '';
-
-        this._updateSensitivity(true);
-        this._setWorking(false);
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        batch.run();
    },

    _onDefaultSessionChanged: function(client, sessionId) {
@ -719,51 +842,80 @@ const LoginDialog = new Lang.Class({
        if (message) {
            this._promptMessage.text = message;
            this._promptMessage.styleClass = styleClass;
-            this._promptMessage.show();
+            GdmUtil.fadeInActor(this._promptMessage);
        } else {
-            this._promptMessage.hide();
+            GdmUtil.fadeOutActor(this._promptMessage);
        }
    },

    _showLoginHint: function(verifier, message) {
        this._promptLoginHint.set_text(message)
-        this._promptLoginHint.show();
-        this._promptLoginHint.opacity = 255;
+        GdmUtil.fadeInActor(this._promptLoginHint);
    },

    _hideLoginHint: function() {
-        this._promptLoginHint.hide();
+        GdmUtil.fadeOutActor(this._promptLoginHint);
        this._promptLoginHint.set_text('');
    },

    cancel: function() {
-        if (this._verifyingUser)
-            this._userVerifier.cancel();
-        else
-            this._reset();
+        this._userVerifier.cancel();
    },

-    _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();
+    _fadeInPrompt: function() {
        let tasks = [function() {
-                         this._prepareDialog(forSecret, hold);
+                         return GdmUtil.fadeInActor(this._promptLabel);
+                     },
+
+                     function() {
+                         return GdmUtil.fadeInActor(this._promptEntry);
+                     },
+
+                     function() {
+                         // Show it with 0 opacity so we preallocate space for it
+                         // in the event we need to fade in the message
+                         this._promptLoginHint.opacity = 0;
+                         this._promptLoginHint.show();
+                     },
+
+                     function() {
+                         return GdmUtil.fadeInActor(this._promptBox);
+                     },
+
+                     function() {
+                         if (this._user && this._user.is_logged_in())
+                             return null;
+
+                         return GdmUtil.fadeInActor(this._sessionList.actor);
+                     },
+
+                     function() {
+                         this._promptEntry.grab_key_focus();
+                     }];
+
+        this._sessionList.actor.hide();
+        let batch = new Batch.ConcurrentBatch(this, tasks);
+        return batch.run();
+    },
+
+    _showPrompt: function() {
+        let hold = new Batch.Hold();
+
+        let buttons = [{ action: Lang.bind(this, this.cancel),
+                         label: _("Cancel"),
+                         key: Clutter.Escape },
+                       { action: Lang.bind(this, function() {
+                                     hold.release();
+                                 }),
+                         label: C_("button", "Sign In"),
+                         default: true }];
+
+        let tasks = [function() {
+                         return this._fadeInPrompt();
+                     },
+
+                     function() {
+                         this.setButtons(buttons);
                     },

                     hold];
@ -773,197 +925,44 @@ const LoginDialog = new Lang.Class({
        return batch.run();
    },

-    _prepareDialog: function(forSecret, hold) {
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
-        this._workSpinner = new Panel.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
-        this._workSpinner.actor.opacity = 0;
-        this._workSpinner.actor.show();
-
-        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.buttonLayout.add(this._workSpinner.actor,
-                              { 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;
-        }
+        let tasks = [function() {
+                         return GdmUtil.fadeOutActor(this._promptBox);
+                     },

-        if (this._promptEntryActivateId > 0) {
-            this._promptEntry.clutter_text.disconnect(this._promptEntryActivateId);
-            this._promptEntryActivateId = 0;
-        }
+                     function() {
+                         this._promptLoginHint.hide();
+                         this._promptEntry.reactive = true;
+                         this._promptEntry.set_text('');
+                     }];

-        this._setWorking(false);
-        this._promptBox.hide();
-        this._promptLoginHint.hide();
+        let batch = new Batch.ConsecutiveBatch(this, tasks);

-        this._promptUser.set_child(null);
-
-        this._updateSensitivity(true);
-        this._promptEntry.set_text('');
-
-        this._sessionList.close();
-        this._promptLoginHint.hide();
-
-        this.clearButtons();
-        this._workSpinner = null;
-        this._signInButton = null;
-    },
-
-    _setWorking: function(working) {
-        if (!this._workSpinner)
-            return;
-
-        if (working) {
-            this._workSpinner.play();
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 255,
-                               delay: WORK_SPINNER_ANIMATION_DELAY,
-                               time: WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear'
-                             });
-        } else {
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 0,
-                               time: WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear',
-                               onCompleteScope: this,
-                               onComplete: function() {
-                                   if (this._workSpinner)
-                                       this._workSpinner.stop();
-                               }
-                             });
-        }
+        return batch.run();
    },

    _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();
-    },
-
-    _askForUsernameAndLogIn: function() {
-        this._promptLabel.set_text(_("Username: "));
-        this._promptEntry.set_text('');
-        this._promptEntry.clutter_text.set_password_char('');
-
        let tasks = [this._showPrompt,

                     function() {
-                         let userName = this._promptEntry.get_text();
+                         let _text = this._promptEntry.get_text();
                         this._promptEntry.reactive = false;
-                         return this._beginVerificationForUser(userName);
+                         this._userVerifier.answerQuery(serviceName, _text);
                     }];

        let batch = new Batch.ConsecutiveBatch(this, tasks);
        return batch.run();
    },

-    _startSession: function(serviceName) {
-        Tweener.addTween(this.dialogLayout,
-                         { opacity: 0,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onUpdate: function() {
-                               let children = Main.layoutManager.uiGroup.get_children();
-
-                               for (let i = 0; i < children.length; i++) {
-                                   if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.dialogLayout.opacity;
-                               }
-                           },
-                           onUpdateScope: this,
-                           onComplete: function() {
-                               Mainloop.idle_add(Lang.bind(this, function() {
-                                   this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
-                                   return false;
-                               }));
-                           },
-                           onCompleteScope: this });
-    },
-
    _onSessionOpened: function(client, serviceName) {
-        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);
-                                                      }));
-        }
+        this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
    },

    _waitForItemForUser: function(userName) {
@ -1029,7 +1028,7 @@ const LoginDialog = new Lang.Class({
                     function() {
                         // If we're just starting out, start on the right
                         // item.
-                         if (!this._userManager.is_loaded) {
+                         if (!this.is_loaded) {
                             this._userList.jumpToItem(this._timedLoginItem);
                         }
                     },
@ -1090,55 +1089,96 @@ const LoginDialog = new Lang.Class({
                             }));
    },

-    _setUserListExpanded: function(expanded) {
-        this._userList.updateStyle(expanded);
-        this._userSelectionBox.visible = expanded;
+    _onNotListedClicked: function(user) {
+        let tasks = [function() {
+                         return this._userList.hideItems();
+                     },
+
+                     function() {
+                         return this._userList.giveUpWhitespace();
+                     },
+
+                     function() {
+                         this._userList.actor.hide();
+                     },
+
+                     new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel,
+                                                      this._fadeOutNotListedButton]),
+
+                     function() {
+                         let hold = new Batch.Hold();
+
+                         this._userVerifier.begin(null, hold);
+                         return hold;
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        batch.run();
    },

-    _hideUserListAndLogIn: function() {
-        this._setUserListExpanded(false);
-        GdmUtil.cloneAndFadeOutActor(this._userSelectionBox);
-        this._askForUsernameAndLogIn();
+    _fadeInBanner: function() {
+        return GdmUtil.fadeInActor(this._bannerLabel);
    },

-    _showUserList: function() {
-        this._hidePrompt();
-        this._setUserListExpanded(true);
-        this._userList.actor.grab_key_focus();
+    _fadeOutBanner: function() {
+        return GdmUtil.fadeOutActor(this._bannerLabel);
+    },
+
+    _fadeInTitleLabel: function() {
+        return GdmUtil.fadeInActor(this._titleLabel);
+    },
+
+    _fadeOutTitleLabel: function() {
+        return GdmUtil.fadeOutActor(this._titleLabel);
+    },
+
+    _fadeInNotListedButton: function() {
+        return GdmUtil.fadeInActor(this._notListedButton);
+    },
+
+    _fadeOutNotListedButton: function() {
+        return GdmUtil.fadeOutActor(this._notListedButton);
    },

    _beginVerificationForUser: function(userName) {
        let hold = new Batch.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 userName;
+
        let tasks = [function() {
-                         return GdmUtil.cloneAndFadeOutActor(this._userSelectionBox);
+                         this._userList.actor.reactive = false;
+                         return this._userList.pinInPlace();
                     },
+
                     function() {
-                         this._setUserListExpanded(false);
+                         return this._userList.hideItemsExcept(activatedItem);
+                     },
+
+                     function() {
+                         return this._userList.giveUpWhitespace();
+                     },
+
+                     new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel,
+                                                      this._fadeOutNotListedButton]),
+
+                     function() {
+                         return this._userList.shrinkToNaturalHeight();
+                     },
+
+                     function() {
+                         userName = activatedItem.user.get_user_name();
+
+                         return this._beginVerificationForUser(userName);
                     }];

        this._user = activatedItem.user;

-        let batch = new Batch.ConcurrentBatch(this, [new Batch.ConsecutiveBatch(this, tasks),
-                                                     this._beginVerificationForItem(activatedItem)]);
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
        batch.run();
    },

@ -1156,8 +1196,6 @@ const LoginDialog = new Lang.Class({
            this._userList.addUser(users[i]);
        }

-        this._updateDisableUserList();
-
        this._userManager.connect('user-added',
                                  Lang.bind(this, function(userManager, user) {
                                      this._userList.addUser(user);
@ -1167,12 +1205,21 @@ const LoginDialog = new Lang.Class({
                                  Lang.bind(this, function(userManager, user) {
                                      this._userList.removeUser(user);
                                  }));
+
+        // emitted in idle so caller doesn't have to explicitly check if
+        // it's loaded immediately after construction
+        // (since there's no way the caller could be listening for
+        // 'loaded' yet)
+        Mainloop.idle_add(Lang.bind(this, function() {
+            this.emit('loaded');
+            this.is_loaded = true;
+        }));
    },

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

    },
@ -1180,10 +1227,6 @@ const LoginDialog = new Lang.Class({
    close: function() {
        this.parent();

-        Main.ctrlAltTabManager.removeGroup(this.dialogLayout);
-    },
-
-    addCharacter: function(unichar) {
-        this._promptEntry.clutter_text.insert_unichar(unichar);
-    },
+        Main.ctrlAltTabManager.removeGroup(this._group);
+    }
 });
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
@ -17,7 +15,6 @@ const Tweener = imports.ui.tweener;
 const PASSWORD_SERVICE_NAME = 'gdm-password';
 const FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
 const FADE_ANIMATION_TIME = 0.16;
-const CLONE_FADE_ANIMATION_TIME = 0.25;

 const LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
 const FINGERPRINT_AUTHENTICATION_KEY = 'enable-fingerprint-authentication';
@ -26,10 +23,6 @@ const BANNER_MESSAGE_TEXT_KEY = 'banner-message-text';
 const ALLOWED_FAILURES_KEY = 'allowed-failures';

 const LOGO_KEY = 'logo';
-const DISABLE_USER_LIST_KEY = 'disable-user-list';
-
-// Give user 16ms to read each character of a PAM message
-const USER_READ_TIME = 16

 function fadeInActor(actor) {
    if (actor.opacity == 255 && actor.visible)
@ -77,34 +70,6 @@ function fadeOutActor(actor) {
    return hold;
 }

-function cloneAndFadeOutActor(actor) {
-    // Immediately hide actor so its sibling can have its space
-    // and position, but leave a non-reactive clone on-screen,
-    // so from the user's point of view it smoothly fades away
-    // and reveals its sibling.
-    actor.hide();
-
-    let clone = new Clutter.Clone({ source: actor,
-                                    reactive: false });
-
-    Main.uiGroup.add_child(clone);
-
-    let [x, y] = actor.get_transformed_position();
-    clone.set_position(x, y);
-
-    let hold = new Batch.Hold();
-    Tweener.addTween(clone,
-                     { opacity: 0,
-                       time: CLONE_FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete: function() {
-                           clone.destroy();
-                           hold.release();
-                       }
-                     });
-    return hold;
-}
-
 const ShellUserVerifier = new Lang.Class({
    Name: 'ShellUserVerifier',

@ -118,9 +83,6 @@ const ShellUserVerifier = new Lang.Class({

        this._fprintManager = new Fprint.FprintManager();
        this._realmManager = new Realmd.Manager();
-        this._messageQueue = [];
-        this._messageQueueTimeoutId = 0;
-        this.hasPendingMessages = false;

        this._failCounter = 0;
    },
@ -160,73 +122,13 @@ const ShellUserVerifier = new Lang.Class({
            this._userVerifier.run_dispose();
            this._userVerifier = null;
        }
-
-        this._clearMessageQueue();
    },

    answerQuery: function(serviceName, answer) {
-        if (!this._userVerifier.hasPendingMessages) {
-            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
-        } else {
-            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);
-                                                      }));
-        }
-    },
-
-    _getIntervalForMessage: function(message) {
-        // We probably could be smarter here
-        return message.length * USER_READ_TIME;
-    },
-
-    finishMessageQueue: function() {
-        if (!this.hasPendingMessages)
-            return;
-
-        this._messageQueue = [];
-
-        this.hasPendingMessages = false;
-        this.emit('no-more-messages');
-    },
-
-    _queueMessageTimeout: function() {
-        if (this._messageQueue.length == 0) {
-            this.finishMessageQueue();
-            return;
-        }
-
-        if (this._messageQueueTimeoutId != 0)
-            return;
-
-        let message = this._messageQueue.shift();
-        this.emit('show-message', message.text, message.iconName);
-
-        this._messageQueueTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                       message.interval,
-                                                       Lang.bind(this, function() {
-                                                           this._messageQueueTimeoutId = 0;
-                                                           this._queueMessageTimeout();
-                                                       }));
-    },
-
-    _queueMessage: function(message, iconName) {
-        let interval = this._getIntervalForMessage(message);
-
-        this.hasPendingMessages = true;
-        this._messageQueue.push({ text: message, interval: interval, iconName: iconName });
-        this._queueMessageTimeout();
-    },
-
-    _clearMessageQueue: function() {
-        this.finishMessageQueue();
-
-        if (this._messageQueueTimeoutId != 0) {
-            GLib.source_remove(this._messageQueueTimeoutId);
-            this._messageQueueTimeoutId = 0;
-        }
+        // Clear any previous message
        this.emit('show-message', null, null);
+
+        this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
    },

    _checkForFingerprintReader: function() {
@ -246,7 +148,7 @@ const ShellUserVerifier = new Lang.Class({
        logError(error, where);
        this._hold.release();

-        this._queueMessage(_("Authentication error"), 'login-dialog-message-warning');
+        this.emit('show-message', _("Authentication error"), 'login-dialog-message-warning');
        this._verificationFailed(false);
    },

@ -365,7 +267,7 @@ const ShellUserVerifier = new Lang.Class({
            // 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');
+            this.emit('show-message', info, 'login-dialog-message-info');
        }
    },

@ -374,7 +276,7 @@ const ShellUserVerifier = new Lang.Class({
        // users who haven't enrolled their fingerprint.
        if (serviceName != PASSWORD_SERVICE_NAME)
            return;
-        this._queueMessage(problem, 'login-dialog-message-warning');
+        this.emit('show-message', problem, 'login-dialog-message-warning');
    },

    _showRealmLoginHint: function() {
@ -413,6 +315,8 @@ const ShellUserVerifier = new Lang.Class({
    },

    _onReset: function() {
+        this.clear();
+
        // Clear previous attempts to authenticate
        this._failCounter = 0;

@ -423,15 +327,6 @@ const ShellUserVerifier = new Lang.Class({
        this.emit('verification-complete');
    },

-    _cancelAndReset: function() {
-        this.cancel();
-        this._onReset();
-    },
-
-    _retry: function() {
-        this.begin(this._userName, new Batch.Hold());
-    },
-
    _verificationFailed: function(retry) {
        // For Not Listed / enterprise logins, immediately reset
        // the dialog
@ -443,25 +338,15 @@ const ShellUserVerifier = new Lang.Class({
            this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);

        if (canRetry) {
-            if (!this._userVerifier.hasPendingMessages) {
-                this._retry();
-            } else {
-                let signalId = this._userVerifier.connect('no-more-messages',
-                                                          Lang.bind(this, function() {
-                                                              this._userVerifier.disconnect(signalId);
-                                                              this._retry();
-                                                          }));
-            }
+            this.clear();
+            this.begin(this._userName, new Batch.Hold());
        } else {
-            if (!this._userVerifier.hasPendingMessages) {
-                this._cancelAndReset();
-            } else {
-                let signalId = this._userVerifier.connect('no-more-messages',
-                                                          Lang.bind(this, function() {
-                                                              this._userVerifier.disconnect(signalId);
-                                                              this._cancelAndReset();
-                                                          }));
-            }
+            // Allow some time to see the message, then reset everything
+            Mainloop.timeout_add(3000, Lang.bind(this, function() {
+                this.cancel();
+
+                this._onReset();
+            }));
        }

        this.emit('verification-failed');
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@ -11,7 +11,6 @@ const Gio = imports.gi.Gio;
 const ShellJS = imports.gi.ShellJS;

 const Config = imports.misc.config;
-const FileUtils = imports.misc.fileUtils;

 const ExtensionType = {
    SYSTEM: 1,
@ -151,40 +150,53 @@ function installImporter(extension) {
 const ExtensionFinder = new Lang.Class({
    Name: 'ExtensionFinder',

-    _loadExtension: function(extensionDir, info, perUserDir) {
-        let fileType = info.get_file_type();
-        if (fileType != Gio.FileType.DIRECTORY)
-            return;
-        let uuid = info.get_name();
-        let existing = extensions[uuid];
-        if (existing) {
-            log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
-            return;
-        }
-
-        let extension;
-        let type = extensionDir.has_prefix(perUserDir) ? ExtensionType.PER_USER
-                                                       : ExtensionType.SYSTEM;
+    _scanExtensionsInDirectory: function(dir, type) {
+        let fileEnum;
+        let file, info;
        try {
-            extension = createExtensionObject(uuid, extensionDir, type);
+            fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
        } catch(e) {
-            logError(e, 'Could not load extension %s'.format(uuid));
+            if (e.domain != Gio.io_error_quark() || e.code != Gio.IOErrorEnum.NOT_FOUND)
+                logError(e, 'Could not enumerate extensions directory');
            return;
        }
-        this.emit('extension-found', extension);
-    },

-    _extensionsLoaded: function() {
-        this.emit('extensions-loaded');
+        while ((info = fileEnum.next_file(null)) != null) {
+            let fileType = info.get_file_type();
+            if (fileType != Gio.FileType.DIRECTORY)
+                continue;
+            let uuid = info.get_name();
+            let extensionDir = dir.get_child(uuid);
+
+            let existing = extensions[uuid];
+            if (existing) {
+                log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
+                continue;
+            }
+
+            let extension;
+            try {
+                extension = createExtensionObject(uuid, extensionDir, type);
+            } catch(e) {
+                logError(e, 'Could not load extension %s'.format(uuid));
+                continue;
+            }
+            this.emit('extension-found', extension);
+        }
+        fileEnum.close(null);
    },

    scanExtensions: function() {
-        let perUserDir = Gio.File.new_for_path(global.userdatadir);
-        FileUtils.collectFromDatadirsAsync('extensions',
-                                           { processFile: Lang.bind(this, this._loadExtension),
-                                             loadedCallback: Lang.bind(this, this._extensionsLoaded),
-                                             includeUserDir: true,
-                                             data: perUserDir });
+        let userExtensionsDir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions']));
+        this._scanExtensionsInDirectory(userExtensionsDir, ExtensionType.PER_USER);
+
+        let systemDataDirs = GLib.get_system_data_dirs();
+        for (let i = 0; i < systemDataDirs.length; i++) {
+            let dirPath = GLib.build_filenamev([systemDataDirs[i], 'gnome-shell', 'extensions']);
+            let dir = Gio.file_new_for_path(dirPath);
+            if (dir.query_exists(null))
+                this._scanExtensionsInDirectory(dir, ExtensionType.SYSTEM);
+        }
    }
 });
 Signals.addSignalMethods(ExtensionFinder.prototype);
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@ -2,12 +2,10 @@

 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Params = imports.misc.params;

 function listDirAsync(file, callback) {
    let allFiles = [];
-    file.enumerate_children_async('standard::name,standard::type',
+    file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME,
                                  Gio.FileQueryInfoFlags.NONE,
                                  GLib.PRIORITY_LOW, null, function (obj, res) {
        let enumerator = obj.enumerate_children_finish(res);
@ -25,63 +23,6 @@ function listDirAsync(file, callback) {
    });
 }

-function _collectFromDirectoryAsync(dir, loadState) {
-    function done() {
-        loadState.numLoading--;
-        if (loadState.loadedCallback &&
-            loadState.numLoading == 0)
-            loadState.loadedCallback(loadState.data);
-    }
-
-    dir.query_info_async('standard::type', Gio.FileQueryInfoFlags.NONE,
-        GLib.PRIORITY_DEFAULT, null, function(object, res) {
-            try {
-                object.query_info_finish(res);
-            } catch (e) {
-                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                    log(e.message);
-                done();
-                return;
-            }
-
-            listDirAsync(dir, Lang.bind(this, function(infos) {
-                for (let i = 0; i < infos.length; i++)
-                    loadState.processFile(dir.get_child(infos[i].get_name()),
-                                          infos[i], loadState.data);
-                done();
-            }));
-        });
-}
-
-function collectFromDatadirsAsync(subdir, params) {
-    params = Params.parse(params, { includeUserDir: false,
-                                    processFile: null,
-                                    loadedCallback: null,
-                                    data: null });
-    let loadState = { data: params.data,
-                      numLoading: 0,
-                      loadedCallback: params.loadedCallback,
-                      processFile: params.processFile };
-
-    if (params.processFile == null) {
-        if (params.loadedCallback)
-            params.loadedCallback(params.data);
-        return;
-    }
-
-    let dataDirs = GLib.get_system_data_dirs();
-    if (params.includeUserDir)
-        dataDirs.unshift(GLib.get_user_data_dir());
-    loadState.numLoading = dataDirs.length;
-
-    for (let i = 0; i < dataDirs.length; i++) {
-        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', subdir]);
-        let dir = Gio.File.new_for_path(path);
-
-        _collectFromDirectoryAsync(dir, loadState);
-    }
-}
-
 function deleteGFile(file) {
    // Work around 'delete' being a keyword in JS.
    return file['delete'](null);
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@ -58,7 +58,6 @@ const SessionManagerIface = <interface name="org.gnome.SessionManager">
    <arg type="u" direction="in" />
    <arg type="b" direction="out" />
 </method>
-<property name="SessionIsActive" type="b" access="read"/>
 <signal name="InhibitorAdded">
    <arg type="o" direction="out"/>
 </signal>
--- a/js/misc/hash.js
+++ b/js/misc/hash.js
@ -1,141 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-const System = imports.system;
-
-const Params = imports.misc.params;
-
-// This is an implementation of EcmaScript SameValue algorithm,
-// which returns true if two values are not observably distinguishable.
-// It was taken from http://wiki.ecmascript.org/doku.php?id=harmony:egal
-//
-// In the future, we may want to use the 'is' operator instead.
-function _sameValue(x, y) {
-    if (x === y) {
-        // 0 === -0, but they are not identical
-        return x !== 0 || 1 / x === 1 / y;
-    }
-
-    // NaN !== NaN, but they are identical.
-    // NaNs are the only non-reflexive value, i.e., if x !== x,
-    // then x is a NaN.
-    // isNaN is broken: it converts its argument to number, so
-    // isNaN("foo") => true
-    return x !== x && y !== y;
-}
-
-const _hashers = {
-    object: function(o) { return o ? System.addressOf(o) : 'null'; },
-    function: function(f) { return System.addressOf(f); },
-    string: function(s) { return s; },
-    number: function(n) { return String(n); },
-    undefined: function() { return 'undefined'; },
-};
-
-/* Map is meant to be similar in usage to ES6 Map, which is
-   described at http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets,
-   without requiring more than ES5 + Gjs extensions.
-
-   Known differences from other implementations:
-   Polyfills around the web usually implement HashMaps for
-   primitive values and reversed WeakMaps for object keys,
-   but we want real maps with real O(1) semantics in all cases,
-   and the easiest way is to have different hashers for different
-   types.
-
-   Known differences from the ES6 specification:
-   - Map is a Lang.Class, not a ES6 class, so inheritance,
-     prototype, sealing, etc. work differently.
-   - items(), keys() and values() don't return iterators,
-     they return actual arrays, so they incur a full copy everytime
-     they're called, and they don't see changes if you mutate
-     the table while iterating
-     (admittedly, the ES6 spec is a bit unclear on this, and
-     the reference code would just blow up)
-*/
-const Map = new Lang.Class({
-    Name: 'Map',
-
-    _init: function(iterable) {
-        this._pool = { };
-
-        if (iterable) {
-            for (let i = 0; i < iterable.length; i++) {
-                let [key, value] = iterable[i];
-                this.set(key, value);
-            }
-        }
-    },
-
-    _hashKey: function(key) {
-        let type = typeof(key);
-        return type + ':' + _hashers[type](key);
-    },
-
-    _internalGet: function(key) {
-        let hash = this._hashKey(key);
-        let node = this._pool[hash];
-
-        if (node && _sameValue(node.key, key))
-            return [true, node.value];
-        else
-            return [false, null];
-    },
-
-    get: function(key) {
-        return this._internalGet(key)[1];
-    },
-
-    has: function(key) {
-        return this._internalGet(key)[0];
-    },
-
-    set: function(key, value) {
-        let hash = this._hashKey(key);
-        let node = this._pool[hash];
-
-        if (node) {
-            node.key = key;
-            node.value = value;
-        } else {
-            this._pool[hash] = { key: key, value: value };
-        }
-    },
-
-    delete: function(key) {
-        let hash = this._hashKey(key);
-        let node = this._pool[hash];
-
-        if (node && _sameValue(node.key, key)) {
-            delete this._pool[hash];
-            return [node.key, node.value];
-        } else {
-            return [null, null];
-        }
-    },
-
-    keys: function() {
-        let pool = this._pool;
-        return Object.getOwnPropertyNames(pool).map(function(hash) {
-            return pool[hash].key;
-        });
-    },
-
-    values: function() {
-        let pool = this._pool;
-        return Object.getOwnPropertyNames(pool).map(function(hash) {
-            return pool[hash].value;
-        });
-    },
-
-    items: function() {
-        let pool = this._pool;
-        return Object.getOwnPropertyNames(pool).map(function(hash) {
-            return [pool[hash].key, pool[hash].value];
-        });
-    },
-
-    size: function() {
-        return Object.getOwnPropertyNames(this._pool).length;
-    },
-});
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@ -5,7 +5,7 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
-const Signals = imports.signals;
+const UPowerGlib = imports.gi.UPowerGlib;

 const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
 <method name='PowerOff'>
@ -26,23 +26,6 @@ const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager
 <method name='CanSuspend'>
    <arg type='s' direction='out'/>
 </method>
-<method name='Inhibit'>
-    <arg type='s' direction='in'/>
-    <arg type='s' direction='in'/>
-    <arg type='s' direction='in'/>
-    <arg type='s' direction='in'/>
-    <arg type='h' direction='out'/>
-</method>
-<method name='GetSession'>
-    <arg type='s' direction='in'/>
-    <arg type='o' direction='out'/>
-</method>
-<method name='ListSessions'>
-    <arg name='sessions' type='a(susso)' direction='out'/>
-</method>
-<signal name='PrepareForSleep'>
-    <arg type='b' direction='out'/>
-</signal>
 </interface>;

 const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
@ -68,6 +51,12 @@ const ConsoleKitManagerIface = <interface name='org.freedesktop.ConsoleKit.Manag
 </interface>;

 const ConsoleKitSessionIface = <interface name='org.freedesktop.ConsoleKit.Session'>
+<method name='IsActive'>
+    <arg type='b' direction='out' />
+</method>
+<signal name='ActiveChanged'>
+    <arg type='b' direction='out' />
+</signal>
 <signal name='Lock' />
 <signal name='Unlock' />
 </interface>;
@ -76,36 +65,7 @@ const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface)
 const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);

 function haveSystemd() {
-    return GLib.access("/run/systemd/seats", 0) >= 0;
-}
-
-function versionCompare(required, reference) {
-    required = required.split('.');
-    reference = reference.split('.');
-
-    for (let i = 0; i < required.length; i++) {
-        if (required[i] != reference[i])
-            return required[i] < reference[i];
-    }
-
-    return true;
-}
-
-function canLock() {
-    try {
-        let params = GLib.Variant.new('(ss)', ['org.gnome.DisplayManager.Manager', 'Version']);
-        let result = Gio.DBus.system.call_sync('org.gnome.DisplayManager',
-                                               '/org/gnome/DisplayManager/Manager',
-                                               'org.freedesktop.DBus.Properties',
-                                               'Get', params, null,
-                                               Gio.DBusCallFlags.NONE,
-                                               -1, null);
-
-        let version = result.deep_unpack()[0].deep_unpack();
-        return versionCompare('3.5.91', version);
-    } catch(e) {
-        return false;
-    }
+    return GLib.access("/sys/fs/cgroup/systemd", 0) >= 0;
 }

 let _loginManager = null;
@ -133,30 +93,24 @@ const LoginManagerSystemd = new Lang.Class({
        this._proxy = new SystemdLoginManager(Gio.DBus.system,
                                              'org.freedesktop.login1',
                                              '/org/freedesktop/login1');
-        this._proxy.connectSignal('PrepareForSleep',
-                                  Lang.bind(this, this._prepareForSleep));
    },

    // Having this function is a bit of a hack since the Systemd and ConsoleKit
    // session objects have different interfaces - but in both cases there are
    // Lock/Unlock signals, and that's all we count upon at the moment.
-    getCurrentSessionProxy: function(callback) {
-        if (this._currentSession) {
-            callback (this._currentSession);
-            return;
+    getCurrentSessionProxy: function() {
+        if (!this._currentSession) {
+            this._currentSession = new SystemdLoginSession(Gio.DBus.system,
+                                                           'org.freedesktop.login1',
+                                                           '/org/freedesktop/login1/session/' +
+                                                           GLib.getenv('XDG_SESSION_ID'));
        }

-        this._proxy.GetSessionRemote(GLib.getenv('XDG_SESSION_ID'), Lang.bind(this,
-            function(result, error) {
-                if (error) {
-                    logError(error, 'Could not get a proxy for the current session');
-                } else {
-                    this._currentSession = new SystemdLoginSession(Gio.DBus.system,
-                                                                   'org.freedesktop.login1',
-                                                                   result[0]);
-                    callback(this._currentSession);
-                }
-            }));
+        return this._currentSession;
+    },
+
+    get sessionActive() {
+        return Shell.session_is_active_for_systemd();
    },

    canPowerOff: function(asyncCallback) {
@ -186,15 +140,6 @@ const LoginManagerSystemd = new Lang.Class({
        });
    },

-    listSessions: function(asyncCallback) {
-        this._proxy.ListSessionsRemote(function(result, error) {
-            if (error)
-                asyncCallback([]);
-            else
-                asyncCallback(result[0]);
-        });
-    },
-
    powerOff: function() {
        this._proxy.PowerOffRemote(true);
    },
@ -205,33 +150,8 @@ const LoginManagerSystemd = new Lang.Class({

    suspend: function() {
        this._proxy.SuspendRemote(true);
-    },
-
-    inhibit: function(reason, callback) {
-        let inVariant = GLib.Variant.new('(ssss)',
-                                         ['sleep',
-                                          'GNOME Shell',
-                                          reason,
-                                          'delay']);
-        this._proxy.call_with_unix_fd_list('Inhibit', inVariant, 0, -1, null, null,
-            Lang.bind(this, function(proxy, result) {
-                let fd = -1;
-                try {
-                    let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
-                    fd = fdList.steal_fds(outVariant.deep_unpack())[0];
-                    callback(new Gio.UnixInputStream({ fd: fd }));
-                } catch(e) {
-                    logError(e, "Error getting systemd inhibitor");
-                    callback(null);
-                }
-            }));
-    },
-
-    _prepareForSleep: function(proxy, sender, [aboutToSuspend]) {
-        this.emit('prepare-for-sleep', aboutToSuspend);
    }
 });
-Signals.addSignalMethods(LoginManagerSystemd.prototype);

 const LoginManagerConsoleKit = new Lang.Class({
    Name: 'LoginManagerConsoleKit',
@ -240,28 +160,34 @@ const LoginManagerConsoleKit = new Lang.Class({
        this._proxy = new ConsoleKitManager(Gio.DBus.system,
                                            'org.freedesktop.ConsoleKit',
                                            '/org/freedesktop/ConsoleKit/Manager');
+        this._upClient = new UPowerGlib.Client();
    },

    // Having this function is a bit of a hack since the Systemd and ConsoleKit
    // session objects have different interfaces - but in both cases there are
    // Lock/Unlock signals, and that's all we count upon at the moment.
-    getCurrentSessionProxy: function(callback) {
-        if (this._currentSession) {
-            callback (this._currentSession);
-            return;
+    getCurrentSessionProxy: function() {
+        if (!this._currentSession) {
+            let [currentSessionId] = this._proxy.GetCurrentSessionSync();
+            this._currentSession = new ConsoleKitSession(Gio.DBus.system,
+                                                         'org.freedesktop.ConsoleKit',
+                                                         currentSessionId);
        }

-        this._proxy.GetCurrentSessionRemote(Lang.bind(this,
-            function(result, error) {
-                if (error) {
-                    logError(error, 'Could not get a proxy for the current session');
-                } else {
-                    this._currentSession = new ConsoleKitSession(Gio.DBus.system,
-                                                                 'org.freedesktop.ConsoleKit',
-                                                                 result[0]);
-                    callback(this._currentSession);
-                }
-            }));
+        return this._currentSession;
+    },
+
+    get sessionActive() {
+        if (this._sessionActive !== undefined)
+            return this._sessionActive;
+
+        let session = this.getCurrentSessionProxy();
+        session.connectSignal('ActiveChanged', Lang.bind(this, function(object, senderName, [isActive]) {
+            this._sessionActive = isActive;
+        }));
+        [this._sessionActive] = session.IsActiveSync();
+
+        return this._sessionActive;
    },

    canPowerOff: function(asyncCallback) {
@ -283,11 +209,10 @@ const LoginManagerConsoleKit = new Lang.Class({
    },

    canSuspend: function(asyncCallback) {
-        asyncCallback(false);
-    },
-
-    listSessions: function(asyncCallback) {
-        asyncCallback([]);
+        Mainloop.idle_add(Lang.bind(this, function() {
+            asyncCallback(this._upClient.get_can_suspend());
+            return false;
+        }));
    },

    powerOff: function() {
@ -299,12 +224,6 @@ const LoginManagerConsoleKit = new Lang.Class({
    },

    suspend: function() {
-        this.emit('prepare-for-sleep', true);
-        this.emit('prepare-for-sleep', false);
-    },
-
-    inhibit: function(reason, callback) {
-        callback(null);
+        this._upClient.suspend_sync(null);
    }
 });
-Signals.addSignalMethods(LoginManagerConsoleKit.prototype);
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@ -2,93 +2,9 @@

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

-// _getMobileProvidersDatabase:
-//
-// Gets the database of mobile providers, with references between MCCMNC/SID and
-// operator name
-//
-let _mpd;
-function _getMobileProvidersDatabase() {
-    if (_mpd == null) {
-        try {
-            _mpd = new NMGtk.MobileProvidersDatabase();
-            _mpd.init(null);
-        } catch (e) {
-            log(e.message);
-            _mpd = null;
-        }
-    }
-
-    return _mpd;
-}
-
-// _findProviderForMccMnc:
-// @operator_name: operator name
-// @operator_code: operator code
-//
-// Given an operator name string (which may not be a real operator name) and an
-// operator code string, tries to find a proper operator name to display.
-//
-function _findProviderForMccMnc(operator_name, operator_code) {
-    if (operator_name) {
-        if (operator_name.length != 0 &&
-            (operator_name.length > 6 || operator_name.length < 5)) {
-            // this looks like a valid name, i.e. not an MCCMNC (that some
-            // devices return when not yet connected
-            return operator_name;
-        }
-
-        if (isNaN(parseInt(operator_name))) {
-            // name is definitely not a MCCMNC, so it may be a name
-            // after all; return that
-            return operator_name;
-        }
-    }
-
-    let needle;
-    if ((!operator_name || operator_name.length == 0) && operator_code)
-        needle = operator_code;
-    else if (operator_name && (operator_name.length == 6 || operator_name.length == 5))
-        needle = operator_name;
-    else // nothing to search
-        return null;
-
-    let mpd = _getMobileProvidersDatabase();
-    if (mpd) {
-        let provider = mpd.lookup_3gpp_mcc_mnc(needle);
-        if (provider)
-            return provider.get_name();
-    }
-    return null;
-}
-
-// _findProviderForSid:
-// @sid: System Identifier of the serving CDMA network
-//
-// Tries to find the operator name corresponding to the given SID
-//
-function _findProviderForSid(sid) {
-    if (sid == 0)
-        return null;
-
-    let mpd = _getMobileProvidersDatabase();
-    if (mpd) {
-        let provider = mpd.lookup_cdma_sid(sid);
-        if (provider)
-            return provider.get_name();
-    }
-    return null;
-}
-
-
-//------------------------------------------------------------------------------
-// Support for the old ModemManager interface (MM < 0.7)
-//------------------------------------------------------------------------------
-
-
 // The following are not the complete interfaces, just the methods we need
 // (or may need in the future)

@ -126,6 +42,14 @@ const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.C

 const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);

+let _providersTable;
+function _getProvidersTable() {
+    if (_providersTable)
+        return _providersTable;
+    let [providers, countryCodes] = Shell.mobile_providers_parse();
+    return _providersTable = providers;
+}
+
 const ModemGsm = new Lang.Class({
    Name: 'ModemGsm',

@ -141,7 +65,7 @@ const ModemGsm = new Lang.Class({
            this.emit('notify::signal-quality');
        }));
        this._proxy.connectSignal('RegistrationInfo', Lang.bind(this, function(proxy, sender, [status, code, name]) {
-            this.operator_name = _findProviderForMccMnc(name, code);
+            this.operator_name = this._findOperatorName(name, code);
            this.emit('notify::operator-name');
        }));
        this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function([result], err) {
@ -151,7 +75,7 @@ const ModemGsm = new Lang.Class({
            }

            let [status, code, name] = result;
-            this.operator_name = _findProviderForMccMnc(name, code);
+            this.operator_name = this._findOperatorName(name, code);
            this.emit('notify::operator-name');
        }));
        this._proxy.GetSignalQualityRemote(Lang.bind(this, function(result, err) {
@ -164,6 +88,67 @@ const ModemGsm = new Lang.Class({
            }
            this.emit('notify::signal-quality');
        }));
+    },
+
+    _findOperatorName: function(name, opCode) {
+        if (name.length != 0 && (name.length > 6 || name.length < 5)) {
+            // this looks like a valid name, i.e. not an MCCMNC (that some
+            // devices return when not yet connected
+            return name;
+        }
+        if (isNaN(parseInt(name))) {
+            // name is definitely not a MCCMNC, so it may be a name
+            // after all; return that
+            return name;
+        }
+
+        let needle;
+        if (name.length == 0 && opCode)
+            needle = opCode;
+        else if (name.length == 6 || name.length == 5)
+            needle = name;
+        else // nothing to search
+            return null;
+
+        return this._findProviderForMCCMNC(needle);
+    },
+
+    _findProviderForMCCMNC: function(needle) {
+        let table = _getProvidersTable();
+        let needlemcc = needle.substring(0, 3);
+        let needlemnc = needle.substring(3, needle.length);
+
+        let name2, name3;
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+
+                // Search through MCC/MNC list
+                let list = provider.get_gsm_mcc_mnc();
+                for (let j = 0; j < list.length; j++) {
+                    let mccmnc = list[j];
+
+                    // Match both 2-digit and 3-digit MNC; prefer a
+                    // 3-digit match if found, otherwise a 2-digit one.
+                    if (mccmnc.mcc != needlemcc)
+                        continue;  // MCC was wrong
+
+                    if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
+                        name3 = provider.name;
+
+                    if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
+                        name2 = provider.name;
+
+                    if (name2 && name3)
+                        break;
+                }
+            }
+        }
+
+        return name3 || name2 || null;
    }
 });
 Signals.addSignalMethods(ModemGsm.prototype);
@ -203,99 +188,40 @@ const ModemCdma = new Lang.Class({
                // it will return an error if the device is not connected
                this.operator_name = null;
            } else {
-                let [bandClass, band, sid] = result;
-
-                this.operator_name = _findProviderForSid(sid)
+                let [bandClass, band, id] = result;
+                if (name.length > 0)
+                    this.operator_name = this._findProviderForSid(id);
+                else
+                    this.operator_name = null;
            }
            this.emit('notify::operator-name');
        }));
+    },
+
+    _findProviderForSid: function(sid) {
+        if (sid == 0)
+            return null;
+
+        let table = _getProvidersTable();
+
+        // Search through each country
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+                let cdma_sid = provider.get_cdma_sid();
+
+                // Search through CDMA SID list
+                for (let j = 0; j < cdma_sid.length; j++) {
+                    if (cdma_sid[j] == sid)
+                        return provider.name;
+                }
+            }
+        }
+
+        return null;
    }
 });
 Signals.addSignalMethods(ModemCdma.prototype);
-
-
-//------------------------------------------------------------------------------
-// Support for the new ModemManager1 interface (MM >= 0.7)
-//------------------------------------------------------------------------------
-
-const BroadbandModemInterface = <interface name="org.freedesktop.ModemManager1.Modem">
-<property name="SignalQuality" type="(ub)" access="read" />
-</interface>;
-const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface);
-
-const BroadbandModem3gppInterface = <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp">
-<property name="OperatorCode" type="s" access="read" />
-<property name="OperatorName" type="s" access="read" />
-</interface>;
-const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gppInterface);
-
-const BroadbandModemCdmaInterface = <interface name="org.freedesktop.ModemManager1.Modem.ModemCdma">
-<property name="Sid" type="u" access="read" />
-</interface>;
-const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface);
-
-const BroadbandModem = new Lang.Class({
-    Name: 'BroadbandModem',
-
-    _init: function(path, capabilities) {
-        this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
-        this._proxy_3gpp = new BroadbandModem3gppProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
-        this._proxy_cdma = new BroadbandModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
-        this._capabilities = capabilities;
-
-        this._proxy.connect('g-properties-changed', Lang.bind(this, function(proxy, properties) {
-            if ('SignalQuality' in properties.deep_unpack())
-                this._reloadSignalQuality();
-        }));
-        this._reloadSignalQuality();
-
-        this._proxy_3gpp.connect('g-properties-changed', Lang.bind(this, function(proxy, properties) {
-            let unpacked = properties.deep_unpack();
-            if ('OperatorName' in unpacked || 'OperatorCode' in unpacked)
-                this._reload3gppOperatorName();
-        }));
-        this._reload3gppOperatorName();
-
-        this._proxy_cdma.connect('g-properties-changed', Lang.bind(this, function(proxy, properties) {
-            let unpacked = properties.deep_unpack();
-            if ('Nid' in unpacked || 'Sid' in unpacked)
-                this._reloadCdmaOperatorName();
-        }));
-        this._reloadCdmaOperatorName();
-    },
-
-    _reloadSignalQuality: function() {
-        let [quality, recent] = this._proxy.SignalQuality;
-        this.signal_quality = quality;
-        this.emit('notify::signal-quality');
-    },
-
-    _reloadOperatorName: function() {
-        let new_name = "";
-        if (this.operator_name_3gpp && this.operator_name_3gpp.length > 0)
-            new_name += this.operator_name_3gpp;
-
-        if (this.operator_name_cdma && this.operator_name_cdma.length > 0) {
-            if (new_name != "")
-                new_name += ", ";
-            new_name += this.operator_name_cdma;
-        }
-
-        this.operator_name = new_name;
-        this.emit('notify::operator-name');
-    },
-
-    _reload3gppOperatorName: function() {
-        let name = this._proxy_3gpp.OperatorName;
-        let code = this._proxy_3gpp.OperatorCode;
-        this.operator_name_3gpp = _findProviderForMccMnc(name, code);
-        this._reloadOperatorName();
-    },
-
-    _reloadCdmaOperatorName: function() {
-        let sid = this._proxy_cdma.Sid;
-        this.operator_name_cdma = _findProviderForSid(sid);
-        this._reloadOperatorName();
-    }
-});
-Signals.addSignalMethods(BroadbandModem.prototype);
--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -1,13 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
-const St = imports.gi.St;

 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const SCROLL_TIME = 0.1;

 // http://daringfireball.net/2010/07/improved_regex_for_matching_urls
 const _balancedParens = '\\((?:[^\\s()<>]+|(?:\\(?:[^\\s()<>]+\\)))*\\)';
@ -164,6 +159,86 @@ function killall(processName) {
    }
 }

+// This was ported from network-manager-applet
+// Copyright 2007 - 2011 Red Hat, Inc.
+// Author: Dan Williams <dcbw@redhat.com>
+
+const _IGNORED_WORDS = [
+        'Semiconductor',
+        'Components',
+        'Corporation',
+        'Communications',
+        'Company',
+        'Corp.',
+        'Corp',
+        'Co.',
+        'Inc.',
+        'Inc',
+        'Incorporated',
+        'Ltd.',
+        'Limited.',
+        'Intel',
+        'chipset',
+        'adapter',
+        '[hex]',
+        'NDIS',
+        'Module'
+];
+
+const _IGNORED_PHRASES = [
+        'Multiprotocol MAC/baseband processor',
+        'Wireless LAN Controller',
+        'Wireless LAN Adapter',
+        'Wireless Adapter',
+        'Network Connection',
+        'Wireless Cardbus Adapter',
+        'Wireless CardBus Adapter',
+        '54 Mbps Wireless PC Card',
+        'Wireless PC Card',
+        'Wireless PC',
+        'PC Card with XJACK(r) Antenna',
+        'Wireless cardbus',
+        'Wireless LAN PC Card',
+        'Technology Group Ltd.',
+        'Communication S.p.A.',
+        'Business Mobile Networks BV',
+        'Mobile Broadband Minicard Composite Device',
+        'Mobile Communications AB',
+        '(PC-Suite Mode)'
+];
+
+function fixupPCIDescription(desc) {
+    desc = desc.replace(/[_,]/, ' ');
+
+    /* Attempt to shorten ID by ignoring certain phrases */
+    for (let i = 0; i < _IGNORED_PHRASES.length; i++) {
+        let item = _IGNORED_PHRASES[i];
+        let pos = desc.indexOf(item);
+        if (pos != -1) {
+            let before = desc.substring(0, pos);
+            let after = desc.substring(pos + item.length, desc.length);
+            desc = before + after;
+        }
+    }
+
+    /* Attmept to shorten ID by ignoring certain individual words */
+    let words = desc.split(' ');
+    let out = [ ];
+    for (let i = 0; i < words.length; i++) {
+        let item = words[i];
+
+        // skip empty items (that come out from consecutive spaces)
+        if (item.length == 0)
+            continue;
+
+        if (_IGNORED_WORDS.indexOf(item) == -1) {
+            out.push(item);
+        }
+    }
+
+    return out.join(' ');
+}
+
 // lowerBound:
 // @array: an array or array-like object, already sorted
 //         according to @cmp
@ -213,63 +288,3 @@ function insertSorted(array, val, cmp) {

    return pos;
 }
-
-function makeCloseButton() {
-    let closeButton = new St.Button({ style_class: 'notification-close'});
-
-    // This is a bit tricky. St.Bin has its own x-align/y-align properties
-    // that compete with Clutter's properties. This should be fixed for
-    // Clutter 2.0. Since St.Bin doesn't define its own setters, the
-    // setters are a workaround to get Clutter's version.
-    closeButton.set_x_align(Clutter.ActorAlign.END);
-    closeButton.set_y_align(Clutter.ActorAlign.START);
-
-    // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
-    // to respect the alignments.
-    closeButton.set_x_expand(true);
-    closeButton.set_y_expand(true);
-
-    closeButton.connect('style-changed', function() {
-        let themeNode = closeButton.get_theme_node();
-        closeButton.translation_x = themeNode.get_length('-shell-close-overlap-x');
-        closeButton.translation_y = themeNode.get_length('-shell-close-overlap-y');
-    });
-
-    return closeButton;
-}
-
-function ensureActorVisibleInScrollView(scrollView, actor) {
-    let adjustment = scrollView.vscroll.adjustment;
-    let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
-
-    let offset = 0;
-    let vfade = scrollView.get_effect("fade");
-    if (vfade)
-        offset = vfade.vfade_offset;
-
-    let box = actor.get_allocation_box();
-    let y1 = box.y1, y2 = box.y2;
-
-    let parent = actor.get_parent();
-    while (parent != scrollView) {
-        if (!parent)
-            throw new Error("actor not in scroll view");
-
-        let box = parent.get_allocation_box();
-        y1 += box.y1;
-        y2 += box.y1;
-        parent = parent.get_parent();
-    }
-
-    if (y1 < value + offset)
-        value = Math.max(0, y1 - offset);
-    else if (y2 > value + pageSize - offset)
-        value = Math.min(upper, y2 + offset - pageSize);
-    else
-        return;
-
-    Tweener.addTween(adjustment,
-                     { value: value,
-                       time: SCROLL_TIME,
-                       transition: 'easeOutQuad' });
-}
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@ -84,12 +84,9 @@ const AppFavorites = new Lang.Class({

        let app = Shell.AppSystem.get_default().lookup_app(appId);

-        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()),
-                                 { forFeedback: true,
-                                   undoCallback: Lang.bind(this, function () {
-                                                               this._removeFavorite(appId);
-                                                           })
-                                 });
+        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
+            this._removeFavorite(appId);
+        }));
    },

    addFavorite: function(appId) {
@ -119,11 +116,9 @@ const AppFavorites = new Lang.Class({
            return;

        Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
-                                 { forFeedback: true,
-                                   undoCallback: Lang.bind(this, function () {
-                                                               this._addFavorite(appId, pos);
-                                                           })
-                                 });
+                                 Lang.bind(this, function () {
+            this._addFavorite(appId, pos);
+        }));
    }
 });
 Signals.addSignalMethods(AppFavorites.prototype);
--- a/js/ui/background.js
+++ b/js/ui/background.js
@ -1,798 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const GDesktopEnums = imports.gi.GDesktopEnums;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
-const Lang = imports.lang;
-const Meta = imports.gi.Meta;
-const Signals = imports.signals;
-
-const Main = imports.ui.main;
-const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;
-
-const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
-const PRIMARY_COLOR_KEY = 'primary-color';
-const SECONDARY_COLOR_KEY = 'secondary-color';
-const COLOR_SHADING_TYPE_KEY = 'color-shading-type';
-const BACKGROUND_STYLE_KEY = 'picture-options';
-const PICTURE_OPACITY_KEY = 'picture-opacity';
-const PICTURE_URI_KEY = 'picture-uri';
-
-const FADE_ANIMATION_TIME = 1.0;
-
-// These parameters affect how often we redraw.
-// The first is how different (percent crossfaded) the slide show
-// has to look before redrawing and the second is the minimum
-// frequency (in seconds) we're willing to wake up
-const ANIMATION_OPACITY_STEP_INCREMENT = 4.0;
-const ANIMATION_MIN_WAKEUP_INTERVAL = 1.0;
-
-let _backgroundCache = null;
-
-const BackgroundCache = new Lang.Class({
-    Name: 'BackgroundCache',
-
-    _init: function() {
-       this._patterns = [];
-       this._images = [];
-       this._pendingFileLoads = [];
-       this._fileMonitors = {};
-    },
-
-    getPatternContent: function(params) {
-        params = Params.parse(params, { monitorIndex: 0,
-                                        color: null,
-                                        secondColor: null,
-                                        shadingType: null,
-                                        effects: Meta.BackgroundEffects.NONE });
-
-        let content = null;
-        let candidateContent = null;
-        for (let i = 0; i < this._patterns.length; i++) {
-            if (!this._patterns[i])
-                continue;
-
-            if (this._patterns[i].get_shading() != params.shadingType)
-                continue;
-
-            if (!params.color.equal(this._patterns[i].get_color()))
-                continue;
-
-            if (params.shadingType != GDesktopEnums.BackgroundShading.SOLID &&
-                !params.secondColor.equal(this._patterns[i].get_second_color()))
-                continue;
-
-            candidateContent = this._patterns[i];
-
-            if (params.effects != this._patterns[i].effects)
-                continue;
-
-            break;
-        }
-
-        if (candidateContent) {
-            content = candidateContent.copy(params.monitorIndex, params.effects);
-        } else {
-            content = new Meta.Background({ meta_screen: global.screen,
-                                            monitor: params.monitorIndex,
-                                            effects: params.effects });
-
-            if (params.shadingType == GDesktopEnums.BackgroundShading.SOLID) {
-                content.load_color(params.color);
-            } else {
-                content.load_gradient(params.shadingType, params.color, params.secondColor);
-            }
-        }
-
-        this._patterns.push(content);
-
-        return content;
-    },
-
-    _monitorFile: function(filename) {
-        if (this._fileMonitors[filename])
-            return;
-
-        let file = Gio.File.new_for_path(filename);
-        let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
-
-        let signalId = monitor.connect('changed',
-                                       Lang.bind(this, function() {
-                                           for (let i = 0; i < this._images.length; i++) {
-                                               if (this._images[i].get_filename() == filename)
-                                                   this._images.splice(i, 1);
-                                           }
-
-                                           monitor.disconnect(signalId);
-
-                                           this.emit('file-changed', filename);
-                                       }));
-
-        this._fileMonitors[filename] = monitor;
-    },
-
-    _removeContent: function(contentList, content) {
-        let index = contentList.indexOf(content);
-
-        if (index >= 0)
-            contentList.splice(index, 1);
-    },
-
-    removePatternContent: function(content) {
-        this._removeContent(this._patterns, content);
-    },
-
-    removeImageContent: function(content) {
-        let filename = content.get_filename();
-
-        if (filename && this._fileMonitors[filename])
-            delete this._fileMonitors[filename];
-
-        this._removeContent(this._images, content);
-    },
-
-    _loadImageContent: function(params) {
-        params = Params.parse(params, { monitorIndex: 0,
-                                        style: null,
-                                        filename: null,
-                                        effects: Meta.BackgroundEffects.NONE,
-                                        cancellable: null,
-                                        onFinished: null });
-
-        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,
-                                params.cancellable,
-                                Lang.bind(this,
-                                          function(object, result) {
-                                              try {
-                                                  content.load_file_finish(result);
-
-                                                  this._monitorFile(params.filename);
-                                                  this._images.push(content);
-                                              } catch(e) {
-                                                  content = null;
-                                              }
-
-                                              for (let i = 0; i < this._pendingFileLoads.length; i++) {
-                                                  let pendingLoad = this._pendingFileLoads[i];
-                                                  if (pendingLoad.filename != params.filename ||
-                                                      pendingLoad.style != params.style)
-                                                      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.callers[j].onFinished(content);
-                                                      }
-                                                  }
-
-                                                  this._pendingFileLoads.splice(i, 1);
-                                              }
-                                          }));
-    },
-
-    getImageContent: function(params) {
-        params = Params.parse(params, { monitorIndex: 0,
-                                        style: null,
-                                        filename: null,
-                                        effects: Meta.BackgroundEffects.NONE,
-                                        cancellable: null,
-                                        onFinished: null });
-
-        let content = null;
-        let candidateContent = null;
-        for (let i = 0; i < this._images.length; i++) {
-            if (!this._images[i])
-                continue;
-
-            if (this._images[i].get_style() != params.style)
-                continue;
-
-            if (this._images[i].get_filename() != params.filename)
-                continue;
-
-            if (params.style == GDesktopEnums.BackgroundStyle.SPANNED &&
-                this._images[i].monitor_index != this._monitorIndex)
-                continue;
-
-            candidateContent = this._images[i];
-
-            if (params.effects != this._images[i].effects)
-                continue;
-
-            break;
-        }
-
-        if (candidateContent) {
-            content = candidateContent.copy(params.monitorIndex, params.effects);
-
-            if (params.cancellable && params.cancellable.is_cancelled())
-                content = null;
-            else
-                this._images.push(content);
-
-            if (params.onFinished)
-                params.onFinished(content);
-        } else {
-            this._loadImageContent({ filename: params.filename,
-                                     style: params.style,
-                                     effects: params.effects,
-                                     monitorIndex: params.monitorIndex,
-                                     cancellable: params.cancellable,
-                                     onFinished: params.onFinished });
-
-        }
-    },
-
-    getAnimation: function(params) {
-        params = Params.parse(params, { filename: null,
-                                        onLoaded: null });
-
-        if (this._animationFilename == params.filename) {
-            if (params.onLoaded) {
-                GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
-                    params.onLoaded(this._animation);
-                }));
-            }
-        }
-
-        let animation = new Animation({ filename: params.filename });
-
-        animation.load(Lang.bind(this, function() {
-                           this._monitorFile(params.filename);
-                           this._animationFilename = params.filename;
-                           this._animation = animation;
-
-                           if (params.onLoaded) {
-                               GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
-                                   params.onLoaded(this._animation);
-                               }));
-                           }
-                       }));
-    }
-});
-Signals.addSignalMethods(BackgroundCache.prototype);
-
-function getBackgroundCache() {
-    if (!_backgroundCache)
-        _backgroundCache = new BackgroundCache();
-    return _backgroundCache;
-}
-
-const Background = new Lang.Class({
-    Name: 'Background',
-
-    _init: function(params) {
-        params = Params.parse(params, { monitorIndex: 0,
-                                        layoutManager: Main.layoutManager,
-                                        effects: Meta.BackgroundEffects.NONE });
-        this.actor = new Meta.BackgroundGroup();
-        this.actor._delegate = this;
-
-        this._destroySignalId = this.actor.connect('destroy',
-                                                   Lang.bind(this, this._destroy));
-
-        this._settings = new Gio.Settings({ schema: BACKGROUND_SCHEMA });
-        this._monitorIndex = params.monitorIndex;
-        this._layoutManager = params.layoutManager;
-        this._effects = params.effects;
-        this._fileWatches = {};
-        this._pattern = null;
-        // contains a single image for static backgrounds and
-        // two images (from and to) for slide shows
-        this._images = {};
-
-        this._brightness = 1.0;
-        this._vignetteSharpness = 0.2;
-        this._saturation = 1.0;
-        this._cancellable = new Gio.Cancellable();
-        this.isLoaded = false;
-
-        this._settings.connect('changed', Lang.bind(this, function() {
-                                   this.emit('changed');
-                               }));
-
-        this._load();
-    },
-
-    _destroy: function() {
-        this._cancellable.cancel();
-
-        if (this._updateAnimationTimeoutId) {
-            GLib.source_remove (this._updateAnimationTimeoutId);
-            this._updateAnimationTimeoutId = 0;
-        }
-
-        let i;
-        let keys = Object.keys(this._fileWatches);
-        for (i = 0; i < keys.length; i++) {
-            this._cache.disconnect(this._fileWatches[keys[i]]);
-        }
-        this._fileWatches = null;
-
-        if (this._pattern) {
-            if (this._pattern.content)
-                this._cache.removePatternContent(this._pattern.content);
-
-            this._pattern.destroy();
-            this._pattern = null;
-        }
-
-        keys = Object.keys(this._images);
-        for (i = 0; i < keys.length; i++) {
-            let actor = this._images[keys[i]];
-
-            if (actor.content)
-                this._cache.removeImageContent(actor.content);
-
-            actor.destroy();
-            this._images[keys[i]] = null;
-        }
-
-        this.actor.disconnect(this._destroySignalId);
-        this._destroySignalId = 0;
-    },
-
-    _setLoaded: function() {
-        if (this.isLoaded)
-            return;
-
-        this.isLoaded = true;
-
-        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
-            this.emit('loaded');
-            return false;
-        }));
-    },
-
-    _loadPattern: function() {
-        let colorString, res, color, secondColor;
-
-        colorString = this._settings.get_string(PRIMARY_COLOR_KEY);
-        [res, color] = Clutter.Color.from_string(colorString);
-        colorString = this._settings.get_string(SECONDARY_COLOR_KEY);
-        [res, secondColor] = Clutter.Color.from_string(colorString);
-
-        let shadingType = this._settings.get_enum(COLOR_SHADING_TYPE_KEY);
-
-        let content = this._cache.getPatternContent({ monitorIndex: this._monitorIndex,
-                                                      effects: this._effects,
-                                                      color: color,
-                                                      secondColor: secondColor,
-                                                      shadingType: shadingType });
-
-        this._pattern = new Meta.BackgroundActor();
-        this.actor.add_child(this._pattern);
-
-        this._pattern.content = content;
-    },
-
-    _watchCacheFile: function(filename) {
-        if (this._fileWatches[filename])
-            return;
-
-        let signalId = this._cache.connect('file-changed',
-                                           Lang.bind(this, function(cache, changedFile) {
-                                               if (changedFile == filename) {
-                                                   this.emit('changed');
-                                               }
-                                           }));
-        this._fileWatches[filename] = signalId;
-    },
-
-    _addImage: function(content, index, filename) {
-        content.saturation = this._saturation;
-        content.brightness = this._brightness;
-        content.vignette_sharpness = this._vignetteSharpness;
-
-        let actor = new Meta.BackgroundActor();
-        actor.content = content;
-
-        // The background pattern is the first actor in
-        // the group, and all images should be above that.
-        this.actor.insert_child_at_index(actor, index + 1);
-
-        this._images[index] = actor;
-        this._watchCacheFile(filename);
-    },
-
-    _updateImage: function(content, index, filename) {
-        content.saturation = this._saturation;
-        content.brightness = this._brightness;
-        content.vignette_sharpness = this._vignetteSharpness;
-
-        this._cache.removeImageContent(this._images[index].content);
-        this._images[index].content = content;
-        this._watchCacheFile(filename);
-    },
-
-    _updateAnimationProgress: function() {
-        if (this._images[1])
-            this._images[1].opacity = this._animation.transitionProgress * 255;
-
-        this._queueUpdateAnimation();
-    },
-
-    _updateAnimation: function() {
-        this._updateAnimationTimeoutId = 0;
-
-        this._animation.update(this._layoutManager.monitors[this._monitorIndex]);
-        let files = this._animation.keyFrameFiles;
-
-        if (files.length == 0) {
-            this._setLoaded();
-            this._queueUpdateAnimation();
-            return;
-        }
-
-        let numPendingImages = files.length;
-        for (let i = 0; i < files.length; i++) {
-            if (this._images[i] && this._images[i].content &&
-                this._images[i].content.get_filename() == files[i]) {
-
-                numPendingImages--;
-                if (numPendingImages == 0)
-                    this._updateAnimationProgress();
-                continue;
-            }
-            this._cache.getImageContent({ monitorIndex: this._monitorIndex,
-                                          effects: this._effects,
-                                          style: this._style,
-                                          filename: files[i],
-                                          cancellable: this._cancellable,
-                                          onFinished: Lang.bind(this, function(content, i) {
-                                              numPendingImages--;
-
-                                              if (!content) {
-                                                  this._setLoaded();
-                                                  if (numPendingImages == 0)
-                                                      this._updateAnimationProgress();
-                                                  return;
-                                              }
-
-                                              if (!this._images[i]) {
-                                                  this._addImage(content, i, files[i]);
-                                              } else {
-                                                  this._updateImage(content, i, files[i]);
-                                              }
-
-                                              if (numPendingImages == 0) {
-                                                  this._setLoaded();
-                                                  this._updateAnimationProgress();
-                                              }
-                                          }, i)
-                                        });
-        }
-    },
-
-    _queueUpdateAnimation: function() {
-        if (this._updateAnimationTimeoutId != 0)
-            return;
-
-        if (!this._cancellable || this._cancellable.is_cancelled())
-            return;
-
-        if (!this._animation.transitionDuration)
-            return;
-
-        let nSteps = 255 / ANIMATION_OPACITY_STEP_INCREMENT;
-        let timePerStep = (this._animation.transitionDuration * 1000) / nSteps;
-
-        let interval = Math.max(ANIMATION_MIN_WAKEUP_INTERVAL * 1000,
-                                timePerStep);
-
-        if (interval > GLib.MAXUINT32)
-            return;
-
-        this._updateAnimationTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                      interval,
-                                                      Lang.bind(this, function() {
-                                                                    this._updateAnimationTimeoutId = 0;
-                                                                    this._updateAnimation();
-                                                                    return false;
-                                                                }));
-    },
-
-    _loadAnimation: function(filename) {
-        this._cache.getAnimation({ filename: filename,
-                                             onLoaded: Lang.bind(this, function(animation) {
-                                                 this._animation = animation;
-
-                                                 if (!this._animation || this._cancellable.is_cancelled()) {
-                                                     this._setLoaded();
-                                                     return;
-                                                 }
-
-                                                 this._updateAnimation();
-                                                 this._watchCacheFile(filename);
-                                             })
-                                           });
-    },
-
-    _loadFile: function(filename) {
-        this._cache.getImageContent({ monitorIndex: this._monitorIndex,
-                                      effects: this._effects,
-                                      style: this._style,
-                                      filename: filename,
-                                      cancellable: this._cancellable,
-                                      onFinished: Lang.bind(this, function(content) {
-                                          if (!content) {
-                                              if (!this._cancellable.is_cancelled())
-                                                  this._loadAnimation(filename);
-                                              return;
-                                          }
-
-                                          this._addImage(content, 0, filename);
-                                          this._setLoaded();
-                                      })
-                                    });
-
-    },
-
-    _load: function () {
-        this._cache = getBackgroundCache();
-
-        this._loadPattern(this._cache);
-
-        this._style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
-        if (this._style == GDesktopEnums.BackgroundStyle.NONE) {
-            this._setLoaded();
-            return;
-        }
-
-        let uri = this._settings.get_string(PICTURE_URI_KEY);
-        let filename = Gio.File.new_for_uri(uri).get_path();
-
-        this._loadFile(filename);
-    },
-
-    get saturation() {
-        return this._saturation;
-    },
-
-    set saturation(saturation) {
-        this._saturation = saturation;
-
-        if (this._pattern && this._pattern.content)
-            this._pattern.content.saturation = saturation;
-
-        let keys = Object.keys(this._images);
-        for (let i = 0; i < keys.length; i++) {
-            let image = this._images[keys[i]];
-            if (image && image.content)
-                image.content.saturation = saturation;
-        }
-    },
-
-    get brightness() {
-        return this._brightness;
-    },
-
-    set brightness(factor) {
-        this._brightness = factor;
-        if (this._pattern && this._pattern.content)
-            this._pattern.content.brightness = factor;
-
-        let keys = Object.keys(this._images);
-        for (let i = 0; i < keys.length; i++) {
-            let image = this._images[keys[i]];
-            if (image && image.content)
-                image.content.brightness = factor;
-        }
-    },
-
-    get vignetteSharpness() {
-        return this._vignetteSharpness;
-    },
-
-    set vignetteSharpness(sharpness) {
-        this._vignetteSharpness = sharpness;
-        if (this._pattern && this._pattern.content)
-            this._pattern.content.vignette_sharpness = sharpness;
-
-        let keys = Object.keys(this._images);
-        for (let i = 0; i < keys.length; i++) {
-            let image = this._images[keys[i]];
-            if (image && image.content)
-                image.content.vignette_sharpness = sharpness;
-        }
-    }
-});
-Signals.addSignalMethods(Background.prototype);
-
-const SystemBackground = new Lang.Class({
-    Name: 'SystemBackground',
-
-    _init: function() {
-        this._cache = getBackgroundCache();
-        this.actor = new Meta.BackgroundActor();
-
-        this._cache.getImageContent({ style: GDesktopEnums.BackgroundStyle.WALLPAPER,
-                                      filename: global.datadir + '/theme/noise-texture.png',
-                                      effects: Meta.BackgroundEffects.NONE,
-                                      onFinished: Lang.bind(this, function(content) {
-                                          this.actor.content = content;
-                                          this.emit('loaded');
-                                      })
-                                    });
-    }
-});
-Signals.addSignalMethods(SystemBackground.prototype);
-
-const Animation = new Lang.Class({
-    Name: 'Animation',
-
-    _init: function(params) {
-        params = Params.parse(params, { filename: null });
-
-        this.filename = params.filename;
-        this.keyFrameFiles = [];
-        this.transitionProgress = 0.0;
-        this.transitionDuration = 0.0;
-        this.loaded = false;
-    },
-
-    load: function(callback) {
-        let file = Gio.File.new_for_path(this.filename);
-
-        this._show = new GnomeDesktop.BGSlideShow({ filename: this.filename });
-
-        this._show.load_async(null,
-                              Lang.bind(this,
-                                        function(object, result) {
-                                            this.loaded = true;
-                                            if (callback)
-                                                callback();
-                                        }));
-    },
-
-    update: function(monitor) {
-        this.keyFrameFiles = [];
-
-        if (!this._show)
-            return;
-
-        if (this._show.get_num_slides() < 1)
-            return;
-
-        let [progress, duration, isFixed, file1, file2] = this._show.get_current_slide(monitor.width, monitor.height);
-
-        this.transitionDuration = duration;
-        this.transitionProgress = progress;
-
-        if (file1)
-            this.keyFrameFiles.push(file1);
-
-        if (file2)
-            this.keyFrameFiles.push(file2);
-    },
-});
-Signals.addSignalMethods(Animation.prototype);
-
-const BackgroundManager = new Lang.Class({
-    Name: 'BackgroundManager',
-
-    _init: function(params) {
-        params = Params.parse(params, { container: null,
-                                        layoutManager: Main.layoutManager,
-                                        monitorIndex: null,
-                                        effects: Meta.BackgroundEffects.NONE,
-                                        controlPosition: true });
-
-        this._container = params.container;
-        this._layoutManager = params.layoutManager;
-        this._effects = params.effects;
-        this._monitorIndex = params.monitorIndex;
-        this._controlPosition = params.controlPosition;
-
-        this.background = this._createBackground();
-        this._newBackground = null;
-    },
-
-    destroy: function() {
-        if (this._newBackground) {
-            this._newBackground.actor.destroy();
-            this._newBackground = null;
-        }
-
-        if (this.background) {
-            this.background.actor.destroy();
-            this.background = null;
-        }
-    },
-
-    _updateBackground: function(background, monitorIndex) {
-        let newBackground = this._createBackground(monitorIndex);
-        newBackground.vignetteSharpness = background.vignetteSharpness;
-        newBackground.brightness = background.brightness;
-        newBackground.saturation = background.saturation;
-        newBackground.visible = background.visible;
-
-        newBackground.loadedSignalId = newBackground.connect('loaded',
-            Lang.bind(this, function() {
-                newBackground.disconnect(newBackground.loadedSignalId);
-                newBackground.loadedSignalId = 0;
-                Tweener.addTween(background.actor,
-                                 { opacity: 0,
-                                   time: FADE_ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onComplete: Lang.bind(this, function() {
-                                       if (this._newBackground == newBackground) {
-                                           this.background = newBackground;
-                                           this._newBackground = null;
-                                       } else {
-                                           newBackground.actor.destroy();
-                                       }
-
-                                       background.actor.destroy();
-
-                                       this.emit('changed');
-                                   })
-                                 });
-        }));
-
-        this._newBackground = newBackground;
-    },
-
-    _createBackground: function() {
-        let background = new Background({ monitorIndex: this._monitorIndex,
-                                          layoutManager: this._layoutManager,
-                                          effects: this._effects });
-        this._container.add_child(background.actor);
-
-        let monitor = this._layoutManager.monitors[this._monitorIndex];
-
-        background.actor.set_size(monitor.width, monitor.height);
-        if (this._controlPosition) {
-            background.actor.set_position(monitor.x, monitor.y);
-            background.actor.lower_bottom();
-        }
-
-        background.changeSignalId = background.connect('changed', Lang.bind(this, function() {
-            background.disconnect(background.changeSignalId);
-            background.changeSignalId = 0;
-            this._updateBackground(background, this._monitorIndex);
-        }));
-
-        background.actor.connect('destroy', Lang.bind(this, function() {
-            if (background.changeSignalId)
-                background.disconnect(background.changeSignalId);
-
-            if (background.loadedSignalId)
-                background.disconnect(background.loadedSignalId);
-        }));
-
-        return background;
-    },
-});
-Signals.addSignalMethods(BackgroundManager.prototype);
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@ -1,66 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-
-const BoxPointer = imports.ui.boxpointer;
-const Main = imports.ui.main;
-const PopupMenu = imports.ui.popupMenu;
-
-const BackgroundMenu = new Lang.Class({
-    Name: 'BackgroundMenu',
-    Extends: PopupMenu.PopupMenu,
-
-    _init: function(source) {
-        this.parent(source, 0, St.Side.TOP);
-
-        this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.addSettingsAction(_("Change Background…"), 'gnome-background-panel.desktop');
-
-        this.actor.add_style_class_name('background-menu');
-
-        Main.uiGroup.add_actor(this.actor);
-        this.actor.hide();
-    }
-});
-
-function addBackgroundMenu(actor) {
-    let cursor = new St.Bin({ opacity: 0 });
-    Main.uiGroup.add_actor(cursor);
-
-    actor.reactive = true;
-    actor._backgroundMenu = new BackgroundMenu(cursor);
-    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
-    actor._backgroundManager.addMenu(actor._backgroundMenu);
-
-    function openMenu() {
-        let [x, y] = global.get_pointer();
-        cursor.set_position(x, y);
-        actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
-    }
-
-    let clickAction = new Clutter.ClickAction();
-    clickAction.connect('long-press', function(action, actor, state) {
-        if (state == Clutter.LongPressState.QUERY)
-            return action.get_button() == 1 && !actor._backgroundMenu.isOpen;
-        if (state == Clutter.LongPressState.ACTIVATE)
-            openMenu();
-        return true;
-    });
-    clickAction.connect('clicked', function(action) {
-        if (action.get_button() == 3)
-            openMenu();
-    });
-    actor.add_action(clickAction);
-
-    actor.connect('destroy', function() {
-                      actor._backgroundMenu.destroy();
-                      actor._backgroundMenu = null;
-                      actor._backgroundManager = null;
-
-                      cursor.destroy();
-                  });
-}
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@ -38,7 +38,6 @@ const BoxPointer = new Lang.Class({
        this._arrowSide = arrowSide;
        this._userArrowSide = arrowSide;
        this._arrowOrigin = 0;
-        this._arrowActor = null;
        this.actor = new St.Bin({ x_fill: true,
                                  y_fill: true });
        this._container = new Shell.GenericContainer();
@ -221,27 +220,31 @@ const BoxPointer = new Lang.Class({
        this.bin.allocate(childBox, flags);

        if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition();
-            this._updateFlip();
+            this._reposition(this._sourceActor, this._arrowAlignment);
+
+            if (this._shouldFlip()) {
+                switch (this._arrowSide) {
+                case St.Side.TOP:
+                    this._arrowSide = St.Side.BOTTOM;
+                    break;
+                case St.Side.BOTTOM:
+                    this._arrowSide = St.Side.TOP;
+                    break;
+                case St.Side.LEFT:
+                    this._arrowSide = St.Side.RIGHT;
+                    break;
+                case St.Side.RIGHT:
+                    this._arrowSide = St.Side.LEFT;
+                    break;
+                }
+                this._reposition(this._sourceActor, this._arrowAlignment);
+            }
        }
    },

    _drawBorder: function(area) {
        let themeNode = this.actor.get_theme_node();

-        if (this._arrowActor) {
-            let [sourceX, sourceY] = this._arrowActor.get_transformed_position();
-            let [sourceWidth, sourceHeight] = this._arrowActor.get_transformed_size();
-            let [absX, absY] = this.actor.get_transformed_position();
-
-            if (this._arrowSide == St.Side.TOP ||
-                this._arrowSide == St.Side.BOTTOM) {
-                this._arrowOrigin = sourceX - absX + sourceWidth / 2;
-            } else {
-                this._arrowOrigin = sourceY - absY + sourceHeight / 2;
-            }
-        }
-
        let borderWidth = themeNode.get_length('-arrow-border-width');
        let base = themeNode.get_length('-arrow-base');
        let rise = themeNode.get_length('-arrow-rise');
@ -402,11 +405,11 @@ const BoxPointer = new Lang.Class({
            cr.setLineWidth(borderWidth);
            cr.stroke();
        }
-
-        cr.$dispose();
    },

    setPosition: function(sourceActor, alignment) {
+        this._arrowSide = this._userArrowSide;
+
        // We need to show it now to force an allocation,
        // so that we can query the correct size.
        this.actor.show();
@ -414,8 +417,7 @@ const BoxPointer = new Lang.Class({
        this._sourceActor = sourceActor;
        this._arrowAlignment = alignment;

-        this._reposition();
-        this._updateFlip();
+        this._reposition(sourceActor, alignment);
    },

    setSourceAlignment: function(alignment) {
@ -427,10 +429,7 @@ const BoxPointer = new Lang.Class({
        this.setPosition(this._sourceActor, this._arrowAlignment);
    },

-    _reposition: function() {
-        let sourceActor = this._sourceActor;
-        let alignment = this._arrowAlignment;
-
+    _reposition: function(sourceActor, alignment) {
        // Position correctly relative to the sourceActor
        let sourceNode = sourceActor.get_theme_node();
        let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
@ -551,20 +550,10 @@ const BoxPointer = new Lang.Class({
        }
    },

-    // @actor: an actor relative to which the arrow is positioned.
-    // Differently from setPosition, this will not move the boxpointer itself,
-    // on the arrow
-    setArrowActor: function(actor) {
-        if (this._arrowActor != actor) {
-            this._arrowActor = actor;
-            this._border.queue_repaint();
-        }
-    },
-
    _shiftActor : function() {
        // Since the position of the BoxPointer depends on the allocated size
        // of the BoxPointer and the position of the source actor, trying
-        // to position the BoxPointer via the x/y properties will result in
+        // to position the BoxPoiner via the x/y properties will result in
        // allocation loops and warnings. Instead we do the positioning via
        // the anchor point, which is independent of allocation, and leave
        // x == y == 0.
@ -572,47 +561,37 @@ const BoxPointer = new Lang.Class({
                                    -(this._yPosition + this._yOffset));
    },

-    _calculateArrowSide: function(arrowSide) {
+    _shouldFlip: function() {
        let sourceAllocation = Shell.util_get_transformed_allocation(this._sourceActor);
-        let [minWidth, minHeight, boxWidth, boxHeight] = this._container.get_preferred_size();
+        let boxAllocation = Shell.util_get_transformed_allocation(this.actor);
+        let boxWidth = boxAllocation.x2 - boxAllocation.x1;
+        let boxHeight = boxAllocation.y2 - boxAllocation.y1;
        let monitor = Main.layoutManager.findMonitorForActor(this.actor);

-        switch (arrowSide) {
+        switch (this._arrowSide) {
        case St.Side.TOP:
-            if (sourceAllocation.y2 + boxHeight > monitor.y + monitor.height &&
+            if (boxAllocation.y2 > monitor.y + monitor.height &&
                boxHeight < sourceAllocation.y1 - monitor.y)
-                return St.Side.BOTTOM;
+                return true;
            break;
        case St.Side.BOTTOM:
-            if (sourceAllocation.y1 - boxHeight < monitor.y &&
+            if (boxAllocation.y1 < monitor.y &&
                boxHeight < monitor.y + monitor.height - sourceAllocation.y2)
-                return St.Side.TOP;
+                return true;
            break;
        case St.Side.LEFT:
-            if (sourceAllocation.y2 + boxWidth > monitor.x + monitor.width &&
+            if (boxAllocation.x2 > monitor.x + monitor.width &&
                boxWidth < sourceAllocation.x1 - monitor.x)
-                return St.Side.RIGHT;
+                return true;
            break;
        case St.Side.RIGHT:
-            if (sourceAllocation.y1 - boxWidth < monitor.x &&
+            if (boxAllocation.x1 < monitor.x &&
                boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
-                return St.Side.LEFT;
+                return true;
            break;
        }

-        return arrowSide;
-    },
-
-    _updateFlip: function() {
-        let arrowSide = this._calculateArrowSide(this._userArrowSide);
-        if (this._arrowSide != arrowSide) {
-            this._arrowSide = arrowSide;
-            this._reposition();
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-                this._container.queue_relayout();
-                return false;
-            }));
-        }
+        return false;
    },

    set xOffset(offset) {
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -2,7 +2,6 @@

 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Signals = imports.signals;
@ -12,6 +11,7 @@ const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;

 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
+const WEEKDATE_HEADER_WIDTH_DIGITS = 3;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';

 // in org.gnome.desktop.interface
@ -63,18 +63,15 @@ function _formatEventTime(event, clockFormat) {
    } else {
        switch (clockFormat) {
        case '24h':
-            /* Translators: Shown in calendar event list, if 24h format,
-               \u2236 is a ratio character, similar to : */
-            ret = event.date.toLocaleFormat(C_("event list time", "%H\u2236%M"));
+            /* Translators: Shown in calendar event list, if 24h format */
+            ret = event.date.toLocaleFormat(C_("event list time", "%H:%M"));
            break;

        default:
            /* explicit fall-through */
        case '12h':
-            /* Translators: Shown in calendar event list, if 12h format,
-               \u2236 is a ratio character, similar to : and \u2009 is
-               a thin space */
-            ret = event.date.toLocaleFormat(C_("event list time", "%l\u2236%M\u2009%p"));
+            /* Transators: Shown in calendar event list, if 12h format */
+            ret = event.date.toLocaleFormat(C_("event list time", "%l:%M %p"));
            break;
        }
    }
@ -98,6 +95,15 @@ function _getCalendarWeekForDate(date) {
    return weekNumber;
 }

+function _getDigitWidth(actor){
+    let context = actor.get_pango_context();
+    let themeNode = actor.get_theme_node();
+    let font = themeNode.get_font();
+    let metrics = context.get_metrics(font, context.get_language());
+    let width = metrics.get_approximate_digit_width();
+    return width;
+}
+
 function _getCalendarDayAbbreviation(dayNumber) {
    let abbreviations = [
        /* Translators: Calendar grid abbreviation for Sunday.
@ -168,12 +174,6 @@ const EmptyEventSource = new Lang.Class({
    Name: 'EmptyEventSource',

    _init: function() {
-        this.isLoading = false;
-        this.isDummy = true;
-        this.hasCalendars = false;
-    },
-
-    destroy: function() {
    },

    requestRange: function(begin, end) {
@ -197,18 +197,21 @@ const CalendarServerIface = <interface name="org.gnome.Shell.CalendarServer">
    <arg type="b" direction="in" />
    <arg type="a(sssbxxa{sv})" direction="out" />
 </method>
-<property name="HasCalendars" type="b" access="read" />
 <signal name="Changed" />
 </interface>;

 const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);

 function CalendarServer() {
-    return new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-                               g_interface_name: CalendarServerInfo.name,
-                               g_interface_info: CalendarServerInfo,
-                               g_name: 'org.gnome.Shell.CalendarServer',
-                               g_object_path: '/org/gnome/Shell/CalendarServer' });
+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
+                                   g_interface_name: CalendarServerInfo.name,
+                                   g_interface_info: CalendarServerInfo,
+                                   g_name: 'org.gnome.Shell.CalendarServer',
+                                   g_object_path: '/org/gnome/Shell/CalendarServer',
+                                   g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
+
+    self.init(null);
+    return self;
 }

 function _datesEqual(a, b) {
@ -235,49 +238,18 @@ const DBusEventSource = new Lang.Class({

    _init: function() {
        this._resetCache();
-        this.isLoading = false;
-        this.isDummy = false;

-        this._initialized = false;
        this._dbusProxy = new CalendarServer();
-        this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
-            try {
-                this._dbusProxy.init_finish(result);
-            } catch(e) {
-                log('Error loading calendars: ' + e.message);
-                return;
-            }
+        this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));

-            this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
-
-            this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
-                if (this._dbusProxy.g_name_owner)
-                    this._onNameAppeared();
-                else
-                    this._onNameVanished();
-            }));
-
-            this._dbusProxy.connect('g-properties-changed', Lang.bind(this, function() {
-                this.emit('notify::has-calendars');
-            }));
-
-            this._initialized = true;
-            this.emit('notify::has-calendars');
-            this._onNameAppeared();
+        this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
+            if (this._dbusProxy.g_name_owner)
+                this._onNameAppeared();
+            else
+                this._onNameVanished();
        }));
    },

-    destroy: function() {
-        this._dbusProxy.run_dispose();
-    },
-
-    get hasCalendars() {
-        if (this._initialized)
-            return this._dbusProxy.HasCalendars;
-        else
-            return false;
-    },
-
    _resetCache: function() {
        this._events = [];
        this._lastRequestBegin = null;
@ -317,15 +289,10 @@ const DBusEventSource = new Lang.Class({
        }

        this._events = newEvents;
-        this.isLoading = false;
        this.emit('changed');
    },

    _loadEvents: function(forceReload) {
-        // Ignore while loading
-        if (!this._initialized)
-            return;
-
        if (this._curRequestBegin && this._curRequestEnd){
            let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
            if (forceReload)
@ -340,7 +307,6 @@ const DBusEventSource = new Lang.Class({

    requestRange: function(begin, end, forceReload) {
        if (forceReload || !(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
-            this.isLoading = true;
            this._lastRequestBegin = begin;
            this._lastRequestEnd = end;
            this._curRequestBegin = begin;
@ -379,6 +345,8 @@ const Calendar = new Lang.Class({

    _init: function() {
        this._weekStart = Shell.util_get_week_start();
+        this._weekdate = NaN;
+        this._digitWidth = NaN;
        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.calendar' });

        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
@ -415,11 +383,19 @@ const Calendar = new Lang.Class({
    // @eventSource: is an object implementing the EventSource API, e.g. the
    // requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
    setEventSource: function(eventSource) {
+        if (this._eventSource) {
+            this._eventSource.disconnect(this._eventSourceChangedId);
+            this._eventSource = null;
+        }
+
        this._eventSource = eventSource;
-        this._eventSource.connect('changed', Lang.bind(this, function() {
-            this._update(false);
-        }));
-        this._update(true);
+
+        if (this._eventSource) {
+            this._eventSourceChangedId = this._eventSource.connect('changed', Lang.bind(this, function() {
+                this._update(false);
+            }));
+            this._update(true);
+        }
    },

    // Sets the calendar to show a specific date
@ -443,6 +419,8 @@ const Calendar = new Lang.Class({
        this.actor.add(this._topBox,
                       { row: 0, col: 0, col_span: offsetCols + 7 });

+        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChange));
+
        let back = new St.Button({ style_class: 'calendar-change-month-back' });
        this._topBox.add(back);
        back.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
@ -479,6 +457,18 @@ const Calendar = new Lang.Class({
        this._firstDayIndex = this.actor.get_n_children();
    },

+    _onStyleChange: function(actor, event) {
+        // width of a digit in pango units
+        this._digitWidth = _getDigitWidth(this.actor) / Pango.SCALE;
+        this._setWeekdateHeaderWidth();
+    },
+
+    _setWeekdateHeaderWidth: function() {
+        if (this.digitWidth != NaN && this._useWeekdate && this._weekdateHeader) {
+            this._weekdateHeader.set_width (this._digitWidth * WEEKDATE_HEADER_WIDTH_DIGITS);
+        }
+    },
+
    _onScroll : function(actor, event) {
        switch (event.get_scroll_direction()) {
        case Clutter.ScrollDirection.UP:
@ -556,44 +546,20 @@ const Calendar = new Lang.Class({
            children[i].destroy();

        // Start at the beginning of the week before the start of the month
-        //
-        // We want to show always 6 weeks (to keep the calendar menu at the same
-        // height if there are no events), so we pad it according to the following
-        // policy:
-        //
-        // 1 - If a month has 6 weeks, we place no padding (example: Dec 2012)
-        // 2 - If a month has 5 weeks and it starts on week start, we pad one week
-        //     before it (example: Apr 2012)
-        // 3 - If a month has 5 weeks and it starts on any other day, we pad one week
-        //     after it (example: Nov 2012)
-        // 4 - If a month has 4 weeks, we pad one week before and one after it
-        //     (example: Feb 2010)
-        //
-        // Actually computing the number of weeks is complex, but we know that the
-        // problematic categories (2 and 4) always start on week start, and that
-        // all months at the end have 6 weeks.
-
        let beginDate = new Date(this._selectedDate);
        beginDate.setDate(1);
        beginDate.setSeconds(0);
        beginDate.setHours(12);
-        let year = beginDate.getYear();
-
        let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
-        let startsOnWeekStart = daysToWeekStart == 0;
-        let weekPadding = startsOnWeekStart ? 7 : 0;
-
-        beginDate.setTime(beginDate.getTime() - (weekPadding + daysToWeekStart) * MSECS_IN_DAY);
+        beginDate.setTime(beginDate.getTime() - daysToWeekStart * MSECS_IN_DAY);

        let iter = new Date(beginDate);
        let row = 2;
-        // nRows here means 6 weeks + one header + one navbar
-        let nRows = 8;
-        while (row < 8) {
+        while (true) {
            let button = new St.Button({ label: iter.getDate().toString() });
            let rtl = button.get_text_direction() == Clutter.TextDirection.RTL;

-            if (this._eventSource.isDummy)
+            if (!this._eventSource)
                button.reactive = false;

            let iterStr = iter.toUTCString();
@ -602,9 +568,8 @@ const Calendar = new Lang.Class({
                this.setDate(newlySelectedDate, false);
            }));

-            let hasEvents = this._eventSource.hasEvents(iter);
+            let hasEvents = this._eventSource && this._eventSource.hasEvents(iter);
            let styleClass = 'calendar-day-base calendar-day';
-
            if (_isWorkDay(iter))
                styleClass += ' calendar-work-day'
            else
@ -644,13 +609,17 @@ const Calendar = new Lang.Class({
            }

            iter.setTime(iter.getTime() + MSECS_IN_DAY);
-
-            if (iter.getDay() == this._weekStart)
+            if (iter.getDay() == this._weekStart) {
+                // We stop on the first "first day of the week" after the month we are displaying
+                if (iter.getMonth() > this._selectedDate.getMonth() || iter.getYear() > this._selectedDate.getYear())
+                    break;
                row++;
+            }
        }
        // Signal to the event source that we are interested in events
        // only from this date range
-        this._eventSource.requestRange(beginDate, iter, forceReload);
+        if (this._eventSource)
+            this._eventSource.requestRange(beginDate, iter, forceReload);
    }
 });

@ -668,8 +637,16 @@ const EventsList = new Lang.Class({
    },

    setEventSource: function(eventSource) {
+        if (this._eventSource) {
+            this._eventSource.disconnect(this._eventSourceChangedId);
+            this._eventSource = null;
+        }
+
        this._eventSource = eventSource;
-        this._eventSource.connect('changed', Lang.bind(this, this._update));
+
+        if (this._eventSource) {
+            this._eventSourceChangedId = this._eventSource.connect('changed', Lang.bind(this, this._update));
+        }
    },

    _addEvent: function(dayNameBox, timeBox, eventTitleBox, includeDayName, day, time, desc) {
@ -686,6 +663,9 @@ const EventsList = new Lang.Class({
    },

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

        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);;
@ -782,9 +762,6 @@ const EventsList = new Lang.Class({
    },

    _update: function() {
-        if (this._eventSource.isLoading)
-            return;
-
        let today = new Date();
        if (_sameDay (this._date, today)) {
            this._showToday();
--- a/js/ui/centerLayout.js
+++ b/js/ui/centerLayout.js
@ -0,0 +1,93 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+
+function connectLayoutManager(layoutManager, styleChanged) {
+    let widget, styleChangedId;
+
+    function _styleChanged() {
+        let themeNode = widget.get_theme_node();
+        styleChanged(themeNode, widget);
+    }
+
+    function actorChanged() {
+        if (widget) {
+            widget.disconnect(styleChangedId);
+            styleChangedId = 0;
+        }
+
+        let actor = layoutManager.get_actor();
+        if (actor && actor instanceof St.Widget) {
+            widget = actor;
+            styleChangedId = widget.connect('style-changed', _styleChanged);
+            _styleChanged();
+        }
+    }
+
+    layoutManager.connect('notify::actor', actorChanged);
+    return layoutManager;
+}
+
+function connectSpacing(layoutManager) {
+    return connectLayoutManager(layoutManager, function(themeNode, widget) {
+        layoutManager.spacing = themeNode.get_length('spacing');
+    });
+}
+
+const CenterLayout = new Lang.Class({
+    Name: 'CenterLayout',
+    Extends: Clutter.BoxLayout,
+
+    vfunc_allocate: function(container, box, flags) {
+        let rtl = container.get_text_direction() == Clutter.TextDirection.RTL;
+
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        // Assume that these are the first three widgets and they are all visible.
+        let [left, center, right] = container.get_children();
+
+        // Only support horizontal layouts for now.
+        let [centerMinWidth, centerNaturalWidth] = center.get_preferred_width(availWidth);
+
+        let sideWidth = (availWidth - centerNaturalWidth) / 2;
+
+        let childBox = new Clutter.ActorBox();
+        childBox.y1 = box.y1;
+        childBox.y2 = box.y1 + availHeight;
+
+        if (left) {
+            let [leftMinWidth, leftNaturalWidth] = left.get_preferred_width(availWidth);
+            let leftSide = Math.min(Math.floor(sideWidth), leftNaturalWidth);
+            if (rtl) {
+                childBox.x1 = availWidth - leftSide;
+                childBox.x2 = availWidth;
+            } else {
+                childBox.x1 = 0;
+                childBox.x2 = leftSide;
+            }
+            childBox.x1 += box.x1;
+            left.allocate(childBox, flags);
+        }
+
+        childBox.x1 = box.x1 + Math.ceil(sideWidth);
+        childBox.x2 = childBox.x1 + centerNaturalWidth;
+        center.allocate(childBox, flags);
+
+        if (right) {
+            let [rightMinWidth, rightNaturalWidth] = right.get_preferred_width(availWidth);
+            let rightSide = Math.min(Math.floor(sideWidth), rightNaturalWidth);
+            if (rtl) {
+                childBox.x1 = 0;
+                childBox.x2 = rightSide;
+            } else {
+                childBox.x1 = availWidth - rightSide;
+                childBox.x2 = availWidth;
+            }
+            childBox.x1 += box.x1;
+            right.allocate(childBox, flags);
+        }
+    }
+});
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@ -8,6 +8,7 @@ const Params = imports.misc.params;
 const Shell = imports.gi.Shell;

 const GnomeSession = imports.misc.gnomeSession;
+const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;

@ -32,6 +33,7 @@ const AutomountManager = new Lang.Class({
                                    Lang.bind(this, this._InhibitorsChanged));
        this._inhibited = false;

+        this._loginManager = LoginManager.getLoginManager();
        this._volumeMonitor = Gio.VolumeMonitor.get();
    },

@ -83,29 +85,25 @@ const AutomountManager = new Lang.Class({
    _onDriveConnected: function() {
        // if we're not in the current ConsoleKit session,
        // or screensaver is active, don't play sounds
-        if (!this._session.SessionIsActive)
+        if (!this._loginManager.sessionActive)
            return;

-        global.play_theme_sound(0, 'device-added-media',
-                                _("External drive connected"),
-                                null);
+        global.play_theme_sound(0, 'device-added-media');
    },

    _onDriveDisconnected: function() {
        // if we're not in the current ConsoleKit session,
        // or screensaver is active, don't play sounds
-        if (!this._session.SessionIsActive)
+        if (!this._loginManager.sessionActive)
            return;

-        global.play_theme_sound(0, 'device-removed-media',
-                                _("External drive disconnected"),
-                                null);
+        global.play_theme_sound(0, 'device-removed-media');        
    },

    _onDriveEjectButton: function(monitor, drive) {
        // TODO: this code path is not tested, as the GVfs volume monitor
        // doesn't emit this signal just yet.
-        if (!this._session.SessionIsActive)
+        if (!this._loginManager.sessionActive)
            return;

        // we force stop/eject in this case, so we don't have to pass a
@ -145,7 +143,7 @@ const AutomountManager = new Lang.Class({
        if (params.checkSession) {
            // if we're not in the current ConsoleKit session,
            // don't attempt automount
-            if (!this._session.SessionIsActive)
+            if (!this._loginManager.sessionActive)
                return;
        }

--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@ -4,7 +4,7 @@ const Lang = imports.lang;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;

-const GnomeSession = imports.misc.gnomeSession;
+const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ShellMountOperation = imports.ui.shellMountOperation;
@ -162,7 +162,8 @@ const AutorunManager = new Lang.Class({
    Name: 'AutorunManager',

    _init: function() {
-        this._session = new GnomeSession.SessionManager();
+        this._loginManager = LoginManager.getLoginManager();
+
        this._volumeMonitor = Gio.VolumeMonitor.get();

        this._transDispatcher = new AutorunTransientDispatcher(this);
@ -214,7 +215,7 @@ const AutorunManager = new Lang.Class({
    _onMountAdded: function(monitor, mount) {
        // don't do anything if our session is not the currently
        // active one
-        if (!this._session.SessionIsActive)
+        if (!this._loginManager.sessionActive)
            return;

        this._processMount(mount, true);
@ -292,7 +293,7 @@ const AutorunResidentSource = new Lang.Class({

    _init: function(manager) {
        this.parent(_("Removable Devices"), 'media-removable');
-        this.resident = true;
+        this.showInLockScreen = false;

        this._mounts = [];

@ -300,10 +301,6 @@ const AutorunResidentSource = new Lang.Class({
        this._notification = new AutorunResidentNotification(this._manager, this);
    },

-    _createPolicy: function() {
-        return new MessageTray.NotificationPolicy({ showInLockScreen: false });
-    },
-
    buildRightClickMenu: function() {
        return null;
    },
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@ -60,14 +60,18 @@ const KeyringDialog = new Lang.Class({

        this._controlTable = null;

+        let buttons = [{ label: '',
+                         action: Lang.bind(this, this._onCancelButton),
+                         key:    Clutter.Escape
+                       },
+                       { label: '',
+                         action: Lang.bind(this, this._onContinueButton),
+                         default: true
+                       }]

-        this._cancelButton = this.addButton({ label: '',
-                                              action: Lang.bind(this, this._onCancelButton),
-                                              key: Clutter.Escape });
-        this._continueButton = this.addButton({ label: '',
-                                                action: Lang.bind(this, this._onContinueButton),
-                                                default: true },
-                                              { expand: true, x_fill: false, x_align: St.Align.END });
+        this.setButtons(buttons);
+        this._cancelButton = buttons[0].button;
+        this._continueButton = buttons[1].button;

        this.prompt.bind_property('cancel-label', this._cancelButton, 'label', GObject.BindingFlags.SYNC_CREATE);
        this.prompt.bind_property('continue-label', this._continueButton, 'label', GObject.BindingFlags.SYNC_CREATE);
@ -142,14 +146,6 @@ const KeyringDialog = new Lang.Class({
        this._messageBox.add(table, { x_fill: true, y_fill: true });
    },

-    _updateSensitivity: function(sensitive) {
-        this._passwordEntry.reactive = sensitive;
-        this._passwordEntry.clutter_text.editable = sensitive;
-
-        this._continueButton.can_focus = sensitive;
-        this._continueButton.reactive = sensitive;
-    },
-
    _ensureOpen: function() {
        // NOTE: ModalDialog.open() is safe to call if the dialog is
        // already open - it just returns true without side-effects
@ -171,14 +167,12 @@ const KeyringDialog = new Lang.Class({
    _onShowPassword: function(prompt) {
        this._buildControlTable();
        this._ensureOpen();
-        this._updateSensitivity(true);
        this._passwordEntry.grab_key_focus();
    },

    _onShowConfirm: function(prompt) {
        this._buildControlTable();
        this._ensureOpen();
-        this._updateSensitivity(true);
        this._continueButton.grab_key_focus();
    },

@ -198,7 +192,6 @@ const KeyringDialog = new Lang.Class({
    },

    _onContinueButton: function() {
-        this._updateSensitivity(false);
        this.prompt.complete();
    },

@ -222,7 +215,7 @@ const KeyringPrompter = new Lang.Class({
    enable: function() {
        this._prompter.register(Gio.DBus.session);
        this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
-                                                 Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
+                                                 Gio.BusNameOwnerFlags.REPLACE, null, null);
    },

    disable: function() {
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@ -587,19 +587,18 @@ const NetworkAgent = new Lang.Class({
    Name: 'NetworkAgent',

    _init: function() {
-        this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent' });
+        this._native = new Shell.NetworkAgent({ auto_register: false,
+                                                identifier: 'org.gnome.Shell.NetworkAgent' });

        this._dialogs = { };
        this._vpnRequests = { };

        this._native.connect('new-request', Lang.bind(this, this._newRequest));
        this._native.connect('cancel-request', Lang.bind(this, this._cancelRequest));
-
-        this._enabled = false;
    },

    enable: function() {
-        this._enabled = true;
+        this._native.register();
    },

    disable: function() {
@ -613,15 +612,10 @@ const NetworkAgent = new Lang.Class({
            this._vpnRequests[requestId].cancel(true);
        this._vpnRequests = { };

-        this._enabled = false;
+        this._native.unregister();
    },

    _newRequest:  function(agent, requestId, connection, settingName, hints, flags) {
-        if (!this._enabled) {
-            agent.respond(requestId, Shell.NetworkAgentResponse.USER_CANCELED);
-            return;
-        }
-
        if (settingName == 'vpn') {
            this._vpnRequest(requestId, connection, hints, flags);
            return;
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@ -49,7 +49,7 @@ const AuthenticationDialog = new Lang.Class({
        let messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
                                            vertical: true });
        mainContentBox.add(messageBox,
-                           { expand: true, y_align: St.Align.START });
+                           { y_align: St.Align.START });

        this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
                                            text: _("Authentication Required") });
@ -159,13 +159,14 @@ const AuthenticationDialog = new Lang.Class({
        messageBox.add(this._nullMessageLabel);
        this._nullMessageLabel.show();

-        this._cancelButton = this.addButton({ label: _("Cancel"),
-                                              action: Lang.bind(this, this.cancel),
-                                              key: Clutter.Escape });
-        this._okButton = this.addButton({ label:  _("Authenticate"),
-                                          action: Lang.bind(this, this._onAuthenticateButtonPressed),
-                                          default: true },
-                                        { expand: true, x_fill: false, x_align: St.Align.END });
+        this.setButtons([{ label: _("Cancel"),
+                           action: Lang.bind(this, this.cancel),
+                           key:    Clutter.Escape
+                         },
+                         { label:  _("Authenticate"),
+                           action: Lang.bind(this, this._onAuthenticateButtonPressed),
+                           default: true
+                         }]);

        this._doneEmitted = false;

@ -213,17 +214,8 @@ const AuthenticationDialog = new Lang.Class({
        }
    },

-    _updateSensitivity: function(sensitive) {
-        this._passwordEntry.reactive = sensitive;
-        this._passwordEntry.clutter_text.editable = sensitive;
-
-        this._okButton.can_focus = sensitive;
-        this._okButton.reactive = sensitive;
-    },
-
    _onEntryActivate: function() {
        let response = this._passwordEntry.get_text();
-        this._updateSensitivity(false);
        this._session.response(response);
        // When the user responds, dismiss already shown info and
        // error texts (if any)
@ -277,7 +269,6 @@ const AuthenticationDialog = new Lang.Class({
        this._passwordBox.show();
        this._passwordEntry.set_text('');
        this._passwordEntry.grab_key_focus();
-        this._updateSensitivity(true);
        this._ensureOpen();
    },

@ -335,19 +326,11 @@ const AuthenticationAgent = new Lang.Class({
    },

    enable: function() {
-        try {
-            this._native.register();
-        } catch(e) {
-            log('Failed to register AuthenticationAgent');
-        }
+        this._native.register();
    },

    disable: function() {
-        try {
-            this._native.unregister();
-        } catch(e) {
-            log('Failed to unregister AuthenticationAgent');
-        }
+        this._native.unregister();
    },

    _onInitiate: function(nativeAgent, actionId, message, iconName, cookie, userNames) {
--- a/js/ui/components/recorder.js
+++ b/js/ui/components/recorder.js
@ -1,6 +1,5 @@

 const Lang = imports.lang;
-const Main = imports.ui.main;

 const Gio = imports.gi.Gio;
 const Meta = imports.gi.Meta;
@ -17,15 +16,13 @@ const Recorder = new Lang.Class({
    },

    enable: function() {
-        Main.wm.addKeybinding('toggle-recording',
-                              this._bindingSettings,
-                              Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.ALL,
-                              Lang.bind(this, this._toggleRecorder));
+        global.display.add_keybinding('toggle-recording',
+                                      this._bindingSettings,
+                                      Meta.KeyBindingFlags.NONE, Lang.bind(this, this._toggleRecorder));
    },

    disable: function() {
-        Main.wm.removeKeybinding('toggle-recording');
+        global.display.remove_keybinding('toggle-recording');
    },

    _ensureRecorder: function() {
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@ -13,7 +13,6 @@ const Tp = imports.gi.TelepathyGLib;
 const History = imports.misc.history;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
-const NotificationDaemon = imports.ui.notificationDaemon;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;

@ -384,12 +383,25 @@ const TelepathyClient = new Lang.Class({
        }

        /* Display notification to ask user to accept/reject request */
-        let source = this._ensureAppSource();
+        let source = this._ensureSubscriptionSource();

        let notif = new SubscriptionRequestNotification(source, contact);
        source.notify(notif);
    },

+    _ensureSubscriptionSource: function() {
+        if (this._subscriptionSource == null) {
+            this._subscriptionSource = new MessageTray.Source(_("Subscription request"),
+                                                              'gtk-dialog-question');
+            Main.messageTray.add(this._subscriptionSource);
+            this._subscriptionSource.connect('destroy', Lang.bind(this, function () {
+                this._subscriptionSource = null;
+            }));
+        }
+
+        return this._subscriptionSource;
+    },
+
    _accountConnectionStatusNotifyCb: function(account) {
        let connectionError = account.connection_error;

@ -403,7 +415,7 @@ const TelepathyClient = new Lang.Class({
            return;

        /* Display notification that account failed to connect */
-        let source = this._ensureAppSource();
+        let source = this._ensureAccountSource();

        notif = new AccountNotification(source, account, connectionError);
        this._accountNotifications[account.get_object_path()] = notif;
@ -413,18 +425,17 @@ const TelepathyClient = new Lang.Class({
        source.notify(notif);
    },

-    _ensureAppSource: function() {
-        if (this._appSource == null) {
-            this._appSource = new MessageTray.Source(_("Chat"), 'empathy');
-            this._appSource.policy = new NotificationDaemon.NotificationApplicationPolicy('empathy');
-
-            Main.messageTray.add(this._appSource);
-            this._appSource.connect('destroy', Lang.bind(this, function () {
-                this._appSource = null;
+    _ensureAccountSource: function() {
+        if (this._accountSource == null) {
+            this._accountSource = new MessageTray.Source(_("Connection error"),
+                                                         'gtk-dialog-error');
+            Main.messageTray.add(this._accountSource);
+            this._accountSource.connect('destroy', Lang.bind(this, function () {
+                this._accountSource = null;
            }));
        }

-        return this._appSource;
+        return this._accountSource;
    }
 });

@ -481,16 +492,12 @@ const ChatSource = new Lang.Class({
        }));
        item.connect('activate', Lang.bind(this, function() {
            this.setMuted(!this.isMuted);
-            this.emit('done-displaying-content', false);
+            this.emit('done-displaying-content');
        }));
        rightClickMenu.add(item.actor);
        return rightClickMenu;
    },

-    _createPolicy: function() {
-        return new NotificationDaemon.NotificationApplicationPolicy('empathy');
-    },
-
    _updateAlias: function() {
        let oldAlias = this.title;
        let newAlias = this._contact.get_alias();
@ -640,10 +647,6 @@ const ChatSource = new Lang.Class({
        return this._pendingMessages.length;
    },

-    get indicatorCount() {
-        return this.count;
-    },
-
    get unseenCount() {
        return this.count;
    },
@ -741,7 +744,8 @@ const ChatSource = new Lang.Class({
    _ackMessages: function() {
        // Don't clear our messages here, tp-glib will send a
        // 'pending-message-removed' for each one.
-        this._channel.ack_all_pending_messages_async(null);
+        this._channel.ack_all_pending_messages_async(Lang.bind(this, function(src, result) {
+            this._channel.ack_all_pending_messages_finish(result);}));
    }
 });

@ -767,19 +771,16 @@ const ChatNotification = new Lang.Class({
            this.emit('unfocused');
        }));

+        this._oldMaxScrollAdjustment = 0;
        this._createScrollArea();
        this._lastGroup = null;
        this._lastGroupActor = null;

-        // Keep track of the bottom position for the current adjustment and
-        // force a scroll to the bottom if things change while we were at the
-        // bottom
-        this._oldMaxScrollValue = this._scrollArea.vscroll.adjustment.value;
-        this._scrollArea.add_style_class_name('chat-notification-scrollview');
        this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
-            if (adjustment.value == this._oldMaxScrollValue)
+            let currentValue = adjustment.value + adjustment.page_size;
+            if (currentValue == this._oldMaxScrollAdjustment)
                this.scrollTo(St.Side.BOTTOM);
-            this._oldMaxScrollValue = Math.max(adjustment.lower, adjustment.upper - adjustment.page_size);
+            this._oldMaxScrollAdjustment = adjustment.upper;
        }));

        this._inputHistory = new History.HistoryManager({ entry: this._responseEntry.clutter_text });
@ -937,24 +938,26 @@ const ChatNotification = new Lang.Class({
        }
        // Show the word "Yesterday" and time if date is on yesterday
        else if(daysAgo <2){
-            /* Translators: this is the word "Yesterday" followed by a time string. i.e. "Yesterday, 14:30"*/
+            /* Translators: this is a time format string followed by the word "Yesterday". i.e. "14:30 on Yesterday"*/
            // xgettext:no-c-format
-            format = _("<b>Yesterday</b>, <b>%H:%M</b>");
+            format = _("<b>%H:%M</b> on Yesterday");
        }
        // Show a week day and time if date is in the last week
        else if (daysAgo < 7) {
-            /* Translators: this is the week day name followed by a time string. i.e. "Monday, 14:30*/
+            /* Translators: this is a time format string followed by a week day name. i.e. "14:30 on Monday*/
            // xgettext:no-c-format
-            format = _("<b>%A</b>, <b>%H:%M</b>");
+            format = _("<b>%H:%M</b> on <b>%A</b>");

        } else if (date.getYear() == now.getYear()) {
-            /* Translators: this is the month name and day number followed by a time string. i.e. "May 25, 14:30"*/
+            /* Translators: this is a time format in the style of "14:30 on Wednesday, May 25",
+             shown when you get a chat message in the same year */
            // xgettext:no-c-format
-            format = _("<b>%B</b> <b>%d</b>, <b>%H:%M</b>");
+            format = _("<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>");
        } else {
-            /* Translators: this is the month name, day number, year number followed by a time string. i.e. "May 25 2012, 14:30"*/
+            /* Translators: this is a time format in the style of "14:30 on Wednesday, May 25, 2012",
+             shown when you get a chat message in a different year */
            // xgettext:no-c-format
-            format = _("<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> ");
+            format = _("<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y");
        }

        return date.toLocaleFormat(format);
@ -1059,10 +1062,6 @@ const ApproverSource = new Lang.Class({
        }));
    },

-    _createPolicy: function() {
-        return new NotificationDaemon.NotificationApplicationPolicy('empathy');
-    },
-
    destroy: function() {
        if (this._invalidId != 0) {
            this._dispatchOp.disconnect(this._invalidId);
@ -1134,7 +1133,7 @@ const AudioVideoNotification = new Lang.Class({
        this.parent(source, title, null, { customContent: true });
        this.setResident(true);

-        this.addButton('reject', _("Decline"));
+        this.addButton('reject', _("Reject"));
        /* translators: this is a button label (verb), not a noun */
        this.addButton('answer', _("Answer"));

@ -1351,18 +1350,29 @@ const AccountNotification = new Lang.Class({
        this.parent(source,
                    /* translators: argument is the account name, like
                     * name@jabber.org for example. */
-                    _("Unable to connect to %s").format(account.get_display_name()),
-                    this._getMessage(connectionError));
+                    _("Connection to %s failed").format(account.get_display_name()),
+                    null, { customContent: true });
+
+        this._label = new St.Label();
+        this.addActor(this._label);
+        this._updateMessage(connectionError);

        this._account = account;

-        this.addButton('view', _("View account"));
+        this.addButton('reconnect', _("Reconnect"));
+        this.addButton('edit', _("Edit account"));

        this.connect('action-invoked', Lang.bind(this, function(self, action) {
            switch (action) {
-            case 'view':
-                let cmd = 'empathy-accounts --select-account=' +
-                          account.get_path_suffix();
+            case 'reconnect':
+                // If it fails again, a new notification should pop up with the
+                // new error.
+                account.reconnect_async(null);
+                break;
+            case 'edit':
+                let cmd = '/usr/bin/empathy-accounts'
+                        + ' --select-account=%s'
+                        .format(account.get_path_suffix());
                let app_info = Gio.app_info_create_from_commandline(cmd, null, 0);
                app_info.launch([], global.create_app_launch_context());
                break;
@ -1385,19 +1395,19 @@ const AccountNotification = new Lang.Class({
                if (status == Tp.ConnectionStatus.CONNECTED) {
                    this.destroy();
                } else if (status == Tp.ConnectionStatus.DISCONNECTED) {
-                    this.update(this.title, this._getMessage(account.connection_error));
+                    this._updateMessage(account.connection_error);
                }
            }));
    },

-    _getMessage: function(connectionError) {
+    _updateMessage: function(connectionError) {
        let message;
        if (connectionError in _connectionErrorMessages) {
            message = _connectionErrorMessages[connectionError];
        } else {
            message = _("Unknown reason");
        }
-        return message;
+        this._label.set_text(message);
    },

    destroy: function() {
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@ -1,14 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;

+const AltTab = imports.ui.altTab;
 const Main = imports.ui.main;
-const SwitcherPopup = imports.ui.switcherPopup;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;

@ -26,9 +27,6 @@ const CtrlAltTabManager = new Lang.Class({

    _init: function() {
        this._items = [];
-        this.addGroup(global.window_group, _("Windows"),
-                      'emblem-documents-symbolic', { sortGroup: SortGroup.TOP,
-                                                     focusCallback: Lang.bind(this, this._focusWindows) });
    },

    addGroup: function(root, name, icon, params) {
@ -42,13 +40,11 @@ const CtrlAltTabManager = new Lang.Class({

        this._items.push(item);
        root.connect('destroy', Lang.bind(this, function() { this.removeGroup(root); }));
-        if (root instanceof St.Widget)
-            global.focus_manager.add_group(root);
+        global.focus_manager.add_group(root);
    },

    removeGroup: function(root) {
-        if (root instanceof St.Widget)
-            global.focus_manager.remove_group(root);
+        global.focus_manager.remove_group(root);
        for (let i = 0; i < this._items.length; i++) {
            if (this._items[i].root == root) {
                this._items.splice(i, 1);
@ -57,9 +53,11 @@ const CtrlAltTabManager = new Lang.Class({
        }
    },

-    focusGroup: function(item, timestamp) {
-        if (item.focusCallback) {
-            item.focusCallback(timestamp);
+    focusGroup: function(item) {
+        if (item.window) {
+            Main.activateWindow(item.window);
+        } else if (item.focusCallback) {
+            item.focusCallback();
        } else {
            if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
                global.stage_input_mode == Shell.StageInputMode.NORMAL)
@ -77,14 +75,24 @@ const CtrlAltTabManager = new Lang.Class({
        if (a.sortGroup != b.sortGroup)
            return a.sortGroup - b.sortGroup;

-        let ax, bx, y;
-        [ax, y] = a.proxy.get_transformed_position();
-        [bx, y] = b.proxy.get_transformed_position();
+        let y;
+        if (a.x == undefined) {
+            if (a.window)
+                a.x = a.window.get_compositor_private().x;
+            else
+                [a.x, y] = a.proxy.get_transformed_position();
+        }
+        if (b.x == undefined) {
+            if (b.window)
+                b.x = b.window.get_compositor_private().x;
+            else
+                [b.x, y] = b.proxy.get_transformed_position();
+        }

-        return ax - bx;
+        return a.x - b.x;
    },

-    popup: function(backward, binding, mask) {
+    popup: function(backwards, mask) {
        // Start with the set of focus groups that are currently mapped
        let items = this._items.filter(function (item) { return item.proxy.mapped; });

@ -102,12 +110,8 @@ const CtrlAltTabManager = new Lang.Class({
                    icon = app.create_icon_texture(POPUP_APPICON_SIZE);
                else
                    icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
-                items.push({ name: windows[i].title,
-                             proxy: windows[i].get_compositor_private(),
-                             focusCallback: Lang.bind(windows[i],
-                                 function(timestamp) {
-                                     Main.activateWindow(this, timestamp);
-                                 }),
+                items.push({ window: windows[i],
+                             name: windows[i].title,
                             iconActor: icon,
                             sortGroup: SortGroup.MIDDLE });
            }
@ -119,63 +123,187 @@ const CtrlAltTabManager = new Lang.Class({
        items.sort(Lang.bind(this, this._sortItems));

        if (!this._popup) {
-            this._popup = new CtrlAltTabPopup(items);
-            this._popup.show(backward, binding, mask);
+            this._popup = new CtrlAltTabPopup();
+            this._popup.show(items, backwards, mask);

            this._popup.actor.connect('destroy',
                                      Lang.bind(this, function() {
                                          this._popup = null;
                                      }));
        }
-    },
-
-    _focusWindows: function(timestamp) {
-        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
-        global.stage.key_focus = null;
-        global.screen.focus_default_window(timestamp);
    }
 });

+function mod(a, b) {
+    return (a + b) % b;
+}
+
 const CtrlAltTabPopup = new Lang.Class({
    Name: 'CtrlAltTabPopup',
-    Extends: SwitcherPopup.SwitcherPopup,

-    _createSwitcher: function() {
-        this._switcherList = new CtrlAltTabSwitcher(this._items);
+    _init : function() {
+        this.actor = new Shell.GenericContainer({ name: 'ctrlAltTabPopup',
+                                                  reactive: true });
+
+        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this.actor.connect('allocate', Lang.bind(this, this._allocate));
+
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+
+        this._haveModal = false;
+        this._modifierMask = 0;
+        this._selection = 0;
+
+        Main.uiGroup.add_actor(this.actor);
+    },
+
+    _getPreferredWidth: function (actor, forHeight, alloc) {
+        let primary = Main.layoutManager.primaryMonitor;
+
+        alloc.min_size = primary.width;
+        alloc.natural_size = primary.width;
+    },
+
+    _getPreferredHeight: function (actor, forWidth, alloc) {
+        let primary = Main.layoutManager.primaryMonitor;
+
+        alloc.min_size = primary.height;
+        alloc.natural_size = primary.height;
+    },
+
+    _allocate: function (actor, box, flags) {
+        let childBox = new Clutter.ActorBox();
+        let primary = Main.layoutManager.primaryMonitor;
+
+        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
+        let vPadding = this.actor.get_theme_node().get_vertical_padding();
+        let hPadding = this.actor.get_theme_node().get_horizontal_padding();
+
+        let [childMinHeight, childNaturalHeight] = this._switcher.actor.get_preferred_height(primary.width - hPadding);
+        let [childMinWidth, childNaturalWidth] = this._switcher.actor.get_preferred_width(childNaturalHeight);
+        childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
+        childBox.x2 = Math.min(primary.x + primary.width - hPadding, childBox.x1 + childNaturalWidth);
+        childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
+        childBox.y2 = childBox.y1 + childNaturalHeight;
+        this._switcher.actor.allocate(childBox, flags);
+    },
+
+    show : function(items, startBackwards, mask) {
+        if (!Main.pushModal(this.actor))
+            return false;
+        this._haveModal = true;
+        this._modifierMask = AltTab.primaryModifier(mask);
+
+        this._keyPressEventId = this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
+        this._keyReleaseEventId = this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
+
+        this._items = items;
+        this._switcher = new CtrlAltTabSwitcher(items);
+        this.actor.add_actor(this._switcher.actor);
+
+        if (startBackwards)
+            this._selection = this._items.length - 1;
+        this._select(this._selection);
+
+        let [x, y, mods] = global.get_pointer();
+        if (!(mods & this._modifierMask)) {
+            this._finish();
+            return false;
+        }
+
+        this.actor.opacity = 0;
+        this.actor.show();
+        Tweener.addTween(this.actor,
+                         { opacity: 255,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad'
+                         });
+
        return true;
    },

-    _initialSelection: function(backward, binding) {
-        if (binding == 'switch-panels') {
-            if (backward)
-                this._selectedIndex = this._items.length - 1;
-        } else if (binding == 'switch-panels-backward') {
-            if (!backward)
-                this._selectedIndex = this._items.length - 1;
-        }
-        this._select(this._selectedIndex);
+    _next : function() {
+        return mod(this._selection + 1, this._items.length);
    },

-    _keyPressHandler: function(keysym, backwards, action) {
-        if (action == Meta.KeyBindingAction.SWITCH_PANELS)
-            this._select(backwards ? this._previous() : this._next());
-        else if (action == Meta.KeyBindingAction.SWITCH_PANELS_BACKWARD)
-            this._select(backwards ? this._next() : this._previous());
-        else if (keysym == Clutter.Left)
-            this._select(this._previous());
-        else if (keysym == Clutter.Right)
+    _previous : function() {
+        return mod(this._selection - 1, this._items.length);
+    },
+
+    _keyPressEvent : function(actor, event) {
+        let keysym = event.get_key_symbol();
+        let shift = (event.get_state() & Clutter.ModifierType.SHIFT_MASK);
+        if (shift && keysym == Clutter.KEY_Tab)
+            keysym = Clutter.ISO_Left_Tab;
+
+        if (keysym == Clutter.KEY_Escape)
+            this.destroy();
+        else if (keysym == Clutter.KEY_Tab)
            this._select(this._next());
+        else if (keysym == Clutter.KEY_ISO_Left_Tab)
+            this._select(this._previous());
+        else if (keysym == Clutter.KEY_Left)
+            this._select(this._previous());
+        else if (keysym == Clutter.KEY_Right)
+            this._select(this._next());
+
+        return true;
    },

-    _finish : function(time) {
-        this.parent(time);
-        Main.ctrlAltTabManager.focusGroup(this._items[this._selectedIndex], time);
+    _keyReleaseEvent : function(actor, event) {
+        let [x, y, mods] = global.get_pointer();
+        let state = mods & this._modifierMask;
+
+        if (state == 0)
+            this._finish();
+
+        return true;
    },
+
+    _finish : function() {
+        this.destroy();
+
+        Main.ctrlAltTabManager.focusGroup(this._items[this._selection]);
+    },
+
+    _popModal: function() {
+        if (this._haveModal) {
+            Main.popModal(this.actor);
+            this._haveModal = false;
+        }
+    },
+
+    destroy : function() {
+        this._popModal();
+        Tweener.addTween(this.actor,
+                         { opacity: 0,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.actor.destroy();
+                               })
+                         });
+    },
+
+    _onDestroy : function() {
+        this._popModal();
+        if (this._keyPressEventId)
+            this.actor.disconnect(this._keyPressEventId);
+        if (this._keyReleaseEventId)
+            this.actor.disconnect(this._keyReleaseEventId);
+    },
+
+    _select : function(num) {
+        this._selection = num;
+        this._switcher.highlight(num);
+    }
 });

 const CtrlAltTabSwitcher = new Lang.Class({
    Name: 'CtrlAltTabSwitcher',
-    Extends: SwitcherPopup.SwitcherList,
+    Extends: AltTab.SwitcherList,

    _init : function(items) {
        this.parent(true);
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -22,8 +22,12 @@ const DASH_ITEM_LABEL_HIDE_TIME = 0.1;
 const DASH_ITEM_HOVER_TIMEOUT = 300;

 function getAppFromSource(source) {
-    if (source instanceof AppDisplay.AppIcon) {
-        return source.app;
+    if (source instanceof AppDisplay.AppWellIcon) {
+        let appSystem = Shell.AppSystem.get_default();
+        return appSystem.lookup_app(source.getId());
+    } else if (source.metaWindow) {
+        let tracker = Shell.WindowTracker.get_default();
+        return tracker.get_window_app(source.metaWindow);
    } else {
        return null;
    }
@ -33,26 +37,30 @@ function getAppFromSource(source) {
 // when requesting a size
 const DashItemContainer = new Lang.Class({
    Name: 'DashItemContainer',
-    Extends: St.Widget,

    _init: function() {
-        this.parent({ style_class: 'dash-item-container' });
+        this.actor = new Shell.GenericContainer({ style_class: 'dash-item-container' });
+        this.actor.connect('get-preferred-width',
+                           Lang.bind(this, this._getPreferredWidth));
+        this.actor.connect('get-preferred-height',
+                           Lang.bind(this, this._getPreferredHeight));
+        this.actor.connect('allocate',
+                           Lang.bind(this, this._allocate));
+        this.actor._delegate = this;

        this._labelText = "";
        this.label = new St.Label({ style_class: 'dash-label'});
        this.label.hide();
        Main.layoutManager.addChrome(this.label);
-        this.label_actor = this.label;
+        this.actor.label_actor = this.label;

        this.child = null;
-        this._childScale = 0;
-        this._childOpacity = 0;
+        this._childScale = 1;
+        this._childOpacity = 255;
        this.animatingOut = false;
    },

-    vfunc_allocate: function(box, flags) {
-        this.set_allocation(box, flags);
-
+    _allocate: function(actor, box, flags) {
        if (this.child == null)
            return;

@ -74,28 +82,28 @@ const DashItemContainer = new Lang.Class({
        this.child.allocate(childBox, flags);
    },

-    vfunc_get_preferred_height: function(forWidth) {
-        let themeNode = this.get_theme_node();
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        alloc.min_size = 0;
+        alloc.natural_size = 0;

        if (this.child == null)
-            return [0, 0];
+            return;

-        forWidth = themeNode.adjust_for_width(forWidth);
        let [minHeight, natHeight] = this.child.get_preferred_height(forWidth);
-        return themeNode.adjust_preferred_height(minHeight * this.child.scale_y,
-                                                 natHeight * this.child.scale_y);
+        alloc.min_size += minHeight * this.child.scale_y;
+        alloc.natural_size += natHeight * this.child.scale_y;
    },

-    vfunc_get_preferred_width: function(forHeight) {
-        let themeNode = this.get_theme_node();
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        alloc.min_size = 0;
+        alloc.natural_size = 0;

        if (this.child == null)
-            return [0, 0];
+            return;

-        forHeight = themeNode.adjust_for_height(forHeight);
        let [minWidth, natWidth] = this.child.get_preferred_width(forHeight);
-        return themeNode.adjust_preferred_width(minWidth * this.child.scale_y,
-                                                natWidth * this.child.scale_y);
+        alloc.min_size = minWidth * this.child.scale_y;
+        alloc.natural_size = natWidth * this.child.scale_y;
    },

    showLabel: function() {
@ -106,9 +114,9 @@ const DashItemContainer = new Lang.Class({
        this.label.opacity = 0;
        this.label.show();

-        let [stageX, stageY] = this.get_transformed_position();
+        let [stageX, stageY] = this.actor.get_transformed_position();

-        let itemHeight = this.allocation.y2 - this.allocation.y1;
+        let itemHeight = this.actor.allocation.y2 - this.actor.allocation.y1;

        let labelHeight = this.label.get_height();
        let yOffset = Math.floor((itemHeight - labelHeight) / 2)
@ -122,7 +130,7 @@ const DashItemContainer = new Lang.Class({
        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
            x = stageX - this.label.get_width() - xOffset;
        else
-            x = stageX + this.get_width() + xOffset;
+            x = stageX + this.actor.get_width() + xOffset;

        this.label.set_position(x, y);
        Tweener.addTween(this.label,
@ -134,7 +142,6 @@ const DashItemContainer = new Lang.Class({

    setLabelText: function(text) {
        this._labelText = text;
-        this.child.accessible_name = text;
    },

    hideLabel: function () {
@ -152,25 +159,22 @@ const DashItemContainer = new Lang.Class({
        if (this.child == actor)
            return;

-        this.destroy_all_children();
+        this.actor.destroy_all_children();

        this.child = actor;
-        this.add_actor(this.child);
-
-        this.child.set_scale_with_gravity(this._childScale, this._childScale,
-                                          Clutter.Gravity.CENTER);
-        this.child.set_opacity(this._childOpacity);
+        this.actor.add_actor(this.child);
    },

-    show: function(animate) {
+    animateIn: function() {
        if (this.child == null)
            return;

-        let time = animate ? DASH_ANIMATION_TIME : 0;
+        this.childScale = 0;
+        this.childOpacity = 0;
        Tweener.addTween(this,
                         { childScale: 1.0,
                           childOpacity: 255,
-                           time: time,
+                           time: DASH_ANIMATION_TIME,
                           transition: 'easeOutQuad'
                         });
    },
@ -179,7 +183,7 @@ const DashItemContainer = new Lang.Class({
        if (this.label)
            this.label.destroy();

-        this.parent();
+        this.actor.destroy();
    },

    animateOutAndDestroy: function() {
@ -187,18 +191,19 @@ const DashItemContainer = new Lang.Class({
            this.label.destroy();

        if (this.child == null) {
-            this.destroy();
+            this.actor.destroy();
            return;
        }

        this.animatingOut = true;
+        this.childScale = 1.0;
        Tweener.addTween(this,
                         { childScale: 0.0,
                           childOpacity: 0,
                           time: DASH_ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: Lang.bind(this, function() {
-                               this.destroy();
+                               this.actor.destroy();
                           })
                         });
    },
@ -211,7 +216,7 @@ const DashItemContainer = new Lang.Class({

        this.child.set_scale_with_gravity(scale, scale,
                                          Clutter.Gravity.CENTER);
-        this.queue_relayout();
+        this.actor.queue_relayout();
    },

    get childScale() {
@ -225,7 +230,7 @@ const DashItemContainer = new Lang.Class({
            return;

        this.child.set_opacity(opacity);
-        this.queue_redraw();
+        this.actor.queue_redraw();
    },

    get childOpacity() {
@ -254,6 +259,7 @@ const ShowAppsIcon = new Lang.Class({

        this.setChild(this.toggleButton);
        this.setDragApp(null);
+        this.toggleButton.label_actor = this.label;
    },

    _createIcon: function(size) {
@ -356,23 +362,6 @@ const DashActor = new Lang.Class({
        childBox.y1 = contentBox.y2 - showAppsNatHeight;
        childBox.y2 = contentBox.y2;
        showAppsButton.allocate(childBox, flags);
-    },
-
-    vfunc_get_preferred_height: function(forWidth) {
-        // We want to request the natural height of all our children
-        // as our natural height, so we chain up to StWidget (which
-        // then calls BoxLayout), but we only request the showApps
-        // button as the minimum size
-
-        let [, natHeight] = this.parent(forWidth);
-
-        let themeNode = this.get_theme_node();
-        let adjustedForWidth = themeNode.adjust_for_width(forWidth);
-        let [, showAppsButton] = this.get_children();
-        let [minHeight, ] = showAppsButton.get_preferred_height(adjustedForWidth);
-        [minHeight, ] = themeNode.adjust_preferred_height(minHeight, natHeight);
-
-        return [minHeight, natHeight];
    }
 });

@ -383,6 +372,9 @@ const Dash = new Lang.Class({
        this._maxHeight = -1;
        this.iconSize = 64;
        this._shownInitially = false;
+        this.visible = false;
+        this._hiddenX;
+        this._targetX;

        this._dragPlaceholder = null;
        this._dragPlaceholderPos = -1;
@ -398,21 +390,20 @@ const Dash = new Lang.Class({
        this._container.add_actor(this._box);

        this._showAppsIcon = new ShowAppsIcon();
-        this._showAppsIcon.childScale = 1;
-        this._showAppsIcon.childOpacity = 255;
        this._showAppsIcon.icon.setIconSize(this.iconSize);
        this._hookUpLabel(this._showAppsIcon);

        this.showAppsButton = this._showAppsIcon.toggleButton;

-        this._container.add_actor(this._showAppsIcon);
+        this._container.add_actor(this._showAppsIcon.actor);

        this.actor = new St.Bin({ child: this._container });
        this.actor.connect('notify::height', Lang.bind(this,
            function() {
                if (this._maxHeight != this.actor.height)
                    this._queueRedisplay();
-                this._maxHeight = this.actor.height;
+                if (this.actor.height > this._maxHeight)
+                    this._maxHeight = this.actor.height;
            }));

        this._workId = Main.initializeDeferredWork(this._box, Lang.bind(this, this._redisplay));
@ -423,16 +414,18 @@ const Dash = new Lang.Class({
        AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay));
        this._appSystem.connect('app-state-changed', Lang.bind(this, this._queueRedisplay));

-        Main.overview.connect('item-drag-begin',
+        Main.overview.connect('app-drag-begin',
                              Lang.bind(this, this._onDragBegin));
-        Main.overview.connect('item-drag-end',
+        Main.overview.connect('app-drag-end',
                              Lang.bind(this, this._onDragEnd));
-        Main.overview.connect('item-drag-cancelled',
+        Main.overview.connect('app-drag-cancelled',
                              Lang.bind(this, this._onDragCancelled));
-
-        // Translators: this is the name of the dock/favorites area on
-        // the left of the overview
-        Main.ctrlAltTabManager.addGroup(this.actor, _("Dash"), 'user-bookmarks-symbolic');
+        Main.overview.connect('window-drag-begin',
+                              Lang.bind(this, this._onDragBegin));
+        Main.overview.connect('window-drag-cancelled',
+                              Lang.bind(this, this._onDragCancelled));
+        Main.overview.connect('window-drag-end',
+                              Lang.bind(this, this._onDragEnd));
    },

    _onDragBegin: function() {
@ -467,7 +460,7 @@ const Dash = new Lang.Class({
            return DND.DragMotionResult.CONTINUE;

        let showAppsHovered =
-                this._showAppsIcon.contains(dragEvent.targetActor);
+                this._showAppsIcon.actor.contains(dragEvent.targetActor);

        if (!this._box.contains(dragEvent.targetActor) || showAppsHovered)
            this._clearDragPlaceholder();
@ -503,51 +496,32 @@ const Dash = new Lang.Class({
    },

    _createAppItem: function(app) {
-        let appIcon = new AppDisplay.AppIcon(app,
-                                             { setSizeManually: true,
-                                               showLabel: false });
-        appIcon._draggable.connect('drag-begin',
+        let display = new AppDisplay.AppWellIcon(app,
+                                                 { setSizeManually: true,
+                                                   showLabel: false });
+        display._draggable.connect('drag-begin',
                                   Lang.bind(this, function() {
-                                       appIcon.actor.opacity = 50;
+                                       display.actor.opacity = 50;
                                   }));
-        appIcon._draggable.connect('drag-end',
+        display._draggable.connect('drag-end',
                                   Lang.bind(this, function() {
-                                       appIcon.actor.opacity = 255;
+                                       display.actor.opacity = 255;
                                   }));
-        appIcon.connect('menu-state-changed',
-                        Lang.bind(this, function(appIcon, opened) {
-                            this._itemMenuStateChanged(item, opened);
-                        }));

        let item = new DashItemContainer();
-        item.setChild(appIcon.actor);
+        item.setChild(display.actor);

-        // Override default AppIcon label_actor, now the
-        // accessible_name is set at DashItemContainer.setLabelText
-        appIcon.actor.label_actor = null;
        item.setLabelText(app.get_name());
-
-        appIcon.icon.setIconSize(this.iconSize);
+        // Override default AppWellIcon label_actor
+        display.actor.label_actor = item.label;
+        display.icon.setIconSize(this.iconSize);
        this._hookUpLabel(item);

        return item;
    },

-    _itemMenuStateChanged: function(item, opened) {
-        // When the menu closes, it calls sync_hover, which means
-        // that the notify::hover handler does everything we need to.
-        if (opened) {
-            if (this._showLabelTimeoutId > 0) {
-                Mainloop.source_remove(this._showLabelTimeoutId);
-                this._showLabelTimeoutId = 0;
-            }
-
-            item.hideLabel();
-        }
-    },
-
    _onHover: function (item) {
-        if (item.child.get_hover()) {
+        if (item.child.get_hover() && !item.child._delegate.isMenuUp) {
            if (this._showLabelTimeoutId == 0) {
                let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
                this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
@ -576,19 +550,30 @@ const Dash = new Lang.Class({
        }
    },

+    _computeDashX: function() {
+        this._targetX = this.actor.get_x();
+
+        let rtl = (this.actor.get_text_direction() == Clutter.TextDirection.RTL);
+
+        if (rtl)
+            this._hiddenX = this._targetX + this.actor.width;
+        else
+            this._hiddenX = -this.actor.width;
+    },
+
    _adjustIconSize: function() {
        // For the icon size, we only consider children which are "proper"
        // icons (i.e. ignoring drag placeholders) and which are not
        // animating out (which means they will be destroyed at the end of
        // the animation)
        let iconChildren = this._box.get_children().filter(function(actor) {
-            return actor.child &&
-                   actor.child._delegate &&
-                   actor.child._delegate.icon &&
-                   !actor.animatingOut;
+            return actor._delegate.child &&
+                   actor._delegate.child._delegate &&
+                   actor._delegate.child._delegate.icon &&
+                   !actor._delegate.animatingOut;
        });

-        iconChildren.push(this._showAppsIcon);
+        iconChildren.push(this._showAppsIcon.actor);

        if (this._maxHeight == -1)
            return;
@ -601,18 +586,23 @@ const Dash = new Lang.Class({
        let availHeight = maxContent.y2 - maxContent.y1;
        let spacing = themeNode.get_length('spacing');

-        let firstButton = iconChildren[0].child;
-        let firstIcon = firstButton._delegate.icon;
+
+        let firstIcon = iconChildren[0]._delegate.child._delegate.icon;

        let minHeight, natHeight;

-        // Enforce the current icon size during the size request
-        let [currentWidth, currentHeight] = firstIcon.icon.get_size();
+        // Enforce the current icon size during the size request if
+        // the icon is animating
+        if (firstIcon._animating) {
+            let [currentWidth, currentHeight] = firstIcon.icon.get_size();

-        firstIcon.icon.set_size(this.iconSize, this.iconSize);
-        [minHeight, natHeight] = firstButton.get_preferred_height(-1);
+            firstIcon.icon.set_size(this.iconSize, this.iconSize);
+            [minHeight, natHeight] = iconChildren[0].get_preferred_height(-1);

-        firstIcon.icon.set_size(currentWidth, currentHeight);
+            firstIcon.icon.set_size(currentWidth, currentHeight);
+        } else {
+            [minHeight, natHeight] = iconChildren[0].get_preferred_height(-1);
+        }

        // Subtract icon padding and box spacing from the available height
        availHeight -= iconChildren.length * (natHeight - this.iconSize) +
@ -637,17 +627,15 @@ const Dash = new Lang.Class({

        let scale = oldIconSize / newIconSize;
        for (let i = 0; i < iconChildren.length; i++) {
-            let icon = iconChildren[i].child._delegate.icon;
+            let icon = iconChildren[i]._delegate.child._delegate.icon;

            // Set the new size immediately, to keep the icons' sizes
            // in sync with this.iconSize
            icon.setIconSize(this.iconSize);

            // Don't animate the icon size change when the overview
-            // is transitioning, not visible or when initially filling
-            // the dash
-            if (!Main.overview.visible || Main.overview.animationInProgress ||
-                !this._shownInitially)
+            // is not visible or when initially filling the dash
+            if (!Main.overview.visible || !this._shownInitially)
                continue;

            let [targetWidth, targetHeight] = icon.icon.get_size();
@ -657,13 +645,19 @@ const Dash = new Lang.Class({
            icon.icon.set_size(icon.icon.width * scale,
                               icon.icon.height * scale);

+            icon._animating = true;
            Tweener.addTween(icon.icon,
                             { width: targetWidth,
                               height: targetHeight,
                               time: DASH_ANIMATION_TIME,
                               transition: 'easeOutQuad',
+                               onComplete: function() {
+                                   icon._animating = false;
+                               }
                             });
        }
+
+        this._computeDashX();
    },

    _redisplay: function () {
@ -672,13 +666,13 @@ const Dash = new Lang.Class({
        let running = this._appSystem.get_running();

        let children = this._box.get_children().filter(function(actor) {
-                return actor.child &&
-                       actor.child._delegate &&
-                       actor.child._delegate.app;
+                return actor._delegate.child &&
+                       actor._delegate.child._delegate &&
+                       actor._delegate.child._delegate.app;
            });
        // Apps currently in the dash
        let oldApps = children.map(function(actor) {
-                return actor.child._delegate.app;
+                return actor._delegate.child._delegate.app;
            });
        // Apps supposed to be in the dash
        let newApps = [];
@ -744,7 +738,7 @@ const Dash = new Lang.Class({
            let insertHere = newApps[newIndex + 1] &&
                             newApps[newIndex + 1] == oldApps[oldIndex];
            let alreadyRemoved = removedActors.reduce(function(result, actor) {
-                let removedApp = actor.child._delegate.app;
+                let removedApp = actor._delegate.child._delegate.app;
                return result || removedApp == newApps[newIndex];
            }, false);

@ -761,15 +755,14 @@ const Dash = new Lang.Class({
        }

        for (let i = 0; i < addedItems.length; i++)
-            this._box.insert_child_at_index(addedItems[i].item,
+            this._box.insert_child_at_index(addedItems[i].item.actor,
                                            addedItems[i].pos);

        for (let i = 0; i < removedActors.length; i++) {
-            let item = removedActors[i];
+            let item = removedActors[i]._delegate;

-            // Don't animate item removal when the overview is transitioning
-            // or hidden
-            if (Main.overview.visible && !Main.overview.animationInProgress)
+            // Don't animate item removal when the overview is hidden
+            if (Main.overview.visible)
                item.animateOutAndDestroy();
            else
                item.destroy();
@ -779,20 +772,18 @@ const Dash = new Lang.Class({

        // Skip animations on first run when adding the initial set
        // of items, to avoid all items zooming in at once
-
-        let animate = this._shownInitially && Main.overview.visible &&
-            !Main.overview.animationInProgress;
-
-        if (!this._shownInitially)
+        if (!this._shownInitially) {
            this._shownInitially = true;
-
-        for (let i = 0; i < addedItems.length; i++) {
-            addedItems[i].item.show(animate);
+            this.visible = true;
+            return;
        }

-        // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=692744
-        // Without it, StBoxLayout may use a stale size cache
-        this._box.queue_relayout();
+        // Don't animate item addition when the overview is hidden
+        if (!Main.overview.visible)
+            return;
+
+        for (let i = 0; i < addedItems.length; i++)
+            addedItems[i].item.animateIn();
    },

    _clearDragPlaceholder: function() {
@ -823,7 +814,7 @@ const Dash = new Lang.Class({
        // the remove target has the same size as "normal" items, we don't
        // need to do the same adjustment there.
        if (this._dragPlaceholder) {
-            boxHeight -= this._dragPlaceholder.height;
+            boxHeight -= this._dragPlaceholder.actor.height;
            numChildren--;
        }

@ -837,7 +828,7 @@ const Dash = new Lang.Class({
                if (this._dragPlaceholder) {
                    this._dragPlaceholder.animateOutAndDestroy();
                    this._animatingPlaceholdersCount++;
-                    this._dragPlaceholder.connect('destroy',
+                    this._dragPlaceholder.actor.connect('destroy',
                        Lang.bind(this, function() {
                            this._animatingPlaceholdersCount--;
                        }));
@ -852,7 +843,7 @@ const Dash = new Lang.Class({
            // an animation
            let fadeIn;
            if (this._dragPlaceholder) {
-                this._dragPlaceholder.destroy();
+                this._dragPlaceholder.actor.destroy();
                fadeIn = false;
            } else {
                fadeIn = true;
@ -861,9 +852,10 @@ const Dash = new Lang.Class({
            this._dragPlaceholder = new DragPlaceholderItem();
            this._dragPlaceholder.child.set_width (this.iconSize);
            this._dragPlaceholder.child.set_height (this.iconSize / 2);
-            this._box.insert_child_at_index(this._dragPlaceholder,
+            this._box.insert_child_at_index(this._dragPlaceholder.actor,
                                            this._dragPlaceholderPos);
-            this._dragPlaceholder.show(fadeIn);
+            if (fadeIn)
+                this._dragPlaceholder.animateIn();
        }

        // Remove the drag placeholder if we are not in the
@ -901,10 +893,10 @@ const Dash = new Lang.Class({
        let children = this._box.get_children();
        for (let i = 0; i < this._dragPlaceholderPos; i++) {
            if (this._dragPlaceholder &&
-                children[i] == this._dragPlaceholder)
+                children[i] == this._dragPlaceholder.actor)
                continue;

-            let childId = children[i].child._delegate.app.get_id();
+            let childId = children[i]._delegate.child._delegate.app.get_id();
            if (childId == id)
                continue;
            if (childId in favorites)
@ -927,6 +919,34 @@ const Dash = new Lang.Class({
            }));

        return true;
+    },
+
+    show: function() {
+        if (this.visible)
+            return;
+
+        this.visible = true;
+
+        this.actor.show();
+        Tweener.addTween(this.actor, { translation_x: this._targetX,
+                                       transition: 'easeOutQuad',
+                                       time: DASH_ANIMATION_TIME
+                                     });
+    },
+
+    hide: function() {
+        if (!this.visible)
+            return;
+
+        this.visible = false;
+
+        Tweener.addTween(this.actor, { translation_x: this._hiddenX,
+                                       transition: 'easeOutQuad',
+                                       time: DASH_ANIMATION_TIME,
+                                       onComplete: Lang.bind(this, function () {
+                                                       this.actor.hide();
+                                                   })
+                                     });
    }
 });

--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -32,7 +32,6 @@ function _onVertSepRepaint (area)
    cr.setDash([1, 3], 1); // Hard-code for now
    cr.setLineWidth(stippleWidth);
    cr.stroke();
-    cr.$dispose();
 };

 const DateMenuButton = new Lang.Class({
@ -84,26 +83,12 @@ const DateMenuButton = new Lang.Class({
                               }));
        vbox.add(this._calendar.actor);

-        let separator = new PopupMenu.PopupSeparatorMenuItem();
-        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',
-                                              Lang.bind(this, this._appInstalledChanged));
-        this._appInstalledChanged();
-
-        item = this.menu.addSettingsAction(_("Date & Time Settings"), 'gnome-datetime-panel.desktop');
+        item = this.menu.addSettingsAction(_("Date and Time Settings"), 'gnome-datetime-panel.desktop');
        if (item) {
+            let separator = new PopupMenu.PopupSeparatorMenuItem();
+            separator.setColumnWidths(1);
+            vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+
            item.actor.show_on_set_parent = false;
            item.actor.can_focus = false;
            item.actor.reparent(vbox);
@ -123,6 +108,16 @@ const DateMenuButton = new Lang.Class({
        // Event list
        vbox.add(this._eventList.actor, { expand: true });

+        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._calendarSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.office.calendar' });
+        this._calendarSettings.connect('changed::exec',
+                                       Lang.bind(this, this._calendarSettingsChanged));
+        this._calendarSettingsChanged();
+
        // Whenever the menu is opened, select today
        this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
            if (isOpen) {
@ -156,15 +151,14 @@ const DateMenuButton = new Lang.Class({
        this._sessionUpdated();
    },

-    _appInstalledChanged: function() {
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
-        this._openClocksItem.actor.visible = app !== null;
+    _calendarSettingsChanged: function() {
+        let exec = this._calendarSettings.get_string('exec');
+        let fullExec = GLib.find_program_in_path(exec);
+        this._openCalendarItem.actor.visible = fullExec != null;
    },

-    _updateEventsVisibility: function() {
-        let visible = this._eventSource.hasCalendars;
+    _setEventsVisibility: function(visible) {
        this._openCalendarItem.actor.visible = visible;
-        this._openClocksItem.actor.visible = visible;
        this._separator.visible = visible;
        if (visible) {
          let alignment = 0.25;
@ -179,16 +173,8 @@ const DateMenuButton = new Lang.Class({
    },

    _setEventSource: function(eventSource) {
-        if (this._eventSource)
-            this._eventSource.destroy();
-
        this._calendar.setEventSource(eventSource);
        this._eventList.setEventSource(eventSource);
-
-        this._eventSource = eventSource;
-        this._eventSource.connect('notify::has-calendars', Lang.bind(this, function() {
-            this._updateEventsVisibility();
-        }));
    },

    _sessionUpdated: function() {
@ -197,10 +183,10 @@ const DateMenuButton = new Lang.Class({
        if (showEvents) {
            eventSource = new Calendar.DBusEventSource();
        } else {
-            eventSource = new Calendar.EmptyEventSource();
+            eventSource = null;
        }
        this._setEventSource(eventSource);
-        this._updateEventsVisibility();
+        this._setEventsVisibility(showEvents);

        // This needs to be handled manually, as the code to
        // autohide separators doesn't work across the vbox
@ -219,16 +205,24 @@ const DateMenuButton = new Lang.Class({

    _onOpenCalendarActivate: function() {
        this.menu.close();
-
-        let app = Gio.AppInfo.get_default_for_type('text/calendar', false);
-        if (app.get_id() == 'evolution')
-            app = Gio.DesktopAppInfo.new('evolution-calendar');
-        app.launch([], global.create_app_launch_context());
-    },
-
-    _onOpenClocksActivate: function() {
-        this.menu.close();
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
-        app.activate();
+        let tool = this._calendarSettings.get_string('exec');
+        if (tool.length == 0 || tool.substr(0, 9) == 'evolution') {
+            // TODO: pass the selected day
+            let app = Shell.AppSystem.get_default().lookup_app('evolution-calendar.desktop');
+            app.activate();
+        } else {
+            let needTerm = this._calendarSettings.get_boolean('needs-term');
+            if (needTerm) {
+                let terminalSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.terminal' });
+                let term = terminalSettings.get_string('exec');
+                let arg = terminalSettings.get_string('exec-arg');
+                if (arg != '')
+                    Util.spawn([term, arg, tool]);
+                else
+                    Util.spawn([term, tool]);
+            } else {
+                Util.spawnCommandLine(tool)
+            }
+        }
    }
 });
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -85,13 +85,11 @@ const _Draggable = new Lang.Class({

        this.actor.connect('destroy', Lang.bind(this, function() {
            this._actorDestroyed = true;
-
            // If the drag actor is destroyed and we were going to fix
            // up its hover state, fix up the parent hover state instead
            if (this.actor == this._firstLeaveActor)
                this._firstLeaveActor = this._dragOrigParent;
-
-            if (this._dragInProgress && this._dragCancellable)
+            if (this._dragInProgress)
                this._cancelDrag(global.get_current_time());
            this.disconnectAll();
        }));
@ -104,7 +102,6 @@ const _Draggable = new Lang.Class({
        this._buttonDown = false; // The mouse button has been pressed and has not yet been released.
        this._dragInProgress = false; // The drag has been started, and has not been dropped or cancelled yet.
        this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).
-        this._dragCancellable = true;

        // During the drag, we eat enter/leave events so that actors don't prelight.
        // But we remember the actors that we first left/last entered so we can
@ -139,10 +136,9 @@ const _Draggable = new Lang.Class({
    },

    _ungrabActor: function() {
+        Clutter.ungrab_pointer();
        if (!this._onEventId)
            return;
-
-        Clutter.ungrab_pointer();
        this.actor.disconnect(this._onEventId);
        this._onEventId = null;
    },
@ -207,19 +203,6 @@ const _Draggable = new Lang.Class({
        return false;
    },

-    /**
-     * fakeRelease:
-     *
-     * Fake a release event.
-     * Must be called if you want to intercept release events on draggable
-     * actors for other purposes (for example if you're using
-     * PopupMenu.ignoreRelease())
-     */
-    fakeRelease: function() {
-        this._buttonDown = false;
-        this._ungrabActor();
-    },
-
    /**
     * startDrag:
     * @stageX: X coordinate of event
@ -251,7 +234,7 @@ const _Draggable = new Lang.Class({
        this._dragY = this._dragStartY = stageY;

        if (this.actor._delegate && this.actor._delegate.getDragActor) {
-            this._dragActor = this.actor._delegate.getDragActor();
+            this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
            this._dragActor.reparent(Main.uiGroup);
            this._dragActor.raise_top();
            Shell.util_set_hidden_from_pick(this._dragActor, true);
@ -291,19 +274,19 @@ const _Draggable = new Lang.Class({
            this._dragOrigY = this._dragActor.y;
            this._dragOrigScale = this._dragActor.scale_x;

-            // Set the actor's scale such that it will keep the same
-            // transformed size when it's reparented to the uiGroup
-            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
-            this._dragActor.set_scale(scaledWidth / this.actor.width,
-                                      scaledHeight / this.actor.height);
+            this._dragActor.reparent(Main.uiGroup);
+            this._dragActor.raise_top();
+            Shell.util_set_hidden_from_pick(this._dragActor, true);

            let [actorStageX, actorStageY] = this.actor.get_transformed_position();
            this._dragOffsetX = actorStageX - this._dragStartX;
            this._dragOffsetY = actorStageY - this._dragStartY;

-            this._dragActor.reparent(Main.uiGroup);
-            this._dragActor.raise_top();
-            Shell.util_set_hidden_from_pick(this._dragActor, true);
+            // Set the actor's scale such that it will keep the same
+            // transformed size when it's reparented to the uiGroup
+            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
+            this.actor.set_scale(scaledWidth / this.actor.width,
+                                 scaledHeight / this.actor.height);
        }

        this._dragOrigOpacity = this._dragActor.opacity;
@ -442,11 +425,6 @@ const _Draggable = new Lang.Class({
                }
        }

-        // At this point it is too late to cancel a drag by destroying
-        // the actor, the fate of which is decided by acceptDrop and its
-        // side-effects
-        this._dragCancellable = false;
-
        while (target) {
            if (target._delegate && target._delegate.acceptDrop) {
                let [r, targX, targY] = target.transform_stage_point(dropX, dropY);
@ -455,6 +433,8 @@ const _Draggable = new Lang.Class({
                                                targX,
                                                targY,
                                                event.get_time())) {
+                    if (this._actorDestroyed)
+                        return true;
                    // If it accepted the drop without taking the actor,
                    // handle it ourselves.
                    if (this._dragActor.get_parent() == Main.uiGroup) {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -19,7 +19,6 @@
 */

 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Signals = imports.signals;

 const AccountsService = imports.gi.AccountsService;
@ -51,7 +50,6 @@ const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessi
    <arg type="u" direction="in" />
    <arg type="ao" direction="in" />
 </method>
-<method name="Close" />
 <signal name="ConfirmedLogout" />
 <signal name="ConfirmedReboot" />
 <signal name="ConfirmedShutdown" />
@ -107,7 +105,7 @@ const restartDialogContent = {
    endDescription: _("Restarting the system."),
    confirmButtons: [{ signal: 'ConfirmedReboot',
                       label:  C_("button", "Restart") }],
-    iconName: 'view-refresh-symbolic',
+    iconName: 'system-shutdown-symbolic',
    iconStyleClass: 'end-session-dialog-shutdown-icon'
 };

@ -225,8 +223,7 @@ const EndSessionDialog = new Lang.Class({
    Extends: ModalDialog.ModalDialog,

    _init: function() {
-        this.parent({ styleClass: 'end-session-dialog',
-                      destroyOnClose: false });
+        this.parent({ styleClass: 'end-session-dialog' });

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

@ -380,12 +377,7 @@ const EndSessionDialog = new Lang.Class({
            let signal = dialogContent.confirmButtons[i].signal;
            let label = dialogContent.confirmButtons[i].label;
            buttons.push({ action: Lang.bind(this, function() {
-                                       this.close(true);
-                                       let signalId = this.connect('closed',
-                                                                   Lang.bind(this, function() {
-                                                                       this.disconnect(signalId);
-                                                                       this._confirm(signal);
-                                                                   }));
+                                       this._confirm(signal);
                                   }),
                           label: label });
        }
@ -393,17 +385,15 @@ const EndSessionDialog = new Lang.Class({
        this.setButtons(buttons);
    },

-    close: function(skipSignal) {
+    close: function() {
        this.parent();
-
-        if (!skipSignal)
-            this._dbusImpl.emit_signal('Closed', null);
+        this._dbusImpl.emit_signal('Closed', null);
    },

    cancel: function() {
        this._stopTimer();
        this._dbusImpl.emit_signal('Canceled', null);
-        this.close();
+        this.close(global.get_current_time());
    },

    _confirm: function(signal) {
@ -418,34 +408,22 @@ const EndSessionDialog = new Lang.Class({
    },

    _startTimer: function() {
-        let startTime = GLib.get_monotonic_time();
        this._secondsLeft = this._totalSecondsToStayOpen;
-
-        this._timerId = Mainloop.timeout_add_seconds(1, Lang.bind(this,
-            function() {
-                let currentTime = GLib.get_monotonic_time();
-                let secondsElapsed = ((currentTime - startTime) / 1000000);
-
-                this._secondsLeft = this._totalSecondsToStayOpen - secondsElapsed;
-                if (this._secondsLeft > 0) {
-                    this._updateDescription();
-                    return true;
-                }
-
-                let dialogContent = DialogContent[this._type];
-                let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
-                this._confirm(button.signal);
-
-                return false;
-            }));
+        Tweener.addTween(this,
+                         { _secondsLeft: 0,
+                           time: this._secondsLeft,
+                           transition: 'linear',
+                           onUpdate: Lang.bind(this, this._updateDescription),
+                           onComplete: Lang.bind(this, function() {
+                                           let dialogContent = DialogContent[this._type];
+                                           let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
+                                           this._confirm(button.signal);
+                                       }),
+                         });
    },

    _stopTimer: function() {
-        if (this._timerId != 0) {
-            Mainloop.source_remove(this._timerId);
-            this._timerId = 0;
-        }
-
+        Tweener.removeTweens(this);
        this._secondsLeft = 0;
    },

@ -462,7 +440,7 @@ const EndSessionDialog = new Lang.Class({
            let item = new ListItem(app, reason);
            item.connect('activate',
                         Lang.bind(this, function() {
-                             this.close();
+                             this.close(global.get_current_time());
                         }));
            this._applicationList.add(item.actor, { x_fill: true });
            this._stopTimer();
@ -510,9 +488,5 @@ const EndSessionDialog = new Lang.Class({
                                        invocation.return_value(null);
                                        this.disconnect(signalId);
                                    }));
-    },
-
-    Close: function(parameters, invocation) {
-        this.close();
    }
 });
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@ -215,7 +215,7 @@ const InstallExtensionDialog = new Lang.Class({
    },

    _onCancelButtonPressed: function(button, event) {
-        this.close();
+        this.close(global.get_current_time());
        this._invocation.return_value(GLib.Variant.new('(s)', ['cancelled']));
    },

@ -257,7 +257,7 @@ const InstallExtensionDialog = new Lang.Class({
            gotExtensionZipFile(session, message, uuid, dir, callback, errback);
        }));

-        this.close();
+        this.close(global.get_current_time());
    }
 });

--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -106,15 +106,11 @@ function enableExtension(uuid) {

    extensionOrder.push(uuid);

-    let stylesheetNames = [global.session_mode + '.css', 'stylesheet.css'];
-    for (let i = 0; i < stylesheetNames.length; i++) {
-        let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
-        if (stylesheetFile.query_exists(null)) {
-            let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-            theme.load_stylesheet(stylesheetFile.get_path());
-            extension.stylesheet = stylesheetFile;
-            break;
-        }
+    let stylesheetFile = extension.dir.get_child('stylesheet.css');
+    if (stylesheetFile.query_exists(null)) {
+        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
+        theme.load_stylesheet(stylesheetFile.get_path());
+        extension.stylesheet = stylesheetFile;
    }

    extension.stateObj.enable();
@ -130,10 +126,13 @@ function logExtensionError(uuid, error) {

    let message = '' + error;

-    extension.state = ExtensionState.ERROR;
+    if (error.state)
+        extension.state = error.state;
+    else
+        extension.state = ExtensionState.ERROR;
+
    if (!extension.errors)
        extension.errors = [];
-    extension.errors.push(message);

    log('Extension "%s" had error: %s'.format(uuid, message));
    _signals.emit('extension-state-changed', { uuid: uuid,
@ -146,16 +145,18 @@ function loadExtension(extension) {
    extension.state = ExtensionState.ERROR;

    if (ExtensionUtils.isOutOfDate(extension)) {
-        extension.state = ExtensionState.OUT_OF_DATE;
+        let error = new Error('extension is not compatible with current GNOME Shell and/or GJS version');
+        error.state = ExtensionState.OUT_OF_DATE;
+        throw error;
+    }
+
+    let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
+    if (enabled) {
+        initExtension(extension.uuid);
+        if (extension.state == ExtensionState.DISABLED)
+            enableExtension(extension.uuid);
    } else {
-        let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
-        if (enabled) {
-            initExtension(extension.uuid);
-            if (extension.state == ExtensionState.DISABLED)
-                enableExtension(extension.uuid);
-        } else {
-            extension.state = ExtensionState.INITIALIZED;
-        }
+        extension.state = ExtensionState.INITIALIZED;
    }

    _signals.emit('extension-state-changed', extension);
@ -216,16 +217,8 @@ function initExtension(uuid) {
    _signals.emit('extension-loaded', uuid);
 }

-function getEnabledExtensions() {
-    let extensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
-    if (!Array.isArray(Main.sessionMode.enabledExtensions))
-        return extensions;
-
-    return Main.sessionMode.enabledExtensions.concat(extensions);
-}
-
 function onEnabledExtensionsChanged() {
-    let newEnabledExtensions = getEnabledExtensions();
+    let newEnabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);

    if (!enabled)
        return;
@ -259,7 +252,7 @@ function onEnabledExtensionsChanged() {

 function _loadExtensions() {
    global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
-    enabledExtensions = getEnabledExtensions();
+    enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);

    let finder = new ExtensionUtils.ExtensionFinder();
    finder.connect('extension-found', function(signals, extension) {
@ -301,17 +294,10 @@ function disableAllExtensions() {
 }

 function _sessionUpdated() {
-    // For now sessionMode.allowExtensions controls extensions from both the
-    // 'enabled-extensions' preference and the sessionMode.enabledExtensions
-    // property; it might make sense to make enabledExtensions independent
-    // from allowExtensions in the future
-    if (Main.sessionMode.allowExtensions) {
-        if (initted)
-            onEnabledExtensionsChanged();
+    if (Main.sessionMode.allowExtensions)
        enableAllExtensions();
-    } else {
+    else
        disableAllExtensions();
-    }
 }

 function init() {
--- a/js/ui/flashspot.js
+++ b/js/ui/flashspot.js
@ -0,0 +1,45 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+
+const Lightbox = imports.ui.lightbox;
+const Main = imports.ui.main;
+const Tweener = imports.ui.tweener;
+
+const FLASHSPOT_ANIMATION_TIME = 0.25; // seconds
+
+const Flashspot = new Lang.Class({
+    Name: 'Flashspot',
+    Extends: Lightbox.Lightbox,
+
+    _init: function(area) {
+        this.parent(Main.uiGroup, { inhibitEvents: true,
+                                    width: area.width,
+                                    height: area.height });
+
+        this.actor.style_class = 'flashspot';
+        this.actor.set_position(area.x, area.y);
+    },
+
+    fire: function() {
+        this.actor.opacity = 0;
+        Tweener.addTween(this.actor,
+                         { opacity: 255,
+                           time: FLASHSPOT_ANIMATION_TIME,
+                           transition: 'linear',
+                           onComplete: Lang.bind(this, this._onFireShowComplete)
+                         });
+        this.actor.show();
+    },
+
+    _onFireShowComplete: function() {
+        Tweener.addTween(this.actor,
+                         { opacity: 0,
+                           time: FLASHSPOT_ANIMATION_TIME,
+                           transition: 'linear',
+                           onComplete: Lang.bind(this, function() {
+                               this.destroy();
+                           })
+                         });
+    }
+});
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@ -1,4 +1,4 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
@ -10,9 +10,19 @@ const St = imports.gi.St;
 const Main = imports.ui.main;
 const Params = imports.misc.params;

+function _navigateActor(actor) {
+    if (!actor)
+        return;
+
+    let needsGrab = true;
+    if (actor instanceof St.Widget)
+        needsGrab = !actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+    if (needsGrab)
+        actor.grab_key_focus();
+}
+
 // GrabHelper:
 // @owner: the actor that owns the GrabHelper
-// @params: optional parameters to pass to Main.pushModal()
 //
 // Creates a new GrabHelper object, for dealing with keyboard and pointer grabs
 // associated with a set of actors.
@ -24,18 +34,17 @@ const Params = imports.misc.params;
 const GrabHelper = new Lang.Class({
    Name: 'GrabHelper',

-    _init: function(owner, params) {
+    _init: function(owner) {
        this._owner = owner;
-        this._modalParams = params;

        this._grabStack = [];

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

        this._modalCount = 0;
        this._grabFocusCount = 0;
@ -67,12 +76,9 @@ const GrabHelper = new Lang.Class({
    },

    _isWithinGrabbedActor: function(actor) {
-        let currentActor = this.currentGrab.actor;
        while (actor) {
            if (this._actors.indexOf(actor) != -1)
                return true;
-            if (actor == currentActor)
-                return true;
            actor = actor.get_parent();
        }
        return false;
@ -82,14 +88,6 @@ const GrabHelper = new Lang.Class({
        return this._grabStack[this._grabStack.length - 1] || {};
    },

-    get grabbed() {
-        return this._grabStack.length > 0;
-    },
-
-    get grabStack() {
-        return this._grabStack;
-    },
-
    _findStackIndex: function(actor) {
        if (!actor)
            return -1;
@ -101,16 +99,6 @@ const GrabHelper = new Lang.Class({
        return -1;
    },

-    _actorInGrabStack: function(actor) {
-        while (actor) {
-            let idx = this._findStackIndex(actor);
-            if (idx >= 0)
-                return idx;
-            actor = actor.get_parent();
-        }
-        return -1;
-    },
-
    isActorGrabbed: function(actor) {
        return this._findStackIndex(actor) >= 0;
    },
@ -150,7 +138,6 @@ const GrabHelper = new Lang.Class({
        params = Params.parse(params, { actor: null,
                                        modal: false,
                                        grabFocus: false,
-                                        focus: null,
                                        onUngrab: null });

        let focus = global.stage.key_focus;
@ -168,26 +155,21 @@ const GrabHelper = new Lang.Class({
        if (params.grabFocus && !this._takeFocusGrab(hadFocus))
            return false;

+        if (hadFocus || params.grabFocus)
+            _navigateActor(newFocus);
+
        this._grabStack.push(params);
-
-        if (params.focus) {
-            params.focus.grab_key_focus();
-        } 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;
    },

    _takeModalGrab: function() {
        let firstGrab = (this._modalCount == 0);
        if (firstGrab) {
-            if (!Main.pushModal(this._owner, this._modalParams))
+            if (!Main.pushModal(this._owner))
                return false;
+
+            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+            this._eventId = global.stage.connect('event', Lang.bind(this, this._onEvent));
        }

        this._modalCount++;
@ -199,6 +181,16 @@ const GrabHelper = new Lang.Class({
        if (this._modalCount > 0)
            return;

+        if (this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+        }
+
+        if (this._eventId > 0) {
+            global.stage.disconnect(this._eventId);
+            this._eventId = 0;
+        }
+
        Main.popModal(this._owner);
        global.sync_pointer();
    },
@ -210,6 +202,7 @@ const GrabHelper = new Lang.Class({

            this._grabbedFromKeynav = hadFocus;
            this._preGrabInputMode = global.stage_input_mode;
+            this._prevFocusedWindow = metaDisplay.focus_window;

            if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE ||
                this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
@ -234,7 +227,7 @@ const GrabHelper = new Lang.Class({
            this._keyFocusNotifyId = 0;
        }

-        if (this._focusWindowChangedId > 0) {
+        if (!this._focusWindowChanged > 0) {
            let metaDisplay = global.screen.get_display();
            metaDisplay.disconnect(this._focusWindowChangedId);
            this._focusWindowChangedId = 0;
@ -248,7 +241,13 @@ const GrabHelper = new Lang.Class({
                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
        }

-        global.screen.focus_default_window(global.display.get_current_time_roundtrip());
+        if (this._prevFocusedWindow) {
+            let metaDisplay = global.screen.get_display();
+            if (!metaDisplay.focus_window) {
+                metaDisplay.set_input_focus_window(this._prevFocusedWindow,
+                                                   false, global.get_current_time());
+            }
+        }
    },

    // ignoreRelease:
@ -269,21 +268,12 @@ const GrabHelper = new Lang.Class({
    // 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 });
+        params = Params.parse(params, { actor: this.currentGrab.actor });

        let grabStackIndex = this._findStackIndex(params.actor);
        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);

@ -296,7 +286,7 @@ const GrabHelper = new Lang.Class({
            let poppedGrab = poppedGrabs[i];

            if (poppedGrab.onUngrab)
-                poppedGrab.onUngrab(params.isUser);
+                poppedGrab.onUngrab();

            if (poppedGrab.modal)
                this._releaseModalGrab();
@ -305,38 +295,21 @@ const GrabHelper = new Lang.Class({
                this._releaseFocusGrab();
        }

-        if (!this.grabbed && this._capturedEventId > 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-
-            this._ignoreRelease = false;
-        }
-
        if (hadFocus) {
            let poppedGrab = poppedGrabs[0];
-            if (poppedGrab.savedFocus)
-                poppedGrab.savedFocus.grab_key_focus();
+            _navigateActor(poppedGrab.savedFocus);
        }
-
-        this._isUngrabbingCount--;
    },

    _onCapturedEvent: function(actor, event) {
        let type = event.type();
-
-        if (type == Clutter.EventType.KEY_PRESS &&
-            event.get_key_symbol() == Clutter.KEY_Escape) {
-            this.ungrab({ isUser: true });
-            return true;
-        }
-
        let press = type == Clutter.EventType.BUTTON_PRESS;
        let release = type == Clutter.EventType.BUTTON_RELEASE;
        let button = press || release;

        if (release && this._ignoreRelease) {
            this._ignoreRelease = false;
-            return true;
+            return false;
        }

        if (!button && this._modalCount == 0)
@ -353,26 +326,33 @@ const GrabHelper = new Lang.Class({
            // which should be a release event.
            if (press)
                this._ignoreRelease = true;
-            let i = this._actorInGrabStack(event.get_source()) + 1;
-            this.ungrab({ actor: this._grabStack[i].actor, isUser: true });
-            return true;
+            this.ungrab({ actor: this._grabStack[0].actor });
        }

        return this._modalCount > 0;
    },

-    _onKeyFocusChanged: function() {
-        if (this._isUngrabbingCount > 0)
-            return;
+    // We catch 'event' rather than 'key-press-event' so that we get
+    // a chance to run before the overview's own Escape check
+    _onEvent: function(actor, event) {
+        if (event.type() == Clutter.EventType.KEY_PRESS &&
+            event.get_key_symbol() == Clutter.KEY_Escape) {
+            this.ungrab();
+            return true;
+        }

+        return false;
+    },
+
+    _onKeyFocusChanged: function() {
        let focus = global.stage.key_focus;
        if (!focus || !this._isWithinGrabbedActor(focus))
-            this.ungrab({ isUser: true });
+            this.ungrab();
    },

    _focusWindowChanged: function() {
        let metaDisplay = global.screen.get_display();
        if (metaDisplay.focus_window != null)
-            this.ungrab({ isUser: true });
+            this.ungrab();
    }
 });
--- a/js/ui/ibusCandidatePopup.js
+++ b/js/ui/ibusCandidatePopup.js
@ -3,149 +3,107 @@
 const Clutter = imports.gi.Clutter;
 const IBus = imports.gi.IBus;
 const Lang = imports.lang;
-const Signals = imports.signals;
 const St = imports.gi.St;

 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
+const PopupMenu = imports.ui.popupMenu;

 const MAX_CANDIDATES_PER_PAGE = 16;

 const CandidateArea = new Lang.Class({
    Name: 'CandidateArea',
+    Extends: PopupMenu.PopupBaseMenuItem,

    _init: function() {
-        this.actor = new St.BoxLayout({ vertical: true,
-                                        visible: false });
-        this._candidateBoxes = [];
+        this.parent({ reactive: false });
+
+        // St.Table exhibits some sizing problems so let's go with a
+        // clutter layout manager for now.
+        this._table = new Clutter.Actor();
+        this.addActor(this._table);
+
+        this._tableLayout = new Clutter.TableLayout();
+        this._table.set_layout_manager(this._tableLayout);
+
+        this._indexLabels = [];
+        this._candidateLabels = [];
        for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
-            let box = new St.BoxLayout({ style_class: 'candidate-box',
-                                         reactive: true,
-                                         track_hover: true });
-            box._indexLabel = new St.Label({ style_class: 'candidate-index' });
-            box._candidateLabel = new St.Label({ style_class: 'candidate-label' });
-            box.add(box._indexLabel, { y_fill: false });
-            box.add(box._candidateLabel, { y_fill: false });
-            this._candidateBoxes.push(box);
-            this.actor.add(box);
-
-            let j = i;
-            box.connect('button-release-event', Lang.bind(this, function(actor, event) {
-                this.emit('candidate-clicked', j, event.get_button(), event.get_state());
-            }));
+            this._indexLabels.push(new St.Label({ style_class: 'candidate-index' }));
+            this._candidateLabels.push(new St.Label({ style_class: 'candidate-label' }));
        }

-        this._buttonBox = new St.BoxLayout({ style_class: 'candidate-page-button-box' });
-
-        this._previousButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-previous' });
-        this._previousButton.child = new St.Icon({ style_class: 'candidate-page-button-icon' });
-        this._buttonBox.add(this._previousButton, { expand: true });
-
-        this._nextButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-next' });
-        this._nextButton.child = new St.Icon({ style_class: 'candidate-page-button-icon' });
-        this._buttonBox.add(this._nextButton, { expand: true });
-
-        this.actor.add(this._buttonBox);
-
-        this._previousButton.connect('clicked', Lang.bind(this, function() {
-            this.emit('previous-page');
-        }));
-        this._nextButton.connect('clicked', Lang.bind(this, function() {
-            this.emit('next-page');
-        }));
-
        this._orientation = -1;
        this._cursorPosition = 0;
    },

-    setOrientation: function(orientation) {
+    _setOrientation: function(orientation) {
        if (this._orientation == orientation)
            return;

        this._orientation = orientation;

-        if (this._orientation == IBus.Orientation.HORIZONTAL) {
-            this.actor.vertical = false;
-            this.actor.remove_style_class_name('vertical');
-            this.actor.add_style_class_name('horizontal');
-            this._previousButton.child.icon_name = 'go-previous-symbolic';
-            this._nextButton.child.icon_name = 'go-next-symbolic';
-        } else {                // VERTICAL || SYSTEM
-            this.actor.vertical = true;
-            this.actor.add_style_class_name('vertical');
-            this.actor.remove_style_class_name('horizontal');
-            this._previousButton.child.icon_name = 'go-up-symbolic';
-            this._nextButton.child.icon_name = 'go-down-symbolic';
-        }
+        this._table.remove_all_children();
+
+        if (this._orientation == IBus.Orientation.HORIZONTAL)
+            for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
+                this._tableLayout.pack(this._indexLabels[i], i*2, 0);
+                this._tableLayout.pack(this._candidateLabels[i], i*2 + 1, 0);
+            }
+        else                    // VERTICAL || SYSTEM
+            for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
+                this._tableLayout.pack(this._indexLabels[i], 0, i);
+                this._tableLayout.pack(this._candidateLabels[i], 1, i);
+            }
    },

-    setCandidates: function(indexes, candidates, cursorPosition, cursorVisible) {
+    setCandidates: function(indexes, candidates, orientation, cursorPosition, cursorVisible) {
+        this._setOrientation(orientation);
+
        for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
            let visible = i < candidates.length;
-            let box = this._candidateBoxes[i];
-            box.visible = visible;
+            this._indexLabels[i].visible = visible;
+            this._candidateLabels[i].visible = visible;

            if (!visible)
                continue;

-            box._indexLabel.text = ((indexes && indexes[i]) ? indexes[i] : '%x'.format(i + 1));
-            box._candidateLabel.text = candidates[i];
+            this._indexLabels[i].text = ((indexes && indexes[i]) ? indexes[i] : '%x.'.format(i + 1));
+            this._candidateLabels[i].text = candidates[i];
        }

-        this._candidateBoxes[this._cursorPosition].remove_style_pseudo_class('selected');
+        this._candidateLabels[this._cursorPosition].remove_style_pseudo_class('selected');
        this._cursorPosition = cursorPosition;
        if (cursorVisible)
-            this._candidateBoxes[cursorPosition].add_style_pseudo_class('selected');
-    },
-
-    updateButtons: function(wrapsAround, page, nPages) {
-        if (nPages < 2) {
-            this._buttonBox.hide();
-            return;
-        }
-        this._buttonBox.show();
-        this._previousButton.reactive = wrapsAround || page > 0;
-        this._nextButton.reactive = wrapsAround || page < nPages - 1;
+            this._candidateLabels[cursorPosition].add_style_pseudo_class('selected');
    },
 });
-Signals.addSignalMethods(CandidateArea.prototype);

 const CandidatePopup = new Lang.Class({
    Name: 'CandidatePopup',
+    Extends: PopupMenu.PopupMenu,

    _init: function() {
        this._cursor = new St.Bin({ opacity: 0 });
        Main.uiGroup.add_actor(this._cursor);

-        this._boxPointer = new BoxPointer.BoxPointer(St.Side.TOP);
-        this._boxPointer.actor.visible = false;
-        this._boxPointer.actor.style_class = 'candidate-popup-boxpointer';
-        Main.layoutManager.addChrome(this._boxPointer.actor);
+        this.parent(this._cursor, 0, St.Side.TOP);
+        this.actor.hide();
+        Main.uiGroup.add_actor(this.actor);

-        let box = new St.BoxLayout({ style_class: 'candidate-popup-content',
-                                     vertical: true });
-        this._boxPointer.bin.set_child(box);
+        this._preeditTextItem = new PopupMenu.PopupMenuItem('', { reactive: false });
+        this._preeditTextItem.actor.hide();
+        this.addMenuItem(this._preeditTextItem);

-        this._preeditText = new St.Label({ style_class: 'candidate-popup-text',
-                                           visible: false });
-        box.add(this._preeditText);
+        this._auxTextItem = new PopupMenu.PopupMenuItem('', { reactive: false });
+        this._auxTextItem.actor.hide();
+        this.addMenuItem(this._auxTextItem);

-        this._auxText = new St.Label({ style_class: 'candidate-popup-text',
-                                       visible: false });
-        box.add(this._auxText);
+        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

-        this._candidateArea = new CandidateArea();
-        box.add(this._candidateArea.actor);
-
-        this._candidateArea.connect('previous-page', Lang.bind(this, function() {
-            this._panelService.page_up();
-        }));
-        this._candidateArea.connect('next-page', Lang.bind(this, function() {
-            this._panelService.page_down();
-        }));
-        this._candidateArea.connect('candidate-clicked', Lang.bind(this, function(ca, index, button, state) {
-            this._panelService.candidate_clicked(index, button, state);
-        }));
+        this._lookupTableItem = new CandidateArea();
+        this._lookupTableItem.actor.hide();
+        this.addMenuItem(this._lookupTableItem);

        this._panelService = null;
    },
@ -159,61 +117,66 @@ const CandidatePopup = new Lang.Class({
                             Lang.bind(this, function(ps, x, y, w, h) {
                                 this._cursor.set_position(x, y);
                                 this._cursor.set_size(w, h);
-                                 if (this._boxPointer.actor.visible)
-                                     this._boxPointer.setPosition(this._cursor, 0);
                             }));
        panelService.connect('update-preedit-text',
                             Lang.bind(this, function(ps, text, cursorPosition, visible) {
-                                 this._preeditText.visible = visible;
+                                 if (visible)
+                                     this._preeditTextItem.actor.show();
+                                 else
+                                     this._preeditTextItem.actor.hide();
                                 this._updateVisibility();

-                                 this._preeditText.text = text.get_text();
+                                 this._preeditTextItem.actor.label_actor.text = text.get_text();

                                 let attrs = text.get_attributes();
                                 if (attrs)
-                                     this._setTextAttributes(this._preeditText.clutter_text,
+                                     this._setTextAttributes(this._preeditTextItem.actor.label_actor.clutter_text,
                                                             attrs);
                             }));
        panelService.connect('show-preedit-text',
                             Lang.bind(this, function(ps) {
-                                 this._preeditText.show();
+                                 this._preeditTextItem.actor.show();
                                 this._updateVisibility();
                             }));
        panelService.connect('hide-preedit-text',
                             Lang.bind(this, function(ps) {
-                                 this._preeditText.hide();
+                                 this._preeditTextItem.actor.hide();
                                 this._updateVisibility();
                             }));
        panelService.connect('update-auxiliary-text',
                             Lang.bind(this, function(ps, text, visible) {
-                                 this._auxText.visible = visible;
+                                 if (visible)
+                                     this._auxTextItem.actor.show();
+                                 else
+                                     this._auxTextItem.actor.hide();
                                 this._updateVisibility();

-                                 this._auxText.text = text.get_text();
+                                 this._auxTextItem.actor.label_actor.text = text.get_text();
                             }));
        panelService.connect('show-auxiliary-text',
                             Lang.bind(this, function(ps) {
-                                 this._auxText.show();
+                                 this._auxTextItem.actor.show();
                                 this._updateVisibility();
                             }));
        panelService.connect('hide-auxiliary-text',
                             Lang.bind(this, function(ps) {
-                                 this._auxText.hide();
+                                 this._auxTextItem.actor.hide();
                                 this._updateVisibility();
                             }));
        panelService.connect('update-lookup-table',
                             Lang.bind(this, function(ps, lookupTable, visible) {
-                                 this._candidateArea.actor.visible = visible;
+                                 if (visible)
+                                     this._lookupTableItem.actor.show();
+                                 else
+                                     this._lookupTableItem.actor.hide();
                                 this._updateVisibility();

-                                 let nCandidates = lookupTable.get_number_of_candidates();
                                 let cursorPos = lookupTable.get_cursor_pos();
                                 let pageSize = lookupTable.get_page_size();
-                                 let nPages = Math.ceil(nCandidates / pageSize);
                                 let page = ((cursorPos == 0) ? 0 : Math.floor(cursorPos / pageSize));
                                 let startIndex = page * pageSize;
-                                 let endIndex = Math.min((page + 1) * pageSize, nCandidates);
-
+                                 let endIndex = Math.min((page + 1) * pageSize,
+                                                         lookupTable.get_number_of_candidates());
                                 let indexes = [];
                                 let indexLabel;
                                 for (let i = 0; indexLabel = lookupTable.get_label(i); ++i)
@ -223,41 +186,37 @@ const CandidatePopup = new Lang.Class({
                                 for (let i = startIndex; i < endIndex; ++i)
                                     candidates.push(lookupTable.get_candidate(i).get_text());

-                                 this._candidateArea.setCandidates(indexes,
-                                                                   candidates,
-                                                                   cursorPos % pageSize,
-                                                                   lookupTable.is_cursor_visible());
-                                 this._candidateArea.setOrientation(lookupTable.get_orientation());
-                                 this._candidateArea.updateButtons(lookupTable.is_round(), page, nPages);
+                                 this._lookupTableItem.setCandidates(indexes,
+                                                                     candidates,
+                                                                     lookupTable.get_orientation(),
+                                                                     cursorPos % pageSize,
+                                                                     lookupTable.is_cursor_visible());
                             }));
        panelService.connect('show-lookup-table',
                             Lang.bind(this, function(ps) {
-                                 this._candidateArea.actor.show();
+                                 this._lookupTableItem.actor.show();
                                 this._updateVisibility();
                             }));
        panelService.connect('hide-lookup-table',
                             Lang.bind(this, function(ps) {
-                                 this._candidateArea.actor.hide();
+                                 this._lookupTableItem.actor.hide();
                                 this._updateVisibility();
                             }));
        panelService.connect('focus-out',
                             Lang.bind(this, function(ps) {
-                                 this._boxPointer.hide(BoxPointer.PopupAnimation.NONE);
+                                 this.close(BoxPointer.PopupAnimation.NONE);
                             }));
    },

    _updateVisibility: function() {
-        let isVisible = (this._preeditText.visible ||
-                         this._auxText.visible ||
-                         this._candidateArea.actor.visible);
+        let isVisible = (this._preeditTextItem.actor.visible ||
+                         this._auxTextItem.actor.visible ||
+                         this._lookupTableItem.actor.visible);

-        if (isVisible) {
-            this._boxPointer.setPosition(this._cursor, 0);
-            this._boxPointer.show(BoxPointer.PopupAnimation.NONE);
-            this._boxPointer.actor.raise_top();
-        } else {
-            this._boxPointer.hide(BoxPointer.PopupAnimation.NONE);
-        }
+        if (isVisible)
+            this.open(BoxPointer.PopupAnimation.NONE);
+        else
+            this.close(BoxPointer.PopupAnimation.NONE);
    },

    _setTextAttributes: function(clutterText, ibusAttrList) {
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@ -23,8 +23,6 @@ const BaseIcon = new Lang.Class({
        this.actor._delegate = this;
        this.actor.connect('style-changed',
                           Lang.bind(this, this._onStyleChanged));
-        this.actor.connect('destroy',
-                           Lang.bind(this, this._onDestroy));

        this._spacing = 0;

@ -54,9 +52,6 @@ const BaseIcon = new Lang.Class({
        this._setSizeManually = params.setSizeManually;

        this.icon = null;
-
-        let cache = St.TextureCache.get_default();
-        this._iconThemeChangedId = cache.connect('icon-theme-changed', Lang.bind(this, this._onIconThemeChanged));
    },

    _allocate: function(actor, box, flags) {
@ -151,22 +146,7 @@ const BaseIcon = new Lang.Class({
            size = found ? len : ICON_SIZE;
        }

-        if (this.iconSize == size && this._iconBin.child)
-            return;
-
        this._createIconTexture(size);
-    },
-
-    _onDestroy: function() {
-        if (this._iconThemeChangedId > 0) {
-            let cache = St.TextureCache.get_default();
-            cache.disconnect(this._iconThemeChangedId);
-            this._iconThemeChangedId = 0;
-        }
-    },
-
-    _onIconThemeChanged: function() {
-        this._createIconTexture(this.iconSize);
    }
 });

@ -176,16 +156,13 @@ const IconGrid = new Lang.Class({
    _init: function(params) {
        params = Params.parse(params, { rowLimit: null,
                                        columnLimit: null,
-                                        fillParent: false,
                                        xAlign: St.Align.MIDDLE });
        this._rowLimit = params.rowLimit;
        this._colLimit = params.columnLimit;
        this._xAlign = params.xAlign;
-        this._fillParent = params.fillParent;

        this.actor = new St.BoxLayout({ style_class: 'icon-grid',
                                        vertical: true });
-
        // Pulled from CSS, but hardcode some defaults here
        this._spacing = 0;
        this._hItemSize = this._vItemSize = ICON_SIZE;
@ -199,11 +176,6 @@ const IconGrid = new Lang.Class({
    },

    _getPreferredWidth: function (grid, forHeight, alloc) {
-        if (this._fillParent)
-            // Ignore all size requests of children and request a size of 0;
-            // later we'll allocate as many children as fit the parent
-            return;
-
        let children = this._grid.get_children();
        let nColumns = this._colLimit ? Math.min(this._colLimit,
                                                 children.length)
@ -225,20 +197,12 @@ const IconGrid = new Lang.Class({
    },

    _getPreferredHeight: function (grid, forWidth, alloc) {
-        if (this._fillParent)
-            // Ignore all size requests of children and request a size of 0;
-            // later we'll allocate as many children as fit the parent
-            return;
-
        let children = this._getVisibleChildren();
-        let nColumns, spacing;
-        if (forWidth < 0) {
+        let nColumns;
+        if (forWidth < 0)
            nColumns = children.length;
-            spacing = this._spacing;
-        } else {
-            [nColumns, , spacing] = this._computeLayout(forWidth);
-        }
-
+        else
+            nColumns = this._computeLayout(forWidth)[0];
        let nRows;
        if (nColumns > 0)
            nRows = Math.ceil(children.length / nColumns);
@ -246,25 +210,18 @@ const IconGrid = new Lang.Class({
            nRows = 0;
        if (this._rowLimit)
            nRows = Math.min(nRows, this._rowLimit);
-        let totalSpacing = Math.max(0, nRows - 1) * spacing;
+        let totalSpacing = Math.max(0, nRows - 1) * this._spacing;
        let height = nRows * this._vItemSize + totalSpacing;
        alloc.min_size = height;
        alloc.natural_size = height;
    },

    _allocate: function (grid, box, flags) {
-        if (this._fillParent) {
-            // Reset the passed in box to fill the parent
-            let parentBox = this.actor.get_parent().allocation;
-            let gridBox = this.actor.get_theme_node().get_content_box(parentBox);
-            box = this._grid.get_theme_node().get_content_box(gridBox);
-        }
-
        let children = this._getVisibleChildren();
        let availWidth = box.x2 - box.x1;
        let availHeight = box.y2 - box.y1;

-        let [nColumns, usedWidth, spacing] = this._computeLayout(availWidth);
+        let [nColumns, usedWidth] = this._computeLayout(availWidth);

        let leftPadding;
        switch(this._xAlign) {
@ -303,8 +260,7 @@ const IconGrid = new Lang.Class({
            childBox.x2 = childBox.x1 + width;
            childBox.y2 = childBox.y1 + height;

-            if (this._rowLimit && rowIndex >= this._rowLimit ||
-                this._fillParent && childBox.y2 > availHeight) {
+            if (this._rowLimit && rowIndex >= this._rowLimit) {
                this._grid.set_skip_paint(children[i], true);
            } else {
                children[i].allocate(childBox, flags);
@ -318,10 +274,10 @@ const IconGrid = new Lang.Class({
            }

            if (columnIndex == 0) {
-                y += this._vItemSize + spacing;
+                y += this._vItemSize + this._spacing;
                x = box.x1 + leftPadding;
            } else {
-                x += this._hItemSize + spacing;
+                x += this._hItemSize + this._spacing;
            }
        }
    },
@ -337,25 +293,16 @@ const IconGrid = new Lang.Class({
    _computeLayout: function (forWidth) {
        let nColumns = 0;
        let usedWidth = 0;
-        let spacing = this._spacing;
-
-        if (this._colLimit) {
-            let itemWidth = this._hItemSize * this._colLimit;
-            let emptyArea = forWidth - itemWidth;
-            spacing = Math.max(this._spacing, emptyArea / (2 * this._colLimit));
-            spacing = Math.round(spacing);
-        }
-
        while ((this._colLimit == null || nColumns < this._colLimit) &&
               (usedWidth + this._hItemSize <= forWidth)) {
-            usedWidth += this._hItemSize + spacing;
+            usedWidth += this._hItemSize + this._spacing;
            nColumns += 1;
        }

        if (nColumns > 0)
-            usedWidth -= spacing;
+            usedWidth -= this._spacing;

-        return [nColumns, usedWidth, spacing];
+        return [nColumns, usedWidth];
    },

    _onStyleChanged: function() {
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@ -2,27 +2,43 @@

 const Caribou = imports.gi.Caribou;
 const Clutter = imports.gi.Clutter;
+const DBus = imports.dbus;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;

 const BoxPointer = imports.ui.boxpointer;
-const Layout = imports.ui.layout;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;

-const KEYBOARD_REST_TIME = Layout.KEYBOARD_ANIMATION_TIME * 2 * 1000;
-
 const KEYBOARD_SCHEMA = 'org.gnome.shell.keyboard';
 const KEYBOARD_TYPE = 'keyboard-type';

 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';

+// Key constants taken from Antler
+// FIXME: ought to be moved into libcaribou
+const PRETTY_KEYS = {
+    'BackSpace': '\u232b',
+    'space': ' ',
+    'Return': '\u23ce',
+    'Caribou_Prefs': '\u2328',
+    'Caribou_ShiftUp': '\u2b06',
+    'Caribou_ShiftDown': '\u2b07',
+    'Caribou_Emoticons': '\u263a',
+    'Caribou_Symbols': '123',
+    'Caribou_Symbols_More': '{#*',
+    'Caribou_Alpha': 'Abc',
+    'Tab': 'Tab',
+    'Escape': 'Esc',
+    'Control_L': 'Ctrl',
+    'Alt_L': 'Alt'
+};
+
 const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
 <method name='Show'>
    <arg type='u' direction='in' />
@ -59,7 +75,14 @@ const Key = new Lang.Class({
        if (this._key.name == 'Control_L' || this._key.name == 'Alt_L')
            this._key.latch = true;

+        this._key.connect('key-pressed', Lang.bind(this, function ()
+                                                   { this.actor.checked = true }));
+        this._key.connect('key-released', Lang.bind(this, function ()
+                                                    { this.actor.checked = false; }));
+
        if (this._extended_keys.length > 0) {
+            this._grabbed = false;
+            this._eventCaptureId = 0;
            this._key.connect('notify::show-subkeys', Lang.bind(this, this._onShowSubkeysChanged));
            this._boxPointer = new BoxPointer.BoxPointer(St.Side.BOTTOM,
                                                         { x_fill: true,
@ -75,7 +98,17 @@ const Key = new Lang.Class({
    },

    _makeKey: function () {
-        let label = GLib.markup_escape_text(this._key.label, -1);
+        let label = this._key.name;
+
+        if (label.length > 1) {
+            let pretty = PRETTY_KEYS[label];
+            if (pretty)
+                label = pretty;
+            else
+                label = this._getUnichar(this._key);
+        }
+
+        label = GLib.markup_escape_text(label, -1);
        let button = new St.Button ({ label: label,
                                      style_class: 'keyboard-key' });

@ -111,23 +144,52 @@ const Key = new Lang.Class({
        this._boxPointer.bin.add_actor(this._extended_keyboard);
    },

-    get subkeys() {
-        return this._boxPointer;
+    _onEventCapture: function (actor, event) {
+        let source = event.get_source();
+        let type = event.type();
+
+        if ((type == Clutter.EventType.BUTTON_PRESS ||
+             type == Clutter.EventType.BUTTON_RELEASE) &&
+            this._extended_keyboard.contains(source)) {
+            source.extended_key.press();
+            source.extended_key.release();
+            return false;
+        }
+        if (type == Clutter.EventType.BUTTON_PRESS) {
+            this._boxPointer.actor.hide();
+            this._ungrab();
+            return true;
+        }
+        return false;
+    },
+
+    _ungrab: function () {
+        global.stage.disconnect(this._eventCaptureId);
+        this._eventCaptureId = 0;
+        this._grabbed = false;
+        Main.popModal(this.actor);
    },

    _onShowSubkeysChanged: function () {
        if (this._key.show_subkeys) {
+            this.actor.fake_release();
            this._boxPointer.actor.raise_top();
            this._boxPointer.setPosition(this.actor, 0.5);
-            this.emit('show-subkeys');
-            this.actor.fake_release();
+            this._boxPointer.show(BoxPointer.PopupAnimation.FULL);
            this.actor.set_hover(false);
+            if (!this._grabbed) {
+                 Main.pushModal(this.actor);
+                 this._eventCaptureId = global.stage.connect('captured-event', Lang.bind(this, this._onEventCapture));
+                 this._grabbed = true;
+            }
+            this._key.release();
        } else {
-            this.emit('hide-subkeys');
+            if (this._grabbed)
+                this._ungrab();
+            this._boxPointer.hide(BoxPointer.PopupAnimation.FULL);
        }
    }
 });
-Signals.addSignalMethods(Key.prototype);

 const Keyboard = new Lang.Class({
    // HACK: we can't set Name, because it collides with Name dbus property
@ -142,26 +204,16 @@ const Keyboard = new Lang.Class({
        this._focusInExtendedKeys = false;

        this._timestamp = global.display.get_current_time_roundtrip();
+        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._redraw));

        this._keyboardSettings = new Gio.Settings({ schema: KEYBOARD_SCHEMA });
        this._keyboardSettings.connect('changed', Lang.bind(this, this._settingsChanged));
        this._a11yApplicationsSettings = new Gio.Settings({ schema: A11Y_APPLICATIONS_SCHEMA });
        this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._settingsChanged));
        this._settingsChanged();
+    },

-        this._showIdleId = 0;
-        this._subkeysBoxPointer = null;
-        this._capturedEventId = 0;
-        this._capturedPress = false;
-
-        this._keyboardVisible = false;
-        Main.layoutManager.connect('keyboard-visible-changed', Lang.bind(this, function(o, visible) {
-            this._keyboardVisible = visible;
-        }));
-        this._keyboardRequested = false;
-        this._keyboardRestingId = 0;
-
-        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._redraw));
+    init: function () {
        this._redraw();
    },

@ -176,19 +228,25 @@ const Keyboard = new Lang.Class({
        if (this._keyboard)
            this._destroyKeyboard();

-        if (this._enableKeyboard)
-            this._setupKeyboard();
-        else
+        if (this._enableKeyboard) {
+            // If we've been called because the setting actually just
+            // changed to true (as opposed to being called from
+            // this._init()), then we want to pop up the keyboard.
+            let showKeyboard = (settings != null);
+
+            // However, caribou-gtk-module or this._onKeyFocusChanged
+            // will probably immediately tell us to hide it, so we
+            // have to fake things out so we'll ignore that request.
+            if (showKeyboard)
+                this._timestamp = global.display.get_current_time_roundtrip() + 1;
+            this._setupKeyboard(showKeyboard);
+        } else
            Main.layoutManager.hideKeyboard(true);
    },

    _destroyKeyboard: function() {
        if (this._keyboardNotifyId)
            this._keyboard.disconnect(this._keyboardNotifyId);
-        if (this._keyboardGroupAddedId)
-            this._keyboard.disconnect(this._keyboardGroupAddedId);
-        if (this._keyboardGroupRemovedId)
-            this._keyboard.disconnect(this._keyboardGroupRemovedId);
        if (this._focusNotifyId)
            global.stage.disconnect(this._focusNotifyId);
        this._keyboard = null;
@ -198,7 +256,7 @@ const Keyboard = new Lang.Class({
        this._destroySource();
    },

-    _setupKeyboard: function() {
+    _setupKeyboard: function(show) {
        this.actor = new St.BoxLayout({ name: 'keyboard', vertical: true, reactive: true });
        Main.layoutManager.keyboardBox.add_actor(this.actor);
        Main.layoutManager.trackChrome(this.actor);
@ -219,11 +277,12 @@ const Keyboard = new Lang.Class({
        this.actor.text_direction = Clutter.TextDirection.LTR;

        this._keyboardNotifyId = this._keyboard.connect('notify::active-group', Lang.bind(this, this._onGroupChanged));
-        this._keyboardGroupAddedId = this._keyboard.connect('group-added', Lang.bind(this, this._onGroupAdded));
-        this._keyboardGroupRemovedId = this._keyboard.connect('group-removed', Lang.bind(this, this._onGroupRemoved));
        this._focusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));

-        this._createSource();
+        if (show)
+            this.show();
+        else
+            this._createSource();
    },

    _onKeyFocusChanged: function () {
@ -243,102 +302,88 @@ const Keyboard = new Lang.Class({
            return;

        let time = global.get_current_time();
-        if (!(focus instanceof Clutter.Text)) {
+        if (focus instanceof Clutter.Text)
+            this.Show(time);
+        else
            this.Hide(time);
-            return;
-        }
-
-        if (!this._showIdleId)
-            this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE,
-                                             Lang.bind(this, function() { this.Show(time); }));
-    },
-
-    _createLayersForGroup: function (gname) {
-        let group = this._keyboard.get_group(gname);
-        group.connect('notify::active-level', Lang.bind(this, this._onLevelChanged));
-        let layers = {};
-        let levels = group.get_levels();
-        for (let j = 0; j < levels.length; ++j) {
-            let lname = levels[j];
-            let level = group.get_level(lname);
-            let layout = new St.BoxLayout({ style_class: 'keyboard-layout',
-                                                 vertical: true });
-            this._loadRows(level, layout);
-            layers[lname] = layout;
-            this.actor.add(layout, { x_fill: false });
-
-            layout.hide();
-        }
-        return layers;
    },

    _addKeys: function () {
        let groups = this._keyboard.get_groups();
        for (let i = 0; i < groups.length; ++i) {
             let gname = groups[i];
-             this._groups[gname] = this._createLayersForGroup(gname);
+             let group = this._keyboard.get_group(gname);
+             group.connect('notify::active-level', Lang.bind(this, this._onLevelChanged));
+             let layers = {};
+             let levels = group.get_levels();
+             for (let j = 0; j < levels.length; ++j) {
+                 let lname = levels[j];
+                 let level = group.get_level(lname);
+                 let layout = new St.BoxLayout({ style_class: 'keyboard-layout',
+                                                 vertical: true });
+                 this._loadRows(level, layout);
+                 layers[lname] = layout;
+                 this.actor.add(layout, { x_fill: false });
+
+                 layout.hide();
+             }
+             this._groups[gname] = layers;
        }

        this._setActiveLayer();
    },

-    _onCapturedEvent: function(actor, event) {
-        let type = event.type();
-        let press = type == Clutter.EventType.BUTTON_PRESS;
-        let release = type == Clutter.EventType.BUTTON_RELEASE;
+    _getTrayIcon: function () {
+        let trayButton = new St.Button ({ label: _("tray"),
+                                          style_class: 'keyboard-key' });
+        trayButton.key_width = 1;
+        trayButton.connect('button-press-event', Lang.bind(this, function () {
+            Main.messageTray.toggle();
+        }));

-        if (press)
-            this._capturedPress = true;
-        else if (release && this._capturedPress)
-            this._hideSubkeys();
+        Main.overview.connect('showing', Lang.bind(this, function () {
+            trayButton.reactive = false;
+            trayButton.add_style_pseudo_class('grayed');
+        }));
+        Main.overview.connect('hiding', Lang.bind(this, function () {
+            trayButton.reactive = true;
+            trayButton.remove_style_pseudo_class('grayed');
+        }));
+        Main.sessionMode.connect('updated', Lang.bind(this, function() {
+            trayButton.reactive = !Main.sessionMode.isLocked;
+            if (Main.sessionMode.isLocked)
+                trayButton.add_style_pseudo_class('grayed');
+            else
+                trayButton.remove_style_pseudo_class('grayed');
+        }));

-        return true;
+        return trayButton;
    },

    _addRows : function (keys, layout) {
        let keyboard_row = new St.BoxLayout();
        for (let i = 0; i < keys.length; ++i) {
            let children = keys[i].get_children();
-            let left_box = new St.BoxLayout({ style_class: 'keyboard-row' });
-            let center_box = new St.BoxLayout({ style_class: 'keyboard-row' });
            let right_box = new St.BoxLayout({ style_class: 'keyboard-row' });
+            let left_box = new St.BoxLayout({ style_class: 'keyboard-row' });
            for (let j = 0; j < children.length; ++j) {
                if (this._numOfHorizKeys == 0)
                    this._numOfHorizKeys = children.length;
                let key = children[j];
                let button = new Key(key);

-                switch (key.align) {
-                case 'right':
+                if (key.align == 'right')
                    right_box.add(button.actor);
-                    break;
-                case 'center':
-                    center_box.add(button.actor);
-                    break;
-                case 'left':
-                default:
+                else
                    left_box.add(button.actor);
-                    break;
-                }
                if (key.name == 'Caribou_Prefs') {
                    key.connect('key-released', Lang.bind(this, this.hide));
-                }

-                button.connect('show-subkeys', Lang.bind(this, function() {
-                    if (this._subkeysBoxPointer)
-                        this._subkeysBoxPointer.hide(BoxPointer.PopupAnimation.FULL);
-                    this._subkeysBoxPointer = button.subkeys;
-                    this._subkeysBoxPointer.show(BoxPointer.PopupAnimation.FULL);
-                    if (!this._capturedEventId)
-                        this._capturedEventId = this.actor.connect('captured-event',
-                                                                   Lang.bind(this, this._onCapturedEvent));
-                }));
-                button.connect('hide-subkeys', Lang.bind(this, function() {
-                    this._hideSubkeys();
-                }));
+                    // Add new key for hiding message tray
+                    right_box.add(this._getTrayIcon());
+                }
            }
            keyboard_row.add(left_box, { expand: true, x_fill: false, x_align: St.Align.START });
-            keyboard_row.add(center_box, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
            keyboard_row.add(right_box, { expand: true, x_fill: false, x_align: St.Align.END });
        }
        layout.add(keyboard_row);
@ -359,7 +404,7 @@ const Keyboard = new Lang.Class({
        if (!this._enableKeyboard)
            return;

-        let monitor = Main.layoutManager.keyboardMonitor;
+        let monitor = Main.layoutManager.bottomMonitor;
        let maxHeight = monitor.height / 3;
        this.actor.width = monitor.width;

@ -411,14 +456,6 @@ const Keyboard = new Lang.Class({
        this._redraw();
    },

-    _onGroupAdded: function (keyboard, gname) {
-        this._groups[gname] = this._createLayersForGroup(gname);
-    },
-
-    _onGroupRemoved: function (keyboard, gname) {
-        delete this._groups[gname];
-    },
-
    _setActiveLayer: function () {
        let active_group_name = this._keyboard.active_group;
        let active_group = this._keyboard.get_group(active_group_name);
@ -454,79 +491,18 @@ const Keyboard = new Lang.Class({
               actor._extended_keys || actor.extended_key;
    },

-    _clearKeyboardRestTimer: function() {
-        if (!this._keyboardRestingId)
-            return;
-        GLib.source_remove(this._keyboardRestingId);
-        this._keyboardRestingId = 0;
-    },
-
-    show: function (monitor) {
-        this._keyboardRequested = true;
-
-        if (this._keyboardVisible) {
-            if (monitor != Main.layoutManager.keyboardIndex) {
-                Main.layoutManager.keyboardIndex = monitor;
-                this._redraw();
-            }
-            return;
-        }
-
-        this._clearKeyboardRestTimer();
-        this._keyboardRestingId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                   KEYBOARD_REST_TIME,
-                                                   Lang.bind(this, function() {
-                                                       this._clearKeyboardRestTimer();
-                                                       this._show(monitor);
-                                                   }));
-    },
-
-    _show: function(monitor) {
-        if (!this._keyboardRequested)
-            return;
-
-        Main.layoutManager.keyboardIndex = monitor;
+    show: function () {
        this._redraw();
+
        Main.layoutManager.showKeyboard();
        this._destroySource();
    },

    hide: function () {
-        this._keyboardRequested = false;
-
-        if (!this._keyboardVisible)
-            return;
-
-        this._clearKeyboardRestTimer();
-        this._keyboardRestingId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                   KEYBOARD_REST_TIME,
-                                                   Lang.bind(this, function() {
-                                                       this._clearKeyboardRestTimer();
-                                                       this._hide();
-                                                   }));
-    },
-
-    _hide: function() {
-        if (this._keyboardRequested)
-            return;
-
-        this._hideSubkeys();
        Main.layoutManager.hideKeyboard();
        this._createSource();
    },

-    _hideSubkeys: function() {
-        if (this._subkeysBoxPointer) {
-            this._subkeysBoxPointer.hide(BoxPointer.PopupAnimation.FULL);
-            this._subkeysBoxPointer = null;
-        }
-        if (this._capturedEventId) {
-            this.actor.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-        this._capturedPress = false;
-    },
-
    _moveTemporarily: function () {
        let currentWindow = global.screen.get_display().focus_window;
        let rect = currentWindow.get_outer_rect();
@ -555,13 +531,6 @@ const Keyboard = new Lang.Class({
        return one - two;
    },

-    _clearShowIdle: function() {
-        if (!this._showIdleId)
-            return;
-        GLib.source_remove(this._showIdleId);
-        this._showIdleId = 0;
-    },
-
    // D-Bus methods
    Show: function(timestamp) {
        if (!this._enableKeyboard)
@ -570,11 +539,9 @@ const Keyboard = new Lang.Class({
        if (this._compareTimestamp(timestamp, this._timestamp) < 0)
            return;

-        this._clearShowIdle();
-
        if (timestamp != Clutter.CURRENT_TIME)
            this._timestamp = timestamp;
-        this.show(Main.layoutManager.focusIndex);
+        this.show();
    },

    Hide: function(timestamp) {
@ -584,8 +551,6 @@ const Keyboard = new Lang.Class({
        if (this._compareTimestamp(timestamp, this._timestamp) < 0)
            return;

-        this._clearShowIdle();
-
        if (timestamp != Clutter.CURRENT_TIME)
            this._timestamp = timestamp;
        this.hide();
@ -620,13 +585,16 @@ const KeyboardSource = new Lang.Class({
        this.keepTrayOnSummaryClick = true;
    },

-    handleSummaryClick: function(button) {
+    handleSummaryClick: function() {
+        let event = Clutter.get_current_event();
+        if (event.type() != Clutter.EventType.BUTTON_RELEASE)
+            return false;
+
        this.open();
        return true;
    },

    open: function() {
-        // Show the OSK below the message tray
-        this._keyboard.show(Main.layoutManager.bottomIndex);
+        this._keyboard.show();
    }
 });
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@ -3,7 +3,6 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
-const Signals = imports.signals;
 const St = imports.gi.St;

 const Params = imports.misc.params;
@ -102,7 +101,6 @@ const Lightbox = new Lang.Class({
    },

    show: function() {
-        Tweener.removeTweens(this.actor);
        if (this._fadeInTime) {
            this.shown = false;
            this.actor.opacity = 0;
@ -112,20 +110,17 @@ const Lightbox = new Lang.Class({
                               transition: 'easeOutQuad',
                               onComplete: Lang.bind(this, function() {
                                   this.shown = true;
-                                   this.emit('shown');
                               })
                             });
        } else {
            this.actor.opacity = 255 * this._fadeFactor;
            this.shown = true;
-            this.emit('shown');
        }
        this.actor.show();
    },

    hide: function() {
        this.shown = false;
-        Tweener.removeTweens(this.actor);
        if (this._fadeOutTime) {
            Tweener.addTween(this.actor,
                             { opacity: 0,
@ -202,4 +197,3 @@ const Lightbox = new Lang.Class({
        this.highlight(null);
    }
 });
-Signals.addSignalMethods(Lightbox.prototype);
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -39,7 +39,6 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                     * in the shell core code too. */
                    'const stage = global.stage; ' +
                    /* Special lookingGlass functions */
-                    'const inspect = Lang.bind(Main.lookingGlass, Main.lookingGlass.inspect); ' +
                    'const it = Main.lookingGlass.getIt(); ' +
                    'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';

@ -685,8 +684,7 @@ const Memory = new Lang.Class({
 const Extensions = new Lang.Class({
    Name: 'Extensions',

-    _init: function(lookingGlass) {
-        this._lookingGlass = lookingGlass;
+    _init: function() {
        this.actor = new St.BoxLayout({ vertical: true,
                                        name: 'lookingGlassExtensions' });
        this._noExtensions = new St.Label({ style_class: 'lg-extensions-none',
@ -873,7 +871,8 @@ const LookingGlass = new Lang.Class({
        inspectIcon.connect('button-press-event', Lang.bind(this, function () {
            let inspector = new Inspector(this);
            inspector.connect('target', Lang.bind(this, function(i, target, stageX, stageY) {
-                this._pushResult('inspect(' + Math.round(stageX) + ', ' + Math.round(stageY) + ')', target);
+                this._pushResult('<inspect x:' + stageX + ' y:' + stageY + '>',
+                                 target);
            }));
            inspector.connect('closed', Lang.bind(this, function() {
                this.actor.show();
@ -913,7 +912,7 @@ const LookingGlass = new Lang.Class({
        this._memory = new Memory();
        notebook.appendPage('Memory', this._memory.actor);

-        this._extensions = new Extensions(this);
+        this._extensions = new Extensions();
        notebook.appendPage('Extensions', this._extensions.actor);

        this._entry.clutter_text.connect('activate', Lang.bind(this, function (o, e) {
@ -951,7 +950,9 @@ const LookingGlass = new Lang.Class({

    _updateFont: function() {
        let fontName = this._interfaceSettings.get_string('monospace-font-name');
-        let fontDesc = Pango.FontDescription.from_string(fontName);
+        // This is mishandled by the scanner - should by Pango.FontDescription_from_string(fontName);
+        // https://bugzilla.gnome.org/show_bug.cgi?id=595889
+        let fontDesc = Pango.font_description_from_string(fontName);
        // We ignore everything but size and style; you'd be crazy to set your system-wide
        // monospace font to be bold/oblique/etc. Could easily be added here.
        this.actor.style =
@ -1056,10 +1057,6 @@ const LookingGlass = new Lang.Class({
        this._entry.text = '';
    },

-    inspect: function(x, y) {
-        return global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
-    },
-
    getIt: function () {
        return this._it;
    },
@ -1132,7 +1129,7 @@ const LookingGlass = new Lang.Class({
        if (this._open)
            return;

-        if (!Main.pushModal(this._entry, { keybindingMode: Shell.KeyBindingMode.LOOKING_GLASS }))
+        if (!Main.pushModal(this._entry))
            return;

        this._notebook.selectIndex(0);
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -18,13 +18,10 @@ const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionDownloader = imports.ui.extensionDownloader;
 const Keyboard = imports.ui.keyboard;
 const MessageTray = imports.ui.messageTray;
-const OsdWindow = imports.ui.osdWindow;
 const Overview = imports.ui.overview;
 const Panel = imports.ui.panel;
-const Params = imports.misc.params;
 const RunDialog = imports.ui.runDialog;
 const Layout = imports.ui.layout;
-const LoginManager = imports.misc.loginManager;
 const LookingGlass = imports.ui.lookingGlass;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
@ -33,6 +30,7 @@ const Scripting = imports.ui.scripting;
 const SessionMode = imports.ui.sessionMode;
 const ShellDBus = imports.ui.shellDBus;
 const ShellMountOperation = imports.ui.shellMountOperation;
+const UnlockDialog = imports.ui.unlockDialog;
 const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
@ -52,13 +50,11 @@ let screenShield = null;
 let notificationDaemon = null;
 let windowAttentionHandler = null;
 let ctrlAltTabManager = null;
-let osdWindow = null;
 let sessionMode = null;
 let shellDBusService = null;
 let shellMountOpDBusService = null;
 let screenSaverDBus = null;
 let modalCount = 0;
-let keybindingMode = Shell.KeyBindingMode.NONE;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
@ -70,23 +66,12 @@ let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
 let _overridesSettings = null;

+let background = null;
+
 function _sessionUpdated() {
-    _loadDefaultStylesheet();
-
-    wm.setCustomKeybindingHandler('panel-main-menu',
-                                  Shell.KeyBindingMode.NORMAL |
-                                  Shell.KeyBindingMode.OVERVIEW,
-                                  sessionMode.hasOverview ? Lang.bind(overview, overview.toggle) : null);
-    wm.allowKeybinding('overlay-key', Shell.KeyBindingMode.NORMAL |
-                                      Shell.KeyBindingMode.OVERVIEW);
-
-    wm.setCustomKeybindingHandler('panel-run-dialog',
-                                  Shell.KeyBindingMode.NORMAL |
-                                  Shell.KeyBindingMode.OVERVIEW,
-                                  sessionMode.hasRunDialog ? openRunDialog : null);
-
-    if (!sessionMode.hasRunDialog && lookingGlass)
-        lookingGlass.close();
+    Meta.keybindings_set_custom_handler('panel-run-dialog', sessionMode.hasRunDialog ? openRunDialog : null);
+    if (sessionMode.isGreeter)
+        screenShield.showDialog();
 }

 function start() {
@ -100,21 +85,9 @@ function start() {
    Gio.DesktopAppInfo.set_desktop_env('GNOME');

    sessionMode = new SessionMode.SessionMode();
-    sessionMode.connect('sessions-loaded', _sessionsLoaded);
-    sessionMode.init();
-}
-
-function _sessionsLoaded() {
-    sessionMode.connect('updated', _sessionUpdated);
-    _initializeUI();
-
    shellDBusService = new ShellDBus.GnomeShell();
    shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();

-    _sessionUpdated();
-}
-
-function _initializeUI() {
    // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
    // also initialize ShellAppSystem first.  ShellAppSystem
    // needs to load all the .desktop files, and ShellWindowTracker
@ -128,26 +101,48 @@ function _initializeUI() {

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

-    _loadDefaultStylesheet();
+    // The stage is always covered so Clutter doesn't need to clear it; however
+    // the color is used as the default contents for the Mutter root background
+    // actor so set it anyways.
+    global.stage.color = DEFAULT_BACKGROUND_COLOR;
+    global.stage.no_clear_hint = true;
+
+    _defaultCssStylesheet = global.datadir + '/theme/gnome-shell.css';
+    loadTheme();
+
+    // Set up stage hierarchy to group all UI actors under one container.
+    uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
+    uiGroup.connect('allocate',
+                    function (actor, box, flags) {
+                        let children = uiGroup.get_children();
+                        for (let i = 0; i < children.length; i++)
+                            children[i].allocate_preferred_size(flags);
+                    });
+    uiGroup.connect('get-preferred-width',
+                    function(actor, forHeight, alloc) {
+                        let width = global.stage.width;
+                        [alloc.min_size, alloc.natural_size] = [width, width];
+                    });
+    uiGroup.connect('get-preferred-height',
+                    function(actor, forWidth, alloc) {
+                        let height = global.stage.height;
+                        [alloc.min_size, alloc.natural_size] = [height, height];
+                    });
+    global.window_group.reparent(uiGroup);
+    global.overlay_group.reparent(uiGroup);
+    global.stage.add_actor(uiGroup);

-    // Setup the stage hierarchy early
    layoutManager = new Layout.LayoutManager();
-
-    // Various parts of the codebase still refers to Main.uiGroup
-    // instead using the layoutManager.  This keeps that code
-    // working until it's updated.
-    uiGroup = layoutManager.uiGroup;
-
    xdndHandler = new XdndHandler.XdndHandler();
    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
-    osdWindow = new OsdWindow.OsdWindow();
    overview = new Overview.Overview();
-    wm = new WindowManager.WindowManager();
    magnifier = new Magnifier.Magnifier();
-    if (LoginManager.canLock())
+    if (UnlockDialog.isSupported())
        screenShield = new ScreenShield.ScreenShield();
-
+    else
+        screenShield = new ScreenShield.ScreenShieldFallback();
    panel = new Panel.Panel();
+    wm = new WindowManager.WindowManager();
    messageTray = new MessageTray.MessageTray();
    keyboard = new Keyboard.Keyboard();
    notificationDaemon = new NotificationDaemon.NotificationDaemon();
@ -155,21 +150,25 @@ function _initializeUI() {
    componentManager = new Components.ComponentManager();

    layoutManager.init();
+    keyboard.init();
    overview.init();

    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
                                            false, -1, 1);
+    Meta.keybindings_set_custom_handler('panel-main-menu', Lang.bind(overview, overview.toggle));
    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));

+    sessionMode.connect('update', _sessionUpdated);
+    _sessionUpdated();
+
    // Provide the bus object for gnome-session to
    // initiate logouts.
    EndSessionDialog.init();

-    // We're ready for the session manager to move to the next phase
-    Meta.register_with_session();
-
    _startDate = new Date();

+    global.stage.connect('captured-event', _globalKeyPressHandler);
+
    log('GNOME Shell started at ' + _startDate);

    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
@ -192,18 +191,6 @@ function _initializeUI() {

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

 let _workspaces = [];
@ -387,18 +374,6 @@ function _nWorkspacesChanged() {
    return false;
 }

-function _loadDefaultStylesheet() {
-    if (!sessionMode.isPrimary)
-        return;
-
-    let stylesheet = global.datadir + '/theme/' + sessionMode.stylesheetName;
-    if (_defaultCssStylesheet == stylesheet)
-        return;
-
-    _defaultCssStylesheet = stylesheet;
-    loadTheme();
-}
-
 /**
 * getThemeStylesheet:
 *
@ -479,6 +454,91 @@ function notifyError(msg, details) {
    notify(msg, details);
 }

+function isWindowActorDisplayedOnWorkspace(win, workspaceIndex) {
+    return win.get_workspace() == workspaceIndex ||
+        (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
+}
+
+function getWindowActorsForWorkspace(workspaceIndex) {
+    return global.get_window_actors().filter(function (win) {
+        return isWindowActorDisplayedOnWorkspace(win, workspaceIndex);
+    });
+}
+
+// This function encapsulates hacks to make certain global keybindings
+// work even when we are in one of our modes where global keybindings
+// are disabled with a global grab. (When there is a global grab, then
+// all key events will be delivered to the stage, so ::captured-event
+// on the stage can be used for global keybindings.)
+function _globalKeyPressHandler(actor, event) {
+    if (modalCount == 0)
+        return false;
+    if (event.type() != Clutter.EventType.KEY_PRESS)
+        return false;
+
+    if (!sessionMode.allowKeybindingsWhenModal) {
+        if (modalCount > (overview.visible ? 1 : 0))
+            return false;
+    }
+
+    let symbol = event.get_key_symbol();
+    let keyCode = event.get_key_code();
+    let ignoredModifiers = global.display.get_ignored_modifier_mask();
+    let modifierState = event.get_state() & ~ignoredModifiers;
+
+    // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
+    let action = global.display.get_keybinding_action(keyCode, modifierState);
+
+    if (action == Meta.KeyBindingAction.SWITCH_PANELS) {
+        ctrlAltTabManager.popup(modifierState & Clutter.ModifierType.SHIFT_MASK,
+                                modifierState);
+        return true;
+    }
+
+    switch (action) {
+        // left/right would effectively act as synonyms for up/down if we enabled them;
+        // but that could be considered confusing; we also disable them in the main view.
+        //
+        // case Meta.KeyBindingAction.WORKSPACE_LEFT:
+        //  if (!sessionMode.hasWorkspaces)
+        //      return false;
+        //
+        //     wm.actionMoveWorkspaceLeft();
+        //     return true;
+        // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
+        //  if (!sessionMode.hasWorkspaces)
+        //      return false;
+        //
+        //     wm.actionMoveWorkspaceRight();
+        //     return true;
+        case Meta.KeyBindingAction.WORKSPACE_UP:
+            if (!sessionMode.hasWorkspaces)
+                return false;
+
+            wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+            return true;
+        case Meta.KeyBindingAction.WORKSPACE_DOWN:
+            if (!sessionMode.hasWorkspaces)
+                return false;
+
+            wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
+            return true;
+        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
+        case Meta.KeyBindingAction.COMMAND_2:
+            if (!sessionMode.hasRunDialog)
+                return false;
+
+            openRunDialog();
+            return true;
+        case Meta.KeyBindingAction.PANEL_MAIN_MENU:
+        case Meta.KeyBindingAction.OVERLAY_KEY:
+            overview.hide();
+            return true;
+    }
+
+    return false;
+}
+
 function _findModal(actor) {
    for (let i = 0; i < modalActorFocusStack.length; i++) {
        if (modalActorFocusStack[i].actor == actor)
@ -487,10 +547,14 @@ function _findModal(actor) {
    return -1;
 }

+function isInModalStack(actor) {
+    return _findModal(actor) != -1;
+}
+
 /**
 * pushModal:
 * @actor: #ClutterActor which will be given keyboard focus
- * @params: optional parameters
+ * @timestamp: optional timestamp
 *
 * Ensure we are in a mode where all keyboard and mouse input goes to
 * the stage, and focus @actor. Multiple calls to this function act in
@ -501,27 +565,21 @@ function _findModal(actor) {
 * modal stack returns to this actor, reset the focus to the actor
 * which was focused at the time pushModal() was invoked.
 *
- * @params may be used to provide the following parameters:
- *  - timestamp: used to associate the call with a specific user initiated
- *               event.  If not provided then the value of
- *               global.get_current_time() is assumed.
+ * @timestamp is optionally used to associate the call with a specific user
+ * initiated event.  If not provided then the value of
+ * global.get_current_time() is assumed.
 *
- *  - options: Meta.ModalOptions flags to indicate that the pointer is
- *             already grabbed
- *
- *  - keybindingMode: used to set the current Shell.KeyBindingMode to filter
- *                    global keybindings; the default of NONE will filter
- *                    out all keybindings
+ * @options: optional Meta.ModalOptions flags to indicate that the
+ *           pointer is alrady grabbed
 *
 * Returns: true iff we successfully acquired a grab or already had one
 */
-function pushModal(actor, params) {
-    params = Params.parse(params, { timestamp: global.get_current_time(),
-                                    options: 0,
-                                    keybindingMode: Shell.KeyBindingMode.NONE });
+function pushModal(actor, timestamp, options) {
+    if (timestamp == undefined)
+        timestamp = global.get_current_time();

    if (modalCount == 0) {
-        if (!global.begin_modal(params.timestamp, params.options)) {
+        if (!global.begin_modal(timestamp, options ? options : 0)) {
            log('pushModal: invocation of begin_modal failed');
            return false;
        }
@ -536,23 +594,20 @@ function pushModal(actor, params) {
        if (index >= 0)
            popModal(actor);
    });
-
-    let prevFocus = global.stage.get_key_focus();
-    let prevFocusDestroyId;
-    if (prevFocus != null) {
-        prevFocusDestroyId = prevFocus.connect('destroy', function() {
+    let curFocus = global.stage.get_key_focus();
+    let curFocusDestroyId;
+    if (curFocus != null) {
+        curFocusDestroyId = curFocus.connect('destroy', function() {
            let index = _findModal(actor);
            if (index >= 0)
-                modalActorFocusStack[index].prevFocus = null;
+                modalActorFocusStack[index].actor = null;
        });
    }
    modalActorFocusStack.push({ actor: actor,
+                                focus: curFocus,
                                destroyId: actorDestroyId,
-                                prevFocus: prevFocus,
-                                prevFocusDestroyId: prevFocusDestroyId,
-                                keybindingMode: keybindingMode });
+                                focusDestroyId: curFocusDestroyId });

-    keybindingMode = params.keybindingMode;
    global.stage.set_key_focus(actor);
    return true;
 }
@ -579,7 +634,6 @@ function popModal(actor, timestamp) {
        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');
    }
@ -590,34 +644,17 @@ function popModal(actor, timestamp) {
    record.actor.disconnect(record.destroyId);

    if (focusIndex == modalActorFocusStack.length - 1) {
-        if (record.prevFocus)
-            record.prevFocus.disconnect(record.prevFocusDestroyId);
-        keybindingMode = record.keybindingMode;
-        global.stage.set_key_focus(record.prevFocus);
+        if (record.focus)
+            record.focus.disconnect(record.focusDestroyId);
+        global.stage.set_key_focus(record.focus);
    } else {
-        // If we have:
-        //     global.stage.set_focus(a);
-        //     Main.pushModal(b);
-        //     Main.pushModal(c);
-        //     Main.pushModal(d);
-        //
-        // then we have the stack:
-        //     [{ prevFocus: a, actor: b },
-        //      { prevFocus: b, actor: c },
-        //      { prevFocus: c, actor: d }]
-        //
-        // When actor c is destroyed/popped, if we only simply remove the
-        // record, then the focus stack will be [a, c], rather than the correct
-        // [a, b]. Shift the focus stack up before removing the record to ensure
-        // that we get the correct result.
        let t = modalActorFocusStack[modalActorFocusStack.length - 1];
-        if (t.prevFocus)
-            t.prevFocus.disconnect(t.prevFocusDestroyId);
+        if (t.focus)
+            t.focus.disconnect(t.focusDestroyId);
        // Remove from the middle, shift the focus chain up
        for (let i = modalActorFocusStack.length - 1; i > focusIndex; i--) {
-            modalActorFocusStack[i].prevFocus = modalActorFocusStack[i - 1].prevFocus;
-            modalActorFocusStack[i].prevFocusDestroyId = modalActorFocusStack[i - 1].prevFocusDestroyId;
-            modalActorFocusStack[i].keybindingMode = modalActorFocusStack[i - 1].keybindingMode;
+            modalActorFocusStack[i].focus = modalActorFocusStack[i - 1].focus;
+            modalActorFocusStack[i].focusDestroyId = modalActorFocusStack[i - 1].focusDestroyId;
        }
    }
    modalActorFocusStack.splice(focusIndex, 1);
@ -628,7 +665,6 @@ function popModal(actor, timestamp) {
    global.end_modal(timestamp);
    global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
    Meta.enable_unredirect_for_screen(global.screen);
-    keybindingMode = Shell.KeyBindingMode.NORMAL;
 }

 function createLookingGlass() {
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -37,16 +37,12 @@ const ModalDialog = new Lang.Class({
        params = Params.parse(params, { shellReactive: false,
                                        styleClass: null,
                                        parentActor: Main.uiGroup,
-                                        keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL,
-                                        shouldFadeIn: true,
-                                        destroyOnClose: true });
+                                        shouldFadeIn: true });

        this.state = State.CLOSED;
        this._hasModal = false;
-        this._keybindingMode = params.keybindingMode;
        this._shellReactive = params.shellReactive;
        this._shouldFadeIn = params.shouldFadeIn;
-        this._destroyOnClose = params.destroyOnClose;

        this._group = new St.Widget({ visible: false,
                                      x: 0,
@ -60,9 +56,7 @@ const ModalDialog = new Lang.Class({

        this._group.connect('destroy', Lang.bind(this, this._onGroupDestroy));

-        this._pressedKey = null;
-        this._buttonKeys = {};
-        this._group.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
+        this._actionKeys = {};
        this._group.connect('key-release-event', Lang.bind(this, this._onKeyReleaseEvent));

        this._backgroundBin = new St.Bin();
@ -84,7 +78,7 @@ const ModalDialog = new Lang.Class({
            let stack = new Shell.Stack();
            this._backgroundBin.child = stack;

-            this._eventBlocker = new Clutter.Actor({ reactive: true });
+            this._eventBlocker = new Clutter.Group({ reactive: true });
            stack.add_actor(this._eventBlocker);
            stack.add_actor(this.dialogLayout);
        } else {
@ -99,9 +93,10 @@ const ModalDialog = new Lang.Class({
                                x_align: St.Align.MIDDLE,
                                y_align: St.Align.START });

-        this.buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
-                                               vertical: false });
-        this.dialogLayout.add(this.buttonLayout,
+        this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
+                                                visible:     false,
+                                                vertical:    false });
+        this.dialogLayout.add(this._buttonLayout,
                              { expand:  true,
                                x_align: St.Align.MIDDLE,
                                y_align: St.Align.END });
@ -116,16 +111,35 @@ const ModalDialog = new Lang.Class({
        this._group.destroy();
    },

-    clearButtons: function() {
-        this.buttonLayout.destroy_all_children();
-        this._buttonKeys = {};
+    setActionKey: function(key, action) {
+        this._actionKeys[key] = action;
    },

    setButtons: function(buttons) {
-        this.clearButtons();
+        this._buttonLayout.destroy_all_children();
+        this._actionKeys = {};
+
+        this._buttonLayout.visible = (buttons.length > 0);

        for (let i = 0; i < buttons.length; i++) {
            let buttonInfo = buttons[i];
+            let label = buttonInfo['label'];
+            let action = buttonInfo['action'];
+            let key = buttonInfo['key'];
+            let isDefault = buttonInfo['default'];
+
+            if (isDefault && !key) {
+                this._actionKeys[Clutter.KEY_KP_Enter] = action;
+                this._actionKeys[Clutter.KEY_ISO_Enter] = action;
+                key = Clutter.KEY_Return;
+            }
+
+            buttonInfo.button = new St.Button({ style_class: 'modal-dialog-button',
+                                                reactive:    true,
+                                                can_focus:   true,
+                                                label:       label });
+            if (isDefault)
+                buttonInfo.button.add_style_pseudo_class('default');

            let x_alignment;
            if (buttons.length == 1)
@ -137,72 +151,29 @@ const ModalDialog = new Lang.Class({
            else
                x_alignment = St.Align.MIDDLE;

-            this.addButton(buttonInfo, { expand: true,
-                                         x_fill: false,
-                                         y_fill: false,
-                                         x_align: x_alignment,
-                                         y_align: St.Align.MIDDLE });
+            if (!this._initialKeyFocusDestroyId)
+                this._initialKeyFocus = buttonInfo.button;
+            this._buttonLayout.add(buttonInfo.button,
+                                   { expand: true,
+                                     x_fill: false,
+                                     y_fill: false,
+                                     x_align: x_alignment,
+                                     y_align: St.Align.MIDDLE });
+
+            buttonInfo.button.connect('clicked', action);
+
+            if (key)
+                this._actionKeys[key] = action;
        }
-    },

-    addButton: function(buttonInfo, layoutInfo) {
-        let label = buttonInfo['label'];
-        let action = buttonInfo['action'];
-        let key = buttonInfo['key'];
-        let isDefault = buttonInfo['default'];
-
-        let keys;
-
-        if (key)
-            keys = [key];
-        else if (isDefault)
-            keys = [Clutter.KEY_Return, Clutter.KEY_KP_Enter, Clutter.KEY_ISO_Enter];
-        else
-            keys = [];
-
-        let button = new St.Button({ style_class: 'modal-dialog-button',
-                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                     reactive:    true,
-                                     can_focus:   true,
-                                     label:       label });
-        button.connect('clicked', action);
-
-        buttonInfo['button'] = button;
-
-        if (isDefault)
-            button.add_style_pseudo_class('default');
-
-        if (!this._initialKeyFocusDestroyId)
-            this._initialKeyFocus = button;
-
-        for (let i in keys)
-            this._buttonKeys[keys[i]] = buttonInfo;
-
-        this.buttonLayout.add(button, layoutInfo);
-
-        return button;
-    },
-
-    _onKeyPressEvent: function(object, event) {
-        this._pressedKey = event.get_key_symbol();
+        this.emit('buttons-set');
    },

    _onKeyReleaseEvent: function(object, event) {
-        let pressedKey = this._pressedKey;
-        this._pressedKey = null;
-
        let symbol = event.get_key_symbol();
-        if (symbol != pressedKey)
-            return false;
+        let action = this._actionKeys[symbol];

-        let buttonInfo = this._buttonKeys[symbol];
-        if (!buttonInfo)
-            return false;
-
-        let button = buttonInfo['button'];
-        let action = buttonInfo['action'];
-
-        if (action && button.reactive) {
+        if (action) {
            action();
            return true;
        }
@ -255,7 +226,7 @@ const ModalDialog = new Lang.Class({
        if (this.state == State.OPENED || this.state == State.OPENING)
            return true;

-        if (!this.pushModal({ timestamp: timestamp }))
+        if (!this.pushModal(timestamp))
            return false;

        this._fadeOpen(onPrimary);
@ -278,10 +249,6 @@ const ModalDialog = new Lang.Class({
                               function() {
                                   this.state = State.CLOSED;
                                   this._group.hide();
-                                   this.emit('closed');
-
-                                   if (this._destroyOnClose)
-                                       this.destroy();
                               })
                         });
    },
@ -309,8 +276,7 @@ const ModalDialog = new Lang.Class({
    pushModal: function (timestamp) {
        if (this._hasModal)
            return true;
-        if (!Main.pushModal(this._group, { timestamp: timestamp,
-                                           keybindingMode: this._keybindingMode }))
+        if (!Main.pushModal(this._group, timestamp))
            return false;

        this._hasModal = true;
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -103,126 +103,6 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
    'ibus-ui-gtk': 'keyboard'
 };

-const NotificationGenericPolicy = new Lang.Class({
-    Name: 'NotificationGenericPolicy',
-    Extends: MessageTray.NotificationPolicy,
-
-    _init: function() {
-        // Don't chain to parent, it would try setting
-        // our properties to the defaults
-
-        this.id = 'generic';
-
-        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
-        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
-    },
-
-    store: function() { },
-
-    destroy: function() {
-        this._masterSettings.run_dispose();
-    },
-
-    _changed: function(settings, key) {
-        this.emit('policy-changed', key);
-    },
-
-    get enable() {
-        return true;
-    },
-
-    get enableSound() {
-        return true;
-    },
-
-    get showBanners() {
-        return this._masterSettings.get_boolean('show-banners');
-    },
-
-    get forceExpanded() {
-        return false;
-    },
-
-    get showInLockScreen() {
-        return this._masterSettings.get_boolean('show-in-lock-screen');
-    },
-
-    get detailsInLockScreen() {
-        return false;
-    }
-});
-
-const NotificationApplicationPolicy = new Lang.Class({
-    Name: 'NotificationApplicationPolicy',
-    Extends: MessageTray.NotificationPolicy,
-
-    _init: function(id) {
-        // Don't chain to parent, it would try setting
-        // our properties to the defaults
-
-        this.id = id;
-        this._canonicalId = this._canonicalizeId(id)
-
-        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
-        this._settings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications.application',
-                                            path: '/org/gnome/desktop/notifications/application/' + this._canonicalId + '/' });
-
-        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
-        this._settings.connect('changed', Lang.bind(this, this._changed));
-    },
-
-    store: function() {
-        this._settings.set_string('application-id', this.id + '.desktop');
-
-        let apps = this._masterSettings.get_strv('application-children');
-        if (apps.indexOf(this._canonicalId) < 0) {
-            apps.push(this._canonicalId);
-            this._masterSettings.set_strv('application-children', apps);
-        }
-    },
-
-    destroy: function() {
-        this._masterSettings.run_dispose();
-        this._settings.run_dispose();
-    },
-
-    _changed: function(settings, key) {
-        this.emit('policy-changed', key);
-    },
-
-    _canonicalizeId: function(id) {
-        // Keys are restricted to lowercase alphanumeric characters and dash,
-        // and two dashes cannot be in succession
-        return id.toLowerCase().replace(/[^a-z0-9\-]/g, '-').replace(/--+/g, '-');
-    },
-
-    get enable() {
-        return this._settings.get_boolean('enable');
-    },
-
-    get enableSound() {
-        return this._settings.get_boolean('enable-sound-alerts');
-    },
-
-    get showBanners() {
-        return this._masterSettings.get_boolean('show-banners') &&
-            this._settings.get_boolean('show-banners');
-    },
-
-    get forceExpanded() {
-        return this._settings.get_boolean('force-expanded');
-    },
-
-    get showInLockScreen() {
-        return this._masterSettings.get_boolean('show-in-lock-screen') &&
-            this._settings.get_boolean('show-in-lock-screen');
-    },
-
-    get detailsInLockScreen() {
-        return this._settings.get_boolean('details-in-lock-screen');
-    }
-});
-
 const NotificationDaemon = new Lang.Class({
    Name: 'NotificationDaemon',

@ -244,45 +124,45 @@ const NotificationDaemon = new Lang.Class({
        Main.overview.connect('hidden',
            Lang.bind(this, this._onFocusAppChanged));

-        this._trayManager.manage_screen(global.screen, Main.messageTray.actor);
+        this._trayManager.manage_stage(global.stage, Main.messageTray.actor);
    },

-    _imageForNotificationData: function(hints) {
-        if (hints['image-data']) {
+    _iconForNotificationData: function(icon, hints) {
+        // If an icon is not specified, we use 'image-data' or 'image-path' hint for an icon
+        // and don't show a large image. There are currently many applications that use
+        // notify_notification_set_icon_from_pixbuf() from libnotify, which in turn sets
+        // the 'image-data' hint. These applications don't typically pass in 'app_icon'
+        // argument to Notify() and actually expect the pixbuf to be shown as an icon.
+        // So the logic here does the right thing for this case. If both an icon and either
+        // one of 'image-data' or 'image-path' are specified, we show both an icon and
+        // a large image.
+        if (icon) {
+            if (icon.substr(0, 7) == 'file://')
+                return new Gio.FileIcon({ file: Gio.File.new_for_uri(icon) });
+            else if (icon[0] == '/') {
+                return new Gio.FileIcon({ file: Gio.File.new_for_path(icon) });
+            } else
+                return new Gio.ThemedIcon({ name: icon });
+        } else if (hints['image-data']) {
            let [width, height, rowStride, hasAlpha,
                 bitsPerSample, nChannels, data] = hints['image-data'];
            return Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
                                                      bitsPerSample, width, height, rowStride);
        } else if (hints['image-path']) {
            return new Gio.FileIcon({ file: Gio.File.new_for_path(hints['image-path']) });
+        } else {
+            let stockIcon;
+            switch (hints.urgency) {
+                case Urgency.LOW:
+                case Urgency.NORMAL:
+                    stockIcon = 'gtk-dialog-info';
+                    break;
+                case Urgency.CRITICAL:
+                    stockIcon = 'gtk-dialog-error';
+                    break;
+            }
+            return new Gio.ThemedIcon({ name: stockIcon });
        }
-        return null;
-    },
-
-    _fallbackIconForNotificationData: function(hints) {
-        let stockIcon;
-        switch (hints.urgency) {
-            case Urgency.LOW:
-            case Urgency.NORMAL:
-                stockIcon = 'gtk-dialog-info';
-                break;
-            case Urgency.CRITICAL:
-                stockIcon = 'gtk-dialog-error';
-                break;
-        }
-        return new Gio.ThemedIcon({ name: stockIcon });
-    },
-
-    _iconForNotificationData: function(icon) {
-        if (icon) {
-            if (icon.substr(0, 7) == 'file://')
-                return new Gio.FileIcon({ file: Gio.File.new_for_uri(icon) });
-            else if (icon[0] == '/')
-                return new Gio.FileIcon({ file: Gio.File.new_for_path(icon) });
-            else
-                return new Gio.ThemedIcon({ name: icon });
-        }
-        return null;
    },

    _lookupSource: function(title, pid, trayIcon) {
@ -333,7 +213,7 @@ const NotificationDaemon = new Lang.Class({
            }
        }

-        let source = new Source(title, pid, sender, trayIcon, ndata ? ndata.hints['desktop-entry'] : null);
+        let source = new Source(title, pid, sender, trayIcon);
        source.setTransient(isForTransientNotification);

        if (!isForTransientNotification) {
@ -475,8 +355,12 @@ const NotificationDaemon = new Lang.Class({
            [ndata.id, ndata.icon, ndata.summary, ndata.body,
             ndata.actions, ndata.hints, ndata.notification];

+        let gicon = this._iconForNotificationData(icon, hints);
+
        if (notification == null) {
-            notification = new MessageTray.Notification(source);
+            notification = new MessageTray.Notification(source, summary, body,
+                                                        { gicon: gicon,
+                                                          bannerMarkup: true });
            ndata.notification = notification;
            notification.connect('destroy', Lang.bind(this,
                function(n, reason) {
@ -499,38 +383,29 @@ const NotificationDaemon = new Lang.Class({
                function(n, actionId) {
                    this._emitActionInvoked(ndata.id, actionId);
                }));
+        } else {
+            notification.update(summary, body, { gicon: gicon,
+                                                 bannerMarkup: true,
+                                                 clear: true });
        }

-        // Mark music notifications so they can be shown in the screen shield
-        notification.isMusic = (ndata.hints['category'] == 'x-gnome.music');
-
-        let gicon = this._iconForNotificationData(icon, hints);
-        let gimage = this._imageForNotificationData(hints);
-
-        let image = null;
-
-        // If an icon is not specified, we use 'image-data' or 'image-path' hint for an icon
-        // and don't show a large image. There are currently many applications that use
-        // notify_notification_set_icon_from_pixbuf() from libnotify, which in turn sets
-        // the 'image-data' hint. These applications don't typically pass in 'app_icon'
-        // argument to Notify() and actually expect the pixbuf to be shown as an icon.
-        // So the logic here does the right thing for this case. If both an icon and either
-        // one of 'image-data' or 'image-path' are specified, we show both an icon and
-        // a large image.
-        if (gicon && gimage)
-            image = new St.Icon({ gicon: gimage,
-                                  icon_size: notification.IMAGE_SIZE });
-        else if (!gicon && gimage)
-            gicon = gimage;
-        else if (!gicon)
-            gicon = this._fallbackIconForNotificationData(hints);
-
-        notification.update(summary, body, { gicon: gicon,
-                                             bannerMarkup: true,
-                                             clear: true,
-                                             soundFile: hints['sound-file'],
-                                             soundName: hints['sound-name'] });
-        notification.setImage(image);
+        // We only display a large image if an icon is also specified.
+        if (icon && (hints['image-data'] || hints['image-path'])) {
+            let image = null;
+            if (hints['image-data']) {
+                let [width, height, rowStride, hasAlpha,
+                 bitsPerSample, nChannels, data] = hints['image-data'];
+                image = St.TextureCache.get_default().load_from_raw(data, hasAlpha,
+                                                                    width, height, rowStride, notification.IMAGE_SIZE);
+            } else if (hints['image-path']) {
+                image = St.TextureCache.get_default().load_uri_async(GLib.filename_to_uri(hints['image-path'], null),
+                                                                     notification.IMAGE_SIZE,
+                                                                     notification.IMAGE_SIZE);
+            }
+            notification.setImage(image);
+        } else {
+            notification.unsetImage();
+        }

        if (actions.length) {
            notification.setUseActionIcons(hints['action-icons'] == true);
@ -560,7 +435,7 @@ const NotificationDaemon = new Lang.Class({
        // of the 'transient' hint with hints['transient'] rather than hints.transient
        notification.setTransient(hints['transient'] == true);

-        let sourceGIcon = source.useNotificationIcon ? gicon : null;
+        let sourceGIcon = source.useNotificationIcon ? this._iconForNotificationData(icon, hints) : null;
        source.processNotification(notification, sourceGIcon);
    },

@ -584,7 +459,7 @@ const NotificationDaemon = new Lang.Class({
            // 'icon-multi',
            'icon-static',
            'persistence',
-            'sound',
+            // 'sound',
        ];
    },

@ -640,22 +515,12 @@ const Source = new Lang.Class({
    Name: 'NotificationDaemonSource',
    Extends: MessageTray.Source,

-    _init: function(title, pid, sender, trayIcon, appId) {
-        // Need to set the app before chaining up, so
-        // methods called from the parent constructor can find it
-        this.trayIcon = trayIcon;
-        this.pid = pid;
-        this.app = this._getApp(appId);
-
+    _init: function(title, pid, sender, trayIcon) {
        this.parent(title);

        this.initialTitle = title;

-        if (this.app)
-            this.title = this.app.get_name();
-        else
-            this.useNotificationIcon = true;
-
+        this.pid = pid;
        if (sender)
            this._nameWatcherId = Gio.DBus.session.watch_name(sender,
                                                              Gio.BusNameWatcherFlags.NONE,
@ -664,19 +529,16 @@ const Source = new Lang.Class({
        else
            this._nameWatcherId = 0;

-        if (this.trayIcon) {
-            // Try again finding the app, using the WM_CLASS from the tray icon
-            this._setSummaryIcon(this.trayIcon);
-            this.useNotificationIcon = false;
-        }
-    },
+        this._setApp();
+        if (this.app)
+            this.title = this.app.get_name();
+        else
+            this.useNotificationIcon = true;

-    _createPolicy: function() {
-        if (this.app) {
-            let id = this.app.get_id().replace(/\.desktop$/,'');
-            return new NotificationApplicationPolicy(id);
-        } else {
-            return new NotificationGenericPolicy();
+        this.trayIcon = trayIcon;
+        if (this.trayIcon) {
+           this._setSummaryIcon(this.trayIcon);
+           this.useNotificationIcon = false;
        }
    },

@ -703,17 +565,19 @@ const Source = new Lang.Class({
            this.notify(notification);
    },

-    handleSummaryClick: function(button) {
+    handleSummaryClick: function() {
        if (!this.trayIcon)
            return false;

        let event = Clutter.get_current_event();
+        if (event.type() != Clutter.EventType.BUTTON_RELEASE)
+            return false;

        // Left clicks are passed through only where there aren't unacknowledged
        // notifications, so it possible to open them in summary mode; right
        // clicks are always forwarded, as the right click menu is not useful for
        // tray icons
-        if (button == 1 &&
+        if (event.get_button() == 1 &&
            this.notifications.length > 0)
            return false;

@ -726,7 +590,7 @@ const Source = new Lang.Class({
        return true;
    },

-    _getApp: function(appId) {
+    _getApp: function() {
        let app;

        app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid);
@ -734,13 +598,7 @@ const Source = new Lang.Class({
            return app;

        if (this.trayIcon) {
-            app = Shell.AppSystem.get_default().lookup_wmclass(this.trayIcon.wm_class);
-            if (app != null)
-                return app;
-        }
-
-        if (appId) {
-            app = Shell.AppSystem.get_default().lookup_app(appId + '.desktop');
+            app = Shell.AppSystem.get_default().lookup_wmclass(this.trayIcon.wmclass);
            if (app != null)
                return app;
        }
@ -748,11 +606,11 @@ const Source = new Lang.Class({
        return null;
    },

-    _setApp: function(appId) {
+    _setApp: function() {
        if (this.app)
            return;

-        this.app = this._getApp(appId);
+        this.app = this._getApp();
        if (!this.app)
            return;

--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@ -1,179 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-
-const Lang = imports.lang;
-const Layout = imports.ui.layout;
-const Main = imports.ui.main;
-const Mainloop = imports.mainloop;
-const Tweener = imports.ui.tweener;
-
-const HIDE_TIMEOUT = 1500;
-const FADE_TIME = 0.1;
-const LEVEL_ANIMATION_TIME = 0.1;
-
-const LevelBar = new Lang.Class({
-    Name: 'LevelBar',
-
-    _init: function() {
-        this._level = 0;
-
-        this.actor = new St.Bin({ style_class: 'level',
-                                  x_fill: true, y_fill: true });
-        this._bar = new St.DrawingArea();
-        this._bar.connect('repaint', Lang.bind(this, this._repaint));
-
-        this.actor.set_child(this._bar);
-    },
-
-    get level() {
-        return this._level;
-    },
-
-    set level(value) {
-        let newValue = Math.max(0, Math.min(value, 100));
-        if (newValue == this._level)
-            return;
-        this._level = newValue;
-        this._bar.queue_repaint();
-    },
-
-    _repaint: function() {
-        let cr = this._bar.get_context();
-
-        let node = this.actor.get_theme_node();
-        let radius = node.get_border_radius(0); // assume same radius for all corners
-        Clutter.cairo_set_source_color(cr, node.get_foreground_color());
-
-        let [w, h] = this._bar.get_surface_size();
-        w *= (this._level / 100.);
-
-        if (w == 0)
-            return;
-
-        cr.moveTo(radius, 0);
-        if (w >= radius)
-            cr.arc(w - radius, radius, radius, 1.5 * Math.PI, 2. * Math.PI);
-        else
-            cr.lineTo(w, 0);
-        if (w >= radius)
-            cr.arc(w - radius, h - radius, radius, 0, 0.5 * Math.PI);
-        else
-            cr.lineTo(w, h);
-        cr.arc(radius, h - radius, radius, 0.5 * Math.PI, Math.PI);
-        cr.arc(radius, radius, radius, Math.PI, 1.5 * Math.PI);
-        cr.fill();
-    }
-});
-
-const OsdWindow = new Lang.Class({
-    Name: 'OsdWindow',
-
-    _init: function() {
-        this.actor = new St.Widget({ x_expand: true,
-                                     y_expand: true,
-                                     x_align: Clutter.ActorAlign.CENTER,
-                                     y_align: Clutter.ActorAlign.CENTER });
-        this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
-        this._box = new St.BoxLayout({ style_class: 'osd-window',
-                                       vertical: true });
-        this.actor.add_actor(this._box);
-
-        this._icon = new St.Icon();
-        this._box.add(this._icon, { expand: true });
-
-        this._label = new St.Label();
-        this._box.add(this._label);
-
-        this._level = new LevelBar();
-        this._box.add(this._level.actor);
-
-        this._hideTimeoutId = 0;
-        this._reset();
-
-        Main.layoutManager.connect('monitors-changed',
-                                   Lang.bind(this, this._monitorsChanged));
-        this._monitorsChanged();
-
-        Main.layoutManager.addChrome(this.actor, { affectsInputRegion: false });
-    },
-
-    setIcon: function(icon) {
-        this._icon.gicon = icon;
-    },
-
-    setLabel: function(label) {
-        this._label.visible = (label != undefined);
-        if (label)
-            this._label.text = label;
-    },
-
-    setLevel: function(level) {
-        this._level.actor.visible = (level != undefined);
-        if (this.actor.visible)
-            Tweener.addTween(this._level,
-                             { level: level,
-                               time: LEVEL_ANIMATION_TIME,
-                               transition: 'easeOutQuad' });
-        else
-            this._level.level = level;
-    },
-
-    show: function() {
-        if (!this._icon.gicon)
-            return;
-
-        if (!this.actor.visible) {
-            this.actor.show();
-            this.actor.opacity = 0;
-
-            Tweener.addTween(this.actor,
-                             { opacity: 255,
-                               time: FADE_TIME,
-                               transition: 'easeOutQuad' });
-        }
-
-        if (this._hideTimeoutId)
-            Mainloop.source_remove(this._hideTimeoutId);
-        this._hideTimeoutId = Mainloop.timeout_add(HIDE_TIMEOUT,
-                                                   Lang.bind(this, this._hide));
-    },
-
-    cancel: function() {
-        if (!this._hideTimeoutId)
-            return;
-
-        Mainloop.source_remove(this._hideTimeoutId);
-        this._hideTimeoutId = 0;
-        this._hide();
-    },
-
-    _hide: function() {
-        Tweener.addTween(this.actor,
-                         { opacity: 0,
-                           time: FADE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, this._reset) });
-    },
-
-    _reset: function() {
-        this.actor.hide();
-        this.setLabel(null);
-        this.setLevel(null);
-    },
-
-    _monitorsChanged: function() {
-        /* assume 110x110 on a 640x480 display and scale from there */
-        let monitor = Main.layoutManager.primaryMonitor;
-        let scalew = monitor.width / 640.0;
-        let scaleh = monitor.height / 480.0;
-        let scale = Math.min(scalew, scaleh);
-        let size = 110 * Math.max(1, scale);
-
-        this._box.set_size(size, size);
-        this._box.translation_y = monitor.height / 4;
-
-        this._icon.icon_size = size / 2;
-    }
-});
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -10,13 +10,11 @@ const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Gdk = imports.gi.Gdk;

-const Background = imports.ui.background;
+const CenterLayout = imports.ui.centerLayout;
 const Dash = imports.ui.dash;
 const DND = imports.ui.dnd;
-const LayoutManager = imports.ui.layout;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
-const OverviewControls = imports.ui.overviewControls;
 const Panel = imports.ui.panel;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
@ -26,14 +24,19 @@ const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
 // Time for initial animation going into Overview mode
 const ANIMATION_TIME = 0.25;

-// Must be less than ANIMATION_TIME, since we switch to
-// or from the overview completely after ANIMATION_TIME,
-// and don't want the shading animation to get cut off
-const SHADE_ANIMATION_TIME = .20;
-
 const DND_WINDOW_SWITCH_TIMEOUT = 1250;

-const OVERVIEW_ACTIVATION_TIMEOUT = 0.5;
+const SwipeScrollDirection = {
+    NONE: 0,
+    HORIZONTAL: 1,
+    VERTICAL: 2
+};
+
+const SwipeScrollResult = {
+    CANCEL: 0,
+    SWIPE: 1,
+    CLICK: 2
+};

 const ShellInfo = new Lang.Class({
    Name: 'ShellInfo',
@ -52,14 +55,7 @@ const ShellInfo = new Lang.Class({
            this._source.destroy();
    },

-    setMessage: function(text, options) {
-        options = Params.parse(options, { undoCallback: null,
-                                          forFeedback: false
-                                        });
-
-        let undoCallback = options.undoCallback;
-        let forFeedback = options.forFeedback;
-
+    setMessage: function(text, undoCallback, undoLabel) {
        if (this._source == null) {
            this._source = new MessageTray.SystemNotificationSource();
            this._source.connect('destroy', Lang.bind(this,
@ -73,7 +69,6 @@ const ShellInfo = new Lang.Class({
        if (this._source.notifications.length == 0) {
            notification = new MessageTray.Notification(this._source, text, null);
            notification.setTransient(true);
-            notification.setForFeedback(forFeedback);
        } else {
            notification = this._source.notifications[0];
            notification.update(text, null, { clear: true });
@ -81,8 +76,10 @@ const ShellInfo = new Lang.Class({

        this._undoCallback = undoCallback;
        if (undoCallback) {
-            notification.addButton('system-undo', _("Undo"));
-            notification.connect('action-invoked', Lang.bind(this, this._onUndoClicked));
+            notification.addButton('system-undo',
+                                   undoLabel ? undoLabel : _("Undo"));
+            notification.connect('action-invoked',
+                                 Lang.bind(this, this._onUndoClicked));
        }

        this._source.notify(notification);
@ -94,7 +91,6 @@ const Overview = new Lang.Class({

    _init: function() {
        this._overviewCreated = false;
-        this._initCalled = false;

        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
        this._sessionUpdated();
@ -109,50 +105,44 @@ const Overview = new Lang.Class({

        this._overviewCreated = true;

-        // The main Background actors are inside global.window_group which are
+        // The main BackgroundActor is inside global.window_group which is
        // hidden when displaying the overview, so we create a new
        // one. Instances of this class share a single CoglTexture behind the
        // scenes which allows us to show the background with different
        // rendering options without duplicating the texture data.
-        let monitor = Main.layoutManager.primaryMonitor;
+        this._background = Meta.BackgroundActor.new_for_screen(global.screen);
+        this._background.hide();
+        global.overlay_group.add_actor(this._background);

        this._desktopFade = new St.Bin();
        global.overlay_group.add_actor(this._desktopFade);

-        let layout = new Clutter.BinLayout();
-        this._stack = new Clutter.Actor({ layout_manager: layout });
-        this._stack.add_constraint(new LayoutManager.MonitorConstraint({ primary: true }));
-
        /* Translators: This is the main view to select
           activities. See also note for "Activities" string. */
        this._overview = new St.BoxLayout({ name: 'overview',
                                            accessible_name: _("Overview"),
                                            reactive: true,
-                                            vertical: true,
-                                            x_expand: true,
-                                            y_expand: true });
+                                            vertical: 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);
+        let layout = new CenterLayout.CenterLayout();
+        CenterLayout.connectSpacing(layout);
+        this._group = new St.Widget({ name: 'overview-group',
+                                      layout_manager: layout });

-        this._backgroundGroup = new Meta.BackgroundGroup();
-        global.overlay_group.add_child(this._backgroundGroup);
-        this._backgroundGroup.hide();
-        this._bgManagers = [];
-
-        this._activationTime = 0;
+        this._scrollDirection = SwipeScrollDirection.NONE;
+        this._scrollAdjustment = null;
+        this._capturedEventId = 0;
+        this._buttonPressId = 0;

        this.visible = false;           // animating to overview, in overview, animating out
        this._shown = false;            // show() and not hide()
+        this._shownTemporarily = false; // showTemporarily() and not hideTemporarily()
        this._modal = false;            // have a modal grab
        this.animationInProgress = false;
-        this.visibleTarget = false;
+        this._hideInProgress = false;
+        this.searchActive = false;
+        this.appsActive = false;

        // 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
@ -162,9 +152,8 @@ const Overview = new Lang.Class({
        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);
-        global.overlay_group.add_actor(this._stack);
+        this._overview.hide();
+        global.overlay_group.add_actor(this._overview);

        this._coverPane.hide();

@ -177,66 +166,12 @@ 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;
        this._lastActiveWorkspaceIndex = -1;
        this._lastHoveredWindow = null;
        this._needsFakePointerEvent = false;
-
-        if (this._initCalled)
-            this.init();
-    },
-
-    _updateBackgrounds: function() {
-        for (let i = 0; i < this._bgManagers.length; i++)
-            this._bgManagers[i].destroy();
-
-        this._bgManagers = [];
-
-        for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
-            let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup,
-                                                               monitorIndex: i,
-                                                               effects: Meta.BackgroundEffects.VIGNETTE });
-            this._bgManagers.push(bgManager);
-        }
-    },
-
-    _unshadeBackgrounds: function() {
-        let backgrounds = this._backgroundGroup.get_children();
-        for (let i = 0; i < backgrounds.length; i++) {
-            let background = backgrounds[i]._delegate;
-
-            Tweener.addTween(background,
-                             { brightness: 1.0,
-                               time: SHADE_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-            Tweener.addTween(background,
-                             { vignetteSharpness: 0.0,
-                               time: SHADE_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-        }
-    },
-
-    _shadeBackgrounds: function() {
-        let backgrounds = this._backgroundGroup.get_children();
-        for (let i = 0; i < backgrounds.length; i++) {
-            let background = backgrounds[i]._delegate;
-
-            Tweener.addTween(background,
-                             { brightness: 0.8,
-                               time: SHADE_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-            Tweener.addTween(background,
-                             { vignetteSharpness: 0.7,
-                               time: SHADE_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-        }
    },

    _sessionUpdated: function() {
@ -249,8 +184,6 @@ const Overview = new Lang.Class({
    // signal handlers and so forth. So we create them after
    // construction in this init() method.
    init: function() {
-        this._initCalled = true;
-
        if (this.isDummy)
            return;

@ -268,46 +201,102 @@ const Overview = new Lang.Class({
                                              in the search entry when no search is
                                              active; it should not exceed ~30
                                              characters. */
-                                           hint_text: _("Type to search…"),
+                                           hint_text: _("Type to search..."),
                                           track_hover: true,
                                           can_focus: true });
        this._searchEntryBin = new St.Bin({ child: this._searchEntry,
                                            x_align: St.Align.MIDDLE });
        this._overview.add_actor(this._searchEntryBin);

-        // Create controls
-        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._groupStack, { y_fill: true, expand: true });
-
-        this._stack.add_actor(this._controls.indicatorActor);
-
        // TODO - recalculate everything when desktop size changes
+        this._dash = new Dash.Dash();
+        this._group.add_actor(this._dash.actor);
        this.dashIconSize = this._dash.iconSize;
        this._dash.connect('icon-size-changed',
                           Lang.bind(this, function() {
                               this.dashIconSize = this._dash.iconSize;
                           }));

+        // Translators: this is the name of the dock/favorites area on
+        // the left of the overview
+        Main.ctrlAltTabManager.addGroup(this._dash.actor, _("Dash"), 'user-bookmarks-symbolic');
+
+        this._viewSelector = new ViewSelector.ViewSelector(this._searchEntry,
+                                                           this._dash.showAppsButton);
+        this._group.add_actor(this._viewSelector.actor);
+
+        this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
+        this._group.add_actor(this._thumbnailsBox.actor);
+
+        // TODO: unique icon
+        Main.ctrlAltTabManager.addGroup(this._thumbnailsBox.actor, _("Workspaces"), 'user-bookmarks-symbolic');
+
+        // Add our same-line elements after the search entry
+        this._overview.add_actor(this._group);
+
+        // Then account for message tray
+        this._messageTrayGhost = new St.Bin({ child: new Clutter.Clone({ source: Main.messageTray.actor }),
+                                              reactive: false,
+                                              opacity: 0 });
+        this._overview.add_actor(this._messageTrayGhost);
+
+        this._viewSelector.connect('search-begin', Lang.bind(this,
+            function() {
+                this.searchActive = true;
+                this._dash.hide();
+                this._thumbnailsBox.hide();
+                Main.messageTray.hide();
+            }));
+        this._viewSelector.connect('search-cancelled', Lang.bind(this,
+            function() {
+                this.searchActive = false;
+                this._dash.show();
+                this._thumbnailsBox.show();
+                // search-cancelled is emitted if we leave the overview
+                // directly from searching. That means the message tray will
+                // be shown when we reach the workspace. Don't do this, only
+                // show the message tray on search-cancelled if we are still
+                // in the overview/not transitioning out of it.
+                if (this.visible && !this.animationInProgress)
+                    Main.messageTray.show();
+            }));
+        this._viewSelector.connect('apps-button-checked', Lang.bind(this,
+            function(vs, checked) {
+                this.appsActive = checked;
+                if (checked) {
+                    this._thumbnailsBox.hide();
+                    Main.messageTray.hide();
+                } else {
+                    this._thumbnailsBox.show();
+                    if (this.visible && !this.animationInProgress)
+                        Main.messageTray.show();
+                }
+            }));
+
+        this.connect('app-drag-begin',
+                              Lang.bind(this, function () {
+                                  this._dash.show();
+                                  this._thumbnailsBox.show();
+                              }));
+        this.connect('app-drag-cancelled',
+                              Lang.bind(this, function () {
+                                  if (this.searchActive) {
+                                      this._dash.hide();
+                                      this._thumbnailsBox.hide();
+                                  } else if (this.appsActive) {
+                                      this._thumbnailsBox.hide();
+                                  }
+                              }));
+        this.connect('app-drag-end',
+                              Lang.bind(this, function () {
+                                  if (this.searchActive) {
+                                      this._dash.hide();
+                                      this._thumbnailsBox.hide();
+                                  } else if (this.appsActive) {
+                                      this._thumbnailsBox.hide();
+                                  }
+                              }));
+
        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._relayout));
        this._relayout();
    },
@ -320,35 +309,26 @@ const Overview = new Lang.Class({
        this._viewSelector.removeSearchProvider(provider);
    },

-    //
-    // options:
-    //  - undoCallback (function): the callback to be called if undo support is needed
-    //  - forFeedback (boolean): whether the message is for direct feedback of a user action
-    //
-    setMessage: function(text, options) {
+    setMessage: function(text, undoCallback, undoLabel) {
        if (this.isDummy)
            return;

-        this._shellInfo.setMessage(text, options);
+        this._shellInfo.setMessage(text, undoCallback, undoLabel);
    },

    _onDragBegin: function() {
-        this._inXdndDrag = true;
-
        DND.addDragMonitor(this._dragMonitor);
        // Remember the workspace we started from
        this._lastActiveWorkspaceIndex = global.screen.get_active_workspace_index();
    },

    _onDragEnd: function(time) {
-        this._inXdndDrag = false;
-
        // In case the drag was canceled while in the overview
        // we have to go back to where we started and hide
        // the overview
-        if (this._shown) {
+        if (this._shownTemporarily)  {
            global.screen.get_workspace_by_index(this._lastActiveWorkspaceIndex).activate(time);
-            this.hide();
+            this.hideTemporarily();
        }
        this._resetWindowSwitchTimeout();
        this._lastHoveredWindow = null;
@ -396,7 +376,7 @@ const Overview = new Lang.Class({
                                                this._needsFakePointerEvent = true;
                                                Main.activateWindow(dragEvent.targetActor._delegate.metaWindow,
                                                                    this._windowSwitchTimestamp);
-                                                this.hide();
+                                                this.hideTemporarily();
                                                this._lastHoveredWindow = null;
                                            }));
        }
@ -404,15 +384,159 @@ const Overview = new Lang.Class({
        return DND.DragMotionResult.CONTINUE;
    },

-    _onScrollEvent: function(actor, event) {
-        this.emit('scroll-event', event);
-    },
-
-    addAction: function(action) {
+    setScrollAdjustment: function(adjustment, direction) {
        if (this.isDummy)
            return;

-        this._overview.add_action(action);
+        this._scrollAdjustment = adjustment;
+        if (this._scrollAdjustment == null)
+            this._scrollDirection = SwipeScrollDirection.NONE;
+        else
+            this._scrollDirection = direction;
+    },
+
+    _onButtonPress: function(actor, event) {
+        if (this._scrollDirection == SwipeScrollDirection.NONE
+            || event.get_button() != 1)
+            return;
+
+        let [stageX, stageY] = event.get_coords();
+        this._dragStartX = this._dragX = stageX;
+        this._dragStartY = this._dragY = stageY;
+        this._dragStartValue = this._scrollAdjustment.value;
+        this._lastMotionTime = -1; // used to track "stopping" while swipe-scrolling
+        this._capturedEventId = global.stage.connect('captured-event',
+            Lang.bind(this, this._onCapturedEvent));
+        this.emit('swipe-scroll-begin');
+    },
+
+    _onCapturedEvent: function(actor, event) {
+        let stageX, stageY;
+        let threshold = Gtk.Settings.get_default().gtk_dnd_drag_threshold;
+
+        switch(event.type()) {
+            case Clutter.EventType.BUTTON_RELEASE:
+                [stageX, stageY] = event.get_coords();
+
+                // default to snapping back to the original value
+                let newValue = this._dragStartValue;
+
+                let minValue = this._scrollAdjustment.lower;
+                let maxValue = this._scrollAdjustment.upper - this._scrollAdjustment.page_size;
+
+                let direction;
+                if (this._scrollDirection == SwipeScrollDirection.HORIZONTAL) {
+                    direction = stageX > this._dragStartX ? -1 : 1;
+                    if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+                        direction *= -1;
+                } else {
+                    direction = stageY > this._dragStartY ? -1 : 1;
+                }
+
+                // We default to scroll a full page size; both the first
+                // and the last page may be smaller though, so we need to
+                // adjust difference in those cases.
+                let difference = direction * this._scrollAdjustment.page_size;
+                if (this._dragStartValue + difference > maxValue)
+                    difference = maxValue - this._dragStartValue;
+                else if (this._dragStartValue + difference < minValue)
+                    difference = minValue - this._dragStartValue;
+
+                // If the user has moved more than half the scroll
+                // difference, we want to "settle" to the new value
+                // even if the user stops dragging rather "throws" by
+                // releasing during the drag.
+                let distance = this._dragStartValue - this._scrollAdjustment.value;
+                let noStop = Math.abs(distance / difference) > 0.5;
+
+                // We detect if the user is stopped by comparing the
+                // timestamp of the button release with the timestamp of
+                // the last motion. Experimentally, a difference of 0 or 1
+                // millisecond indicates that the mouse is in motion, a
+                // larger difference indicates that the mouse is stopped.
+                if ((this._lastMotionTime > 0 &&
+                     this._lastMotionTime > event.get_time() - 2) ||
+                    noStop) {
+                    if (this._dragStartValue + difference >= minValue &&
+                        this._dragStartValue + difference <= maxValue)
+                        newValue += difference;
+                }
+
+                let result;
+
+                // See if the user has moved the mouse enough to trigger
+                // a drag
+                if (Math.abs(stageX - this._dragStartX) < threshold &&
+                    Math.abs(stageY - this._dragStartY) < threshold) {
+                    // no motion? It's a click!
+                    result = SwipeScrollResult.CLICK;
+                    this.emit('swipe-scroll-end', result);
+                } else {
+                    if (newValue == this._dragStartValue)
+                        result = SwipeScrollResult.CANCEL;
+                    else
+                        result = SwipeScrollResult.SWIPE;
+
+                    // The event capture handler is disconnected
+                    // while scrolling to the final position, so
+                    // to avoid undesired prelights we raise
+                    // the cover pane.
+                    this._coverPane.raise_top();
+                    this._coverPane.show();
+
+                    Tweener.addTween(this._scrollAdjustment,
+                                     { value: newValue,
+                                       time: ANIMATION_TIME,
+                                       transition: 'easeOutQuad',
+                                       onCompleteScope: this,
+                                       onComplete: function() {
+                                          this._coverPane.hide();
+                                          this.emit('swipe-scroll-end',
+                                                    result);
+                                       }
+                                     });
+                }
+
+                global.stage.disconnect(this._capturedEventId);
+                this._capturedEventId = 0;
+
+                return result != SwipeScrollResult.CLICK;
+
+            case Clutter.EventType.MOTION:
+                [stageX, stageY] = event.get_coords();
+                let dx = this._dragX - stageX;
+                let dy = this._dragY - stageY;
+                let primary = Main.layoutManager.primaryMonitor;
+
+                this._dragX = stageX;
+                this._dragY = stageY;
+                this._lastMotionTime = event.get_time();
+
+                // See if the user has moved the mouse enough to trigger
+                // a drag
+                if (Math.abs(stageX - this._dragStartX) < threshold &&
+                    Math.abs(stageY - this._dragStartY) < threshold)
+                    return true;
+
+                if (this._scrollDirection == SwipeScrollDirection.HORIZONTAL) {
+                    if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+                        this._scrollAdjustment.value -= (dx / primary.width) * this._scrollAdjustment.page_size;
+                    else
+                        this._scrollAdjustment.value += (dx / primary.width) * this._scrollAdjustment.page_size;
+                } else {
+                    this._scrollAdjustment.value += (dy / primary.height) * this._scrollAdjustment.page_size;
+                }
+
+                return true;
+
+            // Block enter/leave events to avoid prelights
+            // during swipe-scroll
+            case Clutter.EventType.ENTER:
+            case Clutter.EventType.LEAVE:
+                return true;
+        }
+
+        return false;
    },

    _getDesktopClone: function() {
@ -437,12 +561,16 @@ const Overview = new Lang.Class({
        // when it is next shown.
        this.hide();

-        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
+        let primary = Main.layoutManager.primaryMonitor;

-        this._coverPane.set_position(0, workArea.y);
-        this._coverPane.set_size(workArea.width, workArea.height);
+        let contentY = Main.panel.actor.height;
+        let contentHeight = primary.height - contentY - Main.messageTray.actor.height;

-        this._updateBackgrounds();
+        this._overview.set_position(primary.x, primary.y);
+        this._overview.set_size(primary.width, primary.height);
+
+        this._coverPane.set_position(0, contentY);
+        this._coverPane.set_size(primary.width, contentHeight);
    },

    _onRestacked: function() {
@ -454,21 +582,21 @@ const Overview = new Lang.Class({
            stackIndices[stack[i].get_meta_window().get_stable_sequence()] = i;
        }

-        this.emit('windows-restacked', stackIndices);
+        this.emit('sync-window-stacking', stackIndices);
    },

    //// Public methods ////

-    beginItemDrag: function(source) {
-        this.emit('item-drag-begin');
+    beginAppDrag: function(source) {
+        this.emit('app-drag-begin');
    },

-    cancelledItemDrag: function(source) {
-        this.emit('item-drag-cancelled');
+    cancelledAppDrag: function(source) {
+        this.emit('app-drag-cancelled');
    },

-    endItemDrag: function(source) {
-        this.emit('item-drag-end');
+    endAppDrag: function(source) {
+        this.emit('app-drag-end');
    },

    beginWindowDrag: function(source) {
@ -491,12 +619,15 @@ const Overview = new Lang.Class({
            return;
        if (this._shown)
            return;
+        // Do this manually instead of using _syncInputMode, to handle failure
+        if (!Main.pushModal(this._overview))
+            return;
+        this._modal = true;
+        this._animateVisible();
        this._shown = true;

-        if (!this._syncInputMode())
-            return;
-
-        this._animateVisible();
+        this._buttonPressId = this._overview.connect('button-press-event',
+            Lang.bind(this, this._onButtonPress));
    },

    fadeInDesktop: function() {
@ -527,8 +658,6 @@ const Overview = new Lang.Class({

        this.visible = true;
        this.animationInProgress = true;
-        this.visibleTarget = true;
-        this._activationTime = Date.now() / 1000;

        // All the the actors in the window group are completely obscured,
        // hiding the group holding them while the Overview is displayed greatly
@ -540,25 +669,49 @@ const Overview = new Lang.Class({
        //
        // Disable unredirection while in the overview
        Meta.disable_unredirect_for_screen(global.screen);
-        this._stack.show();
-        this._backgroundGroup.show();
+        global.window_group.hide();
+        this._overview.show();
+        this._background.show();
        this._viewSelector.show();

-        this._stack.opacity = 0;
-        Tweener.addTween(this._stack,
+        this._overview.opacity = 0;
+        Tweener.addTween(this._overview,
                         { opacity: 255,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
                           onComplete: this._showDone,
                           onCompleteScope: this
                         });
-        this._shadeBackgrounds();
+
+        Tweener.addTween(this._background,
+                         { dim_factor: 0.4,
+                           time: ANIMATION_TIME,
+                           transition: 'easeOutQuad'
+                         });

        this._coverPane.raise_top();
        this._coverPane.show();
        this.emit('showing');
    },

+    // showTemporarily:
+    //
+    // Animates the overview visible without grabbing mouse and keyboard input;
+    // if show() has already been called, this has no immediate effect, but
+    // will result in the overview not being hidden until hideTemporarily() is
+    // called.
+    showTemporarily: function() {
+        if (this.isDummy)
+            return;
+
+        if (this._shownTemporarily)
+            return;
+
+        this._syncInputMode();
+        this._animateVisible();
+        this._shownTemporarily = true;
+    },
+
    // hide:
    //
    // Reverses the effect of show()
@ -569,46 +722,44 @@ const Overview = new Lang.Class({
        if (!this._shown)
            return;

-        let event = Clutter.get_current_event();
-        if (event) {
-            let type = event.type();
-            let button = (type == Clutter.EventType.BUTTON_PRESS ||
-                          type == Clutter.EventType.BUTTON_RELEASE);
-            let ctrl = (event.get_state() & Clutter.ModifierType.CONTROL_MASK) != 0;
-            if (button && ctrl)
-                return;
-        }
-
-        this._animateNotVisible();
+        if (!this._shownTemporarily)
+            this._animateNotVisible();

        this._shown = false;
        this._syncInputMode();
+
+        if (this._buttonPressId > 0)
+            this._overview.disconnect(this._buttonPressId);
+        this._buttonPressId = 0;
+    },
+
+    // hideTemporarily:
+    //
+    // Reverses the effect of showTemporarily()
+    hideTemporarily: function() {
+        if (this.isDummy)
+            return;
+
+        if (!this._shownTemporarily)
+            return;
+
+        if (!this._shown)
+            this._animateNotVisible();
+
+        this._shownTemporarily = false;
+        this._syncInputMode();
    },

    toggle: function() {
        if (this.isDummy)
            return;

-        if (this.visible)
+        if (this._shown)
            this.hide();
        else
            this.show();
    },

-    // Checks if the Activities button is currently sensitive to
-    // clicks. The first call to this function within the
-    // OVERVIEW_ACTIVATION_TIMEOUT time of the hot corner being
-    // triggered will return false. This avoids opening and closing
-    // the overview if the user both triggered the hot corner and
-    // clicked the Activities button.
-    shouldToggleByCornerOrButton: function() {
-        if (this.animationInProgress)
-            return false;
-        if (this._activationTime == 0 || Date.now() / 1000 - this._activationTime > OVERVIEW_ACTIVATION_TIMEOUT)
-            return true;
-        return false;
-    },
-
    //// Private methods ////

    _syncInputMode: function() {
@ -616,23 +767,21 @@ const Overview = new Lang.Class({
        // overview we don't have a problem with the release of a press/release
        // going to an application.
        if (this.animationInProgress)
-            return true;
+            return;

        if (this._shown) {
-            let shouldBeModal = !this._inXdndDrag;
-            if (shouldBeModal) {
-                if (!this._modal) {
-                    if (Main.pushModal(this._overview,
-                                       { keybindingMode: Shell.KeyBindingMode.OVERVIEW })) {
-                        this._modal = true;
-                    } else {
-                        this.hide();
-                        return false;
-                    }
-                }
-            } else {
-                global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
+            if (!this._modal) {
+                if (Main.pushModal(this._overview))
+                    this._modal = true;
+                else
+                    this.hide();
            }
+        } else if (this._shownTemporarily) {
+            if (this._modal) {
+                Main.popModal(this._overview);
+                this._modal = false;
+            }
+            global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
        } else {
            if (this._modal) {
                Main.popModal(this._overview);
@ -641,7 +790,6 @@ const Overview = new Lang.Class({
            else if (global.stage_input_mode == Shell.StageInputMode.FULLSCREEN)
                global.stage_input_mode = Shell.StageInputMode.NORMAL;
        }
-        return true;
    },

    _animateNotVisible: function() {
@ -649,19 +797,24 @@ const Overview = new Lang.Class({
            return;

        this.animationInProgress = true;
-        this.visibleTarget = false;
+        this._hideInProgress = true;

        this._viewSelector.zoomFromOverview();

        // Make other elements fade out.
-        Tweener.addTween(this._stack,
+        Tweener.addTween(this._overview,
                         { opacity: 0,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
                           onComplete: this._hideDone,
                           onCompleteScope: this
                         });
-        this._unshadeBackgrounds();
+
+        Tweener.addTween(this._background,
+                         { dim_factor: 1.0,
+                           time: ANIMATION_TIME,
+                           transition: 'easeOutQuad'
+                         });

        this._coverPane.raise_top();
        this._coverPane.show();
@ -675,7 +828,7 @@ const Overview = new Lang.Class({

        this.emit('shown');
        // Handle any calls to hide* while we were showing
-        if (!this._shown)
+        if (!this._shown && !this._shownTemporarily)
            this._animateNotVisible();

        this._syncInputMode();
@ -686,19 +839,22 @@ const Overview = new Lang.Class({
        // Re-enable unredirection
        Meta.enable_unredirect_for_screen(global.screen);

+        global.window_group.show();
+
        this._viewSelector.hide();
        this._desktopFade.hide();
-        this._backgroundGroup.hide();
-        this._stack.hide();
+        this._background.hide();
+        this._overview.hide();

        this.visible = false;
        this.animationInProgress = false;
+        this._hideInProgress = false;

        this._coverPane.hide();

        this.emit('hidden');
        // Handle any calls to show* while we were hiding
-        if (this._shown)
+        if (this._shown || this._shownTemporarily)
            this._animateVisible();

        this._syncInputMode();
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@ -1,554 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-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 Main = imports.ui.main;
-const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;
-const ViewSelector = imports.ui.viewSelector;
-
-const SIDE_CONTROLS_ANIMATION_TIME = 0.16;
-
-function getRtlSlideDirection(direction, actor) {
-    let rtl = (actor.text_direction == Clutter.TextDirection.RTL);
-    if (rtl)
-        direction = (direction == SlideDirection.LEFT) ?
-            SlideDirection.RIGHT : SlideDirection.LEFT;
-
-    return direction;
-};
-
-const SlideDirection = {
-    LEFT: 0,
-    RIGHT: 1
-};
-
-const SlideLayout = new Lang.Class({
-    Name: 'SlideLayout',
-    Extends: Clutter.FixedLayout,
-
-    _init: function(params) {
-        this._slideX = 1;
-        this._direction = SlideDirection.LEFT;
-
-        this.parent(params);
-    },
-
-    vfunc_get_preferred_width: function(container, forHeight) {
-        let child = container.get_first_child();
-
-        let [minWidth, natWidth] = child.get_preferred_width(forHeight);
-
-        minWidth *= this._slideX;
-        natWidth *= this._slideX;
-
-        return [minWidth, natWidth];
-    },
-
-    vfunc_allocate: function(container, box, flags) {
-        let child = container.get_first_child();
-
-        let [, , natWidth, natHeight] = child.get_preferred_size();
-        let availWidth = Math.round(box.x2 - box.x1);
-        let availHeight = Math.round(box.y2 - box.y1);
-
-        let realDirection = getRtlSlideDirection(this._direction, child);
-        let translationX = (realDirection == SlideDirection.LEFT) ?
-            (availWidth - natWidth) : (natWidth - availWidth);
-
-        let actorBox = new Clutter.ActorBox({ x1: translationX,
-                                              y1: 0,
-                                              x2: child.x_expand ? availWidth : natWidth,
-                                              y2: child.y_expand ? availHeight : natHeight });
-
-        child.allocate(actorBox, flags);
-    },
-
-    set slideX(value) {
-        this._slideX = value;
-        this.layout_changed();
-    },
-
-    get slideX() {
-        return this._slideX;
-    },
-
-    set slideDirection(direction) {
-        this._direction = direction;
-        this.layout_changed();
-    },
-
-    get slideDirection() {
-        return this._direction;
-    }
-});
-
-const SlidingControl = new Lang.Class({
-    Name: 'SlidingControl',
-
-    _init: function(params) {
-        params = Params.parse(params, { slideDirection: SlideDirection.LEFT });
-
-        this.visible = true;
-        this.inDrag = false;
-
-        this.layout = new SlideLayout();
-        this.layout.slideDirection = params.slideDirection;
-        this.actor = new St.Widget({ layout_manager: this.layout,
-                                     style_class: 'overview-controls',
-                                     clip_to_allocation: true });
-
-        Main.overview.connect('showing', Lang.bind(this, this._onOverviewShowing));
-
-        Main.overview.connect('item-drag-begin', Lang.bind(this, this._onDragBegin));
-        Main.overview.connect('item-drag-end', Lang.bind(this, this._onDragEnd));
-        Main.overview.connect('item-drag-cancelled', Lang.bind(this, this._onDragEnd));
-
-        Main.overview.connect('window-drag-begin', Lang.bind(this, this._onWindowDragBegin));
-        Main.overview.connect('window-drag-cancelled', Lang.bind(this, this._onWindowDragEnd));
-        Main.overview.connect('window-drag-end', Lang.bind(this, this._onWindowDragEnd));
-    },
-
-    getSlide: function() {
-        throw new Error('getSlide() must be overridden');
-    },
-
-    updateSlide: function() {
-        Tweener.addTween(this.layout, { slideX: this.getSlide(),
-                                        time: SIDE_CONTROLS_ANIMATION_TIME,
-                                        transition: 'easeOutQuad' });
-    },
-
-    getVisibleWidth: function() {
-        let child = this.actor.get_first_child();
-        let [, , natWidth, ] = child.get_preferred_size();
-        return natWidth;
-    },
-
-    _getTranslation: function() {
-        let child = this.actor.get_first_child();
-        let direction = getRtlSlideDirection(this.layout.slideDirection, child);
-        let visibleWidth = this.getVisibleWidth();
-
-        if (direction == SlideDirection.LEFT)
-            return - visibleWidth;
-        else
-            return visibleWidth;
-    },
-
-    _updateTranslation: function() {
-        let translationStart = 0;
-        let translationEnd = 0;
-        let translation = this._getTranslation();
-
-        if (this.visible) {
-            translationStart = translation;
-        } else {
-            translationEnd = translation;
-        }
-
-        if (this.actor.translation_x == translationEnd)
-            return;
-
-        this.actor.translation_x = translationStart;
-        Tweener.addTween(this.actor, { translation_x: translationEnd,
-                                       time: SIDE_CONTROLS_ANIMATION_TIME,
-                                       transition: 'easeOutQuad'
-                                     });
-    },
-
-    _onOverviewShowing: function() {
-        // reset any translation and make sure the actor is visible when
-        // entering the overview
-        this.visible = true;
-        this.layout.slideX = this.getSlide();
-        this.actor.translation_x = 0;
-    },
-
-    _onWindowDragBegin: function() {
-        this._onDragBegin();
-    },
-
-    _onWindowDragEnd: function() {
-        this._onDragEnd();
-    },
-
-    _onDragBegin: function() {
-        this.inDrag = true;
-        this.actor.translation_x = 0;
-        this.updateSlide();
-    },
-
-    _onDragEnd: function() {
-        this.inDrag = false;
-        this.updateSlide();
-    },
-
-    fadeIn: function() {
-        Tweener.addTween(this.actor, { opacity: 255,
-                                       time: SIDE_CONTROLS_ANIMATION_TIME / 2,
-                                       transition: 'easeInQuad'
-                                     });
-    },
-
-    fadeHalf: function() {
-        Tweener.addTween(this.actor, { opacity: 128,
-                                       time: SIDE_CONTROLS_ANIMATION_TIME / 2,
-                                       transition: 'easeOutQuad'
-                                     });
-    },
-
-    slideIn: function() {
-        this.visible = true;
-        // we will update slideX and the translation from pageEmpty
-    },
-
-    slideOut: function() {
-        this.visible = false;
-        this._updateTranslation();
-        // we will update slideX from pageEmpty
-    },
-
-    pageEmpty: function() {
-        // When pageEmpty is received, there's no visible view in the
-        // selector; this means we can now safely set the full slide for
-        // the next page, since slideIn or slideOut might have been called,
-        // changing the visiblity
-        this.layout.slideX = this.getSlide();
-        this._updateTranslation();
-    }
-});
-
-const ThumbnailsSlider = new Lang.Class({
-    Name: 'ThumbnailsSlider',
-    Extends: SlidingControl,
-
-    _init: function(thumbnailsBox) {
-        this.parent({ slideDirection: SlideDirection.RIGHT });
-
-        this._thumbnailsBox = thumbnailsBox;
-
-        // SlideLayout reads the actor's expand flags to decide
-        // whether to allocate the natural size to its child, or the whole
-        // available allocation
-        this._thumbnailsBox.actor.y_expand = true;
-
-        this.actor.request_mode = Clutter.RequestMode.WIDTH_FOR_HEIGHT;
-        this.actor.reactive = true;
-        this.actor.track_hover = true;
-        this.actor.add_actor(this._thumbnailsBox.actor);
-
-        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this.updateSlide));
-        this.actor.connect('notify::hover', Lang.bind(this, this.updateSlide));
-    },
-
-    _getAlwaysZoomOut: function() {
-        // Always show the pager when hover, during a drag, or if workspaces are
-        // actually used, e.g. there are windows on more than one
-        let alwaysZoomOut = this.actor.hover || this.inDrag || !Meta.prefs_get_dynamic_workspaces() || global.screen.n_workspaces > 2;
-
-        if (!alwaysZoomOut) {
-            let monitors = Main.layoutManager.monitors;
-            let primary = Main.layoutManager.primaryMonitor;
-
-            /* Look for any monitor to the right of the primary, if there is
-             * one, we always keep zoom out, otherwise its hard to reach
-             * the thumbnail area without passing into the next monitor. */
-            for (let i = 0; i < monitors.length; i++) {
-                if (monitors[i].x >= primary.x + primary.width) {
-                    alwaysZoomOut = true;
-                    break;
-                }
-            }
-        }
-
-        return alwaysZoomOut;
-    },
-
-    getSlide: function() {
-        if (!this.visible)
-            return 0;
-
-        let alwaysZoomOut = this._getAlwaysZoomOut();
-        if (alwaysZoomOut)
-            return 1;
-
-        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 visibleWidth / expandedWidth;
-    },
-
-    getVisibleWidth: function() {
-        let alwaysZoomOut = this._getAlwaysZoomOut();
-        if (alwaysZoomOut)
-            return this.parent();
-
-        let child = this.actor.get_first_child();
-        return child.get_theme_node().get_length('visible-width');
-    }
-});
-
-const DashSlider = new Lang.Class({
-    Name: 'DashSlider',
-    Extends: SlidingControl,
-
-    _init: function(dash) {
-        this.parent({ slideDirection: SlideDirection.LEFT });
-
-        this._dash = dash;
-
-        // SlideLayout reads the actor's expand flags to decide
-        // whether to allocate the natural size to its child, or the whole
-        // available allocation
-        this._dash.actor.x_expand = true;
-        this._dash.actor.y_expand = true;
-        this.actor.add_actor(this._dash.actor);
-
-        this._dash.connect('icon-size-changed', Lang.bind(this, this.updateSlide));
-    },
-
-    getSlide: function() {
-        if (this.visible || this.inDrag)
-            return 1;
-        else
-            return 0;
-    },
-
-    _onWindowDragBegin: function() {
-        this.fadeHalf();
-    },
-
-    _onWindowDragEnd: function() {
-        this.fadeIn();
-    }
-});
-
-const DashSpacer = new Lang.Class({
-    Name: 'DashSpacer',
-    Extends: St.Widget,
-
-    _init: function(params) {
-        this.parent(params);
-
-        this._bindConstraint = null;
-    },
-
-    setDashActor: function(dashActor) {
-        if (this._bindConstraint) {
-            this.remove_constraint(this._bindConstraint);
-            this._bindConstraint = null;
-        }
-
-        if (dashActor) {
-            this._bindConstraint = new Clutter.BindConstraint({ source: dashActor,
-                                                                coordinate: Clutter.BindCoordinate.SIZE });
-            this.add_constraint(this._bindConstraint);
-        }
-    },
-
-    vfunc_get_preferred_width: function(forHeight) {
-        let box = this.get_allocation_box();
-        let minWidth = this.parent(forHeight)[0];
-        let natWidth = box.x2 - box.x1;
-        return [minWidth, natWidth];
-    },
-
-    vfunc_get_preferred_height: function(forWidth) {
-        let box = this.get_allocation_box();
-        let minHeight = this.parent(forWidth)[0];
-        let natHeight = box.y2 - box.y1;
-        return [minHeight, natHeight];
-    }
-});
-
-const MessagesIndicator = new Lang.Class({
-    Name: 'MessagesIndicator',
-
-    _init: function(viewSelector) {
-        this._count = 0;
-        this._sources = [];
-        this._viewSelector = viewSelector;
-
-        this._container = new St.BoxLayout({ style_class: 'messages-indicator-contents',
-                                             reactive: true,
-                                             track_hover: true,
-                                             x_expand: true,
-                                             y_expand: true,
-                                             x_align: Clutter.ActorAlign.CENTER });
-
-        this._icon = new St.Icon({ icon_name: 'user-idle-symbolic',
-                                   icon_size: 16 });
-        this._container.add_actor(this._icon);
-
-        this._label = new St.Label();
-        this._container.add_actor(this._label);
-
-        this._highlight = new St.Widget({ style_class: 'messages-indicator-highlight',
-                                          x_expand: true,
-                                          y_expand: true,
-                                          y_align: Clutter.ActorAlign.END,
-                                          visible: false });
-
-        this._container.connect('notify::hover', Lang.bind(this,
-            function() {
-                this._highlight.visible = this._container.hover;
-            }));
-
-        let clickAction = new Clutter.ClickAction();
-        this._container.add_action(clickAction);
-        clickAction.connect('clicked', Lang.bind(this,
-            function() {
-                Main.messageTray.openTray();
-            }));
-
-        Main.messageTray.connect('showing', Lang.bind(this,
-            function() {
-                this._highlight.visible = false;
-                this._container.hover = false;
-            }));
-
-        let layout = new Clutter.BinLayout();
-        this.actor = new St.Widget({ layout_manager: layout,
-                                     style_class: 'messages-indicator',
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.END,
-                                     visible: false });
-        this.actor.add_actor(this._container);
-        this.actor.add_actor(this._highlight);
-
-        Main.messageTray.connect('source-added', Lang.bind(this, this._onSourceAdded));
-        Main.messageTray.connect('source-removed', Lang.bind(this, this._onSourceRemoved));
-
-        let sources = Main.messageTray.getSources();
-        sources.forEach(Lang.bind(this, function(source) { this._onSourceAdded(null, source); }));
-
-        this._viewSelector.connect('page-changed', Lang.bind(this, this._updateVisibility));
-        Main.overview.connect('showing', Lang.bind(this, this._updateVisibility));
-    },
-
-    _onSourceAdded: function(tray, source) {
-        if (source.trayIcon)
-            return;
-
-        if (source.isTransient)
-            return;
-
-        source.connect('count-updated', Lang.bind(this, this._updateCount));
-        this._sources.push(source);
-        this._updateCount();
-    },
-
-    _onSourceRemoved: function(tray, source) {
-        this._sources.splice(this._sources.indexOf(source), 1);
-        this._updateCount();
-    },
-
-    _updateCount: function() {
-        let count = 0;
-        let hasChats = false;
-        this._sources.forEach(Lang.bind(this,
-            function(source) {
-                count += source.indicatorCount;
-                hasChats |= source.isChat;
-            }));
-
-        this._count = count;
-        this._label.text = ngettext("%d new message",
-                                    "%d new messages",
-                                   count).format(count);
-
-        this._icon.visible = hasChats;
-        this._updateVisibility();
-    },
-
-    _updateVisibility: function() {
-        let activePage = this._viewSelector.getActivePage();
-        let visible = ((this._count > 0) && (activePage == ViewSelector.ViewPage.WINDOWS));
-
-        this.actor.visible = visible;
-    }
-});
-
-const ControlsManager = new Lang.Class({
-    Name: 'ControlsManager',
-
-    _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._thumbnailsSlider = new ThumbnailsSlider(thumbnails);
-        this.thumbnailsActor = this._thumbnailsSlider.actor;
-
-        this._indicator = new MessagesIndicator(viewSelector);
-        this.indicatorActor = this._indicator.actor;
-
-        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();
-                if (activePage != ViewSelector.ViewPage.WINDOWS)
-                    this._viewSelector.fadeHalf();
-            }));
-        Main.overview.connect('item-drag-end', Lang.bind(this,
-            function() {
-                this._viewSelector.fadeIn();
-            }));
-        Main.overview.connect('item-drag-cancelled', Lang.bind(this,
-            function() {
-                this._viewSelector.fadeIn();
-            }));
-    },
-
-    _setVisibility: function() {
-        // Ignore the case when we're leaving the overview, since
-        // actors will be made visible again when entering the overview
-        // next time, and animating them while doing so is just
-        // unnecessary noise
-        if (!Main.overview.visible ||
-            (Main.overview.animationInProgress && !Main.overview.visibleTarget))
-            return;
-
-        let activePage = this._viewSelector.getActivePage();
-        let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS ||
-                           activePage == ViewSelector.ViewPage.APPS);
-        let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
-
-        if (dashVisible)
-            this._dashSlider.slideIn();
-        else
-            this._dashSlider.slideOut();
-
-        if (thumbnailsVisible)
-            this._thumbnailsSlider.slideIn();
-        else
-            this._thumbnailsSlider.slideOut();
-    },
-
-    _updateSpacerVisibility: function() {
-        if (Main.overview.animationInProgress && !Main.overview.visibleTarget)
-            return;
-
-        let activePage = this._viewSelector.getActivePage();
-        this.dashSpacer.visible = (activePage == ViewSelector.ViewPage.WINDOWS);
-    },
-
-    _onPageEmpty: function() {
-        this._dashSlider.pageEmpty();
-        this._thumbnailsSlider.pageEmpty();
-
-        this._updateSpacerVisibility();
-    }
-});
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -15,9 +15,11 @@ const Signals = imports.signals;
 const Atk = imports.gi.Atk;


+const CenterLayout = imports.ui.centerLayout;
 const Config = imports.misc.config;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const DND = imports.ui.dnd;
+const Layout = imports.ui.layout;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
@ -74,41 +76,33 @@ 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();
+const AnimatedIcon = new Lang.Class({
+    Name: 'AnimatedIcon',
+
+    _init: function(name, size) {
+        this.actor = new St.Bin({ visible: false });
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this._speed = speed;
+        this.actor.connect('notify::visible', Lang.bind(this, this._onVisibleNotify));

-        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._animations = St.TextureCache.get_default().load_sliced_image (global.datadir + '/theme/' + name, size, size);
        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() {
+    _disconnectTimeout: function() {
        if (this._timeoutId > 0) {
            Mainloop.source_remove(this._timeoutId);
            this._timeoutId = 0;
        }
+    },

-        this._isPlaying = false;
+    _onVisibleNotify: function() {
+        if (this.actor.visible)
+            this._timeoutId = Mainloop.timeout_add(ANIMATED_ICON_UPDATE_TIMEOUT, Lang.bind(this, this._update));
+        else
+            this._disconnectTimeout();
    },

    _showFrame: function(frame) {
@ -128,24 +122,8 @@ const Animation = new Lang.Class({
        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);
+        this._disconnectTimeout();
    }
 });

@ -202,7 +180,7 @@ const TextShadower = new Lang.Class({
            let child = children[i];
            let childBox = new Clutter.ActorBox();
            // The order of the labels here is arbitrary, except
-            // we know the "real" label is at the end because Clutter.Actor
+            // we know the "real" label is at the end because Clutter.Group
            // sorts by Z order
            switch (i) {
                case 0: // top
@ -258,7 +236,6 @@ const AppMenuButton = new Lang.Class({
        this._actionGroupNotifyId = 0;

        let bin = new St.Bin({ name: 'appMenu' });
-        bin.connect('style-changed', Lang.bind(this, this._onStyleChanged));
        this.actor.add_actor(bin);

        this.actor.bind_property("reactive", this.actor, "can-focus", 0);
@ -298,7 +275,10 @@ const AppMenuButton = new Lang.Class({

        this._stop = true;

-        this._spinner = null;
+        this._spinner = new AnimatedIcon('process-working.svg',
+                                         PANEL_ICON_SIZE);
+        this._container.add_actor(this._spinner.actor);
+        this._spinner.actor.lower_bottom();

        let tracker = Shell.WindowTracker.get_default();
        let appSys = Shell.AppSystem.get_default();
@ -311,7 +291,7 @@ const AppMenuButton = new Lang.Class({
    },

    show: function() {
-        if (this._visible)
+        if (this._visible || Main.screenShield.locked)
            return;

        this._visible = true;
@ -351,18 +331,6 @@ const AppMenuButton = new Lang.Class({
                           onCompleteScope: this });
    },

-    _onStyleChanged: function(actor) {
-        let node = actor.get_theme_node();
-        let [success, icon] = node.lookup_url('spinner-image', false);
-        if (!success || this._spinnerIcon == icon)
-            return;
-        this._spinnerIcon = icon;
-        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();
-    },
-
    _onIconBoxStyleChanged: function() {
        let node = this._iconBox.get_theme_node();
        this._iconBottomClip = node.get_length('app-icon-bottom-clip');
@ -394,17 +362,12 @@ const AppMenuButton = new Lang.Class({

        this._stop = true;
        this.actor.reactive = true;
-
-        if (this._spinner == null)
-            return;
-
        Tweener.addTween(this._spinner.actor,
                         { opacity: 0,
                           time: SPINNER_ANIMATION_TIME,
                           transition: "easeOutQuad",
                           onCompleteScope: this,
                           onComplete: function() {
-                               this._spinner.stop();
                               this._spinner.actor.opacity = 255;
                               this._spinner.actor.hide();
                           }
@ -414,11 +377,6 @@ const AppMenuButton = new Lang.Class({
    startAnimation: function() {
        this._stop = false;
        this.actor.reactive = false;
-
-        if (this._spinner == null)
-            return;
-
-        this._spinner.play();
        this._spinner.actor.show();
    },

@ -480,9 +438,6 @@ const AppMenuButton = new Lang.Class({
        }
        this._label.actor.allocate(childBox, flags);

-        if (this._spinner == null)
-            return;
-
        if (direction == Clutter.TextDirection.LTR) {
            childBox.x1 = Math.floor(iconWidth / 2) + this._label.actor.width;
            childBox.x2 = childBox.x1 + this._spinner.actor.width;
@ -573,8 +528,7 @@ const AppMenuButton = new Lang.Class({
            return;
        }

-        if (this._spinner)
-            this._spinner.actor.hide();
+        this._spinner.actor.hide();
        if (this._iconBox.child != null)
            this._iconBox.child.destroy();
        this._iconBox.hide();
@ -618,18 +572,12 @@ const AppMenuButton = new Lang.Class({
                return;

            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());
-            }));
-
        } else {
-            if (this.menu.isDummyQuitMenu)
+            if (this.menu && !(this.menu instanceof PopupMenu.RemoteMenu))
                return;

            // fallback to older menu
            menu = new PopupMenu.PopupMenu(this.actor, 0.0, St.Side.TOP, 0);
-            menu.isDummyQuitMenu = true;
            menu.addAction(_("Quit"), Lang.bind(this, function() {
                this._targetApp.request_quit();
            }));
@ -642,39 +590,88 @@ const AppMenuButton = new Lang.Class({

 Signals.addSignalMethods(AppMenuButton.prototype);

+// Activities button. Because everything else in the top bar is a
+// PanelMenu.Button, it simplifies some things to make this be one too.
+// We just hack it up to not actually have a menu attached to it.
 const ActivitiesButton = new Lang.Class({
    Name: 'ActivitiesButton',
    Extends: PanelMenu.Button,

    _init: function() {
-        this.parent(0.0, null, true);
+        this.parent(0.0);
        this.actor.accessible_role = Atk.Role.TOGGLE_BUTTON;

+        let container = new Shell.GenericContainer();
+        container.connect('get-preferred-width', Lang.bind(this, this._containerGetPreferredWidth));
+        container.connect('get-preferred-height', Lang.bind(this, this._containerGetPreferredHeight));
+        container.connect('allocate', Lang.bind(this, this._containerAllocate));
+        this.actor.add_actor(container);
        this.actor.name = 'panelActivities';

        /* Translators: If there is no suitable word for "Activities"
           in your language, you can use the word for "Overview". */
        this._label = new St.Label({ text: _("Activities") });
-        this.actor.add_actor(this._label);
+        container.add_actor(this._label);

        this.actor.label_actor = this._label;

+        this.hotCorner = new Layout.HotCorner();
+        container.add_actor(this.hotCorner.actor);
+
+        // Hack up our menu...
+        this.menu.open = Lang.bind(this, this._onMenuOpenRequest);
+        this.menu.close = Lang.bind(this, this._onMenuCloseRequest);
+        this.menu.toggle = Lang.bind(this, this._onMenuToggleRequest);
+
        this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
        this.actor.connect_after('button-release-event', Lang.bind(this, this._onButtonRelease));
        this.actor.connect_after('key-release-event', Lang.bind(this, this._onKeyRelease));

        Main.overview.connect('showing', Lang.bind(this, function() {
            this.actor.add_style_pseudo_class('overview');
+            this._escapeMenuGrab();
            this.actor.add_accessible_state (Atk.StateType.CHECKED);
        }));
        Main.overview.connect('hiding', Lang.bind(this, function() {
            this.actor.remove_style_pseudo_class('overview');
+            this._escapeMenuGrab();
            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
        }));

        this._xdndTimeOut = 0;
    },

+    _containerGetPreferredWidth: function(actor, forHeight, alloc) {
+        [alloc.min_size, alloc.natural_size] = this._label.get_preferred_width(forHeight);
+    },
+
+    _containerGetPreferredHeight: function(actor, forWidth, alloc) {
+        [alloc.min_size, alloc.natural_size] = this._label.get_preferred_height(forWidth);
+    },
+
+    _containerAllocate: function(actor, box, flags) {
+        this._label.allocate(box, flags);
+
+        // The hot corner needs to be outside any padding/alignment
+        // that has been imposed on us
+        let primary = Main.layoutManager.primaryMonitor;
+        let hotBox = new Clutter.ActorBox();
+        let ok, x, y;
+        if (actor.get_text_direction() == Clutter.TextDirection.LTR) {
+            [ok, x, y] = actor.transform_stage_point(primary.x, primary.y)
+        } else {
+            [ok, x, y] = actor.transform_stage_point(primary.x + primary.width, primary.y);
+            // hotCorner.actor has northeast gravity, so we don't need
+            // to adjust x for its width
+        }
+
+        hotBox.x1 = Math.round(x);
+        hotBox.x2 = hotBox.x1 + this.hotCorner.actor.width;
+        hotBox.y1 = Math.round(y);
+        hotBox.y2 = hotBox.y1 + this.hotCorner.actor.height;
+        this.hotCorner.actor.allocate(hotBox, flags);
+    },
+
    handleDragOver: function(source, actor, x, y, time) {
        if (source != Main.xdndHandler)
            return DND.DragMotionResult.CONTINUE;
@ -682,36 +679,65 @@ const ActivitiesButton = new Lang.Class({
        if (this._xdndTimeOut != 0)
            Mainloop.source_remove(this._xdndTimeOut);
        this._xdndTimeOut = Mainloop.timeout_add(BUTTON_DND_ACTIVATION_TIMEOUT,
-                                                 Lang.bind(this, this._xdndToggleOverview, actor));
+                                                 Lang.bind(this, this._xdndShowOverview, actor));

        return DND.DragMotionResult.CONTINUE;
    },

+    _escapeMenuGrab: function() {
+        if (this.menu.isOpen)
+            this.menu.close();
+    },
+
    _onCapturedEvent: function(actor, event) {
        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
-            if (!Main.overview.shouldToggleByCornerOrButton())
+            if (!this.hotCorner.shouldToggleOverviewOnClick())
                return true;
        }
        return false;
    },

+    _onMenuOpenRequest: function() {
+        this.menu.isOpen = true;
+        this.menu.emit('open-state-changed', true);
+    },
+
+    _onMenuCloseRequest: function() {
+        this.menu.isOpen = false;
+        this.menu.emit('open-state-changed', false);
+    },
+
+    _onMenuToggleRequest: function() {
+        this.menu.isOpen = !this.menu.isOpen;
+        this.menu.emit('open-state-changed', this.menu.isOpen);
+    },
+
    _onButtonRelease: function() {
-        Main.overview.toggle();
+        if (this.menu.isOpen) {
+            this.menu.close();
+            Main.overview.toggle();
+        }
    },

    _onKeyRelease: function(actor, event) {
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_space) {
+            if (this.menu.isOpen)
+                this.menu.close();
            Main.overview.toggle();
        }
    },

-    _xdndToggleOverview: function(actor) {
+    _xdndShowOverview: function(actor) {
        let [x, y, mask] = global.get_pointer();
        let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);

-        if (pickedActor == this.actor && Main.overview.shouldToggleByCornerOrButton())
-            Main.overview.toggle();
+        if (pickedActor == this.actor) {
+            if (!Main.overview.visible && !Main.overview.animationInProgress) {
+                Main.overview.showTemporarily();
+                Main.overview.beginItemDrag(actor);
+            }
+        }

        Mainloop.source_remove(this._xdndTimeOut);
        this._xdndTimeOut = 0;
@ -721,9 +747,12 @@ const ActivitiesButton = new Lang.Class({
 const PanelCorner = new Lang.Class({
    Name: 'PanelCorner',

-    _init: function(side) {
+    _init: function(box, side) {
        this._side = side;

+        this._box = box;
+        this._box.connect('style-changed', Lang.bind(this, this._boxStyleChanged));
+
        this.actor = new St.DrawingArea({ style_class: 'panel-corner' });
        this.actor.connect('style-changed', Lang.bind(this, this._styleChanged));
        this.actor.connect('repaint', Lang.bind(this, this._repaint));
@ -779,12 +808,12 @@ const PanelCorner = new Lang.Class({
        return children[index];
    },

-    setStyleParent: function(box) {
+    _boxStyleChanged: function() {
        let side = this._side;

-        let rtlAwareContainer = box instanceof St.BoxLayout;
+        let rtlAwareContainer = this._box instanceof St.BoxLayout;
        if (rtlAwareContainer &&
-            box.get_text_direction() == Clutter.TextDirection.RTL) {
+            this._box.get_text_direction() == Clutter.TextDirection.RTL) {
            if (this._side == St.Side.LEFT)
                side = St.Side.RIGHT;
            else if (this._side == St.Side.RIGHT)
@ -793,9 +822,9 @@ const PanelCorner = new Lang.Class({

        let button;
        if (side == St.Side.LEFT)
-            button = this._findLeftmostButton(box);
+            button = this._findLeftmostButton(this._box);
        else if (side == St.Side.RIGHT)
-            button = this._findRightmostButton(box);
+            button = this._findRightmostButton(this._box);

        if (button) {
            if (this._button && this._buttonStyleChangedSignalId) {
@ -822,7 +851,7 @@ const PanelCorner = new Lang.Class({

            // The corner doesn't support theme transitions, so override
            // the .panel-button default
-            button.style = 'transition-duration: 0ms';
+            button.style = 'transition-duration: 0';
        }
    },

@ -835,13 +864,10 @@ const PanelCorner = new Lang.Class({
        let backgroundColor = node.get_color('-panel-corner-background-color');
        let borderColor = node.get_color('-panel-corner-border-color');

-        let overlap = borderColor.alpha != 0;
-        let offsetY = overlap ? 0 : borderWidth;
-
        let cr = this.actor.get_context();
        cr.setOperator(Cairo.Operator.SOURCE);

-        cr.moveTo(0, offsetY);
+        cr.moveTo(0, 0);
        if (this._side == St.Side.LEFT)
            cr.arc(cornerRadius,
                   borderWidth + cornerRadius,
@ -850,7 +876,7 @@ const PanelCorner = new Lang.Class({
            cr.arc(0,
                   borderWidth + cornerRadius,
                   cornerRadius, 3 * Math.PI / 2, 2 * Math.PI);
-        cr.lineTo(cornerRadius, offsetY);
+        cr.lineTo(cornerRadius, 0);
        cr.closePath();

        let savedPath = cr.copyPath();
@ -860,18 +886,14 @@ const PanelCorner = new Lang.Class({
        Clutter.cairo_set_source_color(cr, over);
        cr.fill();

-        if (overlap) {
-            let offset = borderWidth;
-            Clutter.cairo_set_source_color(cr, backgroundColor);
+        let offset = borderWidth;
+        Clutter.cairo_set_source_color(cr, backgroundColor);

-            cr.save();
-            cr.translate(xOffsetDirection * offset, - offset);
-            cr.appendPath(savedPath);
-            cr.fill();
-            cr.restore();
-        }
-
-        cr.$dispose();
+        cr.save();
+        cr.translate(xOffsetDirection * offset, - offset);
+        cr.appendPath(savedPath);
+        cr.fill();
+        cr.restore();
    },

    _styleChanged: function() {
@ -890,7 +912,6 @@ const PANEL_ITEM_IMPLEMENTATIONS = {
    'appMenu': AppMenuButton,
    'dateMenu': imports.ui.dateMenu.DateMenuButton,
    'a11y': imports.ui.status.accessibility.ATIndicator,
-    'a11yGreeter': imports.ui.status.accessibility.ATGreeterIndicator,
    'volume': imports.ui.status.volume.Indicator,
    'battery': imports.ui.status.power.Indicator,
    'lockScreen': imports.ui.status.lockScreenMenu.Indicator,
@ -911,18 +932,58 @@ try {
    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
 }

+const PanelLayout = new Lang.Class({
+    Name: 'PanelLayout',
+    Extends: CenterLayout.CenterLayout,
+
+    vfunc_allocate: function(container, box, flags) {
+        this.parent(container, box, flags);
+
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        let [left, center, right, leftCorner, rightCorner] = container.get_children();
+        let childBox = new Clutter.ActorBox();
+
+        let cornerMinWidth, cornerMinHeight;
+        let cornerWidth, cornerHeight;
+
+        [cornerMinWidth, cornerWidth] = leftCorner.get_preferred_width(-1);
+        [cornerMinHeight, cornerHeight] = leftCorner.get_preferred_height(-1);
+        childBox.x1 = 0;
+        childBox.x2 = cornerWidth;
+        childBox.y1 = availHeight;
+        childBox.y2 = availHeight + cornerHeight;
+        leftCorner.allocate(childBox, flags);
+
+        [cornerMinWidth, cornerWidth] = rightCorner.get_preferred_width(-1);
+        [cornerMinHeight, cornerHeight] = rightCorner.get_preferred_height(-1);
+        childBox.x1 = availWidth - cornerWidth;
+        childBox.x2 = availWidth;
+        childBox.y1 = availHeight;
+        childBox.y2 = availHeight + cornerHeight;
+        rightCorner.allocate(childBox, flags);
+    }
+});
+
 const Panel = new Lang.Class({
    Name: 'Panel',

    _init : function() {
-        this.actor = new Shell.GenericContainer({ name: 'panel',
-                                                  reactive: true });
+        this.actor = new St.Widget({ name: 'panel',
+                                     reactive: true,
+                                     layoutManager: new PanelLayout() });
        this.actor._delegate = this;

-        this._sessionStyle = null;
-
        this.statusArea = {};

+        Main.overview.connect('shown', Lang.bind(this, function () {
+            this.actor.add_style_class_name('in-overview');
+        }));
+        Main.overview.connect('hiding', Lang.bind(this, function () {
+            this.actor.remove_style_class_name('in-overview');
+        }));
+
        this.menuManager = new PopupMenu.PopupMenuManager(this);

        this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
@ -932,113 +993,29 @@ const Panel = new Lang.Class({
        this._rightBox = new St.BoxLayout({ name: 'panelRight' });
        this.actor.add_actor(this._rightBox);

-        this._leftCorner = new PanelCorner(St.Side.LEFT);
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
+            this._leftCorner = new PanelCorner(this._rightBox, St.Side.LEFT);
+        else
+            this._leftCorner = new PanelCorner(this._leftBox, St.Side.LEFT);
        this.actor.add_actor(this._leftCorner.actor);

-        this._rightCorner = new PanelCorner(St.Side.RIGHT);
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
+            this._rightCorner = new PanelCorner(this._leftBox, St.Side.RIGHT);
+        else
+            this._rightCorner = new PanelCorner(this._rightBox, St.Side.RIGHT);
        this.actor.add_actor(this._rightCorner.actor);

-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));

-        Main.overview.connect('showing', Lang.bind(this, function () {
-            this.actor.add_style_pseudo_class('overview');
-        }));
-        Main.overview.connect('hiding', Lang.bind(this, function () {
-            this.actor.remove_style_pseudo_class('overview');
-        }));
-
        Main.layoutManager.panelBox.add(this.actor);
-        Main.ctrlAltTabManager.addGroup(this.actor, _("Top Bar"), 'emblem-system-symbolic',
+        Main.ctrlAltTabManager.addGroup(this.actor, _("Top Bar"), 'start-here-symbolic',
                                        { sortGroup: CtrlAltTab.SortGroup.TOP });

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

-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        alloc.min_size = -1;
-        alloc.natural_size = Main.layoutManager.primaryMonitor.width;
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        // We don't need to implement this; it's forced by the CSS
-        alloc.min_size = -1;
-        alloc.natural_size = -1;
-    },
-
-    _allocate: function(actor, box, flags) {
-        let allocWidth = box.x2 - box.x1;
-        let allocHeight = box.y2 - box.y1;
-
-        let [leftMinWidth, leftNaturalWidth] = this._leftBox.get_preferred_width(-1);
-        let [centerMinWidth, centerNaturalWidth] = this._centerBox.get_preferred_width(-1);
-        let [rightMinWidth, rightNaturalWidth] = this._rightBox.get_preferred_width(-1);
-
-        let sideWidth, centerWidth;
-        centerWidth = centerNaturalWidth;
-        sideWidth = (allocWidth - centerWidth) / 2;
-
-        let childBox = new Clutter.ActorBox();
-
-        childBox.y1 = 0;
-        childBox.y2 = allocHeight;
-        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL) {
-            childBox.x1 = allocWidth - Math.min(Math.floor(sideWidth),
-                                                leftNaturalWidth);
-            childBox.x2 = allocWidth;
-        } else {
-            childBox.x1 = 0;
-            childBox.x2 = Math.min(Math.floor(sideWidth),
-                                   leftNaturalWidth);
-        }
-        this._leftBox.allocate(childBox, flags);
-
-        childBox.x1 = Math.ceil(sideWidth);
-        childBox.y1 = 0;
-        childBox.x2 = childBox.x1 + centerWidth;
-        childBox.y2 = allocHeight;
-        this._centerBox.allocate(childBox, flags);
-
-        childBox.y1 = 0;
-        childBox.y2 = allocHeight;
-        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL) {
-            childBox.x1 = 0;
-            childBox.x2 = Math.min(Math.floor(sideWidth),
-                                   rightNaturalWidth);
-        } else {
-            childBox.x1 = allocWidth - Math.min(Math.floor(sideWidth),
-                                                rightNaturalWidth);
-            childBox.x2 = allocWidth;
-        }
-        this._rightBox.allocate(childBox, flags);
-
-        let cornerMinWidth, cornerMinHeight;
-        let cornerWidth, cornerHeight;
-
-        [cornerMinWidth, cornerWidth] = this._leftCorner.actor.get_preferred_width(-1);
-        [cornerMinHeight, cornerHeight] = this._leftCorner.actor.get_preferred_height(-1);
-        childBox.x1 = 0;
-        childBox.x2 = cornerWidth;
-        childBox.y1 = allocHeight;
-        childBox.y2 = allocHeight + cornerHeight;
-        this._leftCorner.actor.allocate(childBox, flags);
-
-        [cornerMinWidth, cornerWidth] = this._rightCorner.actor.get_preferred_width(-1);
-        [cornerMinHeight, cornerHeight] = this._rightCorner.actor.get_preferred_height(-1);
-        childBox.x1 = allocWidth - cornerWidth;
-        childBox.x2 = allocWidth;
-        childBox.y1 = allocHeight;
-        childBox.y2 = allocHeight + cornerHeight;
-        this._rightCorner.actor.allocate(childBox, flags);
-    },
-
    _onButtonPress: function(actor, event) {
-        if (Main.modalCount > 0)
-            return false;
-
        if (event.get_source() != actor)
            return false;

@ -1111,20 +1088,17 @@ const Panel = new Lang.Class({
        this._updateBox(panel.left, this._leftBox);
        this._updateBox(panel.center, this._centerBox);
        this._updateBox(panel.right, this._rightBox);
+    },

-        if (this._sessionStyle)
-            this._removeStyleClassName(this._sessionStyle);
-
-        this._sessionStyle = Main.sessionMode.panelStyle;
-        if (this._sessionStyle)
-            this._addStyleClassName(this._sessionStyle);
-
-        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL) {
-            this._leftCorner.setStyleParent(this._rightBox);
-            this._rightCorner.setStyleParent(this._leftBox);
-        } else {
-            this._leftCorner.setStyleParent(this._leftBox);
-            this._rightCorner.setStyleParent(this._rightBox);
+    _initBox: function(elements, box) {
+        for (let i = 0; i < elements.length; i++) {
+            let role = elements[i];
+            let constructor = PANEL_ITEM_IMPLEMENTATIONS[role];
+            if (!constructor) {
+                // panel icon is not supported (can happen for
+                // bluetooth or network)
+                continue;
+            }
        }
    },

@ -1202,17 +1176,5 @@ const Panel = new Lang.Class({
        this.statusArea[role] = indicator;
        this._addToPanelBox(role, indicator, position, boxContainer);
        return indicator;
-    },
-
-    _addStyleClassName: function(className) {
-        this.actor.add_style_class_name(className);
-        this._rightCorner.actor.add_style_class_name(className);
-        this._leftCorner.actor.add_style_class_name(className);
-    },
-
-    _removeStyleClassName: function(className) {
-        this.actor.remove_style_class_name(className);
-        this._rightCorner.actor.remove_style_class_name(className);
-        this._leftCorner.actor.remove_style_class_name(className);
    }
 });
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@ -112,7 +112,7 @@ const Button = new Lang.Class({
        this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));

        if (dontCreateMenu)
-            this.menu = new PopupMenu.PopupDummyMenu(this.actor);
+            this.menu = null;
        else
            this.setMenu(new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0));

@ -205,8 +205,10 @@ const Button = new Lang.Class({
        // Setting the max-height won't do any good if the minimum height of the
        // menu is higher then the screen; it's useful if part of the menu is
        // scrollable so the minimum height is smaller than the natural height
-        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
-        this.menu.actor.style = ('max-height: ' + Math.round(workArea.height) + 'px;');
+        let monitor = Main.layoutManager.primaryMonitor;
+        this.menu.actor.style = ('max-height: ' +
+                                 Math.round(monitor.height - Main.panel.actor.height) +
+                                 'px;');
    },

    destroy: function() {
@ -242,21 +244,18 @@ const SystemStatusButton = new Lang.Class({
            this.setIcon(iconName);
    },

-    get icons() {
-        return this._box.get_children();
-    },
-
    addIcon: function(gicon) {
        let icon = new St.Icon({ gicon: gicon,
                                 style_class: 'system-status-icon' });
        this._box.add_actor(icon);

-        this.emit('icons-changed');
-
        return icon;
    },

    setIcon: function(iconName) {
+        // Need to first add a NULL GIcon and then set icon_name, to ensure
+        // compatibility with -symbolic fallbacks
+
        if (!this.mainIcon)
            this.mainIcon = this.addIcon(null);
        this.mainIcon.icon_name = iconName;
--- a/js/ui/pointerWatcher.js
+++ b/js/ui/pointerWatcher.js
@ -41,9 +41,10 @@ const PointerWatcher = new Lang.Class({
    Name: 'PointerWatcher',

    _init: function() {
-        this._idleMonitor = new GnomeDesktop.IdleMonitor();
-        this._idleMonitor.add_idle_watch(IDLE_TIME, Lang.bind(this, this._onIdleMonitorBecameIdle));
-        this._idle = this._idleMonitor.get_idletime() > IDLE_TIME;
+        let idleMonitor = new GnomeDesktop.IdleMonitor();
+        idleMonitor.connect('became-active', Lang.bind(this, this._onIdleMonitorBecameActive));
+        idleMonitor.add_watch(IDLE_TIME, Lang.bind(this, this._onIdleMonitorBecameIdle));
+        this._idle = idleMonitor.get_idletime() > IDLE_TIME;
        this._watches = [];
        this.pointerX = null;
        this.pointerY = null;
@ -86,7 +87,6 @@ const PointerWatcher = new Lang.Class({

    _onIdleMonitorBecameIdle: function(monitor) {
        this._idle = true;
-        this._idleMonitor.add_user_active_watch(Lang.bind(this, this._onIdleMonitorBecameActive));
        this._updateTimeout();
    },

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

+const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
@ -11,10 +12,8 @@ const St = imports.gi.St;
 const Atk = imports.gi.Atk;

 const BoxPointer = imports.ui.boxpointer;
-const GrabHelper = imports.ui.grabHelper;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
-const Separator = imports.ui.separator;
 const Tweener = imports.ui.tweener;

 const SLIDER_SCROLL_STEP = 0.05; /* Slider scrolling step in % */
@ -207,7 +206,6 @@ const PopupBaseMenuItem = new Lang.Class({
            color.alpha / 255);
        cr.arc(width / 2, height / 2, width / 3, 0, 2 * Math.PI);
        cr.fill();
-        cr.$dispose();
    },

    // This returns column widths in logical order (i.e. from the dot
@ -406,11 +404,40 @@ const PopupSeparatorMenuItem = new Lang.Class({
        this.parent({ reactive: false,
                      can_focus: false});

-        this._separator = new Separator.HorizontalSeparator({ style_class: 'popup-separator-menu-item' });
+        this._separator = new HorzSeparator({ style_class: 'popup-separator-menu-item' });
        this.addActor(this._separator.actor, { span: -1, expand: true });
    }
 });

+const HorzSeparator = new Lang.Class({
+    Name: 'HorzSeparator',
+
+    _init: function (params) {
+        this.actor = new St.DrawingArea(params);
+        this.actor.connect('repaint', Lang.bind(this, this._onRepaint));
+    },
+
+    _onRepaint: function(area) {
+        let cr = area.get_context();
+        let themeNode = area.get_theme_node();
+        let [width, height] = area.get_surface_size();
+        let margin = themeNode.get_length('-margin-horizontal');
+        let gradientHeight = themeNode.get_length('-gradient-height');
+        let startColor = themeNode.get_color('-gradient-start');
+        let endColor = themeNode.get_color('-gradient-end');
+
+        let gradientWidth = (width - margin * 2);
+        let gradientOffset = (height - gradientHeight) / 2;
+        let pattern = new Cairo.LinearGradient(margin, gradientOffset, width - margin, gradientOffset + gradientHeight);
+        pattern.addColorStopRGBA(0, startColor.red / 255, startColor.green / 255, startColor.blue / 255, startColor.alpha / 255);
+        pattern.addColorStopRGBA(0.5, endColor.red / 255, endColor.green / 255, endColor.blue / 255, endColor.alpha / 255);
+        pattern.addColorStopRGBA(1, startColor.red / 255, startColor.green / 255, startColor.blue / 255, startColor.alpha / 255);
+        cr.setSource(pattern);
+        cr.rectangle(margin, gradientOffset, gradientWidth, gradientHeight);
+        cr.fill();
+    }
+});
+
 const PopupAlternatingMenuItemState = {
    DEFAULT: 0,
    ALTERNATIVE: 1
@ -605,7 +632,6 @@ const PopupSliderMenuItem = new Lang.Class({
            color.alpha / 255);
        cr.arc(handleX, handleY, handleRadius, 0, 2 * Math.PI);
        cr.fill();
-        cr.$dispose();
    },

    _startDragging: function(actor, event) {
@ -638,34 +664,20 @@ const PopupSliderMenuItem = new Lang.Class({
        return true;
    },

-    scroll: function(event) {
+    _onScrollEvent: function (actor, 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.max(0, this._value - SLIDER_SCROLL_STEP);
+        }
+        else if (direction == Clutter.ScrollDirection.UP) {
+            this._value = Math.min(1, this._value + SLIDER_SCROLL_STEP);
        }
-
-        this._value = Math.min(Math.max(0, this._value + delta), 1);

        this._slider.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();
@ -867,6 +879,7 @@ const PopupMenuBase = new Lang.Class({
        this.blockSourceEvents = false;

        this._activeMenuItem = null;
+        this._childMenus = [];
        this._settingsActions = { };

        this._sessionUpdatedId = Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
@ -888,7 +901,7 @@ const PopupMenuBase = new Lang.Class({

    addSettingsAction: function(title, desktopFile) {
        let menuItem = this.addAction(title, function() {
-                           let app = Shell.AppSystem.get_default().lookup_app(desktopFile);
+                           let app = Shell.AppSystem.get_default().lookup_setting(desktopFile);

                           if (!app) {
                               log('Settings panel for desktop file ' + desktopFile + ' could not be loaded!');
@ -913,15 +926,29 @@ const PopupMenuBase = new Lang.Class({
    },

    isEmpty: function() {
-        let hasVisibleChildren = this.box.get_children().some(function(child) {
-            return child.visible;
-        });
-
-        return !hasVisibleChildren;
+        return this.box.get_n_children() == 0;
    },

-    isChildMenu: function() {
-        return false;
+    isChildMenu: function(menu) {
+        return this._childMenus.indexOf(menu) != -1;
+    },
+
+    addChildMenu: function(menu) {
+        if (this.isChildMenu(menu))
+            return;
+
+        this._childMenus.push(menu);
+        this.emit('child-menu-added', menu);
+    },
+
+    removeChildMenu: function(menu) {
+        let index = this._childMenus.indexOf(menu);
+
+        if (index == -1)
+            return;
+
+        this._childMenus.splice(index, 1);
+        this.emit('child-menu-removed', menu);
    },

    /**
@ -1157,7 +1184,6 @@ const PopupMenuBase = new Lang.Class({
    },

    destroy: function() {
-        this.close();
        this.removeAll();
        this.actor.destroy();

@ -1186,6 +1212,7 @@ const PopupMenu = new Lang.Class({
        this.actor = this._boxPointer.actor;
        this.actor._delegate = this;
        this.actor.style_class = 'popup-menu-boxpointer';
+        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));

        this._boxWrapper = new Shell.GenericContainer();
        this._boxWrapper.connect('get-preferred-width', Lang.bind(this, this._boxGetPreferredWidth));
@ -1197,8 +1224,6 @@ const PopupMenu = new Lang.Class({

        global.focus_manager.add_group(this.actor);
        this.actor.reactive = true;
-
-        this._childMenus = [];
    },

    _boxGetPreferredWidth: function (actor, forHeight, alloc) {
@ -1217,6 +1242,15 @@ const PopupMenu = new Lang.Class({
        this.box.allocate(box, flags);
    },

+    _onKeyPressEvent: function(actor, event) {
+        if (event.get_key_symbol() == Clutter.Escape) {
+            this.close(BoxPointer.PopupAnimation.FULL);
+            return true;
+        }
+
+        return false;
+    },
+
    setArrowOrigin: function(origin) {
        this._boxPointer.setArrowOrigin(origin);
    },
@ -1225,28 +1259,6 @@ const PopupMenu = new Lang.Class({
        this._boxPointer.setSourceAlignment(alignment);
    },

-    isChildMenu: function(menu) {
-        return this._childMenus.indexOf(menu) != -1;
-    },
-
-    addChildMenu: function(menu) {
-        if (this.isChildMenu(menu))
-            return;
-
-        this._childMenus.push(menu);
-        this.emit('child-menu-added', menu);
-    },
-
-    removeChildMenu: function(menu) {
-        let index = this._childMenus.indexOf(menu);
-
-        if (index == -1)
-            return;
-
-        this._childMenus.splice(index, 1);
-        this.emit('child-menu-removed', menu);
-    },
-
    open: function(animate) {
        if (this.isOpen)
            return;
@ -1268,10 +1280,6 @@ const PopupMenu = new Lang.Class({
        if (this._activeMenuItem)
            this._activeMenuItem.setActive(false);

-        this._childMenus.forEach(function(childMenu) {
-            childMenu.close();
-        });
-
        if (this._boxPointer.actor.visible)
            this._boxPointer.hide(animate);

@ -1283,28 +1291,6 @@ const PopupMenu = new Lang.Class({
    }
 });

-const PopupDummyMenu = new Lang.Class({
-    Name: 'PopupDummyMenu',
-
-    _init: function(sourceActor) {
-        this.sourceActor = sourceActor;
-        this.actor = sourceActor;
-        this.actor._delegate = this;
-    },
-
-    isChildMenu: function() {
-        return false;
-    },
-
-    open: function() { this.emit('open-state-changed', true); },
-    close: function() { this.emit('open-state-changed', false); },
-    toggle: function() {},
-    destroy: function() {
-        this.emit('destroy');
-    },
-});
-Signals.addSignalMethods(PopupDummyMenu.prototype);
-
 const PopupSubMenu = new Lang.Class({
    Name: 'PopupSubMenu',
    Extends: PopupMenuBase,
@ -1559,6 +1545,7 @@ const PopupComboMenu = new Lang.Class({

        this.actor = this.box;
        this.actor._delegate = this;
+        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
        this.actor.connect('key-focus-in', Lang.bind(this, this._onKeyFocusIn));
        sourceActor.connect('style-changed',
                            Lang.bind(this, this._onSourceActorStyleChanged));
@ -1566,6 +1553,15 @@ const PopupComboMenu = new Lang.Class({
        global.focus_manager.add_group(this.actor);
    },

+    _onKeyPressEvent: function(actor, event) {
+        if (event.get_key_symbol() == Clutter.Escape) {
+            this.close(BoxPointer.PopupAnimation.FULL);
+            return true;
+        }
+
+        return false;
+    },
+
    _onKeyFocusIn: function(actor) {
        let items = this._getMenuItems();
        let activeItem = items[this._activeItemPos];
@ -1692,7 +1688,9 @@ const PopupComboBoxMenuItem = new Lang.Class({
    _getTopMenu: function() {
        let actor = this.actor.get_parent();
        while (actor) {
-            if (actor._delegate && actor._delegate instanceof PopupMenu)
+            if (actor._delegate &&
+                (actor._delegate instanceof PopupMenu ||
+                 actor._delegate instanceof PopupComboMenu))
                return actor._delegate;

            actor = actor.get_parent();
@ -2054,8 +2052,17 @@ const PopupMenuManager = new Lang.Class({

    _init: function(owner) {
        this._owner = owner;
-        this._grabHelper = new GrabHelper.GrabHelper(owner.actor);
+        this.grabbed = false;
+
+        this._eventCaptureId = 0;
+        this._enterEventId = 0;
+        this._leaveEventId = 0;
+        this._keyFocusNotifyId = 0;
+        this._activeMenu = null;
        this._menus = [];
+        this._menuStack = [];
+        this._preGrabInputMode = null;
+        this._grabbedFromKeynav = false;
    },

    addMenu: function(menu, position) {
@ -2074,8 +2081,6 @@ const PopupMenuManager = new Lang.Class({

        let source = menu.sourceActor;
        if (source) {
-            if (!menu.blockSourceEvents)
-                this._grabHelper.addActor(source);
            menudata.enterId = source.connect('enter-event', Lang.bind(this, function() { this._onMenuSourceEnter(menu); }));
            menudata.focusInId = source.connect('key-focus-in', Lang.bind(this, function() { this._onMenuSourceEnter(menu); }));
        }
@ -2087,8 +2092,8 @@ const PopupMenuManager = new Lang.Class({
    },

    removeMenu: function(menu) {
-        if (menu == this.activeMenu)
-            this._closeMenu(menu);
+        if (menu == this._activeMenu)
+            this._closeMenu();

        let position = this._findMenu(menu);
        if (position == -1) // not a menu we manage
@ -2105,29 +2110,79 @@ const PopupMenuManager = new Lang.Class({
        if (menudata.focusInId)
            menu.sourceActor.disconnect(menudata.focusInId);

-        if (menu.sourceActor)
-            this._grabHelper.removeActor(menu.sourceActor);
        this._menus.splice(position, 1);
    },

-    get activeMenu() {
-        let firstGrab = this._grabHelper.grabStack[0];
-        if (firstGrab)
-            return firstGrab.actor._delegate;
-        else
-            return null;
+    _grab: function() {
+        Main.pushModal(this._owner.actor);
+
+        this._eventCaptureId = global.stage.connect('captured-event', Lang.bind(this, this._onEventCapture));
+        // captured-event doesn't see enter/leave events
+        this._enterEventId = global.stage.connect('enter-event', Lang.bind(this, this._onEventCapture));
+        this._leaveEventId = global.stage.connect('leave-event', Lang.bind(this, this._onEventCapture));
+        this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
+
+        this.grabbed = true;
    },

-    ignoreRelease: function() {
-        return this._grabHelper.ignoreRelease();
+    _ungrab: function() {
+        global.stage.disconnect(this._eventCaptureId);
+        this._eventCaptureId = 0;
+        global.stage.disconnect(this._enterEventId);
+        this._enterEventId = 0;
+        global.stage.disconnect(this._leaveEventId);
+        this._leaveEventId = 0;
+        global.stage.disconnect(this._keyFocusNotifyId);
+        this._keyFocusNotifyId = 0;
+
+        this.grabbed = false;
+        Main.popModal(this._owner.actor);
    },

    _onMenuOpenState: function(menu, open) {
        if (open) {
-            this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor,
-                                    onUngrab: Lang.bind(this, this._closeMenu, menu) });
+            if (this._activeMenu && this._activeMenu.isChildMenu(menu)) {
+                this._menuStack.push(this._activeMenu);
+                menu.actor.grab_key_focus();
+            }
+            this._activeMenu = menu;
        } else {
-            this._grabHelper.ungrab({ actor: menu.actor });
+            if (this._menuStack.length > 0) {
+                this._activeMenu = this._menuStack.pop();
+                if (menu.sourceActor)
+                    menu.sourceActor.grab_key_focus();
+                this._didPop = true;
+            }
+        }
+
+        // Check what the focus was before calling pushModal/popModal
+        let focus = global.stage.key_focus;
+        let hadFocus = focus && this._activeMenuContains(focus);
+
+        if (open) {
+            if (!this.grabbed) {
+                this._preGrabInputMode = global.stage_input_mode;
+                this._grabbedFromKeynav = hadFocus;
+                this._grab();
+            }
+
+            if (hadFocus)
+                focus.grab_key_focus();
+            else
+                menu.actor.grab_key_focus();
+        } else if (menu == this._activeMenu) {
+            if (this.grabbed)
+                this._ungrab();
+            this._activeMenu = null;
+
+            if (this._grabbedFromKeynav) {
+                if (this._preGrabInputMode == Shell.StageInputMode.FOCUSED)
+                    global.stage_input_mode = Shell.StageInputMode.FOCUSED;
+                if (hadFocus && menu.sourceActor)
+                    menu.sourceActor.grab_key_focus();
+                else if (focus)
+                    focus.grab_key_focus();
+            }
        }
    },

@ -2139,38 +2194,87 @@ const PopupMenuManager = new Lang.Class({
        this.removeMenu(childMenu);
    },

+    // change the currently-open menu without dropping grab
    _changeMenu: function(newMenu) {
-        let oldMenu = this.activeMenu;
-        if (oldMenu) {
+        if (this._activeMenu) {
+            // _onOpenMenuState will drop the grab if it sees
+            // this._activeMenu being closed; so clear _activeMenu
+            // before closing it to keep that from happening
+            let oldMenu = this._activeMenu;
+            this._activeMenu = null;
+            for (let i = this._menuStack.length - 1; i >= 0; i--)
+                this._menuStack[i].close(BoxPointer.PopupAnimation.FADE);
            oldMenu.close(BoxPointer.PopupAnimation.FADE);
            newMenu.open(BoxPointer.PopupAnimation.FADE);
-        } else {
+        } else
            newMenu.open(BoxPointer.PopupAnimation.FULL);
-        }
    },

    _onMenuSourceEnter: function(menu) {
-        if (!this._grabHelper.grabbed)
+        if (!this.grabbed || menu == this._activeMenu)
            return false;

-        if (this._grabHelper.isActorGrabbed(menu.actor))
+        if (this._activeMenu && this._activeMenu.isChildMenu(menu))
            return false;

-        let isChildMenu = this._grabHelper.grabStack.some(function(grab) {
-            let existingMenu = grab.actor._delegate;
-            return existingMenu.isChildMenu(menu);
-        });
-        if (isChildMenu)
+        if (this._menuStack.indexOf(menu) != -1)
+            return false;
+
+        if (this._menuStack.length > 0 && this._menuStack[0].isChildMenu(menu))
            return false;

        this._changeMenu(menu);
        return false;
    },

+    _onKeyFocusChanged: function() {
+        if (!this.grabbed || !this._activeMenu)
+            return;
+
+        let focus = global.stage.key_focus;
+        if (focus) {
+            if (this._activeMenuContains(focus))
+                return;
+            if (this._menuStack.length > 0)
+                return;
+            if (focus._delegate && focus._delegate.menu &&
+                this._findMenu(focus._delegate.menu) != -1)
+                return;
+        }
+
+        this._closeMenu();
+    },
+
    _onMenuDestroy: function(menu) {
        this.removeMenu(menu);
    },

+    _activeMenuContains: function(actor) {
+        return this._activeMenu != null
+                && (this._activeMenu.actor.contains(actor) ||
+                    (this._activeMenu.sourceActor && this._activeMenu.sourceActor.contains(actor)));
+    },
+
+    _eventIsOnActiveMenu: function(event) {
+        return this._activeMenuContains(event.get_source());
+    },
+
+    _shouldBlockEvent: function(event) {
+        let src = event.get_source();
+
+        if (this._activeMenu != null && this._activeMenu.actor.contains(src))
+            return false;
+
+        for (let i = 0; i < this._menus.length; i++) {
+            let menu = this._menus[i].menu;
+            if (menu.sourceActor && !menu.blockSourceEvents && menu.sourceActor.contains(src)) {
+                return false;
+            }
+        }
+
+        return true;
+    },
+
    _findMenu: function(item) {
        for (let i = 0; i < this._menus.length; i++) {
            let menudata = this._menus[i];
@ -2180,11 +2284,41 @@ const PopupMenuManager = new Lang.Class({
        return -1;
    },

-    _closeMenu: function(isUser, menu) {
-        // If this isn't a user action, we called close()
-        // on the BoxPointer ourselves, so we shouldn't
-        // reanimate.
-        if (isUser)
-            menu.close(BoxPointer.PopupAnimation.FULL);
+    _onEventCapture: function(actor, event) {
+        if (!this.grabbed)
+            return false;
+
+        if (this._owner.menuEventFilter &&
+            this._owner.menuEventFilter(event))
+            return true;
+
+        if (this._didPop) {
+            this._didPop = false;
+            return true;
+        }
+
+        let activeMenuContains = this._eventIsOnActiveMenu(event);
+        let eventType = event.type();
+
+        if (eventType == Clutter.EventType.BUTTON_RELEASE) {
+            if (activeMenuContains) {
+                return false;
+            } else {
+                this._closeMenu();
+                return true;
+            }
+        } else if (eventType == Clutter.EventType.BUTTON_PRESS && !activeMenuContains) {
+            this._closeMenu();
+            return true;
+        } else if (!this._shouldBlockEvent(event)) {
+            return false;
+        }
+
+        return true;
+    },
+
+    _closeMenu: function() {
+        if (this._activeMenu != null)
+            this._activeMenu.close(BoxPointer.PopupAnimation.FULL);
    }
 });
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@ -1,11 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const GdkPixbuf = imports.gi.GdkPixbuf;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;

 const FileUtils = imports.misc.fileUtils;
 const Search = imports.ui.search;
@ -29,175 +27,110 @@ const SearchProviderIface = <interface name="org.gnome.Shell.SearchProvider">
 <method name="ActivateResult">
    <arg type="s" direction="in" />
 </method>
-</interface>;
-
-const SearchProvider2Iface = <interface name="org.gnome.Shell.SearchProvider2">
-<method name="GetInitialResultSet">
-    <arg type="as" direction="in" />
-    <arg type="as" direction="out" />
-</method>
-<method name="GetSubsearchResultSet">
-    <arg type="as" direction="in" />
-    <arg type="as" direction="in" />
-    <arg type="as" direction="out" />
-</method>
-<method name="GetResultMetas">
-    <arg type="as" direction="in" />
-    <arg type="aa{sv}" direction="out" />
-</method>
-<method name="ActivateResult">
-    <arg type="s" direction="in" />
-    <arg type="as" direction="in" />
-    <arg type="u" direction="in" />
-</method>
 <method name="LaunchSearch">
    <arg type="as" direction="in" />
-    <arg type="u" direction="in" />
 </method>
 </interface>;

 var SearchProviderProxy = Gio.DBusProxy.makeProxyWrapper(SearchProviderIface);
-var SearchProvider2Proxy = Gio.DBusProxy.makeProxyWrapper(SearchProvider2Iface);
+

 function loadRemoteSearchProviders(addProviderCallback) {
-    let data = { loadedProviders: [],
-                 objectPaths: {},
-                 addProviderCallback: addProviderCallback };
-    FileUtils.collectFromDatadirsAsync('search-providers',
-                                       { loadedCallback: remoteProvidersLoaded,
-                                         processFile: loadRemoteSearchProvider,
-                                         data: data
-                                       });
-}
-
-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;
+    let dataDirs = GLib.get_system_data_dirs();
+    let loadedProviders = {};
+    for (let i = 0; i < dataDirs.length; i++) {
+        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'search-providers']);
+        let dir = Gio.file_new_for_path(path);
+        if (!dir.query_exists(null))
+            continue;
+        loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallback);
    }
+};

-    if (!keyfile.has_group(KEY_FILE_GROUP))
-        return;
+function loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallback) {
+    let dirPath = dir.get_path();
+    FileUtils.listDirAsync(dir, Lang.bind(this, function(files) {
+        for (let i = 0; i < files.length; i++) {
+            let keyfile = new GLib.KeyFile();
+            let path = GLib.build_filenamev([dirPath, files[i].get_name()]);

-    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');
-
-    loadState.loadedProviders.sort(
-        function(providerA, providerB) {
-            let idxA, idxB;
-            let appIdA, appIdB;
-
-            appIdA = providerA.appInfo.get_id();
-            appIdB = providerB.appInfo.get_id();
-
-            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();
-
-                return GLib.utf8_collate(nameA, nameB);
+            try {
+                keyfile.load_from_file(path, 0);
+            } catch(e) {
+                continue;
            }

-            // if providerA isn't found, it's sorted after providerB
-            if (idxA == -1)
-                return 1;
+            if (!keyfile.has_group(KEY_FILE_GROUP))
+                continue;

-            // if providerB isn't found, it's sorted after providerA
-            if (idxB == -1)
-                return -1;
+            let remoteProvider, title;
+            try {
+                let group = KEY_FILE_GROUP;
+                let busName = keyfile.get_string(group, 'BusName');
+                let objectPath = keyfile.get_string(group, 'ObjectPath');

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

-    loadState.loadedProviders.forEach(
-        function(provider) {
-            loadState.addProviderCallback(provider);
-        });
-}
+                let appInfo = null;
+                try {
+                    let desktopId = keyfile.get_string(group, 'DesktopId');
+                    appInfo = Gio.DesktopAppInfo.new(desktopId);
+                } catch (e) {
+                }
+
+                let icon;
+                if (appInfo) {
+                    icon = appInfo.get_icon();
+                    title = appInfo.get_name();
+                } else {
+                    let iconName = keyfile.get_string(group, 'Icon');
+                    icon = new Gio.ThemedIcon({ name: iconName });
+                    title = keyfile.get_locale_string(group, 'Title', null);
+                }
+
+                remoteProvider = new RemoteSearchProvider(title,
+                                                          icon,
+                                                          busName,
+                                                          objectPath);
+                loadedProviders[objectPath] = remoteProvider;
+            } catch(e) {
+                log('Failed to add search provider "%s": %s'.format(title, e.toString()));
+                continue;
+            }
+
+            addProviderCallback(remoteProvider);
+        }
+    }));
+
+};

 const RemoteSearchProvider = new Lang.Class({
    Name: 'RemoteSearchProvider',
+    Extends: Search.SearchProvider,

-    _init: function(appInfo, dbusName, dbusPath, proxyType) {
-        if (!proxyType)
-            proxyType = SearchProviderProxy;
-
-        this.proxy = new proxyType(Gio.DBus.session,
-                dbusName, dbusPath, Lang.bind(this, this._onProxyConstructed));
-
-        this.appInfo = appInfo;
-        this.id = appInfo.get_id();
-        this.isRemoteProvider = true;
+    _init: function(title, icon, dbusName, dbusPath) {
+        this._proxy = new SearchProviderProxy(Gio.DBus.session,
+                                              dbusName, dbusPath);

+        this.parent(title.toUpperCase());
        this._cancellable = new Gio.Cancellable();
-    },
-
-    _onProxyConstructed: function(proxy) {
-        // Do nothing
+        this.icon = icon;
    },

    createIcon: function(size, meta) {
-        let gicon;
        if (meta['gicon']) {
-            gicon = Gio.icon_new_for_string(meta['gicon']);
+            return new St.Icon({ gicon: Gio.icon_new_for_string(meta['gicon']),
+                                 icon_size: size });
        } else if (meta['icon-data']) {
            let [width, height, rowStride, hasAlpha,
                 bitsPerSample, nChannels, data] = meta['icon-data'];
-            gicon = Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
-                                                       bitsPerSample, width, height, rowStride);
+            let textureCache = St.TextureCache.get_default();
+            return textureCache.load_from_raw(data, hasAlpha,
+                                              width, height, rowStride, size);
        }

-        return new St.Icon({ gicon: gicon,
-                             icon_size: size });
+        return null;
    },

    _getResultsFinished: function(results, error) {
@ -210,11 +143,11 @@ const RemoteSearchProvider = new Lang.Class({
        this._cancellable.cancel();
        this._cancellable.reset();
        try {
-            this.proxy.GetInitialResultSetRemote(terms,
-                                                 Lang.bind(this, this._getResultsFinished),
-                                                 this._cancellable);
+            this._proxy.GetInitialResultSetRemote(terms,
+                                                  Lang.bind(this, this._getResultsFinished),
+                                                  this._cancellable);
        } catch(e) {
-            log('Error calling GetInitialResultSet for provider %s: %s'.format(this.id, e.toString()));
+            log('Error calling GetInitialResultSet for provider %s: %s'.format( this.title, e.toString()));
            this.searchSystem.pushResults(this, []);
        }
    },
@ -223,11 +156,11 @@ const RemoteSearchProvider = new Lang.Class({
        this._cancellable.cancel();
        this._cancellable.reset();
        try {
-            this.proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
-                                                   Lang.bind(this, this._getResultsFinished),
-                                                   this._cancellable);
+            this._proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
+                                                    Lang.bind(this, this._getResultsFinished),
+                                                    this._cancellable);
        } catch(e) {
-            log('Error calling GetSubsearchResultSet for provider %s: %s'.format(this.id, e.toString()));
+            log('Error calling GetSubsearchResultSet for provider %s: %s'.format(this.title, e.toString()));
            this.searchSystem.pushResults(this, []);
        }
    },
@ -244,7 +177,6 @@ const RemoteSearchProvider = new Lang.Class({
                metas[i][prop] = metas[i][prop].deep_unpack();
            resultMetas.push({ id: metas[i]['id'],
                               name: metas[i]['name'],
-                               description: metas[i]['description'],
                               createIcon: Lang.bind(this,
                                                     this.createIcon, metas[i]) });
        }
@ -255,42 +187,22 @@ const RemoteSearchProvider = new Lang.Class({
        this._cancellable.cancel();
        this._cancellable.reset();
        try {
-            this.proxy.GetResultMetasRemote(ids,
-                                            Lang.bind(this, this._getResultMetasFinished, callback),
-                                            this._cancellable);
+            this._proxy.GetResultMetasRemote(ids,
+                                             Lang.bind(this, this._getResultMetasFinished, callback),
+                                             this._cancellable);
        } catch(e) {
-            log('Error calling GetResultMetas for provider %s: %s'.format(this.id, e.toString()));
+            log('Error calling GetResultMetas for provider %s: %s'.format(this.title, e.toString()));
            callback([]);
        }
    },

    activateResult: function(id) {
-        this.proxy.ActivateResultRemote(id);
+        this._proxy.ActivateResultRemote(id);
    },

    launchSearch: function(terms) {
-        // the provider is not compatible with the new version of the interface, launch
-        // the app itself but warn so we can catch the error in logs
-        log('Search provider ' + this.appInfo.get_id() + ' does not implement LaunchSearch');
-        this.appInfo.launch([], global.create_app_launch_context());
+        this._proxy.LaunchSearchRemote(terms);
    }
 });

-const RemoteSearchProvider2 = new Lang.Class({
-    Name: 'RemoteSearchProvider2',
-    Extends: RemoteSearchProvider,

-    _init: function(appInfo, dbusName, dbusPath) {
-        this.parent(appInfo, dbusName, dbusPath, SearchProvider2Proxy);
-
-        this.canLaunchSearch = true;
-    },
-
-    activateResult: function(id, terms) {
-        this.proxy.ActivateResultRemote(id, terms, global.get_current_time());
-    },
-
-    launchSearch: function(terms) {
-        this.proxy.LaunchSearchRemote(terms, global.get_current_time());
-    }
-});
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -30,13 +30,144 @@ const EXEC_ARG_KEY = 'exec-arg';

 const DIALOG_GROW_TIME = 0.1;

+const CommandCompleter = new Lang.Class({
+    Name: 'CommandCompleter',
+
+    _init : function() {
+        this._changedCount = 0;
+        this._paths = GLib.getenv('PATH').split(':');
+        this._paths.push(GLib.get_home_dir());
+        this._valid = false;
+        this._updateInProgress = false;
+        this._childs = new Array(this._paths.length);
+        this._monitors = new Array(this._paths.length);
+        for (let i = 0; i < this._paths.length; i++) {
+            this._childs[i] = [];
+            let file = Gio.file_new_for_path(this._paths[i]);
+            let info;
+            try {
+                info = file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE, Gio.FileQueryInfoFlags.NONE, null);
+            } catch (e) {
+                // FIXME catchall
+                this._paths[i] = null;
+                continue;
+            }
+
+            if (info.get_attribute_uint32(Gio.FILE_ATTRIBUTE_STANDARD_TYPE) != Gio.FileType.DIRECTORY)
+                continue;
+
+            this._paths[i] = file.get_path();
+            this._monitors[i] = file.monitor_directory(Gio.FileMonitorFlags.NONE, null);
+            if (this._monitors[i] != null) {
+                this._monitors[i].connect('changed', Lang.bind(this, this._onChanged));
+            }
+        }
+        this._paths = this._paths.filter(function(a) {
+            return a != null;
+        });
+        this._update(0);
+    },
+
+    update : function() {
+        if (this._valid)
+            return;
+        this._update(0);
+    },
+
+    _update : function(i) {
+        if (i == 0 && this._updateInProgress)
+            return;
+        this._updateInProgress = true;
+        this._changedCount = 0;
+        this._i = i;
+        if (i >= this._paths.length) {
+            this._valid = true;
+            this._updateInProgress = false;
+            return;
+        }
+        let file = Gio.file_new_for_path(this._paths[i]);
+        this._childs[this._i] = [];
+        FileUtils.listDirAsync(file, Lang.bind(this, function (files) {
+            for (let i = 0; i < files.length; i++) {
+                this._childs[this._i].push(files[i].get_name());
+            }
+            this._update(this._i + 1);
+        }));
+    },
+
+    _onChanged : function(m, f, of, type) {
+        if (!this._valid)
+            return;
+        let path = f.get_parent().get_path();
+        let k = undefined;
+        for (let i = 0; i < this._paths.length; i++) {
+            if (this._paths[i] == path)
+                k = i;
+        }
+        if (k === undefined) {
+            return;
+        }
+        if (type == Gio.FileMonitorEvent.CREATED) {
+            this._childs[k].push(f.get_basename());
+        }
+        if (type == Gio.FileMonitorEvent.DELETED) {
+            this._changedCount++;
+            if (this._changedCount > MAX_FILE_DELETED_BEFORE_INVALID) {
+                this._valid = false;
+            }
+            let name = f.get_basename();
+            this._childs[k] = this._childs[k].filter(function(e) {
+                return e != name;
+            });
+        }
+        if (type == Gio.FileMonitorEvent.UNMOUNTED) {
+            this._childs[k] = [];
+        }
+    },
+
+    getCompletion: function(text) {
+        let common = '';
+        let notInit = true;
+        if (!this._valid) {
+            this._update(0);
+            return common;
+        }
+        function _getCommon(s1, s2) {
+            let k = 0;
+            for (; k < s1.length && k < s2.length; k++) {
+                if (s1[k] != s2[k])
+                    break;
+            }
+            if (k == 0)
+                return '';
+            return s1.substr(0, k);
+        }
+        function _hasPrefix(s1, prefix) {
+            return s1.indexOf(prefix) == 0;
+        }
+        for (let i = 0; i < this._childs.length; i++) {
+            for (let k = 0; k < this._childs[i].length; k++) {
+                if (!_hasPrefix(this._childs[i][k], text))
+                    continue;
+                if (notInit) {
+                    common = this._childs[i][k];
+                    notInit = false;
+                }
+                common = _getCommon(common, this._childs[i][k]);
+            }
+        }
+        if (common.length)
+            return common.substr(text.length);
+        return common;
+    }
+});
+
 const RunDialog = new Lang.Class({
    Name: 'RunDialog',
    Extends: ModalDialog.ModalDialog,

    _init : function() {
-        this.parent({ styleClass: 'run-dialog',
-                      destroyOnClose: false });
+        this.parent({ styleClass: 'run-dialog' });

        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
        this._terminalSettings = new Gio.Settings({ schema: TERMINAL_SCHEMA });
@ -111,6 +242,8 @@ const RunDialog = new Lang.Class({
                           key: Clutter.Escape }]);

        this._pathCompleter = new Gio.FilenameCompleter();
+        this._commandCompleter = new CommandCompleter();
+        this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));

        this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
                                                     entry: this._entryText });
@ -126,6 +259,18 @@ const RunDialog = new Lang.Class({

                return true;
            }
+            if (symbol == Clutter.slash) {
+                // Need preload data before get completion. GFilenameCompleter load content of parent directory.
+                // Parent directory for /usr/include/ is /usr/. So need to add fake name('a').
+                let text = o.get_text().concat('/a');
+                let prefix;
+                if (text.lastIndexOf(' ') == -1)
+                    prefix = text;
+                else
+                    prefix = text.substr(text.lastIndexOf(' ') + 1);
+                this._getCompletion(prefix);
+                return false;
+            }
            if (symbol == Clutter.Tab) {
                let text = o.get_text();
                let prefix;
@ -137,6 +282,8 @@ const RunDialog = new Lang.Class({
                if (postfix != null && postfix.length > 0) {
                    o.insert_text(postfix, -1);
                    o.set_cursor_position(text.length + postfix.length);
+                    if (postfix[postfix.length - 1] == '/')
+                        this._getCompletion(text + postfix + 'a');
                }
                return true;
            }
@ -144,53 +291,11 @@ const RunDialog = new Lang.Class({
        }));
    },

-    _getCommandCompletion: function(text) {
-        function _getCommon(s1, s2) {
-            if (s1 == null)
-                return s2;
-
-            let k = 0;
-            for (; k < s1.length && k < s2.length; k++) {
-                if (s1[k] != s2[k])
-                    break;
-            }
-            if (k == 0)
-                return '';
-            return s1.substr(0, k);
-        }
-
-        let paths = GLib.getenv('PATH').split(':');
-        paths.push(GLib.get_home_dir());
-        let someResults = paths.map(function(path) {
-            let results = [];
-            try {
-                let file = Gio.File.new_for_path(path);
-                let fileEnum = file.enumerate_children('standard::name', Gio.FileQueryInfoFlags.NONE, null);
-                let info;
-                while ((info = fileEnum.next_file(null))) {
-                    let name = info.get_name();
-                    if (name.slice(0, text.length) == text)
-                        results.push(name);
-                }
-            } catch (e if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND) &&
-                           !e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_DIRECTORY))) {
-                log(e);
-            } finally {
-                return results;
-            }
-        });
-        let results = someResults.reduce(function(a, b) {
-            return a.concat(b);
-        }, []);
-        let common = results.reduce(_getCommon, null);
-        return common.substr(text.length);
-    },
-
    _getCompletion : function(text) {
        if (text.indexOf('/') != -1) {
            return this._pathCompleter.get_completion_suffix(text);
        } else {
-            return this._getCommandCompletion(text);
+            return this._commandCompleter.getCompletion(text);
        }
    },

--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@ -1,277 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Gdk = imports.gi.Gdk;
-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 Signals = imports.signals;
-const St = imports.gi.St;
-
-const Lightbox = imports.ui.lightbox;
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const ScreenshotIface = <interface name="org.gnome.Shell.Screenshot">
-<method name="ScreenshotArea">
-    <arg type="i" direction="in" name="x"/>
-    <arg type="i" direction="in" name="y"/>
-    <arg type="i" direction="in" name="width"/>
-    <arg type="i" direction="in" name="height"/>
-    <arg type="b" direction="in" name="flash"/>
-    <arg type="s" direction="in" name="filename"/>
-    <arg type="b" direction="out" name="success"/>
-    <arg type="s" direction="out" name="filename_used"/>
-</method>
-<method name="ScreenshotWindow">
-    <arg type="b" direction="in" name="include_frame"/>
-    <arg type="b" direction="in" name="include_cursor"/>
-    <arg type="b" direction="in" name="flash"/>
-    <arg type="s" direction="in" name="filename"/>
-    <arg type="b" direction="out" name="success"/>
-    <arg type="s" direction="out" name="filename_used"/>
-</method>
-<method name="Screenshot">
-    <arg type="b" direction="in" name="include_cursor"/>
-    <arg type="b" direction="in" name="flash"/>
-    <arg type="s" direction="in" name="filename"/>
-    <arg type="b" direction="out" name="success"/>
-    <arg type="s" direction="out" name="filename_used"/>
-</method>
-<method name="SelectArea">
-    <arg type="i" direction="out" name="x"/>
-    <arg type="i" direction="out" name="y"/>
-    <arg type="i" direction="out" name="width"/>
-    <arg type="i" direction="out" name="height"/>
-</method>
-<method name="FlashArea">
-    <arg type="i" direction="in" name="x"/>
-    <arg type="i" direction="in" name="y"/>
-    <arg type="i" direction="in" name="width"/>
-    <arg type="i" direction="in" name="height"/>
-</method>
-</interface>;
-
-const ScreenshotService = new Lang.Class({
-    Name: 'ScreenshotService',
-
-    _init: function() {
-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenshotIface, this);
-        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/Screenshot');
-
-        Gio.DBus.session.own_name('org.gnome.Shell.Screenshot', Gio.BusNameOwnerFlags.REPLACE, null, null);
-    },
-
-    _onScreenshotComplete: function(obj, result, area, filenameUsed, flash, invocation) {
-        if (flash && result) {
-            let flashspot = new Flashspot(area);
-            flashspot.fire();
-        }
-
-        let retval = GLib.Variant.new('(bs)', [result, filenameUsed]);
-        invocation.return_value(retval);
-    },
-
-    ScreenshotAreaAsync : function (params, invocation) {
-        let [x, y, width, height, flash, filename, callback] = params;
-        if (height <= 0 || width <= 0) {
-            invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
-                        "Invalid params");
-            return;
-        }
-        let screenshot = new Shell.Screenshot();
-        screenshot.screenshot_area (x, y, width, height, filename,
-                                Lang.bind(this, this._onScreenshotComplete,
-                                          flash, invocation));
-    },
-
-    ScreenshotWindowAsync : function (params, invocation) {
-        let [include_frame, include_cursor, flash, filename] = params;
-        let screenshot = new Shell.Screenshot();
-        screenshot.screenshot_window (include_frame, include_cursor, filename,
-                                  Lang.bind(this, this._onScreenshotComplete,
-                                            flash, invocation));
-    },
-
-    ScreenshotAsync : function (params, invocation) {
-        let [include_cursor, flash, filename] = params;
-        let screenshot = new Shell.Screenshot();
-        screenshot.screenshot(include_cursor, filename,
-                          Lang.bind(this, this._onScreenshotComplete,
-                                    flash, invocation));
-    },
-
-    SelectAreaAsync: function (params, invocation) {
-        let selectArea = new SelectArea();
-        selectArea.show();
-        selectArea.connect('finished', Lang.bind(this,
-            function(selectArea, areaRectangle) {
-                if (areaRectangle) {
-                    let retval = GLib.Variant.new('(iiii)',
-                        [areaRectangle.x, areaRectangle.y,
-                         areaRectangle.width, areaRectangle.height]);
-                    invocation.return_value(retval);
-                } else {
-                    invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
-                        "Operation was cancelled");
-                }
-            }));
-    },
-
-    FlashArea: function(x, y, width, height) {
-        let flashspot = new Flashspot({ x : x, y : y, width: width, height: height});
-        flashspot.fire();
-    }
-});
-
-const SelectArea = new Lang.Class({
-    Name: 'SelectArea',
-
-    _init: function() {
-        this._startX = -1;
-        this._startY = -1;
-        this._lastX = 0;
-        this._lastY = 0;
-
-        this._initRubberbandColors();
-
-        this._group = new St.Widget({ visible: false,
-                                      reactive: true,
-                                      x: 0,
-                                      y: 0 });
-        Main.uiGroup.add_actor(this._group);
-
-        this._group.connect('button-press-event',
-                            Lang.bind(this, this._onButtonPress));
-        this._group.connect('button-release-event',
-                            Lang.bind(this, this._onButtonRelease));
-        this._group.connect('key-press-event',
-                            Lang.bind(this, this._onKeyPress));
-        this._group.connect('motion-event',
-                            Lang.bind(this, this._onMotionEvent));
-
-        let constraint = new Clutter.BindConstraint({ source: global.stage,
-                                                      coordinate: Clutter.BindCoordinate.ALL });
-        this._group.add_constraint(constraint);
-
-        this._rubberband = new Clutter.Rectangle({ color: this._background,
-                                                   has_border: true,
-                                                   border_width: 1,
-                                                   border_color: this._border });
-        this._group.add_actor(this._rubberband);
-    },
-
-    show: function() {
-        if (!Main.pushModal(this._group) || this._group.visible)
-            return;
-
-        global.set_cursor(Shell.Cursor.CROSSHAIR);
-        this._group.visible = true;
-    },
-
-    _initRubberbandColors: function() {
-        function colorFromRGBA(rgba) {
-            return new Clutter.Color({ red: rgba.red * 255,
-                                       green: rgba.green * 255,
-                                       blue: rgba.blue * 255,
-                                       alpha: rgba.alpha * 255 });
-        }
-
-        let path = new Gtk.WidgetPath();
-        path.append_type(Gtk.IconView);
-
-        let context = new Gtk.StyleContext();
-        context.set_path(path);
-        context.add_class('rubberband');
-
-        this._background = colorFromRGBA(context.get_background_color(Gtk.StateFlags.NORMAL));
-        this._border = colorFromRGBA(context.get_border_color(Gtk.StateFlags.NORMAL));
-    },
-
-    _getGeometry: function() {
-        return { x: Math.min(this._startX, this._lastX),
-                 y: Math.min(this._startY, this._lastY),
-                 width: Math.abs(this._startX - this._lastX),
-                 height: Math.abs(this._startY - this._lastY) };
-    },
-
-    _onKeyPress: function(actor, event) {
-        if (event.get_key_symbol() == Clutter.Escape)
-            this._destroy(null, false);
-
-        return;
-    },
-
-    _onMotionEvent: function(actor, event) {
-        if (this._startX == -1 || this._startY == -1)
-            return false;
-
-        [this._lastX, this._lastY] = event.get_coords();
-        let geometry = this._getGeometry();
-
-        this._rubberband.set_position(geometry.x, geometry.y);
-        this._rubberband.set_size(geometry.width, geometry.height);
-
-        return false;
-    },
-
-    _onButtonPress: function(actor, event) {
-        [this._startX, this._startY] = event.get_coords();
-        this._rubberband.set_position(this._startX, this._startY);
-
-        return false;
-    },
-
-    _onButtonRelease: function(actor, event) {
-        this._destroy(this._getGeometry(), true);
-        return false;
-    },
-
-    _destroy: function(geometry, fade) {
-        Tweener.addTween(this._group,
-                         { opacity: 0,
-                           time: fade ? 0.2 : 0,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this,
-                               function() {
-                                   Main.popModal(this._group);
-                                   this._group.destroy();
-                                   global.unset_cursor();
-
-                                   this.emit('finished', geometry);
-                               })
-                         });
-    }
-});
-Signals.addSignalMethods(SelectArea.prototype);
-
-const FLASHSPOT_ANIMATION_OUT_TIME = 0.5; // seconds
-
-const Flashspot = new Lang.Class({
-    Name: 'Flashspot',
-    Extends: Lightbox.Lightbox,
-
-    _init: function(area) {
-        this.parent(Main.uiGroup, { inhibitEvents: true,
-                                    width: area.width,
-                                    height: area.height });
-
-        this.actor.style_class = 'flashspot';
-        this.actor.set_position(area.x, area.y);
-    },
-
-    fire: function() {
-        this.actor.show();
-        this.actor.opacity = 255;
-        Tweener.addTween(this.actor,
-                         { opacity: 0,
-                           time: FLASHSPOT_ANIMATION_OUT_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this.destroy();
-                           })
-                         });
-    }
-});
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -1,25 +1,193 @@
 // -*- 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 Signals = imports.signals;
+const Shell = imports.gi.Shell;
+const Util = imports.misc.util;

-const SEARCH_PROVIDERS_SCHEMA = 'org.gnome.desktop.search-providers';
+const FileUtils = imports.misc.fileUtils;
+const Main = imports.ui.main;
+
+// Not currently referenced by the search API, but
+// this enumeration can be useful for provider
+// implementations.
+const MatchType = {
+    NONE: 0,
+    SUBSTRING: 1,
+    PREFIX: 2
+};
+
+const SearchResultDisplay = new Lang.Class({
+    Name: 'SearchResultDisplay',
+
+    _init: function(provider) {
+        this.provider = provider;
+        this.actor = null;
+    },
+
+    /**
+     * renderResults:
+     * @results: List of identifier strings
+     * @terms: List of search term strings
+     *
+     * Display the given search matches which resulted
+     * from the given terms.  It's expected that not
+     * all results will fit in the space for the container
+     * actor; in this case, show as many as makes sense
+     * for your result type.
+     *
+     * The terms are useful for search match highlighting.
+     */
+    renderResults: function(results, terms) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * clear:
+     * Remove all results from this display.
+     */
+    clear: function() {
+        this.actor.destroy_all_children();
+    },
+
+    /**
+     * getVisibleResultCount:
+     *
+     * Returns: The number of actors visible.
+     */
+    getVisibleResultCount: function() {
+        throw new Error('Not implemented');
+    },
+});
+
+/**
+ * SearchProvider:
+ *
+ * Subclass this object to add a new result type
+ * to the search system, then call registerProvider()
+ * in SearchSystem with an instance.
+ * Search is asynchronous and uses the
+ * getInitialResultSet()/getSubsearchResultSet() methods.
+ */
+const SearchProvider = new Lang.Class({
+    Name: 'SearchProvider',
+
+    _init: function(title) {
+        this.title = title;
+        this.searchSystem = null;
+    },
+
+    /**
+     * getInitialResultSet:
+     * @terms: Array of search terms, treated as logical AND
+     *
+     * Called when the user first begins a search (most likely
+     * therefore a single term of length one or two), or when
+     * a new term is added.
+     *
+     * Should "return" an array of result identifier strings representing
+     * items which match the given search terms.  This
+     * is expected to be a substring match on the metadata for a given
+     * item.  Ordering of returned results is up to the discretion of the provider,
+     * but you should follow these heruistics:
+     *
+     *  * Put items where the term matches multiple criteria (e.g. name and
+     *    description) before single matches
+     *  * Put items which match on a prefix before non-prefix substring matches
+     *
+     * We say "return" above, but in order to make the query asynchronous, use
+     * this.searchSystem.pushResults();. The return value should be ignored.
+     *
+     * This function should be fast; do not perform unindexed full-text searches
+     * or network queries.
+     */
+    getInitialResultSet: function(terms) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * getSubsearchResultSet:
+     * @previousResults: Array of item identifiers
+     * @newTerms: Updated search terms
+     *
+     * Called when a search is performed which is a "subsearch" of
+     * the previous search; i.e. when every search term has exactly
+     * one corresponding term in the previous search which is a prefix
+     * of the new term.
+     *
+     * This allows search providers to only search through the previous
+     * result set, rather than possibly performing a full re-query.
+     *
+     * Similar to getInitialResultSet, the return value for this will
+     * be ignored; use this.searchSystem.pushResults();.
+     */
+    getSubsearchResultSet: function(previousResults, newTerms) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * getResultMetas:
+     * @ids: Result identifier strings
+     *
+     * Call callback with array of objects with 'id', 'name', (both strings) and
+     * 'createIcon' (function(size) returning a Clutter.Texture) properties
+     * with the same number of members as @ids
+     */
+    getResultMetas: function(ids, callback) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * createResultActor:
+     * @resultMeta: Object with result metadata
+     * @terms: Array of search terms, should be used for highlighting
+     *
+     * Search providers may optionally override this to render a
+     * particular serch result in a custom fashion.  The default
+     * implementation will show the icon next to the name.
+     *
+     * The actor should be an instance of St.Widget, with the style class
+     * 'search-result-content'.
+     */
+    createResultActor: function(resultMeta, terms) {
+        return null;
+    },
+
+    /**
+     * activateResult:
+     * @id: Result identifier string
+     *
+     * Called when the user chooses a given result.
+     */
+    activateResult: function(id) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * launchSearch:
+     * @terms: Current search terms
+     *
+     * Called when the user clicks the provider icon.
+     */
+    launchSearch: function(terms) {
+        throw new Error('Not implemented');
+    }
+});
+Signals.addSignalMethods(SearchProvider.prototype);

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

    _init: function() {
        this._providers = [];
-        this._remoteProviders = [];
        this.reset();
    },

    registerProvider: function (provider) {
        provider.searchSystem = this;
        this._providers.push(provider);
-
-        if (provider.isRemoteProvider)
-            this._remoteProviders.push(provider);
    },

    unregisterProvider: function (provider) {
@ -28,20 +196,12 @@ const SearchSystem = new Lang.Class({
            return;
        provider.searchSystem = null;
        this._providers.splice(index, 1);
-
-        let remoteIndex = this._remoteProviders.indexOf(provider);
-        if (remoteIndex != -1)
-            this._remoteProviders.splice(index, 1);
    },

    getProviders: function() {
        return this._providers;
    },

-    getRemoteProviders: function() {
-        return this._remoteProviders;
-    },
-
    getTerms: function() {
        return this._previousTerms;
    },
@ -60,18 +220,28 @@ const SearchSystem = new Lang.Class({
        this.emit('search-updated', this._previousResults[i]);
    },

+    updateSearch: function(searchString) {
+        searchString = searchString.replace(/^\s+/g, '').replace(/\s+$/g, '');
+        if (searchString == '')
+            return;
+
+        let terms = searchString.split(/\s+/);
+        this.updateSearchResults(terms);
+    },
+
    updateSearchResults: function(terms) {
        if (!terms)
            return;

-        let searchString = terms.join(' ');
-        let previousSearchString = this._previousTerms.join(' ');
-        if (searchString == previousSearchString)
-            return;
-
-        let isSubSearch = false;
-        if (this._previousTerms.length > 0)
-            isSubSearch = searchString.indexOf(previousSearchString) == 0;
+        let isSubSearch = terms.length == this._previousTerms.length;
+        if (isSubSearch) {
+            for (let i = 0; i < terms.length; i++) {
+                if (terms[i].indexOf(this._previousTerms[i]) != 0) {
+                    isSubSearch = false;
+                    break;
+                }
+            }
+        }

        let previousResultsArr = this._previousResults;

@ -86,7 +256,7 @@ const SearchSystem = new Lang.Class({
                    results.push([provider, []]);
                    provider.getSubsearchResultSet(previousResults, terms);
                } catch (error) {
-                    log('A ' + error.name + ' has occured in ' + provider.id + ': ' + error.message);
+                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                }
            }
        } else {
@ -96,10 +266,16 @@ const SearchSystem = new Lang.Class({
                    results.push([provider, []]);
                    provider.getInitialResultSet(terms);
                } catch (error) {
-                    log('A ' + error.name + ' has occured in ' + provider.id + ': ' + error.message);
+                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                }
            }
        }
+    },
+
+    launchSearch: function(provider) {
+        let terms = this.getTerms();
+        provider.launchSearch(terms);
+        Main.overview.toggle();
    }
 });
 Signals.addSignalMethods(SearchSystem.prototype);
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@ -8,58 +8,74 @@ const Signals = imports.signals;
 const St = imports.gi.St;
 const Atk = imports.gi.Atk;

+const AppDisplay = imports.ui.appDisplay;
 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
-const Separator = imports.ui.separator;
+const PopupMenu = imports.ui.popupMenu;
 const Search = imports.ui.search;
-const Util = imports.misc.util;

-const MAX_LIST_SEARCH_RESULTS_ROWS = 3;
+const MAX_SEARCH_RESULTS_ROWS = 3;
 const MAX_GRID_SEARCH_RESULTS_ROWS = 1;

-const MaxWidthBin = new Lang.Class({
-    Name: 'MaxWidthBin',
-    Extends: St.Bin,

-    vfunc_allocate: function(box, flags) {
-        let themeNode = this.get_theme_node();
-        let maxWidth = themeNode.get_max_width();
-        let availWidth = box.x2 - box.x1;
-        let adjustedBox = box;
+const ListSearchResult = new Lang.Class({
+    Name: 'ListSearchResult',

-        if (availWidth > maxWidth) {
-            let excessWidth = availWidth - maxWidth;
-            adjustedBox.x1 += Math.floor(excessWidth / 2);
-            adjustedBox.x2 -= Math.floor(excessWidth / 2);
-        }
-
-        this.parent(adjustedBox, flags);
-    }
-});
-
-const SearchResult = new Lang.Class({
-    Name: 'SearchResult',
+    ICON_SIZE: 64,

    _init: function(provider, metaInfo, terms) {
        this.provider = provider;
        this.metaInfo = metaInfo;
-        this.terms = terms;
-
-        this.actor = new St.Button({ reactive: true,
+        this.actor = new St.Button({ style_class: 'search-result',
+                                     reactive: true,
                                     can_focus: true,
                                     track_hover: true,
                                     x_align: St.Align.START,
+                                     x_fill: true,
                                     y_fill: true });
-
        this.actor._delegate = this;
-        this.actor.connect('clicked', Lang.bind(this, this.activate));
-    },

-    activate: function() {
-        this.provider.activateResult(this.metaInfo.id, this.terms);
-        Main.overview.toggle();
+        let content = new St.BoxLayout({ style_class: 'search-result-content',
+                                         vertical: false });
+        this._content = content;
+        this.actor.set_child(content);
+
+        // An icon for, or thumbnail of, content
+        let icon = this.metaInfo['createIcon'](this.ICON_SIZE);
+        if (icon) {
+            let iconBin = new St.Bin({ style_class: 'search-result-icon',
+                                    child: icon });
+            content.add(iconBin);
+        }
+
+        let details = new St.BoxLayout({ style_class: 'search-result-details',
+                                         vertical: true });
+        content.add(details, { x_fill: true,
+                               y_fill: false,
+                               x_align: St.Align.START,
+                               y_align: St.Align.MIDDLE });
+
+        let title = new St.Label({ style_class: 'search-result-details-title',
+                                   text: this.metaInfo['name'] })
+        details.add(title, { x_fill: true,
+                             y_fill: false,
+                             x_align: St.Align.START,
+                             y_align: St.Align.START });
+
+        // TODO: could highlight terms in the description here, or should
+        // providers provide what should be highlighted?
+        if (this.metaInfo['description']) {
+            let description = new St.Label({ style_class: 'search-result-details-description',
+                                             text: this.metaInfo['description'] });
+            details.add(description, { x_fill: false,
+                                       y_fill: true,
+                                       x_align: St.Align.START,
+                                       y_align: St.Align.END });
+        }
+
+        this.actor.connect('clicked', Lang.bind(this, this._onResultClicked));
    },

    setSelected: function(selected) {
@ -67,142 +83,37 @@ const SearchResult = new Lang.Class({
            this.actor.add_style_pseudo_class('selected');
        else
            this.actor.remove_style_pseudo_class('selected');
+    },
+
+    activate: function() {
+        this.provider.activateResult(this.metaInfo.id);
+        Main.overview.toggle();
+    },
+
+    _onResultClicked: function(actor) {
+        this.activate();
    }
 });

-const ListSearchResult = new Lang.Class({
-    Name: 'ListSearchResult',
-    Extends: SearchResult,
-
-    ICON_SIZE: 64,
-
-    _init: function(provider, metaInfo, terms) {
-        this.parent(provider, metaInfo, terms);
-
-        this.actor.style_class = 'list-search-result';
-        this.actor.x_fill = true;
-
-        let content = new St.BoxLayout({ style_class: 'list-search-result-content',
-                                         vertical: false });
-        this.actor.set_child(content);
-
-        // An icon for, or thumbnail of, content
-        let icon = this.metaInfo['createIcon'](this.ICON_SIZE);
-        if (icon) {
-            content.add(icon);
-        }
-
-        let details = new St.BoxLayout({ vertical: true });
-        content.add(details, { x_fill: true,
-                               y_fill: false,
-                               x_align: St.Align.START,
-                               y_align: St.Align.MIDDLE });
-
-        let title = new St.Label({ style_class: 'list-search-result-title',
-                                   text: this.metaInfo['name'] })
-        details.add(title, { x_fill: false,
-                             y_fill: false,
-                             x_align: St.Align.START,
-                             y_align: St.Align.START });
-        this.actor.label_actor = title;
-
-        if (this.metaInfo['description']) {
-            let description = new St.Label({ style_class: 'list-search-result-description' });
-            description.clutter_text.set_markup(this.metaInfo['description']);
-            details.add(description, { x_fill: false,
-                                       y_fill: false,
-                                       x_align: St.Align.START,
-                                       y_align: St.Align.END });
-        }
-    }
-});
-
-const GridSearchResult = new Lang.Class({
-    Name: 'GridSearchResult',
-    Extends: SearchResult,
-
-    _init: function(provider, metaInfo, terms) {
-        this.parent(provider, metaInfo, terms);
-
-        this.actor.style_class = 'grid-search-result';
-
-        let content = provider.createResultActor(metaInfo, terms);
-        let dragSource = null;
-
-        if (content == null) {
-            content = new St.Bin();
-            let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
-                                             { createIcon: this.metaInfo['createIcon'] });
-            content.set_child(icon.actor);
-            content.label_actor = icon.label;
-            dragSource = icon.icon;
-        } else {
-            if (content._delegate && content._delegate.getDragActorSource)
-                dragSource = content._delegate.getDragActorSource();
-        }
-
-        this.actor.set_child(content);
-        this.actor.label_actor = content.label_actor;
-
-        let draggable = DND.makeDraggable(this.actor);
-        draggable.connect('drag-begin',
-                          Lang.bind(this, function() {
-                              Main.overview.beginItemDrag(this);
-                          }));
-        draggable.connect('drag-cancelled',
-                          Lang.bind(this, function() {
-                              Main.overview.cancelledItemDrag(this);
-                          }));
-        draggable.connect('drag-end',
-                          Lang.bind(this, function() {
-                              Main.overview.endItemDrag(this);
-                          }));
-
-        if (!dragSource)
-            // not exactly right, but alignment problems are hard to notice
-            dragSource = content;
-        this._dragActorSource = dragSource;
-    },
-
-    getDragActorSource: function() {
-        return this._dragActorSource;
-    },
-
-    getDragActor: function() {
-        return this.metaInfo['createIcon'](Main.overview.dashIconSize);
-    },
-
-    shellWorkspaceLaunch: function(params) {
-        if (this.provider.dragActivateResult)
-            this.provider.dragActivateResult(this.metaInfo.id, params);
-        else
-            this.provider.activateResult(this.metaInfo.id, this.terms);
-    }
-});

 const ListSearchResults = new Lang.Class({
    Name: 'ListSearchResults',
+    Extends: Search.SearchResultDisplay,

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

-        this.actor = new St.BoxLayout({ style_class: 'search-section-content' });
-        this.providerIcon = new ProviderIcon(provider);
-        this.providerIcon.connect('clicked', Lang.bind(this,
-            function() {
-                provider.launchSearch(this._terms);
-                Main.overview.toggle();
+        this.actor = new St.BoxLayout({ style_class: 'results-list',
+                                        vertical: true });
+        this.actor.connect('notify::width', Lang.bind(this, function() {
+            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+                let results = this.getResultsForDisplay();
+                if (results.length == 0)
+                    return;
+
+                provider.getResultMetas(results, Lang.bind(this, this.renderResults));
            }));
-
-        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.actor.add(this._content, { expand: true });
-
+        }));
        this._notDisplayedResult = [];
        this._terms = [];
        this._pendingClear = false;
@ -210,14 +121,15 @@ const ListSearchResults = new Lang.Class({

    getResultsForDisplay: function() {
        let alreadyVisible = this._pendingClear ? 0 : this.getVisibleResultCount();
-        let canDisplay = MAX_LIST_SEARCH_RESULTS_ROWS - alreadyVisible;
+        let canDisplay = MAX_SEARCH_RESULTS_ROWS - alreadyVisible;

-        let newResults = this._notDisplayedResult.splice(0, canDisplay);
-        return newResults;
+        let numResults = Math.min(this._notDisplayedResult.length, canDisplay);
+
+        return this._notDisplayedResult.splice(0, numResults);
    },

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

    hasMoreResults: function() {
@ -231,56 +143,167 @@ const ListSearchResults = new Lang.Class({
        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));
-            this._content.add_actor(display.actor);
+            this.addItem(display.actor);
+
+            display.actor.connect('key-focus-in', Lang.bind(this, this._onFocusedProviderChanged));
        }
    },

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

    getFirstResult: function() {
        if (this.getVisibleResultCount() > 0)
-            return this._content.get_child_at_index(0)._delegate;
+            return this.getItemAtIndex(0)._delegate;
        else
            return null;
+    },
+
+    addItem: function(actor, index) {
+        if (index !== undefined)
+            this.actor.insert_child_at_index(actor, index);
+        else
+            this.actor.add_actor(actor);
+    },
+
+    getItemAtIndex: function(index) {
+        return this.actor.get_child_at_index(index);
+    },
+
+    _onFocusedProviderChanged: function() {
+        this.emit('focused-provider-changed');
    }
 });
 Signals.addSignalMethods(ListSearchResults.prototype);

+
+const GridSearchResult = new Lang.Class({
+    Name: 'GridSearchResult',
+
+    _init: function(provider, metaInfo, terms) {
+        this.provider = provider;
+        this.metaInfo = metaInfo;
+        this.actor = new St.Button({ style_class: 'grid-search-result',
+                                     reactive: true,
+                                     x_align: St.Align.START,
+                                     y_fill: true });
+        this.actor._delegate = this;
+        this._dragActorSource = null;
+
+        let content = provider.createResultActor(metaInfo, terms);
+        if (content == null) {
+            content = new St.Bin({ style_class: 'grid-search-result-content',
+                                   reactive: true,
+                                   can_focus: true,
+                                   track_hover: true,
+                                   accessible_role: Atk.Role.PUSH_BUTTON });
+            let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
+                                             { createIcon: this.metaInfo['createIcon'] });
+            content.set_child(icon.actor);
+            this._dragActorSource = icon.icon;
+            content.label_actor = icon.label;
+        } else {
+            if (content._delegate && content._delegate.getDragActorSource)
+                this._dragActorSource = content._delegate.getDragActorSource();
+        }
+        this.content = content;
+        this.actor.set_child(content);
+
+        this.actor.connect('clicked', Lang.bind(this, this._onResultClicked));
+
+        let draggable = DND.makeDraggable(this.actor);
+        draggable.connect('drag-begin',
+                          Lang.bind(this, function() {
+                              Main.overview.beginAppDrag(this);
+                          }));
+        draggable.connect('drag-cancelled',
+                          Lang.bind(this, function() {
+                              Main.overview.cancelledAppDrag(this);
+                          }));
+        draggable.connect('drag-end',
+                          Lang.bind(this, function() {
+                              Main.overview.endAppDrag(this);
+                          }));
+    },
+
+    setSelected: function(selected) {
+        if (selected)
+            this.content.add_style_pseudo_class('selected');
+        else
+            this.content.remove_style_pseudo_class('selected');
+    },
+
+    activate: function() {
+        this.provider.activateResult(this.metaInfo.id);
+        Main.overview.toggle();
+    },
+
+    _onResultClicked: function(actor) {
+        this.activate();
+    },
+
+    getDragActorSource: function() {
+        if (this._dragActorSource)
+            return this._dragActorSource;
+        // not exactly right, but alignment problems are hard to notice
+        return this.content;
+    },
+
+    getDragActor: function(stageX, stageY) {
+        return this.metaInfo['createIcon'](Main.overview.dashIconSize);
+    },
+
+    shellWorkspaceLaunch: function(params) {
+        if (this.provider.dragActivateResult)
+            this.provider.dragActivateResult(this.metaInfo.id, params);
+        else
+            this.provider.activateResult(this.metaInfo.id, params);
+    }
+});
+
+
 const GridSearchResults = new Lang.Class({
    Name: 'GridSearchResults',
+    Extends: Search.SearchResultDisplay,

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

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

+        this._width = 0;
+        this.actor.connect('notify::width', Lang.bind(this, function() {
+            this._width = this.actor.width;
+            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+                let results = this.getResultsForDisplay();
+                if (results.length == 0)
+                    return;
+
+                provider.getResultMetas(results, Lang.bind(this, this.renderResults));
+            }));
+        }));
        this._notDisplayedResult = [];
        this._terms = [];
        this._pendingClear = false;
    },

    getResultsForDisplay: function() {
+        this._grid.actor.ensure_style();
        let alreadyVisible = this._pendingClear ? 0 : this._grid.visibleItemsCount();
-        let canDisplay = this._grid.childrenInRow(this.actor.width) * this._grid.getRowLimit()
+        let canDisplay = this._grid.childrenInRow(this._width) * this._grid.getRowLimit()
                         - alreadyVisible;

-        let newResults = this._notDisplayedResult.splice(0, canDisplay);
-        return newResults;
+        let numResults = Math.min(this._notDisplayedResult.length, canDisplay);
+
+        return this._notDisplayedResult.splice(0, numResults);
    },

    getVisibleResultCount: function() {
@ -298,15 +321,12 @@ const GridSearchResults = new Lang.Class({
        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));
            this._grid.addItem(display.actor);
+
+            display.content.connect('key-focus-in', Lang.bind(this, this._onFocusedProviderChanged));
        }
    },

@ -320,12 +340,17 @@ const GridSearchResults = new Lang.Class({
            return this._grid.getItemAtIndex(0)._delegate;
        else
            return null;
+    },
+
+    _onFocusedProviderChanged: function() {
+        this.emit('focused-provider-changed');
    }
 });
 Signals.addSignalMethods(GridSearchResults.prototype);

-const SearchResults = new Lang.Class({
-    Name: 'SearchResults',
+
+const SearchDisplay = new Lang.Class({
+    Name: 'SearchDisplay',

    _init: function(searchSystem) {
        this._searchSystem = searchSystem;
@ -336,29 +361,27 @@ const SearchResults = new Lang.Class({

        this._content = new St.BoxLayout({ name: 'searchResultsContent',
                                           vertical: true });
-        this._contentBin = new MaxWidthBin({ name: 'searchResultsBin',
-                                             x_fill: true,
-                                             y_fill: true,
-                                             child: this._content });

-        let scrollChild = new St.BoxLayout();
-        scrollChild.add(this._contentBin, { expand: true });
+        let scrollView = new St.ScrollView({ x_fill: true,
+                                             y_fill: false,
+                                             style_class: 'vfade' });
+        scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        scrollView.add_actor(this._content);

-        this._scrollView = new St.ScrollView({ x_fill: true,
-                                               y_fill: false,
-                                               overlay_scrollbars: true,
-                                               style_class: 'search-display vfade' });
-        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this._scrollView.add_actor(scrollChild);
-        let action = new Clutter.PanAction({ interpolate: true });
-        action.connect('pan', Lang.bind(this, this._onPan));
-        this._scrollView.add_action(action);
+        this.actor.add(scrollView, { x_fill: true,
+                                     y_fill: true,
+                                     expand: true,
+                                     x_align: St.Align.START,
+                                     y_align: St.Align.START });
+        this.actor.connect('notify::mapped', Lang.bind(this,
+            function() {
+                if (!this.actor.mapped)
+                    return;

-        this.actor.add(this._scrollView, { x_fill: true,
-                                           y_fill: true,
-                                           expand: true,
-                                           x_align: St.Align.START,
-                                           y_align: St.Align.START });
+                let adjustment = scrollView.vscroll.adjustment;
+                let direction = Overview.SwipeScrollDirection.VERTICAL;
+                Main.overview.setScrollAdjustment(adjustment, direction);
+            }));

        this._statusText = new St.Label({ style_class: 'search-statustext' });
        this._statusBin = new St.Bin({ x_align: St.Align.MIDDLE,
@ -375,39 +398,42 @@ const SearchResults = new Lang.Class({
        this._defaultResult = null;
    },

-    _onPan: function(action) {
-        let [dist, dx, dy] = action.get_motion_delta(0);
-        let adjustment = this._scrollView.vscroll.adjustment;
-        adjustment.value -= (dy / this.actor.height) * adjustment.page_size;
-        return false;
-    },
-
-    _keyFocusIn: function(provider, icon) {
-        Util.ensureActorVisibleInScrollView(this._scrollView, icon);
-    },
-
    createProviderMeta: function(provider) {
        let providerBox = new St.BoxLayout({ style_class: 'search-section',
                                             vertical: true });
-        let providerIcon = null;
-        let resultDisplay = null;
+        let providerBoxContent = new St.BoxLayout({ style_class: 'search-section-content' });
+        let isAppsProvider = (provider instanceof AppDisplay.AppSearchProvider);

-        if (provider.appInfo) {
-            resultDisplay = new ListSearchResults(provider);
-            providerIcon = resultDisplay.providerIcon;
-        } else {
-            resultDisplay = new GridSearchResults(provider);
+        let providerIcon;
+        if (!isAppsProvider) {
+            let separator = new PopupMenu.HorzSeparator({ style_class: 'search-section-separator' });
+            providerBox.add(separator.actor, { expand: true });
+
+            providerIcon = new ProviderIcon(provider);
+            providerIcon.connect('launch-search', Lang.bind(this, function(providerIcon) {
+                this._searchSystem.launchSearch(providerIcon.provider);
+            }));
+            providerBoxContent.add(providerIcon.actor, { x_fill: false,
+                                                         y_fill: false,
+                                                         x_align: St.Align.START,
+                                                         y_align: St.Align.START });
        }

-        resultDisplay.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
-
-        let resultDisplayBin = new St.Bin({ child: resultDisplay.actor,
+        let resultDisplayBin = new St.Bin({ style_class: 'search-section-results',
                                            x_fill: true,
                                            y_fill: true });
-        providerBox.add(resultDisplayBin, { expand: true });
+        providerBoxContent.add(resultDisplayBin, { expand: true });

-        let separator = new Separator.HorizontalSeparator({ style_class: 'search-section-separator' });
-        providerBox.add(separator.actor);
+        providerBox.add(providerBoxContent);
+
+        let resultDisplay;
+        if (isAppsProvider)
+            resultDisplay = new GridSearchResults(provider);
+        else
+            resultDisplay = new ListSearchResults(provider);
+
+        resultDisplay.connect('focused-provider-changed', Lang.bind(this, this._updateProviderIconCanFocus));
+        resultDisplayBin.set_child(resultDisplay.actor);

        this._providerMeta.push({ provider: provider,
                                  actor: providerBox,
@ -432,6 +458,7 @@ const SearchResults = new Lang.Class({
            let meta = this._providerMeta[i];
            meta.resultDisplay.clear();
            meta.actor.hide();
+            if (meta.icon) meta.icon.actor.can_focus = false;
        }
    },

@ -439,25 +466,34 @@ const SearchResults = new Lang.Class({
        let meta = this._metaForProvider(provider);
        meta.resultDisplay.clear();
        meta.actor.hide();
+        if (meta.icon) meta.icon.actor.can_focus = false;
    },

    reset: function() {
        this._searchSystem.reset();
        this._statusBin.hide();
        this._clearDisplay();
-        this._defaultResult = null;
    },

    startingSearch: function() {
        this.reset();
-        this._statusText.set_text(_("Searching…"));
+        this._statusText.set_text(_("Searching..."));
        this._statusBin.show();
    },

+    doSearch: function (searchString) {
+        this._searchSystem.updateSearch(searchString);
+    },
+
    _metaForProvider: function(provider) {
        return this._providerMeta[this._providers.indexOf(provider)];
    },

+    _metaForProvidersExcept: function(provider) {
+        let skip = this._providers.indexOf(provider);
+        return this._providerMeta.filter(function(meta, index) { return index != skip }, this);
+    },
+
    _maybeSetInitialSelection: function() {
        let newDefaultResult = null;

@ -516,9 +552,7 @@ const SearchResults = new Lang.Class({
            let results = meta.resultDisplay.getResultsForDisplay();

            if (meta.icon)
-                meta.icon.moreIcon.visible =
-                    meta.resultDisplay.hasMoreResults() &&
-                    provider.canLaunchSearch;
+                meta.icon.moreIcon.visible = meta.resultDisplay.hasMoreResults();

            provider.getResultMetas(results, Lang.bind(this, function(metas) {
                this._clearDisplayForProvider(provider);
@ -553,6 +587,15 @@ const SearchResults = new Lang.Class({
            this._defaultResult.setSelected(highlight);
    },

+    _updateProviderIconCanFocus: function(resultDisplay) {
+        let meta = this._metaForProvider(resultDisplay.provider);
+        if (meta.icon)
+            meta.icon.actor.can_focus = true;
+
+        let others = this._metaForProvidersExcept(resultDisplay.provider);
+        others.forEach(function(meta) { if (meta.icon) meta.icon.actor.can_focus = false; });
+    },
+
    navigateFocus: function(direction) {
        let rtl = this.actor.get_text_direction() == Clutter.TextDirection.RTL;
        if (direction == Gtk.DirectionType.TAB_BACKWARD ||
@ -565,38 +608,72 @@ const SearchResults = new Lang.Class({

        let from = this._defaultResult ? this._defaultResult.actor : null;
        this.actor.navigate_focus(from, direction, false);
+        if (this._defaultResult) {
+            // The default result appears focused, so navigate directly to the
+            // next result.
+            this.actor.navigate_focus(global.stage.key_focus, direction, false);
+        }
    }
 });

 const ProviderIcon = new Lang.Class({
    Name: 'ProviderIcon',
-    Extends: St.Button,

    PROVIDER_ICON_SIZE: 48,

+    MORE_ICON_SIZE: 16,
+
    _init: function(provider) {
        this.provider = provider;
-        this.parent({ style_class: 'search-provider-icon',
-                      reactive: true,
-                      can_focus: true,
-                      accessible_name: provider.appInfo.get_name(),
-                      track_hover: true });
+
+        this.actor = new St.Button({ style_class: 'search-section-icon-bin',
+                                     reactive: true,
+                                     track_hover: true });
+        this.actor.connect('clicked', Lang.bind(this, this._onIconClicked));

        this._content = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-        this.set_child(this._content);
+        this.actor.set_child(this._content);

-        let rtl = (this.get_text_direction() == Clutter.TextDirection.RTL);
+        let rtl = (this.actor.get_text_direction() == Clutter.TextDirection.RTL);

-        this.moreIcon = new St.Widget({ style_class: 'search-provider-icon-more',
-                                        visible: false,
-                                        x_align: rtl ? Clutter.ActorAlign.START : Clutter.ActorAlign.END,
-                                        y_align: Clutter.ActorAlign.END,
-                                        x_expand: true,
-                                        y_expand: true });
+        this.moreIcon = new St.Icon({ style_class: 'search-section-icon-more',
+                                      icon_size: this.MORE_ICON_SIZE,
+                                      icon_name: 'list-add-symbolic',
+                                      visible: false,
+                                      x_align: rtl ? Clutter.ActorAlign.START : Clutter.ActorAlign.END,
+                                      y_align: Clutter.ActorAlign.END,
+                                      // HACK: without these, ClutterBinLayout
+                                      // ignores alignment properties on the actor
+                                      x_expand: true,
+                                      y_expand: true });

-        let icon = new St.Icon({ icon_size: this.PROVIDER_ICON_SIZE,
-                                 gicon: provider.appInfo.get_icon() });
-        this._content.add_actor(icon);
+        this._iconBin = new St.Bin({ style_class: 'search-section-icon',
+                                     width: this.PROVIDER_ICON_SIZE,
+                                     height: this.PROVIDER_ICON_SIZE });
+
+        this._content.add_actor(this._iconBin);
        this._content.add_actor(this.moreIcon);
+
+        this._createProviderIcon();
+    },
+
+    _createProviderIcon: function() {
+        let icon = new St.Icon({ icon_size: this.PROVIDER_ICON_SIZE });
+
+        if (this.provider.icon)
+            icon.gicon = this.provider.icon;
+        else
+            icon.icon_name = 'application-x-executable';
+
+        this._iconBin.set_child(icon);
+    },
+
+    activate: function() {
+        this.emit('launch-search');
+    },
+
+    _onIconClicked: function(actor) {
+        this.activate();
    }
 });
+Signals.addSignalMethods(ProviderIcon.prototype);
--- a/js/ui/separator.js
+++ b/js/ui/separator.js
@ -1,35 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Cairo = imports.cairo;
-const Lang = imports.lang;
-const St = imports.gi.St;
-
-const HorizontalSeparator = new Lang.Class({
-    Name: 'HorizontalSeparator',
-
-    _init: function (params) {
-        this.actor = new St.DrawingArea(params);
-        this.actor.connect('repaint', Lang.bind(this, this._onRepaint));
-    },
-
-    _onRepaint: function(area) {
-        let cr = area.get_context();
-        let themeNode = area.get_theme_node();
-        let [width, height] = area.get_surface_size();
-        let margin = themeNode.get_length('-margin-horizontal');
-        let gradientHeight = themeNode.get_length('-gradient-height');
-        let startColor = themeNode.get_color('-gradient-start');
-        let endColor = themeNode.get_color('-gradient-end');
-
-        let gradientWidth = (width - margin * 2);
-        let gradientOffset = (height - gradientHeight) / 2;
-        let pattern = new Cairo.LinearGradient(margin, gradientOffset, width - margin, gradientOffset + gradientHeight);
-        pattern.addColorStopRGBA(0, startColor.red / 255, startColor.green / 255, startColor.blue / 255, startColor.alpha / 255);
-        pattern.addColorStopRGBA(0.5, endColor.red / 255, endColor.green / 255, endColor.blue / 255, endColor.alpha / 255);
-        pattern.addColorStopRGBA(1, startColor.red / 255, startColor.green / 255, startColor.blue / 255, startColor.alpha / 255);
-        cr.setSource(pattern);
-        cr.rectangle(margin, gradientOffset, gradientWidth, gradientHeight);
-        cr.fill();
-        cr.$dispose();
-    }
-});
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@ -1,12 +1,8 @@
 // -*- 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 Mainloop = imports.mainloop;
 const Signals = imports.signals;

-const FileUtils = imports.misc.fileUtils;
 const Main = imports.ui.main;
 const Params = imports.misc.params;

@ -14,13 +10,11 @@ const DEFAULT_MODE = 'restrictive';

 const _modes = {
    'restrictive': {
-        parentMode: null,
-        stylesheetName: 'gnome-shell.css',
        hasOverview: false,
        showCalendarEvents: false,
        allowSettings: false,
        allowExtensions: false,
-        enabledExtensions: [],
+        allowKeybindingsWhenModal: false,
        hasRunDialog: false,
        hasWorkspaces: false,
        hasWindows: false,
@ -35,10 +29,10 @@ const _modes = {
            center: [],
            right: []
        },
-        panelStyle: null
    },

    'gdm': {
+        allowKeybindingsWhenModal: true,
        hasNotifications: true,
        isGreeter: true,
        isPrimary: true,
@ -47,10 +41,9 @@ const _modes = {
        panel: {
            left: ['logo'],
            center: ['dateMenu'],
-            right: ['a11yGreeter', 'display', 'keyboard',
+            right: ['a11y', 'display', 'keyboard',
                    'volume', 'battery', 'powerMenu']
-        },
-        panelStyle: 'login-screen'
+        }
    },

    'lock-screen': {
@ -63,7 +56,6 @@ const _modes = {
            center: [],
            right: ['lockScreen']
        },
-        panelStyle: 'lock-screen'
    },

    'unlock-dialog': {
@ -75,17 +67,15 @@ const _modes = {
            center: [],
            right: ['a11y', 'keyboard', 'lockScreen']
        },
-        panelStyle: 'unlock-screen'
    },

    'initial-setup': {
-        hasWindows: true,
        isPrimary: true,
-        components: ['networkAgent', 'keyring'],
+        components: ['keyring'],
        panel: {
            left: [],
            center: ['dateMenu'],
-            right: ['a11yGreeter', 'keyboard', 'volume', 'battery']
+            right: ['a11y', 'keyboard', 'volume']
        }
    },

@ -112,64 +102,22 @@ const _modes = {
    }
 };

-function _getModes(modesLoadedCallback) {
-    FileUtils.collectFromDatadirsAsync('modes',
-                                       { processFile: _loadMode,
-                                         loadedCallback: modesLoadedCallback,
-                                         data: _modes });
-}
-
-function _loadMode(file, info, loadedData) {
-    let name = info.get_name();
-    let suffix = name.indexOf('.json');
-    let modeName = suffix == -1 ? name : name.slice(name, suffix);
-
-    if (loadedData.hasOwnProperty(modeName))
-        return;
-
-    let fileContent, success, tag, newMode;
-    try {
-        [success, fileContent, tag] = file.load_contents(null);
-        newMode = JSON.parse(fileContent);
-    } catch(e) {
-        return;
-    }
-
-    loadedData[modeName] = {};
-    let propBlacklist = ['unlockDialog'];
-    for (let prop in loadedData[DEFAULT_MODE]) {
-        if (newMode[prop] !== undefined &&
-            propBlacklist.indexOf(prop) == -1)
-            loadedData[modeName][prop]= newMode[prop];
-    }
-    loadedData[modeName]['isPrimary'] = true;
-}
-
 function listModes() {
-    _getModes(function(modes) {
-        let names = Object.getOwnPropertyNames(modes);
-        for (let i = 0; i < names.length; i++)
-            if (_modes[names[i]].isPrimary)
-                print(names[i]);
-        Mainloop.quit('listModes');
-    });
-    Mainloop.run('listModes');
+    let modes = Object.getOwnPropertyNames(_modes);
+    for (let i = 0; i < modes.length; i++)
+        if (_modes[modes[i]].isPrimary)
+            print(modes[i]);
 }

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

-    init: function() {
-        _getModes(Lang.bind(this, function(modes) {
-            this._modes = modes;
-            let primary = modes[global.session_mode] &&
-                          modes[global.session_mode].isPrimary;
-            let mode = primary ? global.session_mode : 'user';
-            this._modeStack = [mode];
-            this._sync();
-
-            this.emit('sessions-loaded');
-        }));
+    _init: function() {
+        global.connect('notify::session-mode', Lang.bind(this, this._sync));
+        let mode = _modes[global.session_mode].isPrimary ? global.session_mode
+                                                         : 'user';
+        this._modeStack = [mode];
+        this._sync();
    },

    pushMode: function(mode) {
@ -196,14 +144,8 @@ const SessionMode = new Lang.Class({
    },

    _sync: function() {
-        let params = this._modes[this.currentMode];
-        let defaults;
-        if (params.parentMode)
-            defaults = Params.parse(this._modes[params.parentMode],
-                                    this._modes[DEFAULT_MODE]);
-        else
-            defaults = this._modes[DEFAULT_MODE];
-        params = Params.parse(params, defaults);
+        let params = _modes[this.currentMode];
+        params = Params.parse(params, _modes[DEFAULT_MODE]);

        // A simplified version of Lang.copyProperties, handles
        // undefined as a special case for "no change / inherit from previous mode"
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@ -1,18 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

+const Lang = imports.lang;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;

 const Config = imports.misc.config;
 const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionDownloader = imports.ui.extensionDownloader;
 const ExtensionUtils = imports.misc.extensionUtils;
-const Hash = imports.misc.hash;
+const Flashspot = imports.ui.flashspot;
 const Main = imports.ui.main;
-const Screenshot = imports.ui.screenshot;

 const GnomeShellIface = <interface name="org.gnome.Shell">
 <method name="Eval">
@ -20,27 +18,34 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
    <arg type="b" direction="out" name="success" />
    <arg type="s" direction="out" name="result" />
 </method>
-<method name="ShowOSD">
-    <arg type="a{sv}" direction="in" name="params"/>
-</method>
-<method name="GrabAccelerator">
-    <arg type="s" direction="in" name="accelerator"/>
-    <arg type="u" direction="in" name="flags"/>
-    <arg type="u" direction="out" name="action"/>
-</method>
-<method name="GrabAccelerators">
-    <arg type="a(su)" direction="in" name="accelerators"/>
-    <arg type="au" direction="out" name="actions"/>
-</method>
-<method name="UngrabAccelerator">
-    <arg type="u" direction="in" name="action"/>
+<method name="ScreenshotArea">
+    <arg type="i" direction="in" name="x"/>
+    <arg type="i" direction="in" name="y"/>
+    <arg type="i" direction="in" name="width"/>
+    <arg type="i" direction="in" name="height"/>
+    <arg type="b" direction="in" name="flash"/>
+    <arg type="s" direction="in" name="filename"/>
    <arg type="b" direction="out" name="success"/>
 </method>
-<signal name="AcceleratorActivated">
-    <arg name="action" type="u" />
-    <arg name="deviceid" type="u" />
-</signal>
-<property name="Mode" type="s" access="read" />
+<method name="ScreenshotWindow">
+    <arg type="b" direction="in" name="include_frame"/>
+    <arg type="b" direction="in" name="include_cursor"/>
+    <arg type="b" direction="in" name="flash"/>
+    <arg type="s" direction="in" name="filename"/>
+    <arg type="b" direction="out" name="success"/>
+</method>
+<method name="Screenshot">
+    <arg type="b" direction="in" name="include_cursor"/>
+    <arg type="b" direction="in" name="flash"/>
+    <arg type="s" direction="in" name="filename"/>
+    <arg type="b" direction="out" name="success"/>
+</method>
+<method name="FlashArea">
+    <arg type="i" direction="in" name="x"/>
+    <arg type="i" direction="in" name="y"/>
+    <arg type="i" direction="in" name="width"/>
+    <arg type="i" direction="in" name="height"/>
+</method>
 <property name="OverviewActive" type="b" access="readwrite" />
 <property name="ShellVersion" type="s" access="read" />
 </interface>;
@ -69,16 +74,7 @@ const GnomeShell = new Lang.Class({
        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellIface, this);
        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell');

-        this._extensionsService = new GnomeShellExtensions();
-        this._screenshotService = new Screenshot.ScreenshotService();
-
-        this._grabbedAccelerators = new Hash.Map();
-        this._grabbers = new Hash.Map();
-
-        global.display.connect('accelerator-activated', Lang.bind(this,
-            function(display, action, deviceid) {
-                this._emitAcceleratorActivated(action, deviceid);
-            }));
+        this._extensionsSerivce = new GnomeShellExtensions();
    },

    /**
@ -114,103 +110,81 @@ const GnomeShell = new Lang.Class({
        return [success, returnValue];
    },

-    ShowOSD: function(params) {
-        for (let param in params)
-            params[param] = params[param].deep_unpack();
-
-        let icon = null;
-        if (params['icon'])
-            icon = Gio.Icon.new_for_string(params['icon']);
-
-        Main.osdWindow.setIcon(icon);
-        Main.osdWindow.setLabel(params['label']);
-        Main.osdWindow.setLevel(params['level']);
-
-        Main.osdWindow.show();
-    },
-
-    GrabAcceleratorAsync: function(params, invocation) {
-        let [accel, flags] = params;
-        let sender = invocation.get_sender();
-        let bindingAction = this._grabAcceleratorForSender(accel, flags, sender);
-        return invocation.return_value(GLib.Variant.new('(u)', [bindingAction]));
-    },
-
-    GrabAcceleratorsAsync: function(params, invocation) {
-        let [accels] = params;
-        let sender = invocation.get_sender();
-        let bindingActions = [];
-        for (let i = 0; i < accels.length; i++) {
-            let [accel, flags] = accels[i];
-            bindingActions.push(this._grabAcceleratorForSender(accel, flags, sender));
-        }
-        return invocation.return_value(GLib.Variant.new('(au)', [bindingActions]));
-    },
-
-    UngrabAcceleratorAsync: function(params, invocation) {
-        let [action] = params;
-        let grabbedBy = this._grabbedAccelerators.get(action);
-        if (invocation.get_sender() != grabbedBy)
-            return invocation.return_value(GLib.Variant.new('(b)', [false]));
-
-        let ungrabSucceeded = global.display.ungrab_accelerator(action);
-        if (ungrabSucceeded)
-            this._grabbedAccelerators.delete(action);
-        return invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded]));
-    },
-
-    _emitAcceleratorActivated: function(action, deviceid) {
-        let destination = this._grabbedAccelerators.get(action);
-        if (!destination)
-            return;
-
-        let connection = this._dbusImpl.get_connection();
-        let info = this._dbusImpl.get_info();
-        connection.emit_signal(destination,
-                               this._dbusImpl.get_object_path(),
-                               info ? info.name : null,
-                               'AcceleratorActivated',
-                               GLib.Variant.new('(uu)', [action, deviceid]));
-    },
-
-    _grabAcceleratorForSender: function(accelerator, flags, sender) {
-        let bindingAction = global.display.grab_accelerator(accelerator);
-        if (bindingAction == Meta.KeyBindingAction.NONE)
-            return Meta.KeyBindingAction.NONE;
-
-        let bindingName = Meta.external_binding_name_for_action(bindingAction);
-        Main.wm.allowKeybinding(bindingName, flags);
-
-        this._grabbedAccelerators.set(bindingAction, sender);
-
-        if (!this._grabbers.has(sender)) {
-            let id = Gio.bus_watch_name(Gio.BusType.SESSION, sender, 0, null,
-                                        Lang.bind(this, this._onGrabberBusNameVanished));
-            this._grabbers.set(sender, id);
+    _onScreenshotComplete: function(obj, result, area, flash, invocation) {
+        if (flash) {
+            let flashspot = new Flashspot.Flashspot(area);
+            flashspot.fire();
        }

-        return bindingAction;
+        let retval = GLib.Variant.new('(b)', [result]);
+        invocation.return_value(retval);
    },

-    _ungrabAccelerator: function(action) {
-        let ungrabSucceeded = global.display.ungrab_accelerator(action);
-        if (ungrabSucceeded)
-            this._grabbedAccelerators.delete(action);
+    /**
+     * ScreenshotArea:
+     * @x: The X coordinate of the area
+     * @y: The Y coordinate of the area
+     * @width: The width of the area
+     * @height: The height of the area
+     * @flash: Whether to flash the area or not
+     * @filename: The filename for the screenshot
+     *
+     * Takes a screenshot of the passed in area and saves it
+     * in @filename as png image, it returns a boolean
+     * indicating whether the operation was successful or not.
+     *
+     */
+    ScreenshotAreaAsync : function (params, invocation) {
+        let [x, y, width, height, flash, filename, callback] = params;
+        let screenshot = new Shell.Screenshot();
+        screenshot.screenshot_area (x, y, width, height, filename,
+                                Lang.bind(this, this._onScreenshotComplete,
+                                          flash, invocation));
    },

-    _onGrabberBusNameVanished: function(connection, name) {
-        let grabs = this._grabbedAccelerators.items();
-        for (let i = 0; i < grabs.length; i++) {
-            let [action, sender] = grabs[i];
-            if (sender == name)
-                this._ungrabAccelerator(action);
-        }
-        Gio.bus_unwatch_name(this._grabbers.get(name));
-        this._grabbers.delete(name);
+    /**
+     * ScreenshotWindow:
+     * @include_frame: Whether to include the frame or not
+     * @include_cursor: Whether to include the cursor image or not
+     * @flash: Whether to flash the window area or not
+     * @filename: The filename for the screenshot
+     *
+     * Takes a screenshot of the focused window (optionally omitting the frame)
+     * and saves it in @filename as png image, it returns a boolean
+     * indicating whether the operation was successful or not.
+     *
+     */
+    ScreenshotWindowAsync : function (params, invocation) {
+        let [include_frame, include_cursor, flash, filename] = params;
+        let screenshot = new Shell.Screenshot();
+        screenshot.screenshot_window (include_frame, include_cursor, filename,
+                                  Lang.bind(this, this._onScreenshotComplete,
+                                            flash, invocation));
    },

+    /**
+     * Screenshot:
+     * @filename: The filename for the screenshot
+     * @include_cursor: Whether to include the cursor image or not
+     * @flash: Whether to flash the screen or not
+     *
+     * Takes a screenshot of the whole screen and saves it
+     * in @filename as png image, it returns a boolean
+     * indicating whether the operation was successful or not.
+     *
+     */
+    ScreenshotAsync : function (params, invocation) {
+        let [include_cursor, flash, filename] = params;
+        let screenshot = new Shell.Screenshot();
+        screenshot.screenshot(include_cursor, filename,
+                          Lang.bind(this, this._onScreenshotComplete,
+                                    flash, invocation));
+    },

-    Mode: global.session_mode,
+    FlashArea: function(x, y, width, height) {
+        let flashspot = new Flashspot.Flashspot({ x : x, y : y, width: width, height: height});
+        flashspot.fire();
+    },

    get OverviewActive() {
        return Main.overview.visible;
@ -373,8 +347,8 @@ const ScreenSaverDBus = new Lang.Class({
        this.parent();

        this._screenShield = screenShield;
-        screenShield.connect('active-changed', Lang.bind(this, function(shield) {
-            this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.active]));
+        screenShield.connect('lock-status-changed', Lang.bind(this, function(shield) {
+            this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.locked]));
        }));

        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenSaverIface, this);
@ -395,13 +369,13 @@ const ScreenSaverDBus = new Lang.Class({

    SetActive: function(active) {
        if (active)
-            this._screenShield.activate(true);
+            this._screenShield.lock(true);
        else
-            this._screenShield.deactivate(false);
+            this._screenShield.unlock();
    },

    GetActive: function() {
-        return this._screenShield.active;
+        return this._screenShield.locked;
    },

    GetActiveTime: function() {
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@ -1,11 +1,8 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const St = imports.gi.St;

-const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;
@ -68,28 +65,32 @@ const EntryMenu = new Lang.Class({
 	}
    },

-    open: function(animate) {
+    open: function() {
        this._updatePasteItem();
        this._updateCopyItem();
        if (this._passwordItem)
            this._updatePasswordItem();

-        this.parent(animate);
-        this._entry.add_style_pseudo_class('focus');
-
        let direction = Gtk.DirectionType.TAB_FORWARD;
        if (!this.actor.navigate_focus(null, direction, false))
            this.actor.grab_key_focus();
+
+        this.parent();
+        this._entry.add_style_pseudo_class('focus');
+    },
+
+    close: function() {
+        this._entry.grab_key_focus();
+        this.parent();
    },

    _updateCopyItem: function() {
        let selection = this._entry.clutter_text.get_selection();
-        this._copyItem.setSensitive(!this._entry.clutter_text.password_char &&
-                                    selection && selection != '');
+        this._copyItem.setSensitive(selection && selection != '');
    },

    _updatePasteItem: function() {
-        this._clipboard.get_text(St.ClipboardType.CLIPBOARD, Lang.bind(this,
+        this._clipboard.get_text(Lang.bind(this,
            function(clipboard, text) {
                this._pasteItem.setSensitive(text && text != '');
            }));
@ -105,11 +106,11 @@ const EntryMenu = new Lang.Class({

    _onCopyActivated: function() {
        let selection = this._entry.clutter_text.get_selection();
-        this._clipboard.set_text(St.ClipboardType.CLIPBOARD, selection);
+        this._clipboard.set_text(selection);
    },

    _onPasteActivated: function() {
-        this._clipboard.get_text(St.ClipboardType.CLIPBOARD, Lang.bind(this,
+        this._clipboard.get_text(Lang.bind(this,
            function(clipboard, text) {
                if (!text)
                    return;
@ -133,12 +134,12 @@ function _setMenuAlignment(entry, stageX) {

 function _onButtonPressEvent(actor, event, entry) {
    if (entry.menu.isOpen) {
-        entry.menu.close(BoxPointer.PopupAnimation.FULL);
+        entry.menu.close();
        return true;
    } else if (event.get_button() == 3) {
        let [stageX, stageY] = event.get_coords();
        _setMenuAlignment(entry, stageX);
-        entry.menu.open(BoxPointer.PopupAnimation.FULL);
+        entry.menu.open();
        return true;
    }
    return false;
@ -148,7 +149,7 @@ function _onPopup(actor, entry) {
    let [success, textX, textY, lineHeight] = entry.clutter_text.position_to_coords(-1);
    if (success)
        entry.menu.setSourceAlignment(textX / entry.width);
-    entry.menu.open(BoxPointer.PopupAnimation.FULL);
+    entry.menu.open();
 };

 function addContextMenu(entry, params) {
@ -166,10 +167,4 @@ function addContextMenu(entry, params) {
    entry.connect('button-press-event', Lang.bind(null, _onButtonPressEvent, entry));

    entry.connect('popup-menu', Lang.bind(null, _onPopup, entry));
-
-    entry.connect('destroy', function() {
-        entry.menu.destroy();
-        entry.menu = null;
-        entry._menuManager = null;
-    });
 }
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@ -19,8 +19,6 @@ const ShellEntry = imports.ui.shellEntry;

 const LIST_ITEM_ICON_SIZE = 48;

-const REMEMBER_MOUNT_PASSWORD_KEY = 'remember-mount-password';
-
 /* ------ Common Utils ------- */
 function _setLabelText(label, text) {
    if (text) {
@ -389,8 +387,7 @@ const ShellMountPasswordDialog = new Lang.Class({
        if (flags & Gio.AskPasswordFlags.SAVING_SUPPORTED) {
            this._rememberChoice = new CheckBox.CheckBox();
            this._rememberChoice.getLabelActor().text = _("Remember Password");
-            this._rememberChoice.actor.checked =
-                global.settings.get_boolean(REMEMBER_MOUNT_PASSWORD_KEY);
+            this._rememberChoice.actor.checked = true;
            this._messageBox.add(this._rememberChoice.actor);
        } else {
            this._rememberChoice = null;
@ -422,8 +419,6 @@ const ShellMountPasswordDialog = new Lang.Class({
    },

    _onEntryActivate: function() {
-        global.settings.set_boolean(REMEMBER_MOUNT_PASSWORD_KEY,
-            this._rememberChoice && this._rememberChoice.actor.checked);
        this.emit('response', 1,
            this._passwordEntry.get_text(),
            this._rememberChoice &&
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@ -2,7 +2,6 @@

 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;

 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@ -15,7 +14,12 @@ const KEY_MOUSE_KEYS_ENABLED  = 'mousekeys-enable';

 const APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';

+const DPI_LOW_REASONABLE_VALUE  = 50;
+const DPI_HIGH_REASONABLE_VALUE = 500;
+
 const DPI_FACTOR_LARGE   = 1.25;
+const DPI_FACTOR_LARGER  = 1.5;
+const DPI_FACTOR_LARGEST = 2.0;

 const WM_SCHEMA            = 'org.gnome.desktop.wm.preferences';
 const KEY_VISUAL_BELL      = 'visual-bell';
@ -23,7 +27,6 @@ const KEY_VISUAL_BELL      = 'visual-bell';
 const DESKTOP_INTERFACE_SCHEMA = 'org.gnome.desktop.interface';
 const KEY_GTK_THEME      = 'gtk-theme';
 const KEY_ICON_THEME     = 'icon-theme';
-const KEY_WM_THEME       = 'theme';
 const KEY_TEXT_SCALING_FACTOR = 'text-scaling-factor';

 const HIGH_CONTRAST_THEME = 'HighContrast';
@ -70,25 +73,6 @@ const ATIndicator = new Lang.Class({

        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addSettingsAction(_("Universal Access Settings"), 'gnome-universal-access-panel.desktop');
-
-        this._syncMenuVisibility();
-    },
-
-    _syncMenuVisibility: function() {
-        this._syncMenuVisibilityIdle = 0;
-
-        let items = this.menu._getMenuItems();
-
-        this.actor.visible = items.some(function(f) { return !!f.state; });
-
-        return false;
-    },
-
-    _queueSyncMenuVisibility: function() {
-        if (this._syncMenuVisibilityIdle)
-            return;
-
-        this._syncMenuVisbilityIdle = Mainloop.idle_add(Lang.bind(this, this._syncMenuVisibility));
    },

    _buildItemExtended: function(string, initial_value, writable, on_set) {
@ -110,63 +94,47 @@ const ATIndicator = new Lang.Class({
            function(enabled) {
                return settings.set_boolean(key, enabled);
            });
-        settings.connect('changed::'+key, Lang.bind(this, function() {
+        settings.connect('changed::'+key, function() {
            widget.setToggleState(settings.get_boolean(key));
-
-            this._queueSyncMenuVisibility();
-        }));
+        });
        return widget;
    },

    _buildHCItem: function() {
-        let interfaceSettings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
-        let wmSettings = new Gio.Settings({ schema: WM_SCHEMA });
-        let gtkTheme = interfaceSettings.get_string(KEY_GTK_THEME);
-        let iconTheme = interfaceSettings.get_string(KEY_ICON_THEME);
-        let wmTheme = wmSettings.get_string(KEY_WM_THEME);
+        let settings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
+        let gtkTheme = settings.get_string(KEY_GTK_THEME);
+        let iconTheme = settings.get_string(KEY_ICON_THEME);
        let hasHC = (gtkTheme == HIGH_CONTRAST_THEME);
        let highContrast = this._buildItemExtended(
            _("High Contrast"),
            hasHC,
-            interfaceSettings.is_writable(KEY_GTK_THEME) &&
-            interfaceSettings.is_writable(KEY_ICON_THEME) &&
-            wmSettings.is_writable(KEY_WM_THEME),
+            settings.is_writable(KEY_GTK_THEME) && settings.is_writable(KEY_ICON_THEME),
            function (enabled) {
                if (enabled) {
-                    interfaceSettings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
-                    interfaceSettings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
-                    wmSettings.set_string(KEY_WM_THEME, HIGH_CONTRAST_THEME);
+                    settings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
+                    settings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
                } else if(!hasHC) {
-                    interfaceSettings.set_string(KEY_GTK_THEME, gtkTheme);
-                    interfaceSettings.set_string(KEY_ICON_THEME, iconTheme);
-                    wmSettings.set_string(KEY_WM_THEME, wmTheme);
+                    settings.set_string(KEY_GTK_THEME, gtkTheme);
+                    settings.set_string(KEY_ICON_THEME, iconTheme);
                } else {
-                    interfaceSettings.reset(KEY_GTK_THEME);
-                    interfaceSettings.reset(KEY_ICON_THEME);
-                    wmSettings.reset(KEY_WM_THEME);
+                    settings.reset(KEY_GTK_THEME);
+                    settings.reset(KEY_ICON_THEME);
                }
            });
-        interfaceSettings.connect('changed::' + KEY_GTK_THEME, Lang.bind(this, function() {
-            let value = interfaceSettings.get_string(KEY_GTK_THEME);
+        settings.connect('changed::' + KEY_GTK_THEME, function() {
+            let value = settings.get_string(KEY_GTK_THEME);
            if (value == HIGH_CONTRAST_THEME) {
                highContrast.setToggleState(true);
            } else {
                highContrast.setToggleState(false);
                gtkTheme = value;
            }
-
-            this._queueSyncMenuVisibility();
-        }));
-        interfaceSettings.connect('changed::' + KEY_ICON_THEME, function() {
-            let value = interfaceSettings.get_string(KEY_ICON_THEME);
+        });
+        settings.connect('changed::' + KEY_ICON_THEME, function() {
+            let value = settings.get_string(KEY_ICON_THEME);
            if (value != HIGH_CONTRAST_THEME)
                iconTheme = value;
        });
-        wmSettings.connect('changed::' + KEY_WM_THEME, function() {
-            let value = wmSettings.get_string(KEY_WM_THEME);
-            if (value != HIGH_CONTRAST_THEME)
-                wmTheme = value;
-        });
        return highContrast;
    },

@ -185,22 +153,11 @@ const ATIndicator = new Lang.Class({
                else
                    settings.reset(KEY_TEXT_SCALING_FACTOR);
            });
-        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, Lang.bind(this, function() {
+        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, function() {
            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
            let active = (factor > 1.0);
            widget.setToggleState(active);
-
-            this._queueSyncMenuVisibility();
-        }));
+        });
        return widget;
    }
 });
-
-const ATGreeterIndicator = new Lang.Class({
-    Name: 'ATGreeterIndicator',
-    Extends: ATIndicator,
-
-    // Override visibility handling to be always visible
-    _syncMenuVisibility: function() { },
-    _queueSyncMenuVisibility: function() { }
-});
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@ -9,7 +9,6 @@ const St = imports.gi.St;

 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
-const NotificationDaemon = imports.ui.notificationDaemon;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

@ -56,8 +55,8 @@ const Indicator = new Lang.Class({
        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.PopupMenuItem(_("Send Files to Device...")),
+                               new PopupMenu.PopupMenuItem(_("Set up a New Device...")),
                               new PopupMenu.PopupSeparatorMenuItem()];
        this._hasDevices = false;

@ -81,7 +80,7 @@ const Indicator = new Lang.Class({
        this._applet.connect('notify::show-full-menu', Lang.bind(this, this._updateFullMenu));
        this._updateFullMenu();

-        this.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-bluetooth-panel.desktop');
+        this.menu.addSettingsAction(_("Bluetooth Settings"), 'bluetooth-properties.desktop');

        this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest));
        this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest));
@ -236,10 +235,26 @@ const Indicator = new Lang.Class({
        }

        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
-            item.menu.addAction(_("Send Files…"), Lang.bind(this, function() {
+            item.menu.addAction(_("Send Files..."), Lang.bind(this, function() {
                this._applet.send_to_address(device.bdaddr, device.alias);
            }));
        }
+        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
+            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
+                this._applet.browse_address(device.bdaddr, event.get_time(),
+                    Lang.bind(this, function(applet, result) {
+                        try {
+                            applet.browse_address_finish(result);
+                        } catch (e) {
+                            this._ensureSource();
+                            this._source.notify(new MessageTray.Notification(this._source,
+                                 _("Bluetooth"),
+                                 _("Error browsing device"),
+                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
+                        }
+                    }));
+            }));
+        }

        switch (device.type) {
        case GnomeBluetoothApplet.Type.KEYBOARD:
@ -287,7 +302,6 @@ const Indicator = new Lang.Class({
    _ensureSource: function() {
        if (!this._source) {
            this._source = new MessageTray.Source(_("Bluetooth"), 'bluetooth-active');
-            this._source.policy = new NotificationDaemon.NotificationApplicationPolicy('gnome-bluetooth-panel');
            Main.messageTray.add(this._source);
        }
    },
@ -355,7 +369,6 @@ const ConfirmNotification = new Lang.Class({
    _init: function(source, applet, device_path, name, long_name, pin) {
        this.parent(source,
                    _("Bluetooth"),
-                    /* Translators: argument is the device short name */
                    _("Pairing confirmation for %s").format(name),
                    { customContent: true });
        this.setResident(true);
@ -365,7 +378,6 @@ const ConfirmNotification = new Lang.Class({
        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
        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"));
        this.addButton('does-not-match', _("Does not match"));

@ -448,5 +460,10 @@ const PinNotification = new Lang.Class({
            return this._entry.clutter_text.text.length == 6;
        else
            return true;
+    },
+
+    grabFocus: function(lockTray) {
+        this.parent(lockTray);
+        global.stage.set_key_focus(this._entry);
    }
 });
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -1,11 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GnomeDesktop = imports.gi.GnomeDesktop;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@ -23,7 +21,6 @@ try {
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
-const SwitcherPopup = imports.ui.switcherPopup;
 const Util = imports.misc.util;

 const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
@ -50,7 +47,6 @@ const IBusManager = new Lang.Class({
        this._engines = {};
        this._ready = false;
        this._registerPropertiesId = 0;
-        this._currentEngineName = null;

        this._nameWatcherId = Gio.DBus.session.watch_name(IBus.SERVICE_IBUS,
                                                          Gio.BusNameWatcherFlags.NONE,
@ -70,10 +66,6 @@ const IBusManager = new Lang.Class({
        this._engines = {};
        this._ready = false;
        this._registerPropertiesId = 0;
-        this._currentEngineName = null;
-
-        if (this._readyCallback)
-            this._readyCallback(false);
    },

    _onNameAppeared: function() {
@ -97,10 +89,12 @@ const IBusManager = new Lang.Class({
                let name = enginesList[i].get_name();
                this._engines[name] = enginesList[i];
            }
-            this._updateReadiness();
        } else {
            this._clear();
+            return;
        }
+
+        this._updateReadiness();
    },

    _initPanelService: function(ibus, result) {
@ -111,36 +105,27 @@ const IBusManager = new Lang.Class({
            this._candidatePopup.setPanelService(this._panelService);
            // Need to set this to get 'global-engine-changed' emitions
            this._ibus.set_watch_ibus_signal(true);
-            this._ibus.connect('global-engine-changed', Lang.bind(this, this._engineChanged));
+            this._ibus.connect('global-engine-changed', Lang.bind(this, this._resetProperties));
            this._panelService.connect('update-property', Lang.bind(this, this._updateProperty));
-            // If an engine is already active we need to get its properties
-            this._ibus.get_global_engine_async(-1, null, Lang.bind(this, function(i, result) {
-                let engine;
-                try {
-                    engine = this._ibus.get_global_engine_async_finish(result);
-                    if (!engine)
-                        return;
-                } catch(e) {
-                    return;
-                }
-                this._engineChanged(this._ibus, engine.get_name());
-            }));
-            this._updateReadiness();
+            this._resetProperties();
        } else {
            this._clear();
+            return;
        }
+
+        this._updateReadiness();
    },

    _updateReadiness: function() {
        this._ready = (Object.keys(this._engines).length > 0 &&
                       this._panelService != null);

-        if (this._readyCallback)
-            this._readyCallback(this._ready);
+        if (this._ready && this._readyCallback)
+            this._readyCallback();
    },

-    _engineChanged: function(bus, engineName) {
-        this._currentEngineName = engineName;
+    _resetProperties: function() {
+        this.emit('properties-registered', null);

        if (this._registerPropertiesId != 0)
            return;
@ -153,18 +138,25 @@ const IBusManager = new Lang.Class({
                this._panelService.disconnect(this._registerPropertiesId);
                this._registerPropertiesId = 0;

-                this.emit('properties-registered', this._currentEngineName, props);
+                this.emit('properties-registered', props);
            }));
    },

    _updateProperty: function(panel, prop) {
-        this.emit('property-updated', this._currentEngineName, prop);
+        this.emit('property-updated', prop);
    },

    activateProperty: function(key, state) {
        this._panelService.property_activate(key, state);
    },

+    hasProperties: function(id) {
+        if (id == 'anthy')
+            return true;
+
+        return false;
+    },
+
    getEngineDesc: function(id) {
        if (!IBus || !this._ready)
            return null;
@ -189,127 +181,16 @@ const LayoutMenuItem = new Lang.Class({
    }
 });

-const InputSource = new Lang.Class({
-    Name: 'InputSource',
-
-    _init: function(type, id, displayName, shortName, index) {
-        this.type = type;
-        this.id = id;
-        this.displayName = displayName;
-        this._shortName = shortName;
-        this.index = index;
-
-        this._menuItem = new LayoutMenuItem(this.displayName, this._shortName);
-        this._menuItem.connect('activate', Lang.bind(this, this.activate));
-        this._indicatorLabel = new St.Label({ text: this._shortName });
-
-        this.properties = null;
-    },
-
-    destroy: function() {
-        this._menuItem.destroy();
-        this._indicatorLabel.destroy();
-    },
-
-    get shortName() {
-        return this._shortName;
-    },
-
-    set shortName(v) {
-        this._shortName = v;
-        this._menuItem.indicator.set_text(v);
-        this._indicatorLabel.set_text(v);
-    },
-
-    get menuItem() {
-        return this._menuItem;
-    },
-
-    get indicatorLabel() {
-        return this._indicatorLabel;
-    },
-
-    activate: function() {
-        this.emit('activate');
-    },
-});
-Signals.addSignalMethods(InputSource.prototype);
-
-const InputSourcePopup = new Lang.Class({
-    Name: 'InputSourcePopup',
-    Extends: SwitcherPopup.SwitcherPopup,
-
-    _init: function(items, action, actionBackward) {
-        this.parent(items);
-
-        this._action = action;
-        this._actionBackward = actionBackward;
-    },
-
-    _createSwitcher: function() {
-        this._switcherList = new InputSourceSwitcher(this._items);
-        return true;
-    },
-
-    _initialSelection: function(backward, binding) {
-        if (binding == 'switch-input-source') {
-            if (backward)
-                this._selectedIndex = this._items.length - 1;
-        } else if (binding == 'switch-input-source-backward') {
-            if (!backward)
-                this._selectedIndex = this._items.length - 1;
-        }
-        this._select(this._selectedIndex);
-    },
-
-    _keyPressHandler: function(keysym, backwards, action) {
-        if (action == this._action)
-            this._select(backwards ? this._previous() : this._next());
-        else if (action == this._actionBackward)
-            this._select(backwards ? this._next() : this._previous());
-        else if (keysym == Clutter.Left)
-            this._select(this._previous());
-        else if (keysym == Clutter.Right)
-            this._select(this._next());
-    },
-
-    _finish : function() {
-        this.parent();
-
-        this._items[this._selectedIndex].activate();
-    },
-});
-
-const InputSourceSwitcher = new Lang.Class({
-    Name: 'InputSourceSwitcher',
-    Extends: SwitcherPopup.SwitcherList,
-
-    _init: function(items) {
-        this.parent(true);
-
-        for (let i = 0; i < items.length; i++)
-            this._addIcon(items[i]);
-    },
-
-    _addIcon: function(item) {
-        let box = new St.BoxLayout({ vertical: true });
-
-        let bin = new St.Bin({ style_class: 'input-source-switcher-symbol' });
-        let symbol = new St.Label({ text: item.shortName });
-        bin.set_child(symbol);
-        box.add(bin, { x_fill: false, y_fill: false } );
-
-        let text = new St.Label({ text: item.displayName });
-        box.add(text, { x_fill: false });
-
-        this.addItem(box, text);
-    }
-});
-
 const InputSourceIndicator = new Lang.Class({
    Name: 'InputSourceIndicator',
    Extends: PanelMenu.Button,

+    _propertiesWhitelist: [
+        'InputMode',
+        'TypingMode',
+        'DictMode'
+    ],
+
    _init: function() {
        this.parent(0.0, _("Keyboard"));

@ -320,36 +201,14 @@ const InputSourceIndicator = new Lang.Class({
        this.actor.add_actor(this._container);
        this.actor.add_style_class_name('panel-status-button');

-        // All valid input sources currently in the gsettings
-        // KEY_INPUT_SOURCES list indexed by their index there
-        this._inputSources = {};
-        // All valid input sources currently in the gsettings
-        // KEY_INPUT_SOURCES list of type INPUT_SOURCE_TYPE_IBUS
-        // indexed by the IBus ID
-        this._ibusSources = {};
+        this._labelActors = {};
+        this._layoutItems = {};

-        this._currentSource = null;
-
-        // All valid input sources currently in the gsettings
-        // KEY_INPUT_SOURCES list ordered by most recently used
-        this._mruSources = [];
-        this._keybindingAction =
-            Main.wm.addKeybinding('switch-input-source',
-                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
-                                  Meta.KeyBindingFlags.REVERSES,
-                                  Shell.KeyBindingMode.ALL & ~Shell.KeyBindingMode.MESSAGE_TRAY,
-                                  Lang.bind(this, this._switchInputSource));
-        this._keybindingActionBackward =
-            Main.wm.addKeybinding('switch-input-source-backward',
-                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
-                                  Meta.KeyBindingFlags.REVERSES |
-                                  Meta.KeyBindingFlags.REVERSED,
-                                  Shell.KeyBindingMode.ALL & ~Shell.KeyBindingMode.MESSAGE_TRAY,
-                                  Lang.bind(this, this._switchInputSource));
        this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
        this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
        this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));

+        this._currentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
        this._xkbInfo = new GnomeDesktop.XkbInfo();

        this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();
@ -358,8 +217,9 @@ const InputSourceIndicator = new Lang.Class({
        this.menu.addMenuItem(this._propSection);
        this._propSection.actor.hide();

-        this._ibusReady = false;
-        this._ibusManager = new IBusManager(Lang.bind(this, this._ibusReadyCallback));
+        this._properties = null;
+
+        this._ibusManager = new IBusManager(Lang.bind(this, this._inputSourcesChanged));
        this._ibusManager.connect('properties-registered', Lang.bind(this, this._ibusPropertiesRegistered));
        this._ibusManager.connect('property-updated', Lang.bind(this, this._ibusPropertyUpdated));
        this._inputSourcesChanged();
@ -370,14 +230,7 @@ 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;
-        this._overviewHiddenId = 0;
-        this._settings.connect('changed::per-window', Lang.bind(this, this._sourcesPerWindowChanged));
-        this._sourcesPerWindowChanged();
+        this.menu.addSettingsAction(_("Region and Language Settings"), 'gnome-region-panel.desktop');
    },

    _sessionUpdated: function() {
@ -388,40 +241,18 @@ const InputSourceIndicator = new Lang.Class({
        this._showLayoutItem.actor.visible = Main.sessionMode.allowSettings;
    },

-    _ibusReadyCallback: function(ready) {
-        if (this._ibusReady == ready)
-            return;
-
-        this._ibusReady = ready;
-        this._mruSources = [];
-        this._inputSourcesChanged();
-    },
-
-    _switchInputSource: function(display, screen, window, binding) {
-        if (this._mruSources.length < 2)
-            return;
-
-        let popup = new InputSourcePopup(this._mruSources, this._keybindingAction, this._keybindingActionBackward);
-        let modifiers = binding.get_modifiers();
-        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
-        if (!popup.show(backwards, binding.get_name(), binding.get_mask()))
-            popup.destroy();
-    },
-
    _currentInputSourceChanged: function() {
-        let nVisibleSources = Object.keys(this._inputSources).length;
-        let newSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
-        let newSource = this._inputSources[newSourceIndex];
+        let nVisibleSources = Object.keys(this._layoutItems).length;
+        let newCurrentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
+        let newLayoutItem = this._layoutItems[newCurrentSourceIndex];
+        let hasProperties;

-        let oldSource;
-        [oldSource, this._currentSource] = [this._currentSource, newSource];
+        if (newLayoutItem)
+            hasProperties = this._ibusManager.hasProperties(newLayoutItem.ibusEngineId);
+        else
+            hasProperties = false;

-        if (oldSource) {
-            oldSource.menuItem.setShowDot(false);
-            oldSource.indicatorLabel.hide();
-        }
-
-        if (!newSource || (nVisibleSources < 2 && !newSource.properties)) {
+        if (!newLayoutItem || (nVisibleSources < 2 && !hasProperties)) {
            // This source index might be invalid if we weren't able
            // to build a menu item for it, so we hide ourselves since
            // we can't fix it here. *shrug*
@ -435,117 +266,106 @@ const InputSourceIndicator = new Lang.Class({

        this.actor.show();

-        newSource.menuItem.setShowDot(true);
-        newSource.indicatorLabel.show();
+        if (this._layoutItems[this._currentSourceIndex]) {
+            this._layoutItems[this._currentSourceIndex].setShowDot(false);
+            this._container.set_skip_paint(this._labelActors[this._currentSourceIndex], true);
+        }

-        this._buildPropSection(newSource.properties);
+        newLayoutItem.setShowDot(true);

-        for (let i = 1; i < this._mruSources.length; ++i)
-            if (this._mruSources[i] == newSource) {
-                let currentSource = this._mruSources.splice(i, 1);
-                this._mruSources = currentSource.concat(this._mruSources);
-                break;
-            }
+        let newLabelActor = this._labelActors[newCurrentSourceIndex];
+        this._container.set_skip_paint(newLabelActor, false);

-        this._changePerWindowSource();
+        if (hasProperties)
+            newLabelActor.set_text(newLayoutItem.indicator.get_text());
+
+        this._currentSourceIndex = newCurrentSourceIndex;
    },

    _inputSourcesChanged: function() {
        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
        let nSources = sources.n_children();

-        for (let i in this._inputSources)
-            this._inputSources[i].destroy();
+        for (let i in this._layoutItems)
+            this._layoutItems[i].destroy();

-        this._inputSources = {};
-        this._ibusSources = {};
+        for (let i in this._labelActors)
+            this._labelActors[i].destroy();

-        let inputSourcesByShortName = {};
+        this._layoutItems = {};
+        this._labelActors = {};
+
+        let infos = [];
+        let infosByShortName = {};

        for (let i = 0; i < nSources; i++) {
-            let displayName;
-            let shortName;
+            let info = { exists: false };
            let [type, id] = sources.get_child_value(i).deep_unpack();
-            let exists = false;

            if (type == INPUT_SOURCE_TYPE_XKB) {
-                [exists, displayName, shortName, , ] =
+                [info.exists, info.displayName, info.shortName, , ] =
                    this._xkbInfo.get_layout_info(id);
            } else if (type == INPUT_SOURCE_TYPE_IBUS) {
                let engineDesc = this._ibusManager.getEngineDesc(id);
                if (engineDesc) {
                    let language = IBus.get_language_name(engineDesc.get_language());
-                    exists = true;
-                    displayName = language + ' (' + engineDesc.get_longname() + ')';
-                    shortName = this._makeEngineShortName(engineDesc);
+
+                    info.exists = true;
+                    info.displayName = language + ' (' + engineDesc.get_longname() + ')';
+                    info.shortName = this._makeEngineShortName(engineDesc);
+                    info.ibusEngineId = id;
                }
            }

-            if (!exists)
+            if (!info.exists)
                continue;

-            let is = new InputSource(type, id, displayName, shortName, i);
+            info.sourceIndex = i;

-            is.connect('activate', Lang.bind(this, function() {
-                if (this._currentSource && this._currentSource.index == is.index)
-                    return;
-                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
-                                         GLib.Variant.new_uint32(is.index));
-            }));
-
-            if (!(is.shortName in inputSourcesByShortName))
-                inputSourcesByShortName[is.shortName] = [];
-            inputSourcesByShortName[is.shortName].push(is);
-
-            this._inputSources[is.index] = is;
-
-            if (is.type == INPUT_SOURCE_TYPE_IBUS)
-                this._ibusSources[is.id] = is;
+            if (!(info.shortName in infosByShortName))
+                infosByShortName[info.shortName] = [];
+            infosByShortName[info.shortName].push(info);
+            infos.push(info);
        }

-        let menuIndex = 0;
-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            if (inputSourcesByShortName[is.shortName].length > 1) {
-                let sub = inputSourcesByShortName[is.shortName].indexOf(is) + 1;
-                is.shortName += String.fromCharCode(0x2080 + sub);
+        for (let i = 0; i < infos.length; i++) {
+            let info = infos[i];
+            if (infosByShortName[info.shortName].length > 1) {
+                let sub = infosByShortName[info.shortName].indexOf(info) + 1;
+                info.shortName += String.fromCharCode(0x2080 + sub);
            }

-            this.menu.addMenuItem(is.menuItem, menuIndex++);
+            let item = new LayoutMenuItem(info.displayName, info.shortName);
+            item.ibusEngineId = info.ibusEngineId;
+            this._layoutItems[info.sourceIndex] = item;
+            this.menu.addMenuItem(item, i);
+            item.connect('activate', Lang.bind(this, function() {
+                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
+                                         GLib.Variant.new_uint32(info.sourceIndex));
+            }));

-            is.indicatorLabel.hide();
-            this._container.add_actor(is.indicatorLabel);
+            let shortLabel = new St.Label({ text: info.shortName });
+            this._labelActors[info.sourceIndex] = shortLabel;
+            this._container.add_actor(shortLabel);
+            this._container.set_skip_paint(shortLabel, true);
        }

-        let sourcesList = [];
-        for (let i in this._inputSources)
-            sourcesList.push(this._inputSources[i]);
-
-        let mruSources = [];
-        for (let i = 0; i < this._mruSources.length; i++) {
-            for (let j = 0; j < sourcesList.length; j++)
-                if (this._mruSources[i].type == sourcesList[j].type &&
-                    this._mruSources[i].id == sourcesList[j].id) {
-                    mruSources = mruSources.concat(sourcesList.splice(j, 1));
-                    break;
-                }
-        }
-        this._mruSources = mruSources.concat(sourcesList);
-
        this._currentInputSourceChanged();
    },

    _showLayout: function() {
        Main.overview.hide();

-        let source = this._currentSource;
+        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
+        let current = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
+        let [type, id] = sources.get_child_value(current).deep_unpack();
        let xkbLayout = '';
        let xkbVariant = '';

-        if (source.type == INPUT_SOURCE_TYPE_XKB) {
-            [, , , xkbLayout, xkbVariant] = this._xkbInfo.get_layout_info(source.id);
-        } else if (source.type == INPUT_SOURCE_TYPE_IBUS) {
-            let engineDesc = this._ibusManager.getEngineDesc(source.id);
+        if (type == INPUT_SOURCE_TYPE_XKB) {
+            [, , , xkbLayout, xkbVariant] = this._xkbInfo.get_layout_info(id);
+        } else if (type == INPUT_SOURCE_TYPE_IBUS) {
+            let engineDesc = this._ibusManager.getEngineDesc(id);
            if (engineDesc) {
                xkbLayout = engineDesc.get_layout();
                xkbVariant = '';
@ -574,25 +394,26 @@ const InputSourceIndicator = new Lang.Class({
        return String.fromCharCode(0x2328); // keyboard glyph
    },

-    _ibusPropertiesRegistered: function(im, engineName, props) {
-        let source = this._ibusSources[engineName];
-        if (!source)
-            return;
-
-        source.properties = props;
-
-        if (source == this._currentSource)
-            this._currentInputSourceChanged();
+    _propertyWhitelisted: function(prop) {
+        for (let i = 0; i < this._propertiesWhitelist.length; ++i) {
+            let key = prop.get_key();
+            if (key.substr(0, this._propertiesWhitelist[i].length) == this._propertiesWhitelist[i])
+                return true;
+        }
+        return false;
    },

-    _ibusPropertyUpdated: function(im, engineName, prop) {
-        let source = this._ibusSources[engineName];
-        if (!source)
+    _ibusPropertiesRegistered: function(im, props) {
+        this._properties = props;
+        this._buildPropSection();
+    },
+
+    _ibusPropertyUpdated: function(im, prop) {
+        if (!this._propertyWhitelisted(prop))
            return;

-        if (this._updateSubProperty(source.properties, prop) &&
-            source == this._currentSource)
-            this._currentInputSourceChanged();
+        if (this._updateSubProperty(this._properties, prop))
+            this._buildPropSection();
    },

    _updateSubProperty: function(props, prop) {
@ -612,12 +433,25 @@ const InputSourceIndicator = new Lang.Class({
        return false;
    },

-    _buildPropSection: function(properties) {
+    _updateIndicatorLabel: function(text) {
+        let layoutItem = this._layoutItems[this._currentSourceIndex];
+        let hasProperties;
+
+        if (layoutItem)
+            hasProperties = this._ibusManager.hasProperties(layoutItem.ibusEngineId);
+        else
+            hasProperties = false;
+
+        if (hasProperties)
+            this._labelActors[this._currentSourceIndex].set_text(text);
+    },
+
+    _buildPropSection: function() {
        this._propSeparator.actor.hide();
        this._propSection.actor.hide();
        this._propSection.removeAll();

-        this._buildPropSubMenu(this._propSection, properties);
+        this._buildPropSubMenu(this._propSection, this._properties);

        if (!this._propSection.isEmpty()) {
            this._propSection.actor.show();
@ -634,7 +468,8 @@ const InputSourceIndicator = new Lang.Class({
        for (let i = 0; (p = props.get(i)) != null; ++i) {
            let prop = p;

-            if (!prop.get_visible())
+            if (!this._propertyWhitelisted(prop) ||
+                !prop.get_visible())
                continue;

            if (prop.get_key() == 'InputMode') {
@ -645,17 +480,15 @@ const InputSourceIndicator = new Lang.Class({
                    text = prop.get_label().get_text();

                if (text && text.length > 0 && text.length < 3)
-                    this._currentSource.indicatorLabel.set_text(text);
+                    this._updateIndicatorLabel(text);
            }

            let item;
-            switch (prop.get_prop_type()) {
-            case IBus.PropType.MENU:
+            let type = prop.get_prop_type();
+            if (type == IBus.PropType.MENU) {
                item = new PopupMenu.PopupSubMenuMenuItem(prop.get_label().get_text());
                this._buildPropSubMenu(item.menu, prop.get_sub_props());
-                break;
-
-            case IBus.PropType.RADIO:
+            } else if (type == IBus.PropType.RADIO) {
                item = new PopupMenu.PopupMenuItem(prop.get_label().get_text());
                item.prop = prop;
                radioGroup.push(item);
@ -680,39 +513,7 @@ const InputSourceIndicator = new Lang.Class({
                        }
                    }
                }));
-                break;
-
-            case IBus.PropType.TOGGLE:
-                item = new PopupMenu.PopupSwitchMenuItem(prop.get_label().get_text(), prop.get_state() == IBus.PropState.CHECKED);
-                item.prop = prop;
-                item.connect('toggled', Lang.bind(this, function() {
-                    if (item.state) {
-                        item.prop.set_state(IBus.PropState.CHECKED);
-                        this._ibusManager.activateProperty(item.prop.get_key(),
-                                                           IBus.PropState.CHECKED);
-                    } else {
-                        item.prop.set_state(IBus.PropState.UNCHECKED);
-                        this._ibusManager.activateProperty(item.prop.get_key(),
-                                                           IBus.PropState.UNCHECKED);
-                    }
-                }));
-                break;
-
-            case IBus.PropType.NORMAL:
-                item = new PopupMenu.PopupMenuItem(prop.get_label().get_text());
-                item.prop = prop;
-                item.connect('activate', Lang.bind(this, function() {
-                    this._ibusManager.activateProperty(item.prop.get_key(),
-                                                       item.prop.get_state());
-                }));
-                break;
-
-            case IBus.PropType.SEPARATOR:
-                item = new PopupMenu.PopupSeparatorMenuItem();
-                break;
-
-            default:
-                log ('IBus property %s has invalid type %d'.format(prop.get_key(), type));
+            } else {
                continue;
            }

@ -721,91 +522,14 @@ const InputSourceIndicator = new Lang.Class({
        }
    },

-    _getNewInputSource: function(current) {
-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            if (is.type == current.type &&
-                is.id == current.id)
-                return is;
-        }
-        return this._currentSource;
-    },
-
-    _getCurrentWindow: function() {
-        if (Main.overview.visible)
-            return Main.overview;
-        else
-            return global.display.focus_window;
-    },
-
-    _setPerWindowInputSource: function() {
-        let window = this._getCurrentWindow();
-        if (!window)
-            return;
-
-        if (!window._inputSources) {
-            window._inputSources = this._inputSources;
-            window._currentSource = this._currentSource;
-        } else if (window._inputSources == this._inputSources) {
-            window._currentSource.activate();
-        } else {
-            window._inputSources = this._inputSources;
-            window._currentSource = this._getNewInputSource(window._currentSource);
-            window._currentSource.activate();
-        }
-    },
-
-    _sourcesPerWindowChanged: function() {
-        this._sourcesPerWindow = this._settings.get_boolean('per-window');
-
-        if (this._sourcesPerWindow && this._focusWindowNotifyId == 0) {
-            this._focusWindowNotifyId = global.display.connect('notify::focus-window',
-                                                               Lang.bind(this, this._setPerWindowInputSource));
-            this._overviewShowingId = Main.overview.connect('showing',
-                                                            Lang.bind(this, this._setPerWindowInputSource));
-            this._overviewHiddenId = Main.overview.connect('hidden',
-                                                           Lang.bind(this, this._setPerWindowInputSource));
-        } else if (!this._sourcesPerWindow && this._focusWindowNotifyId != 0) {
-            global.display.disconnect(this._focusWindowNotifyId);
-            this._focusWindowNotifyId = 0;
-            Main.overview.disconnect(this._overviewShowingId);
-            this._overviewShowingId = 0;
-            Main.overview.disconnect(this._overviewHiddenId);
-            this._overviewHiddenId = 0;
-
-            let windows = global.get_window_actors().map(function(w) {
-                return w.meta_window;
-            });
-            for (let i = 0; i < windows.length; ++i) {
-                delete windows[i]._inputSources;
-                delete windows[i]._currentSource;
-            }
-            delete Main.overview._inputSources;
-            delete Main.overview._currentSource;
-        }
-    },
-
-    _changePerWindowSource: function() {
-        if (!this._sourcesPerWindow)
-            return;
-
-        let window = this._getCurrentWindow();
-        if (!window)
-            return;
-
-        window._inputSources = this._inputSources;
-        window._currentSource = this._currentSource;
-    },
-
    _containerGetPreferredWidth: function(container, for_height, alloc) {
        // Here, and in _containerGetPreferredHeight, we need to query
        // for the height of all children, but we ignore the results
        // for those we don't actually display.
        let max_min_width = 0, max_natural_width = 0;

-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            let [min_width, natural_width] = is.indicatorLabel.get_preferred_width(for_height);
+        for (let i in this._labelActors) {
+            let [min_width, natural_width] = this._labelActors[i].get_preferred_width(for_height);
            max_min_width = Math.max(max_min_width, min_width);
            max_natural_width = Math.max(max_natural_width, natural_width);
        }
@ -817,9 +541,8 @@ const InputSourceIndicator = new Lang.Class({
    _containerGetPreferredHeight: function(container, for_width, alloc) {
        let max_min_height = 0, max_natural_height = 0;

-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            let [min_height, natural_height] = is.indicatorLabel.get_preferred_height(for_width);
+        for (let i in this._labelActors) {
+            let [min_height, natural_height] = this._labelActors[i].get_preferred_height(for_width);
            max_min_height = Math.max(max_min_height, min_height);
            max_natural_height = Math.max(max_natural_height, natural_height);
        }
@ -835,9 +558,7 @@ const InputSourceIndicator = new Lang.Class({
        box.y2 -= box.y1;
        box.y1 = 0;

-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            is.indicatorLabel.allocate_align_fill(box, 0.5, 0, false, false, flags);
-        }
+        for (let i in this._labelActors)
+            this._labelActors[i].allocate_align_fill(box, 0.5, 0, false, false, flags);
    }
 });
--- a/js/ui/status/lockScreenMenu.js
+++ b/js/ui/status/lockScreenMenu.js
@ -10,53 +10,48 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const VolumeMenu = imports.ui.status.volume;

-const FakeStatusIcon = new Lang.Class({
-    Name: 'FakeStatusIcon',
-
-    _init: function(button) {
-        this.actor = new St.BoxLayout({ style_class: 'panel-status-button-box' });
-        this._button = button;
-        this._button.connect('icons-updated', Lang.bind(this, this._reconstructIcons));
-        this._button.actor.bind_property('visible', this.actor, 'visible',
-                                         GObject.BindingFlags.SYNC_CREATE);
-        this._reconstructIcons();
-    },
-
-    _reconstructIcons: function() {
-        this.actor.destroy_all_children();
-        this._button.icons.forEach(Lang.bind(this, function(icon) {
-            let newIcon = new St.Icon({ style_class: 'system-status-icon' });
-            icon.bind_property('gicon', newIcon, 'gicon',
-                               GObject.BindingFlags.SYNC_CREATE);
-            icon.bind_property('visible', newIcon, 'visible',
-                               GObject.BindingFlags.SYNC_CREATE);
-            this.actor.add_actor(newIcon);
-        }));
-    }
-});
-
 const Indicator = new Lang.Class({
    Name: 'LockScreenMenuIndicator',
    Extends: PanelMenu.SystemStatusButton,

    _init: function() {
        this.parent(null, _("Volume, network, battery"));
-        this._box.style_class = 'lock-screen-status-button-box';

-        this._volumeControl = VolumeMenu.getMixerControl();
-        this._volumeMenu = new VolumeMenu.VolumeMenu(this._volumeControl);
-        this.menu.addMenuItem(this._volumeMenu);
+        this._volume = Main.panel.statusArea.volume;
+        if (this._volume) {
+            this._volumeIcon = this.addIcon(null);
+            this._volume.mainIcon.bind_property('gicon', this._volumeIcon, 'gicon',
+                                                GObject.BindingFlags.SYNC_CREATE);
+            this._volume.mainIcon.bind_property('visible', this._volumeIcon, 'visible',
+                                                GObject.BindingFlags.SYNC_CREATE);

-        this._volume = new FakeStatusIcon(Main.panel.statusArea.volume);
-        this._box.add_child(this._volume.actor);
-
-        // Network may not exist if the user doesn't have NetworkManager
-        if (Main.panel.statusArea.network) {
-            this._network = new FakeStatusIcon(Main.panel.statusArea.network);
-            this._box.add_child(this._network.actor);
+            this._volumeControl = VolumeMenu.getMixerControl();
+            this._volumeMenu = new VolumeMenu.VolumeMenu(this._volumeControl);
+            this.menu.addMenuItem(this._volumeMenu);
        }

-        this._battery = new FakeStatusIcon(Main.panel.statusArea.battery);
-        this._box.add_child(this._battery.actor);
+        this._network = Main.panel.statusArea.network;
+        if (this._network) {
+            this._networkIcon = this.addIcon(null);
+            this._network.mainIcon.bind_property('gicon', this._networkIcon, 'gicon',
+                                                 GObject.BindingFlags.SYNC_CREATE);
+            this._network.mainIcon.bind_property('visible', this._networkIcon, 'visible',
+                                                 GObject.BindingFlags.SYNC_CREATE);
+
+            this._networkSecondaryIcon = this.addIcon(null);
+            this._network.secondaryIcon.bind_property('gicon', this._networkSecondaryIcon, 'gicon',
+                                                      GObject.BindingFlags.SYNC_CREATE);
+            this._network.secondaryIcon.bind_property('visible', this._networkSecondaryIcon, 'visible',
+                                                      GObject.BindingFlags.SYNC_CREATE);
+        }
+
+        this._battery = Main.panel.statusArea.battery;
+        if (this._battery) {
+            this._batteryIcon = this.addIcon(null);
+            this._battery.mainIcon.bind_property('gicon', this._batteryIcon, 'gicon',
+                                                 GObject.BindingFlags.SYNC_CREATE);
+            this._battery.mainIcon.bind_property('visible', this._batteryIcon, 'visible',
+                                                 GObject.BindingFlags.SYNC_CREATE);
+        }
    }
 });
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -8,26 +8,16 @@ const NMClient = imports.gi.NMClient;
 const Signals = imports.signals;
 const St = imports.gi.St;

-// Some of the new code depends on as-yet-unreleased NM
-var NMGtk;
-try {
-    NMGtk = imports.gi.NMGtk;
-} catch(e) {
-    NMGtk = null;
-}
-
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const MessageTray = imports.ui.messageTray;
-const NotificationDaemon = imports.ui.notificationDaemon;
 const ModemManager = imports.misc.modemManager;
 const Util = imports.misc.util;

 const NMConnectionCategory = {
    INVALID: 'invalid',
    WIRED: 'wired',
-    VIRTUAL: 'virtual',
    WIRELESS: 'wireless',
    WWAN: 'wwan',
    VPN: 'vpn'
@ -49,7 +39,7 @@ const NM80211ApFlags = NetworkManager['80211ApFlags'];
 const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];

 // number of wireless networks that should be visible
-// (the remaining are placed into More…)
+// (the remaining are placed into More...)
 const NUM_VISIBLE_NETWORKS = 5;

 function macToArray(string) {
@ -149,6 +139,46 @@ const NMNetworkMenuItem = new Lang.Class({
    }
 });

+const NMWiredSectionTitleMenuItem = new Lang.Class({
+    Name: 'NMWiredSectionTitleMenuItem',
+    Extends: PopupMenu.PopupSwitchMenuItem,
+
+    _init: function(label, params) {
+        params = params || { };
+        params.style_class = 'popup-subtitle-menu-item';
+        this.parent(label, false, params);
+    },
+
+    updateForDevice: function(device) {
+        if (device) {
+            this._device = device;
+            this.setStatus(device.getStatusLabel());
+            this.setToggleState(device.connected);
+        } else
+            this.setStatus('');
+    },
+
+    activate: function(event) {
+        this.parent(event);
+
+        if (!this._device) {
+            log('Section title activated when there is more than one device, should be non reactive');
+            return;
+        }
+
+        let newState = this._switch.state;
+
+        let ok;
+        if (newState)
+            ok = this._device.activate();
+        else
+            ok = this._device.deactivate();
+
+        if (!ok)
+            this._switch.setToggleState(false);
+    }
+});
+
 const NMWirelessSectionTitleMenuItem = new Lang.Class({
    Name: 'NMWirelessSectionTitleMenuItem',
    Extends: PopupMenu.PopupSwitchMenuItem,
@ -309,16 +339,19 @@ const NMDevice = new Lang.Class({
    Extends: NMConnectionBased,

    _init: function(client, device, connections) {
-        this._client = client;
-        this._setDevice(device);
-        this.parent(connections);
+        this.device = device;
+        this.device._delegate = this;
+        this._stateChangedId = this.device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));

+        // protected
+        this._client = client;
+        this.parent(connections);
        this._activeConnection = null;
        this._activeConnectionItem = null;
        this._autoConnectionItem = null;
        this._overflowItem = null;

-        this.statusItem = new PopupMenu.PopupSwitchMenuItem('', this.connected, { style_class: 'popup-subtitle-menu-item' });
+        this.statusItem = new PopupMenu.PopupSwitchMenuItem(this._getDescription(), this.connected, { style_class: 'popup-subtitle-menu-item' });
        this._statusChanged = this.statusItem.connect('toggled', Lang.bind(this, function(item, state) {
            let ok;
            if (state)
@ -337,12 +370,23 @@ const NMDevice = new Lang.Class({
    },

    destroy: function() {
-        this._setDevice(null);
+        if (this.device)
+            this.device._delegate = null;

-        if (this._deferredWorkId) {
-            // Just clear out, the actual removal is handled when the
-            // actor is destroyed
-            this._deferredWorkId = 0;
+        if (this._stateChangedId) {
+            // Need to go through GObject.Object.prototype because
+            // nm_device_disconnect conflicts with g_signal_disconnect
+            GObject.Object.prototype.disconnect.call(this.device, this._stateChangedId);
+            this._stateChangedId = 0;
+        }
+        if (this._carrierChangedId) {
+            // see above for why this is needed
+            GObject.Object.prototype.disconnect.call(this.device, this._carrierChangedId);
+            this._carrierChangedId = 0;
+        }
+        if (this._firmwareChangedId) {
+            GObject.Object.prototype.disconnect.call(this.device, this._firmwareChangedId);
+            this._firmwareChangedId = 0;
        }

        this._clearSection();
@ -351,33 +395,6 @@ const NMDevice = new Lang.Class({
        this.section.destroy();
    },

-    _setDevice: function(device) {
-        if (device) {
-            this.device = device;
-            this.device._delegate = this;
-            this._stateChangedId = this.device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));
-        } else if (this.device) {
-            this.device._delegate = null;
-
-            if (this._stateChangedId) {
-                // Need to go through GObject.Object.prototype because
-                // nm_device_disconnect conflicts with g_signal_disconnect
-                GObject.Object.prototype.disconnect.call(this.device, this._stateChangedId);
-                this._stateChangedId = 0;
-            }
-            if (this._carrierChangedId) {
-                GObject.Object.prototype.disconnect.call(this.device, this._carrierChangedId);
-                this._carrierChangedId = 0;
-            }
-            if (this._firmwareChangedId) {
-                GObject.Object.prototype.disconnect.call(this.device, this._firmwareChangedId);
-                this._firmwareChangedId = 0;
-            }
-
-            this.device = null;
-        }
-    },
-
    deactivate: function() {
        this.device.disconnect(null);
        return true;
@ -392,7 +409,7 @@ const NMDevice = new Lang.Class({
        // Otherwise, if no connection is currently configured,
        // try automatic configuration (or summon the config dialog)
        if (this._connections.length == 1) {
-            this._client.activate_connection(this._connections[0].connection, this.device || null, null, null);
+            this._client.activate_connection(this._connections[0].connection, this.device, null, null);
            return true;
        } else if (this._connections.length == 0) {
            return this._activateAutomaticConnection();
@ -412,7 +429,7 @@ const NMDevice = new Lang.Class({
    },

    get connected() {
-        return this.device && this.device.state == NetworkManager.DeviceState.ACTIVATED;
+        return this.device.state == NetworkManager.DeviceState.ACTIVATED;
    },

    clearActiveConnection: function(activeConnection) {
@ -432,6 +449,7 @@ const NMDevice = new Lang.Class({

        this._activeConnection = activeConnection;

+        this._clearSection();
        this._queueCreateSection();
    },

@ -445,9 +463,6 @@ const NMDevice = new Lang.Class({
    },

    getStatusLabel: function() {
-        if (!this.device)
-            return null;
-
        switch(this.device.state) {
        case NetworkManager.DeviceState.DISCONNECTED:
        case NetworkManager.DeviceState.ACTIVATED:
@ -497,21 +512,14 @@ const NMDevice = new Lang.Class({
        }
    },

-    syncDescription: function() {
-        if (this.device && this.device._description)
-            this.statusItem.label.text = this.device._description;
-    },
-
    // protected
    _createAutomaticConnection: function() {
        throw new TypeError('Invoking pure virtual function NMDevice.createAutomaticConnection');
    },

    _queueCreateSection: function() {
-        if (this._deferredWorkId) {
-            this._clearSection();
-            Main.queueDeferredWork(this._deferredWorkId);
-        }
+        this._clearSection();
+        Main.queueDeferredWork(this._deferredWorkId);
    },

    _clearSection: function() {
@ -549,7 +557,7 @@ const NMDevice = new Lang.Class({

                if (j + activeOffset >= NUM_VISIBLE_NETWORKS) {
                    if (!this._overflowItem) {
-                        this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More…"));
+                        this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
                        this.section.addMenuItem(this._overflowItem);
                    }
                    this._overflowItem.menu.addMenuItem(obj.item);
@ -601,16 +609,13 @@ const NMDevice = new Lang.Class({
            this.emit('network-lost');
        }

-        /* Emit a notification if activation fails, but don't do it
-           if the reason is no secrets, as that indicates the user
-           cancelled the agent dialog */
-        if (newstate == NetworkManager.DeviceState.FAILED &&
-            reason != NetworkManager.DeviceStateReason.NO_SECRETS) {
+        if (newstate == NetworkManager.DeviceState.FAILED) {
            this.emit('activation-failed', reason);
        }

        this._updateStatusItem();

+        this._clearSection();
        this._queueCreateSection();
        this.emit('state-changed');
    },
@ -634,14 +639,34 @@ const NMDevice = new Lang.Class({
        this.statusItem.setStatus(this.getStatusLabel());

        this.emit('state-changed');
+    },
+
+    _getDescription: function() {
+        let dev_product = this.device.get_product();
+        let dev_vendor = this.device.get_vendor();
+        if (!dev_product || !dev_vendor)
+	    return '';
+
+        let product = Util.fixupPCIDescription(dev_product);
+        let vendor = Util.fixupPCIDescription(dev_vendor);
+        let out = '';
+
+        // Another quick hack; if all of the fixed up vendor string
+        // is found in product, ignore the vendor.
+        if (product.indexOf(vendor) == -1)
+            out += vendor + ' ';
+        out += product;
+
+        return out;
    }
 });

-const NMDeviceSimple = new Lang.Class({
-    Name: 'NMDeviceSimple',
+const NMDeviceWired = new Lang.Class({
+    Name: 'NMDeviceWired',
    Extends: NMDevice,

    _init: function(client, device, connections) {
+        this._autoConnectionName = _("Auto Ethernet");
        this.category = NMConnectionCategory.WIRED;

        this.parent(client, device, connections);
@ -656,19 +681,6 @@ const NMDeviceSimple = new Lang.Class({
        // we can do it here because addConnection and removeConnection
        // both call _createSection at some point
        this.section.actor.visible = this._connections.length > 1;
-    }
-});
-
-const NMDeviceWired = new Lang.Class({
-    Name: 'NMDeviceWired',
-    Extends: NMDeviceSimple,
-
-    _init: function(client, device, connections) {
-        device._description = _("Wired");
-        this._autoConnectionName = _("Auto Ethernet");
-        this.category = NMConnectionCategory.WIRED;
-
-        this.parent(client, device, connections);
    },

    _createAutomaticConnection: function() {
@ -692,24 +704,12 @@ const NMDeviceModem = new Lang.Class({
    _init: function(client, device, connections) {
        let is_wwan = false;

-        device._description = _("Mobile broadband");
        this._enabled = true;
        this.mobileDevice = null;
        this._connectionType = 'ppp';

        this._capabilities = device.current_capabilities;
-        // Support new ModemManager1 devices
-        if (device.udi.indexOf('/org/freedesktop/ModemManager1/Modem') == 0) {
-            is_wwan = true;
-            this.mobileDevice = new ModemManager.BroadbandModem(device.udi, device.current_capabilities);
-            if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
-                this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
-            } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.LTE) {
-                this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
-            } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.CDMA_EVDO) {
-                this._connectionType = NetworkManager.SETTING_CDMA_SETTING_NAME;
-            }
-        } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
+        if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
            is_wwan = true;
            this.mobileDevice = new ModemManager.ModemGsm(device.udi);
            this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
@ -719,8 +719,7 @@ const NMDeviceModem = new Lang.Class({
            this._connectionType = NetworkManager.SETTING_CDMA_SETTING_NAME;
        } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.LTE) {
            is_wwan = true;
-            this.mobileDevice = new ModemManager.ModemGsm(device.udi);
-            this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
+            // FIXME: support signal quality
        }

        if (is_wwan) {
@ -823,7 +822,6 @@ const NMDeviceBluetooth = new Lang.Class({
    Extends: NMDevice,

    _init: function(client, device, connections) {
-        device._description = _("Bluetooth");
        this._autoConnectionName = this._makeConnectionName(device);
        device.connect('notify::name', Lang.bind(this, this._updateAutoConnectionName));

@ -866,8 +864,13 @@ const NMDeviceBluetooth = new Lang.Class({
    _updateAutoConnectionName: function() {
        this._autoConnectionName = this._makeConnectionName(this.device);

+        this._clearSection();
        this._queueCreateSection();
        this._updateStatusItem();
+    },
+
+    _getDescription: function() {
+        return this.device.name || _("Bluetooth");
    }
 });

@ -1127,8 +1130,10 @@ const NMDeviceWireless = new Lang.Class({
        this._networks.splice(res.network, 1);
        let newPos = Util.insertSorted(this._networks, network, Lang.bind(this, this._networkSortFunction));

-        if (newPos != res.network)
+        if (newPos != res.network) {
+            this._clearSection();
            this._queueCreateSection();
+        }
    },

    _accessPointAdded: function(device, accessPoint) {
@ -1181,8 +1186,10 @@ const NMDeviceWireless = new Lang.Class({
        let newPos = Util.insertSorted(this._networks, apObj, this._networkSortFunction);

        // Queue an update of the UI if we changed the order
-        if (newPos != pos)
+        if (newPos != pos) {
+            this._clearSection();
            this._queueCreateSection();
+        }
    },

    _accessPointRemoved: function(device, accessPoint) {
@ -1242,10 +1249,12 @@ const NMDeviceWireless = new Lang.Class({
            if (res.network < this._networks.length-1)
                okNext = this._networkSortFunction(this._networks[res.network + 1], apObj) <= 0;

-            if (!okPrev || !okNext)
+            if (!okPrev || !okNext) {
+                this._clearSection();
                this._queueCreateSection();
-            else if (apObj.item)
+            } else if (apObj.item) {
                apObj.item.updateBestAP(apObj.accessPoints[0]);
+            }
        }
    },

@ -1321,6 +1330,7 @@ const NMDeviceWireless = new Lang.Class({

        if (forceupdate) {
            this._networks.sort(this._networkSortFunction);
+            this._clearSection();
            this._queueCreateSection();
        }
    },
@ -1353,6 +1363,7 @@ const NMDeviceWireless = new Lang.Class({

        if (forceupdate) {
            this._networks.sort(this._networkSortFunction);
+            this._clearSection();
            this._queueCreateSection();
        }
    },
@ -1432,7 +1443,7 @@ const NMDeviceWireless = new Lang.Class({
            this.section.addMenuItem(apObj.item, position);
        } else {
            if (!this._overflowItem) {
-                this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More…"));
+                this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
                this.section.addMenuItem(this._overflowItem);
            }
            this._overflowItem.menu.addMenuItem(apObj.item, position - NUM_VISIBLE_NETWORKS);
@ -1463,56 +1474,6 @@ const NMDeviceWireless = new Lang.Class({
    },
 });

-const NMDeviceVirtual = new Lang.Class({
-    Name: 'NMDeviceVirtual',
-    Extends: NMDeviceSimple,
-
-    _init: function(client, iface, connections) {
-        this.iface = iface;
-        this.parent(client, null, connections);
-        this.category = NMConnectionCategory.VIRTUAL;
-    },
-
-    _shouldShowConnectionList: function() {
-        return this.hasConnections();
-    },
-
-    connectionValid: function(connection) {
-        return connection.get_virtual_iface_name() == this.iface;
-    },
-
-    addConnection: function(connection) {
-        if (!this.device && !this.hasConnections())
-            this.statusItem.label.text = NMGtk.utils_get_connection_device_name(connection);
-
-        this.parent(connection);
-    },
-
-    adoptDevice: function(device) {
-        if (device.get_iface() == this.iface) {
-            this._setDevice(device);
-            if (device._description)
-                this.syncDescription();
-            this._updateStatusItem();
-            this.emit('state-changed');
-            return true;
-        } else
-            return false;
-    },
-
-    removeDevice: function(device) {
-        if (device == this.device) {
-            this._setDevice(null);
-            this._updateStatusItem();
-            this.emit('state-changed');
-        }
-    },
-
-    hasConnections: function() {
-        return this._connections.length != 0;
-    }
-});
-
 const NMVPNSection = new Lang.Class({
    Name: 'NMVPNSection',
    Extends: NMConnectionBased,
@ -1624,7 +1585,7 @@ const NMVPNSection = new Lang.Class({

                if (j >= NUM_VISIBLE_NETWORKS) {
                    if (!this._overflowItem) {
-                        this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More…"));
+                        this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
                        this.section.addMenuItem(this._overflowItem);
                    }
                    this._overflowItem.menu.addMenuItem(obj.item);
@ -1637,8 +1598,7 @@ const NMVPNSection = new Lang.Class({
    },

    _connectionStateChanged: function(vpnConnection, newstate, reason) {
-        if (newstate == NetworkManager.VPNConnectionState.FAILED &&
-            reason != NetworkManager.VPNConnectionStateReason.NO_SECRETS) {
+        if (newstate == NetworkManager.VPNConnectionState.FAILED) {
            // FIXME: if we ever want to show something based on reason,
            // we need to convert from NetworkManager.VPNConnectionStateReason
            // to NetworkManager.DeviceStateReason
@ -1669,59 +1629,7 @@ const NMApplet = new Lang.Class({
        this.secondaryIcon = this.addIcon(new Gio.ThemedIcon({ name: 'network-vpn-symbolic' }));
        this.secondaryIcon.hide();

-        // Device types
-        this._dtypes = { };
-        this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
-        this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
-        this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
-        this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
-        this._dtypes[NetworkManager.DeviceType.INFINIBAND] = NMDeviceSimple;
-        // TODO: WiMax support
-
-        // Virtual device types
-        this._vtypes = { };
-        if (NMGtk) {
-            this._vtypes[NetworkManager.SETTING_VLAN_SETTING_NAME] = NMDeviceVirtual;
-            this._vtypes[NetworkManager.SETTING_BOND_SETTING_NAME] = NMDeviceVirtual;
-            this._vtypes[NetworkManager.SETTING_BRIDGE_SETTING_NAME] = NMDeviceVirtual;
-        }
-
-        // Connection types
-        this._ctypes = { };
-        this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS;
-        this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
-        this._ctypes[NetworkManager.SETTING_PPPOE_SETTING_NAME] = NMConnectionCategory.WIRED;
-        this._ctypes[NetworkManager.SETTING_PPP_SETTING_NAME] = NMConnectionCategory.WIRED;
-        this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN;
-        this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
-        this._ctypes[NetworkManager.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
-        this._ctypes[NetworkManager.SETTING_INFINIBAND_SETTING_NAME] = NMConnectionCategory.WIRED;
-        if (NMGtk) {
-            this._ctypes[NetworkManager.SETTING_VLAN_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
-            this._ctypes[NetworkManager.SETTING_BOND_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
-            this._ctypes[NetworkManager.SETTING_BRIDGE_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
-        }
-        this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
-
-        NMClient.Client.new_async(null, Lang.bind(this, this._clientGot));
-        NMClient.RemoteSettings.new_async(null, null, Lang.bind(this, this._remoteSettingsGot));
-    },
-
-    _clientGot: function(obj, result) {
-        this._client = NMClient.Client.new_finish(result);
-
-        this._tryLateInit();
-    },
-
-    _remoteSettingsGot: function(obj, result) {
-        this._settings = NMClient.RemoteSettings.new_finish(result);
-
-        this._tryLateInit();
-    },
-
-    _tryLateInit: function() {
-        if (!this._client || !this._settings)
-            return;
+        this._client = NMClient.Client.new();

        this._statusSection = new PopupMenu.PopupMenuSection();
        this._statusItem = new PopupMenu.PopupMenuItem('', { reactive: false });
@ -1743,32 +1651,23 @@ const NMApplet = new Lang.Class({
        this._mobileUpdateId = 0;
        this._mobileUpdateDevice = null;

-        this._nmDevices = [];
        this._devices = { };
-        this._virtualDevices = [ ];

        this._devices.wired = {
            section: new PopupMenu.PopupMenuSection(),
            devices: [ ],
+            item: new NMWiredSectionTitleMenuItem(_("Wired"))
        };

+        this._devices.wired.section.addMenuItem(this._devices.wired.item);
        this._devices.wired.section.actor.hide();
        this.menu.addMenuItem(this._devices.wired.section);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

-        this._devices.virtual = {
-            section: new PopupMenu.PopupMenuSection(),
-            devices: [ ],
-        };
-
-        this._devices.virtual.section.actor.hide();
-        this.menu.addMenuItem(this._devices.virtual.section);
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
        this._devices.wireless = {
            section: new PopupMenu.PopupMenuSection(),
            devices: [ ],
-            item: this._makeToggleItem('wireless', _("Wi-Fi"))
+            item: this._makeToggleItem('wireless', _("Wireless"))
        };
        this._devices.wireless.section.addMenuItem(this._devices.wireless.item);
        this._devices.wireless.section.actor.hide();
@ -1778,7 +1677,9 @@ const NMApplet = new Lang.Class({
        this._devices.wwan = {
            section: new PopupMenu.PopupMenuSection(),
            devices: [ ],
+            item: this._makeToggleItem('wwan', _("Mobile broadband"))
        };
+        this._devices.wwan.section.addMenuItem(this._devices.wwan.item);
        this._devices.wwan.section.actor.hide();
        this.menu.addMenuItem(this._devices.wwan.section);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@ -1789,24 +1690,50 @@ const NMApplet = new Lang.Class({
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');

-        this._readConnections();
-        this._readDevices();
-        this._syncNMState();
+        // Device types
+        this._dtypes = { };
+        this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
+        this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
+        this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
+        this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
+        // TODO: WiMax support

-        this._client.connect('notify::manager-running', Lang.bind(this, this._syncNMState));
-        this._client.connect('notify::networking-enabled', Lang.bind(this, this._syncNMState));
-        this._client.connect('notify::state', Lang.bind(this, this._syncNMState));
-        this._client.connect('notify::active-connections', Lang.bind(this, this._updateIcon));
-        this._client.connect('device-added', Lang.bind(this, this._deviceAdded));
-        this._client.connect('device-removed', Lang.bind(this, this._deviceRemoved));
-        this._settings.connect('new-connection', Lang.bind(this, this._newConnection));
+        // Connection types
+        this._ctypes = { };
+        this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS;
+        this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
+        this._ctypes[NetworkManager.SETTING_PPPOE_SETTING_NAME] = NMConnectionCategory.WIRED;
+        this._ctypes[NetworkManager.SETTING_PPP_SETTING_NAME] = NMConnectionCategory.WIRED;
+        this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN;
+        this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
+        this._ctypes[NetworkManager.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
+        this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
+
+        this._settings = NMClient.RemoteSettings.new(null);
+        this._connectionsReadId = this._settings.connect('connections-read', Lang.bind(this, function() {
+            this._readConnections();
+            this._readDevices();
+            this._syncNMState();
+
+            // Connect to signals late so that early signals don't find in inconsistent state
+            // and connect only once (this signal handler can be called again if NetworkManager goes up and down)
+            if (!this._inited) {
+                this._inited = true;
+                this._client.connect('notify::manager-running', Lang.bind(this, this._syncNMState));
+                this._client.connect('notify::networking-enabled', Lang.bind(this, this._syncNMState));
+                this._client.connect('notify::state', Lang.bind(this, this._syncNMState));
+                this._client.connect('notify::active-connections', Lang.bind(this, this._updateIcon));
+                this._client.connect('device-added', Lang.bind(this, this._deviceAdded));
+                this._client.connect('device-removed', Lang.bind(this, this._deviceRemoved));
+                this._settings.connect('new-connection', Lang.bind(this, this._newConnection));
+            }
+        }));
    },

    _ensureSource: function() {
        if (!this._source) {
            this._source = new MessageTray.Source(_("Network Manager"),
                                                  'network-transmit-receive');
-            this._source.policy = new NotificationDaemon.NotificationApplicationPolicy('gnome-network-panel');

            this._source.connect('destroy', Lang.bind(this, function() {
                this._source = null;
@ -1831,34 +1758,20 @@ const NMApplet = new Lang.Class({
        let devices = this._devices[category].devices;
        let item = this._devices[category].item;
        let section = this._devices[category].section;
-
-        let visible;
-        if (category == NMConnectionCategory.VIRTUAL)
-            visible = !section.isEmpty();
-        else
-            visible = devices.length > 0;
-
-        if (!visible)
+        if (devices.length == 0)
            section.actor.hide();
        else {
            section.actor.show();
-
-            // Sync the relation between the section title
-            // item (the one with the airplane mode switch)
-            // and the individual device switches
-            if (item) {
-                if (devices.length == 1) {
-                    let dev = devices[0];
-                    dev.statusItem.actor.hide();
-                    item.updateForDevice(dev);
-                } else {
-                    devices.forEach(function(dev) {
-                        dev.statusItem.actor.show();
-                    });
-
-                    // remove status text from the section title item
-                    item.updateForDevice(null);
-                }
+            if (devices.length == 1) {
+                let dev = devices[0];
+                dev.statusItem.actor.hide();
+                item.updateForDevice(dev);
+            } else {
+                devices.forEach(function(dev) {
+                    dev.statusItem.actor.show();
+                });
+                // remove status text from the section title item
+                item.updateForDevice(null);
            }
        }
    },
@ -1866,9 +1779,8 @@ const NMApplet = new Lang.Class({
    _readDevices: function() {
        let devices = this._client.get_devices() || [ ];
        for (let i = 0; i < devices.length; ++i) {
-            this._deviceAdded(this._client, devices[i], true);
+            this._deviceAdded(this._client, devices[i]);
        }
-        this._syncDeviceNames();
    },

    _notifyForDevice: function(device, iconName, title, text, urgency) {
@ -1899,50 +1811,9 @@ const NMApplet = new Lang.Class({
                              MessageTray.Urgency.HIGH);
    },

-    _syncDeviceNames: function() {
-        if (NMGtk) {
-            let names = NMGtk.utils_disambiguate_device_names(this._nmDevices);
-            for (let i = 0; i < this._nmDevices.length; i++) {
-                let device = this._nmDevices[i];
-                device._description = names[i];
-                if (device._delegate)
-                    device._delegate.syncDescription();
-            }
-        } else {
-            for (let i = 0; i < this._nmDevices.length; i++) {
-                let device = this._nmDevices[i];
-                device._delegate.syncDescription();
-            }
-        }
-    },
+    _makeWrapperDevice: function(wrapperClass, device) {
+        let wrapper = new wrapperClass(this._client, device, this._connections);

-    _deviceAdded: function(client, device, skipSyncDeviceNames) {
-        if (device._delegate) {
-            // already seen, not adding again
-            return;
-        }
-
-        for (let i = 0; i < this._virtualDevices.length; i++) {
-            if (this._virtualDevices[i].adoptDevice(device)) {
-                this._nmDevices.push(device);
-                if (!skipSyncDeviceNames)
-                    this._syncDeviceNames();
-                return;
-            }
-        }
-
-        let wrapperClass = this._dtypes[device.get_device_type()];
-        if (wrapperClass) {
-            let wrapper = new wrapperClass(this._client, device, this._connections);
-            this._addDeviceWrapper(wrapper);
-
-            this._nmDevices.push(device);
-            if (!skipSyncDeviceNames)
-                this._syncDeviceNames();
-        }
-    },
-
-    _addDeviceWrapper: function(wrapper) {
        wrapper._activationFailedId = wrapper.connect('activation-failed',
                                                      Lang.bind(this, this._onActivationFailed));
        wrapper._deviceStateChangedId = wrapper.connect('state-changed', Lang.bind(this, function(dev) {
@ -1954,36 +1825,35 @@ const NMApplet = new Lang.Class({
            wrapper.disconnect(wrapper._destroyId);
        });

-        let section = this._devices[wrapper.category].section;
-        section.addMenuItem(wrapper.statusItem);
-        section.addMenuItem(wrapper.section);
+        return wrapper;
+    },

-        let devices = this._devices[wrapper.category].devices;
-        devices.push(wrapper);
+    _deviceAdded: function(client, device) {
+        if (device._delegate) {
+            // already seen, not adding again
+            return;
+        }
+        let wrapperClass = this._dtypes[device.get_device_type()];
+        if (wrapperClass) {
+            let wrapper = this._makeWrapperDevice(wrapperClass, device);
+            let section = this._devices[wrapper.category].section;
+            let devices = this._devices[wrapper.category].devices;

-        this._syncSectionTitle(wrapper.category);
+            section.addMenuItem(wrapper.section, 1);
+            section.addMenuItem(wrapper.statusItem, 1);
+            devices.push(wrapper);
+
+            this._syncSectionTitle(wrapper.category);
+        }
    },

    _deviceRemoved: function(client, device) {
-        let pos = this._nmDevices.indexOf(device);
-        if (pos != -1) {
-            this._nmDevices.splice(pos, 1);
-            this._syncDeviceNames();
-        }
-
-        let wrapper = device._delegate;
-        if (!wrapper) {
+        if (!device._delegate) {
            log('Removing a network device that was not added');
            return;
        }

-        if (wrapper instanceof NMDeviceVirtual)
-            wrapper.removeDevice(device);
-        else
-            this._removeDeviceWrapper(wrapper);
-    },
-
-    _removeDeviceWrapper: function(wrapper) {
+        let wrapper = device._delegate;
        wrapper.destroy();

        let devices = this._devices[wrapper.category].devices;
@ -2184,13 +2054,6 @@ const NMApplet = new Lang.Class({
                devices[i].removeConnection(connection);
        }

-        if (section == NMConnectionCategory.VIRTUAL) {
-            let iface = connection.get_virtual_iface_name();
-            let wrapper = this._findVirtualDevice(iface);
-            if (wrapper && !wrapper.hasConnections())
-                this._removeDeviceWrapper(wrapper);
-        }
-
        connection.disconnect(connection._removedId);
        connection.disconnect(connection._updatedId);
        connection._removedId = connection._updatedId = 0;
@ -2204,27 +2067,6 @@ const NMApplet = new Lang.Class({

        let section = connection._section;

-        if (section == NMConnectionCategory.VIRTUAL) {
-            let wrapperClass = this._vtypes[connection._type];
-            if (!wrapperClass)
-                return;
-
-            let iface = connection.get_virtual_iface_name();
-            let wrapper = this._findVirtualDevice(iface);
-            if (!wrapper) {
-                wrapper = new wrapperClass(this._client, iface, this._connections);
-                this._addDeviceWrapper(wrapper);
-                this._virtualDevices.push(wrapper);
-
-                // We might already have a device for this connection
-                for (let i = 0; i < this._nmDevices.length; i++) {
-                    let device = this._nmDevices[i];
-                    if (wrapper.adoptDevice(device))
-                        break;
-                }
-            }
-        }
-
        if (section == NMConnectionCategory.INVALID)
            return;
        if (section == NMConnectionCategory.VPN) {
@ -2237,15 +2079,6 @@ const NMApplet = new Lang.Class({
        }
    },

-    _findVirtualDevice: function(iface) {
-        for (let i = 0; i < this._virtualDevices.length; i++) {
-            if (this._virtualDevices[i].iface == iface)
-                return this._virtualDevices[i];
-        }
-
-        return null;
-    },
-
    _hideDevices: function() {
        this._devicesHidden = true;

@ -2261,7 +2094,6 @@ const NMApplet = new Lang.Class({
        this._statusSection.actor.hide();

        this._syncSectionTitle(NMConnectionCategory.WIRED);
-        this._syncSectionTitle(NMConnectionCategory.VIRTUAL);
        this._syncSectionTitle(NMConnectionCategory.WIRELESS);
        this._syncSectionTitle(NMConnectionCategory.WWAN);
    },
@ -2299,7 +2131,6 @@ const NMApplet = new Lang.Class({
                this.setIcon('network-wireless-acquiring-symbolic');
                break;
            case NMConnectionCategory.WIRED:
-            case NMConnectionCategory.VIRTUAL:
                this.setIcon('network-wired-acquiring-symbolic');
                break;
            default:
@ -2339,7 +2170,6 @@ const NMApplet = new Lang.Class({
                    break;
                }
            case NMConnectionCategory.WIRED:
-            case NMConnectionCategory.VIRTUAL:
                this.setIcon('network-wired-symbolic');
                break;
            case NMConnectionCategory.WWAN:
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@ -7,7 +7,7 @@ const St = imports.gi.St;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

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

 const UPDeviceType = {
@ -54,23 +54,14 @@ const Indicator = new Lang.Class({
    _init: function() {
        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._devicesChanged));
-                                               this._devicesChanged();
-                                           }));
+        this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);

        this._deviceItems = [ ];
        this._hasPrimary = false;
        this._primaryDeviceId = null;

        this._batteryItem = new PopupMenu.PopupMenuItem('', { reactive: false });
-        this._primaryPercentage = new St.Label({ style_class: 'popup-battery-percentage' });
+        this._primaryPercentage = new St.Label();
        this._batteryItem.addActor(this._primaryPercentage, { align: St.Align.END });
        this.menu.addMenuItem(this._batteryItem);

@ -79,6 +70,10 @@ const Indicator = new Lang.Class({

        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop');
+
+        this._proxy.connect('g-properties-changed',
+                            Lang.bind(this, this._devicesChanged));
+        this._devicesChanged();
    },

    _readPrimaryDevice: function() {
@ -96,12 +91,12 @@ const Indicator = new Lang.Class({
                if (time == 0) {
                    // 0 is reported when UPower does not have enough data
                    // to estimate battery life
-                    this._batteryItem.label.text = _("Estimating…");
+                    this._batteryItem.label.text = _("Estimating...");
                } else {
                    let minutes = time % 60;
                    let hours = Math.floor(time / 60);
                    let timestring;
-                    if (time >= 60) {
+                    if (time > 60) {
                        if (minutes == 0) {
                            timestring = ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
                        } else {
@ -188,8 +183,7 @@ const DeviceItem = new Lang.Class({
        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' });
+        let percentLabel = new St.Label({ text: C_("percent of battery remaining", "%d%%").format(Math.round(percentage)) });
        this.addActor(percentLabel, { align: St.Align.END });
        //FIXME: ideally we would like to expose this._label and percentLabel
        this.actor.label_actor = percentLabel;
@ -198,9 +192,9 @@ const DeviceItem = new Lang.Class({
    _deviceTypeToString: function(type) {
 	switch (type) {
 	case UPDeviceType.AC_POWER:
-            return _("AC Adapter");
+            return _("AC adapter");
        case UPDeviceType.BATTERY:
-            return _("Laptop Battery");
+            return _("Laptop battery");
        case UPDeviceType.UPS:
            return _("UPS");
        case UPDeviceType.MONITOR:
@ -212,9 +206,9 @@ const DeviceItem = new Lang.Class({
        case UPDeviceType.PDA:
            return _("PDA");
        case UPDeviceType.PHONE:
-            return _("Cell Phone");
+            return _("Cell phone");
        case UPDeviceType.MEDIA_PLAYER:
-            return _("Media Player");
+            return _("Media player");
        case UPDeviceType.TABLET:
            return _("Tablet");
        case UPDeviceType.COMPUTER:
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@ -2,10 +2,8 @@

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

 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@ -27,189 +25,122 @@ function getMixerControl() {
    return _mixerControl;
 }

-const StreamSlider = new Lang.Class({
-    Name: 'StreamSlider',
+const VolumeMenu = new Lang.Class({
+    Name: 'VolumeMenu',
+    Extends: PopupMenu.PopupMenuSection,
+
+    _init: function(control) {
+        this.parent();

-    _init: function(control, title) {
        this._control = control;
-
-        this.item = new PopupMenu.PopupMenuSection();
-
-        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.item.addMenuItem(this._title);
-        this.item.addMenuItem(this._slider);
-
-        this._stream = null;
-        this._shouldShow = true;
-    },
-
-    get stream() {
-        return this._stream;
-    },
-
-    set stream(stream) {
-        if (this._stream) {
-            this._disconnectStream(this._stream);
-        }
-
-        this._stream = stream;
-
-        if (this._stream) {
-            this._connectStream(this._stream);
-            this._updateVolume();
-        } else {
-            this.emit('stream-updated');
-        }
-
-        this._updateVisibility();
-    },
-
-    _disconnectStream: function(stream) {
-        stream.disconnect(this._mutedChangedId);
-        this._mutedChangedId = 0;
-        stream.disconnect(this._volumeChangedId);
-        this._volumeChangedId = 0;
-    },
-
-    _connectStream: function(stream) {
-        this._mutedChangedId = stream.connect('notify::is-muted', Lang.bind(this, this._updateVolume));
-        this._volumeChangedId = stream.connect('notify::volume', Lang.bind(this, this._updateVolume));
-    },
-
-    _shouldBeVisible: function() {
-        return this._stream != null;
-    },
-
-    _updateVisibility: function() {
-        let visible = this._shouldBeVisible();
-        this._title.actor.visible = visible;
-        this._slider.actor.visible = visible;
-    },
-
-    scroll: function(event) {
-        this._slider.scroll(event);
-    },
-
-    setValue: function(value) {
-        // piggy-back off of sliderChanged
-        this._slider.setValue(value);
-    },
-
-    _sliderChanged: function(slider, value, property) {
-        if (!this._stream)
-            return;
-
-        let volume = value * this._control.get_vol_max_norm();
-        let prevMuted = this._stream.is_muted;
-        if (volume < 1) {
-            this._stream.volume = 0;
-            if (!prevMuted)
-                this._stream.change_is_muted(true);
-        } else {
-            this._stream.volume = volume;
-            if (prevMuted)
-                this._stream.change_is_muted(false);
-        }
-        this._stream.push_volume();
-    },
-
-    _notifyVolumeChange: function() {
-        global.cancel_theme_sound(VOLUME_NOTIFY_ID);
-        global.play_theme_sound(VOLUME_NOTIFY_ID,
-                                'audio-volume-change',
-                                _("Volume changed"),
-                                Clutter.get_current_event ());
-    },
-
-    _updateVolume: function() {
-        let muted = this._stream.is_muted;
-        this._slider.setValue(muted ? 0 : (this._stream.volume / this._control.get_vol_max_norm()));
-        this.emit('stream-updated');
-    },
-
-    getIcon: function() {
-        if (!this._stream)
-            return null;
-
-        let volume = this._stream.volume;
-        if (this._stream.is_muted || volume <= 0) {
-            return 'audio-volume-muted-symbolic';
-        } else {
-            let n = Math.floor(3 * volume / this._control.get_vol_max_norm()) + 1;
-            if (n < 2)
-                return 'audio-volume-low-symbolic';
-            if (n >= 3)
-                return 'audio-volume-high-symbolic';
-            return 'audio-volume-medium-symbolic';
-        }
-    }
-});
-Signals.addSignalMethods(StreamSlider.prototype);
-
-const OutputStreamSlider = new Lang.Class({
-    Name: 'OutputStreamSlider',
-    Extends: StreamSlider,
-
-    _connectStream: function(stream) {
-        this.parent(stream);
-        this._portChangedId = stream.connect('notify::port', Lang.bind(this, this._portChanged));
-        this._portChanged();
-    },
-
-    _findHeadphones: function(sink) {
-        // This only works for external headphones (e.g. bluetooth)
-        if (sink.get_form_factor() == 'headset' ||
-            sink.get_form_factor() == 'headphone')
-            return true;
-
-        // a bit hackish, but ALSA/PulseAudio have a number
-        // of different identifiers for headphones, and I could
-        // not find the complete list
-        if (sink.get_ports().length > 0)
-            return sink.get_port().port.indexOf('headphone') >= 0;
-
-        return false;
-    },
-
-    _disconnectStream: function(stream) {
-        this.parent(stream);
-        stream.disconnect(this._portChangedId);
-        this._portChangedId = 0;
-    },
-
-    _portChanged: function() {
-        let hasHeadphones = this._findHeadphones(this._stream);
-        if (hasHeadphones != this._hasHeadphones) {
-            this._hasHeadphones = hasHeadphones;
-            this.emit('headphones-changed', this._hasHeadphones);
-        }
-    }
-});
-
-const InputStreamSlider = new Lang.Class({
-    Name: 'InputStreamSlider',
-    Extends: StreamSlider,
-
-    _init: function(control, title) {
-        this.parent(control, title);
+        this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
+        this._control.connect('default-sink-changed', Lang.bind(this, this._readOutput));
+        this._control.connect('default-source-changed', Lang.bind(this, this._readInput));
        this._control.connect('stream-added', Lang.bind(this, this._maybeShowInput));
        this._control.connect('stream-removed', Lang.bind(this, this._maybeShowInput));
+        this._volumeMax = this._control.get_vol_max_norm();
+
+        this._output = null;
+        this._outputVolumeId = 0;
+        this._outputMutedId = 0;
+        /* Translators: This is the label for audio volume */
+        this._outputTitle = new PopupMenu.PopupMenuItem(_("Volume"), { reactive: false });
+        this._outputSlider = new PopupMenu.PopupSliderMenuItem(0);
+        this._outputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_output'));
+        this._outputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
+        this.addMenuItem(this._outputTitle);
+        this.addMenuItem(this._outputSlider);
+
+        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        this._input = null;
+        this._inputVolumeId = 0;
+        this._inputMutedId = 0;
+        this._inputTitle = new PopupMenu.PopupMenuItem(_("Microphone"), { reactive: false });
+        this._inputSlider = new PopupMenu.PopupSliderMenuItem(0);
+        this._inputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_input'));
+        this._inputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
+        this.addMenuItem(this._inputTitle);
+        this.addMenuItem(this._inputSlider);
+
+        this._onControlStateChanged();
    },

-    _connectStream: function(stream) {
-        this.parent(stream);
-        this._maybeShowInput();
+    scroll: function(direction) {
+        let currentVolume = this._output.volume;
+
+        if (direction == Clutter.ScrollDirection.DOWN) {
+            let prev_muted = this._output.is_muted;
+            this._output.volume = Math.max(0, currentVolume - this._volumeMax * VOLUME_ADJUSTMENT_STEP);
+            if (this._output.volume < 1) {
+                this._output.volume = 0;
+                if (!prev_muted)
+                    this._output.change_is_muted(true);
+            }
+            this._output.push_volume();
+        }
+        else if (direction == Clutter.ScrollDirection.UP) {
+            this._output.volume = Math.min(this._volumeMax, currentVolume + this._volumeMax * VOLUME_ADJUSTMENT_STEP);
+            this._output.change_is_muted(false);
+            this._output.push_volume();
+        }
+
+        this._notifyVolumeChange();
+    },
+
+    _onControlStateChanged: function() {
+        if (this._control.get_state() == Gvc.MixerControlState.READY) {
+            this._readOutput();
+            this._readInput();
+            this._maybeShowInput();
+        } else {
+            this.emit('icon-changed', null);
+        }
+    },
+
+    _readOutput: function() {
+        if (this._outputVolumeId) {
+            this._output.disconnect(this._outputVolumeId);
+            this._output.disconnect(this._outputMutedId);
+            this._outputVolumeId = 0;
+            this._outputMutedId = 0;
+        }
+        this._output = this._control.get_default_sink();
+        if (this._output) {
+            this._outputMutedId = this._output.connect('notify::is-muted', Lang.bind(this, this._mutedChanged, '_output'));
+            this._outputVolumeId = this._output.connect('notify::volume', Lang.bind(this, this._volumeChanged, '_output'));
+            this._mutedChanged (null, null, '_output');
+            this._volumeChanged (null, null, '_output');
+        } else {
+            this._outputSlider.setValue(0);
+            this.emit('icon-changed', 'audio-volume-muted-symbolic');
+        }
+    },
+
+    _readInput: function() {
+        if (this._inputVolumeId) {
+            this._input.disconnect(this._inputVolumeId);
+            this._input.disconnect(this._inputMutedId);
+            this._inputVolumeId = 0;
+            this._inputMutedId = 0;
+        }
+        this._input = this._control.get_default_source();
+        if (this._input) {
+            this._inputMutedId = this._input.connect('notify::is-muted', Lang.bind(this, this._mutedChanged, '_input'));
+            this._inputVolumeId = this._input.connect('notify::volume', Lang.bind(this, this._volumeChanged, '_input'));
+            this._mutedChanged (null, null, '_input');
+            this._volumeChanged (null, null, '_input');
+        } else {
+            this._inputTitle.actor.hide();
+            this._inputSlider.actor.hide();
+        }
    },

    _maybeShowInput: function() {
        // only show input widgets if any application is recording audio
        let showInput = false;
        let recordingApps = this._control.get_source_outputs();
-        if (this._stream && recordingApps) {
+        if (this._input && recordingApps) {
            for (let i = 0; i < recordingApps.length; i++) {
                let outputStream = recordingApps[i];
                let id = outputStream.get_application_id();
@ -222,70 +153,63 @@ const InputStreamSlider = new Lang.Class({
            }
        }

-        this._showInput = showInput;
-        this._updateVisibility();
+        this._inputTitle.actor.visible = showInput;
+        this._inputSlider.actor.visible = showInput;
    },

-    _shouldBeVisible: function() {
-        return this.parent() && this._showInput;
-    }
-});
-
-const VolumeMenu = new Lang.Class({
-    Name: 'VolumeMenu',
-    Extends: PopupMenu.PopupMenuSection,
-
-    _init: function(control) {
-        this.parent();
-
-        this.hasHeadphones = false;
-
-        this._control = control;
-        this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
-        this._control.connect('default-sink-changed', Lang.bind(this, this._readOutput));
-        this._control.connect('default-source-changed', Lang.bind(this, this._readInput));
-
-        /* 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, _("Microphone"));
-        this.addMenuItem(this._input.item);
-
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        this._onControlStateChanged();
-    },
-
-    scroll: function(event) {
-        this._output.scroll(event);
-    },
-
-    _onControlStateChanged: function() {
-        if (this._control.get_state() == Gvc.MixerControlState.READY) {
-            this._readInput();
-            this._readOutput();
+    _volumeToIcon: function(volume) {
+        if (volume <= 0) {
+            return 'audio-volume-muted-symbolic';
        } else {
-            this.emit('icon-changed');
+            let n = Math.floor(3 * volume / this._volumeMax) + 1;
+            if (n < 2)
+                return 'audio-volume-low-symbolic';
+            if (n >= 3)
+                return 'audio-volume-high-symbolic';
+            return 'audio-volume-medium-symbolic';
        }
    },

-    _readOutput: function() {
-        this._output.stream = this._control.get_default_sink();
+    _sliderChanged: function(slider, value, property) {
+        if (this[property] == null) {
+            log ('Volume slider changed for %s, but %s does not exist'.format(property, property));
+            return;
+        }
+        let volume = value * this._volumeMax;
+        let prev_muted = this[property].is_muted;
+        if (volume < 1) {
+            this[property].volume = 0;
+            if (!prev_muted)
+                this[property].change_is_muted(true);
+        } else {
+            this[property].volume = volume;
+            if (prev_muted)
+                this[property].change_is_muted(false);
+        }
+        this[property].push_volume();
    },

-    _readInput: function() {
-        this._input.stream = this._control.get_default_source();
+    _notifyVolumeChange: function() {
+        global.cancel_theme_sound(VOLUME_NOTIFY_ID);
+        global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
    },

-    getIcon: function() {
-        return this._output.getIcon();
+    _mutedChanged: function(object, param_spec, property) {
+        let muted = this[property].is_muted;
+        let slider = this[property+'Slider'];
+        slider.setValue(muted ? 0 : (this[property].volume / this._volumeMax));
+        if (property == '_output') {
+            if (muted)
+                this.emit('icon-changed', 'audio-volume-muted-symbolic');
+            else
+                this.emit('icon-changed', this._volumeToIcon(this._output.volume));
+        }
+    },
+
+    _volumeChanged: function(object, param_spec, property) {
+        this[property+'Slider'].setValue(this[property].volume / this._volumeMax);
+        if (property == '_output' && !this._output.is_muted)
+            this.emit('icon-changed', this._volumeToIcon(this._output.volume));
    }
 });

@ -298,17 +222,11 @@ const Indicator = new Lang.Class({

        this._control = getMixerControl();
        this._volumeMenu = new VolumeMenu(this._control);
-        this._volumeMenu.connect('icon-changed', Lang.bind(this, function(menu) {
-            let icon = this._volumeMenu.getIcon();
-            this.actor.visible = (icon != null);
+        this._volumeMenu.connect('icon-changed', Lang.bind(this, function(menu, icon) {
+            this._hasPulseAudio = (icon != null);
            this.setIcon(icon);
+            this._syncVisibility();
        }));
-        this._volumeMenu.connect('headphones-changed', Lang.bind(this, function(menu, value) {
-            this._headphoneIcon.visible = value;
-        }));
-
-        this._headphoneIcon = this.addIcon(new Gio.ThemedIcon({ name: 'headphones-symbolic' }));
-        this._headphoneIcon.visible = false;

        this.menu.addMenuItem(this._volumeMenu);

@ -318,7 +236,12 @@ const Indicator = new Lang.Class({
        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
    },

+    _syncVisibility: function() {
+        this.actor.visible = this._hasPulseAudio;
+        this.mainIcon.visible = this._hasPulseAudio;
+    },
+
    _onScrollEvent: function(actor, event) {
-        this._volumeMenu.scroll(event);
+        this._volumeMenu.scroll(event.get_scroll_direction());
    }
 });
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@ -1,616 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-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 Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const POPUP_DELAY_TIMEOUT = 150; // milliseconds
-
-const POPUP_SCROLL_TIME = 0.10; // seconds
-const POPUP_FADE_OUT_TIME = 0.1; // seconds
-
-const DISABLE_HOVER_TIMEOUT = 500; // milliseconds
-
-function mod(a, b) {
-    return (a + b) % b;
-}
-
-function primaryModifier(mask) {
-    if (mask == 0)
-        return 0;
-
-    let primary = 1;
-    while (mask > 1) {
-        mask >>= 1;
-        primary <<= 1;
-    }
-    return primary;
-}
-
-const SwitcherPopup = new Lang.Class({
-    Name: 'SwitcherPopup',
-    Abstract: true,
-
-    _init: function(items) {
-        this._switcherList = null;
-
-        this._items = items || [];
-        this._selectedIndex = 0;
-
-        this.actor = new Shell.GenericContainer({ style_class: 'switcher-popup',
-                                                  reactive: true,
-                                                  visible: false });
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        Main.uiGroup.add_actor(this.actor);
-
-        this._haveModal = false;
-        this._modifierMask = 0;
-
-        this._motionTimeoutId = 0;
-        this._initialDelayTimeoutId = 0;
-
-        // Initially disable hover so we ignore the enter-event if
-        // the switcher appears underneath the current pointer location
-        this._disableHover();
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        let primary = Main.layoutManager.primaryMonitor;
-
-        alloc.min_size = primary.width;
-        alloc.natural_size = primary.width;
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let primary = Main.layoutManager.primaryMonitor;
-
-        alloc.min_size = primary.height;
-        alloc.natural_size = primary.height;
-    },
-
-    _allocate: function(actor, box, flags) {
-        let childBox = new Clutter.ActorBox();
-        let primary = Main.layoutManager.primaryMonitor;
-
-        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
-        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
-        let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
-        let vPadding = this.actor.get_theme_node().get_vertical_padding();
-        let hPadding = leftPadding + rightPadding;
-
-        // Allocate the switcherList
-        // We select a size based on an icon size that does not overflow the screen
-        let [childMinHeight, childNaturalHeight] = this._switcherList.actor.get_preferred_height(primary.width - hPadding);
-        let [childMinWidth, childNaturalWidth] = this._switcherList.actor.get_preferred_width(childNaturalHeight);
-        childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
-        childBox.x2 = Math.min(primary.x + primary.width - rightPadding, childBox.x1 + childNaturalWidth);
-        childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
-        childBox.y2 = childBox.y1 + childNaturalHeight;
-        this._switcherList.actor.allocate(childBox, flags);
-    },
-
-    _createSwitcher: function() {
-        throw new Error('Not implemented');
-    },
-
-    _initialSelection: function(backward, binding) {
-        throw new Error('Not implemented');
-    },
-
-    show: function(backward, binding, mask) {
-        if (!this._createSwitcher())
-            return false;
-
-        if (!Main.pushModal(this.actor)) {
-            // Probably someone else has a pointer grab, try again with keyboard only
-            if (!Main.pushModal(this.actor, { options: Meta.ModalOptions.POINTER_ALREADY_GRABBED })) {
-                return false;
-            }
-        }
-        this._haveModal = true;
-        this._modifierMask = primaryModifier(mask);
-
-        this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
-        this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
-
-        this.actor.connect('button-press-event', Lang.bind(this, this._clickedOutside));
-        this.actor.connect('scroll-event', Lang.bind(this, this._scrollEvent));
-
-        this.actor.add_actor(this._switcherList.actor);
-        this._switcherList.connect('item-activated', Lang.bind(this, this._itemActivated));
-        this._switcherList.connect('item-entered', Lang.bind(this, this._itemEntered));
-
-        // Need to force an allocation so we can figure out whether we
-        // need to scroll when selecting
-        this.actor.opacity = 0;
-        this.actor.show();
-        this.actor.get_allocation_box();
-
-        if (this._items.length > 1)
-            this._selectedIndex = 1;
-        else
-            this._selectedIndex = 0;
-
-        this._initialSelection(backward, binding);
-
-        // There's a race condition; if the user released Alt before
-        // we got the grab, then we won't be notified. (See
-        // https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
-        // details.) So we check now. (Have to do this after updating
-        // selection.)
-        let [x, y, mods] = global.get_pointer();
-        if (!(mods & this._modifierMask)) {
-            this._finish(global.get_current_time());
-            return false;
-        }
-
-        // We delay showing the popup so that fast Alt+Tab users aren't
-        // disturbed by the popup briefly flashing.
-        this._initialDelayTimeoutId = Mainloop.timeout_add(POPUP_DELAY_TIMEOUT,
-                                                           Lang.bind(this, function () {
-                                                               Main.osdWindow.cancel();
-                                                               this.actor.opacity = 255;
-                                                               this._initialDelayTimeoutId = 0;
-                                                           }));
-        return true;
-    },
-
-    _next: function() {
-        return mod(this._selectedIndex + 1, this._items.length);
-    },
-
-    _previous: function() {
-        return mod(this._selectedIndex - 1, this._items.length);
-    },
-
-    _keyPressHandler: function(keysym, backwards, action) {
-        throw new Error('Not implemented');
-    },
-
-    _keyPressEvent: function(actor, event) {
-        let keysym = event.get_key_symbol();
-        let event_state = event.get_state();
-        let backwards = event_state & Clutter.ModifierType.SHIFT_MASK;
-        let action = global.display.get_keybinding_action(event.get_key_code(), event_state);
-
-        this._disableHover();
-
-        if (keysym == Clutter.Escape)
-            this.destroy();
-        else
-            this._keyPressHandler(keysym, backwards, action);
-
-        return true;
-    },
-
-    _keyReleaseEvent: function(actor, event) {
-        let [x, y, mods] = global.get_pointer();
-        let state = mods & this._modifierMask;
-
-        if (state == 0)
-            this._finish(event.get_time());
-
-        return true;
-    },
-
-    _clickedOutside: function(actor, event) {
-        this.destroy();
-    },
-
-    _scrollHandler: function(direction) {
-        if (direction == Clutter.ScrollDirection.UP)
-            this._select(this._previous());
-        else if (direction == Clutter.ScrollDirection.DOWN)
-            this._select(this._next());
-    },
-
-    _scrollEvent: function(actor, event) {
-        this._scrollHandler(event.get_scroll_direction());
-    },
-
-    _itemActivatedHandler: function(n) {
-        this._select(n);
-    },
-
-    _itemActivated: function(switcher, n) {
-        this._itemActivatedHandler(n);
-        this._finish(global.get_current_time());
-    },
-
-    _itemEnteredHandler: function(n) {
-        this._select(n);
-    },
-
-    _itemEntered: function(switcher, n) {
-        if (!this.mouseActive)
-            return;
-        this._itemEnteredHandler(n);
-    },
-
-    _disableHover: function() {
-        this.mouseActive = false;
-
-        if (this._motionTimeoutId != 0)
-            Mainloop.source_remove(this._motionTimeoutId);
-
-        this._motionTimeoutId = Mainloop.timeout_add(DISABLE_HOVER_TIMEOUT, Lang.bind(this, this._mouseTimedOut));
-    },
-
-    _mouseTimedOut: function() {
-        this._motionTimeoutId = 0;
-        this.mouseActive = true;
-    },
-
-    _popModal: function() {
-        if (this._haveModal) {
-            Main.popModal(this.actor);
-            this._haveModal = false;
-        }
-    },
-
-    destroy: function() {
-        this._popModal();
-        if (this.actor.visible) {
-            Tweener.addTween(this.actor,
-                             { opacity: 0,
-                               time: POPUP_FADE_OUT_TIME,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this,
-                                   function() {
-                                       this.actor.destroy();
-                                   })
-                             });
-        } else
-            this.actor.destroy();
-    },
-
-    _finish: function(timestamp) {
-        this.destroy();
-    },
-
-    _onDestroy: function() {
-        this._popModal();
-
-        if (this._motionTimeoutId != 0)
-            Mainloop.source_remove(this._motionTimeoutId);
-        if (this._initialDelayTimeoutId != 0)
-            Mainloop.source_remove(this._initialDelayTimeoutId);
-    },
-
-    _select: function(num) {
-        this._selectedIndex = num;
-        this._switcherList.highlight(num);
-    }
-});
-
-const SwitcherList = new Lang.Class({
-    Name: 'SwitcherList',
-
-    _init : function(squareItems) {
-        this.actor = new Shell.GenericContainer({ style_class: 'switcher-list' });
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocateTop));
-
-        // Here we use a GenericContainer so that we can force all the
-        // children to have the same width.
-        this._list = new Shell.GenericContainer({ style_class: 'switcher-list-item-container' });
-        this._list.spacing = 0;
-        this._list.connect('style-changed', Lang.bind(this, function() {
-                                                        this._list.spacing = this._list.get_theme_node().get_length('spacing');
-                                                     }));
-
-        this._list.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this._list.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this._list.connect('allocate', Lang.bind(this, this._allocate));
-
-        this._scrollView = new St.ScrollView({ style_class: 'hfade',
-                                               enable_mouse_scrolling: false });
-        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER);
-
-        let scrollBox = new St.BoxLayout();
-        scrollBox.add_actor(this._list);
-        this._scrollView.add_actor(scrollBox);
-        this.actor.add_actor(this._scrollView);
-
-        // Those arrows indicate whether scrolling in one direction is possible
-        this._leftArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
-                                               pseudo_class: 'highlighted' });
-        this._leftArrow.connect('repaint', Lang.bind(this,
-            function() { drawArrow(this._leftArrow, St.Side.LEFT); }));
-        this._rightArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
-                                                pseudo_class: 'highlighted' });
-        this._rightArrow.connect('repaint', Lang.bind(this,
-            function() { drawArrow(this._rightArrow, St.Side.RIGHT); }));
-
-        this.actor.add_actor(this._leftArrow);
-        this.actor.add_actor(this._rightArrow);
-
-        this._items = [];
-        this._highlighted = -1;
-        this._squareItems = squareItems;
-        this._minSize = 0;
-        this._scrollableRight = true;
-        this._scrollableLeft = false;
-    },
-
-    _allocateTop: function(actor, box, flags) {
-        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
-        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
-
-        let childBox = new Clutter.ActorBox();
-        let scrollable = this._minSize > box.x2 - box.x1;
-
-        box.y1 -= this.actor.get_theme_node().get_padding(St.Side.TOP);
-        box.y2 += this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
-        this._scrollView.allocate(box, flags);
-
-        let arrowWidth = Math.floor(leftPadding / 3);
-        let arrowHeight = arrowWidth * 2;
-        childBox.x1 = leftPadding / 2;
-        childBox.y1 = this.actor.height / 2 - arrowWidth;
-        childBox.x2 = childBox.x1 + arrowWidth;
-        childBox.y2 = childBox.y1 + arrowHeight;
-        this._leftArrow.allocate(childBox, flags);
-        this._leftArrow.opacity = (this._scrollableLeft && scrollable) ? 255 : 0;
-
-        arrowWidth = Math.floor(rightPadding / 3);
-        arrowHeight = arrowWidth * 2;
-        childBox.x1 = this.actor.width - arrowWidth - rightPadding / 2;
-        childBox.y1 = this.actor.height / 2 - arrowWidth;
-        childBox.x2 = childBox.x1 + arrowWidth;
-        childBox.y2 = childBox.y1 + arrowHeight;
-        this._rightArrow.allocate(childBox, flags);
-        this._rightArrow.opacity = (this._scrollableRight && scrollable) ? 255 : 0;
-    },
-
-    addItem : function(item, label) {
-        let bbox = new St.Button({ style_class: 'item-box',
-                                   reactive: true });
-
-        bbox.set_child(item);
-        this._list.add_actor(bbox);
-
-        let n = this._items.length;
-        bbox.connect('clicked', Lang.bind(this, function() { this._onItemClicked(n); }));
-        bbox.connect('enter-event', Lang.bind(this, function() { this._onItemEnter(n); }));
-
-        bbox.label_actor = label;
-
-        this._items.push(bbox);
-
-        return bbox;
-    },
-
-    _onItemClicked: function (index) {
-        this._itemActivated(index);
-    },
-
-    _onItemEnter: function (index) {
-        this._itemEntered(index);
-    },
-
-    highlight: function(index, justOutline) {
-        if (this._highlighted != -1) {
-            this._items[this._highlighted].remove_style_pseudo_class('outlined');
-            this._items[this._highlighted].remove_style_pseudo_class('selected');
-        }
-
-        this._highlighted = index;
-
-        if (this._highlighted != -1) {
-            if (justOutline)
-                this._items[this._highlighted].add_style_pseudo_class('outlined');
-            else
-                this._items[this._highlighted].add_style_pseudo_class('selected');
-        }
-
-        let adjustment = this._scrollView.hscroll.adjustment;
-        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
-        let [absItemX, absItemY] = this._items[index].get_transformed_position();
-        let [result, posX, posY] = this.actor.transform_stage_point(absItemX, 0);
-        let [containerWidth, containerHeight] = this.actor.get_transformed_size();
-        if (posX + this._items[index].get_width() > containerWidth)
-            this._scrollToRight();
-        else if (this._items[index].allocation.x1 - value < 0)
-            this._scrollToLeft();
-
-    },
-
-    _scrollToLeft : function() {
-        let adjustment = this._scrollView.hscroll.adjustment;
-        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
-
-        let item = this._items[this._highlighted];
-
-        if (item.allocation.x1 < value)
-            value = Math.min(0, item.allocation.x1);
-        else if (item.allocation.x2 > value + pageSize)
-            value = Math.max(upper, item.allocation.x2 - pageSize);
-
-        this._scrollableRight = true;
-        Tweener.addTween(adjustment,
-                         { value: value,
-                           time: POPUP_SCROLL_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function () {
-                                if (this._highlighted == 0) {
-                                    this._scrollableLeft = false;
-                                    this.actor.queue_relayout();
-                                }
-                           })
-                          });
-    },
-
-    _scrollToRight : function() {
-        let adjustment = this._scrollView.hscroll.adjustment;
-        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
-
-        let item = this._items[this._highlighted];
-
-        if (item.allocation.x1 < value)
-            value = Math.max(0, item.allocation.x1);
-        else if (item.allocation.x2 > value + pageSize)
-            value = Math.min(upper, item.allocation.x2 - pageSize);
-
-        this._scrollableLeft = true;
-        Tweener.addTween(adjustment,
-                         { value: value,
-                           time: POPUP_SCROLL_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function () {
-                                if (this._highlighted == this._items.length - 1) {
-                                    this._scrollableRight = false;
-                                    this.actor.queue_relayout();
-                                }
-                            })
-                          });
-    },
-
-    _itemActivated: function(n) {
-        this.emit('item-activated', n);
-    },
-
-    _itemEntered: function(n) {
-        this.emit('item-entered', n);
-    },
-
-    _maxChildWidth: function (forHeight) {
-        let maxChildMin = 0;
-        let maxChildNat = 0;
-
-        for (let i = 0; i < this._items.length; i++) {
-            let [childMin, childNat] = this._items[i].get_preferred_width(forHeight);
-            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = Math.max(childNat, maxChildNat);
-
-            if (this._squareItems) {
-                let [childMin, childNat] = this._items[i].get_preferred_height(-1);
-                maxChildMin = Math.max(childMin, maxChildMin);
-                maxChildNat = Math.max(childNat, maxChildNat);
-            }
-        }
-
-        return [maxChildMin, maxChildNat];
-    },
-
-    _getPreferredWidth: function (actor, forHeight, alloc) {
-        let [maxChildMin, maxChildNat] = this._maxChildWidth(forHeight);
-
-        let totalSpacing = this._list.spacing * (this._items.length - 1);
-        alloc.min_size = this._items.length * maxChildMin + totalSpacing;
-        alloc.natural_size = alloc.min_size;
-        this._minSize = alloc.min_size;
-    },
-
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        let maxChildMin = 0;
-        let maxChildNat = 0;
-
-        for (let i = 0; i < this._items.length; i++) {
-            let [childMin, childNat] = this._items[i].get_preferred_height(-1);
-            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = Math.max(childNat, maxChildNat);
-        }
-
-        if (this._squareItems) {
-            let [childMin, childNat] = this._maxChildWidth(-1);
-            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = maxChildMin;
-        }
-
-        alloc.min_size = maxChildMin;
-        alloc.natural_size = maxChildNat;
-    },
-
-    _allocate: function (actor, box, flags) {
-        let childHeight = box.y2 - box.y1;
-
-        let [maxChildMin, maxChildNat] = this._maxChildWidth(childHeight);
-        let totalSpacing = this._list.spacing * (this._items.length - 1);
-
-        let childWidth = Math.floor(Math.max(0, box.x2 - box.x1 - totalSpacing) / this._items.length);
-
-        let x = 0;
-        let children = this._list.get_children();
-        let childBox = new Clutter.ActorBox();
-
-        let primary = Main.layoutManager.primaryMonitor;
-        let parentRightPadding = this.actor.get_parent().get_theme_node().get_padding(St.Side.RIGHT);
-
-        for (let i = 0; i < children.length; i++) {
-            if (this._items.indexOf(children[i]) != -1) {
-                let [childMin, childNat] = children[i].get_preferred_height(childWidth);
-                let vSpacing = (childHeight - childNat) / 2;
-                childBox.x1 = x;
-                childBox.y1 = vSpacing;
-                childBox.x2 = x + childWidth;
-                childBox.y2 = childBox.y1 + childNat;
-                children[i].allocate(childBox, flags);
-
-                x += this._list.spacing + childWidth;
-            } else {
-                // Something else, eg, AppSwitcher's arrows;
-                // we don't allocate it.
-            }
-        }
-    }
-});
-Signals.addSignalMethods(SwitcherList.prototype);
-
-function drawArrow(area, side) {
-    let themeNode = area.get_theme_node();
-    let borderColor = themeNode.get_border_color(side);
-    let bodyColor = themeNode.get_foreground_color();
-
-    let [width, height] = area.get_surface_size ();
-    let cr = area.get_context();
-
-    cr.setLineWidth(1.0);
-    Clutter.cairo_set_source_color(cr, borderColor);
-
-    switch (side) {
-    case St.Side.TOP:
-        cr.moveTo(0, height);
-        cr.lineTo(Math.floor(width * 0.5), 0);
-        cr.lineTo(width, height);
-        break;
-
-    case St.Side.BOTTOM:
-        cr.moveTo(width, 0);
-        cr.lineTo(Math.floor(width * 0.5), height);
-        cr.lineTo(0, 0);
-        break;
-
-    case St.Side.LEFT:
-        cr.moveTo(width, height);
-        cr.lineTo(0, Math.floor(height * 0.5));
-        cr.lineTo(width, 0);
-        break;
-
-    case St.Side.RIGHT:
-        cr.moveTo(0, 0);
-        cr.lineTo(width, Math.floor(height * 0.5));
-        cr.lineTo(0, height);
-        break;
-    }
-
-    cr.strokePreserve();
-
-    Clutter.cairo_set_source_color(cr, bodyColor);
-    cr.fill();
-    cr.$dispose();
-}
-
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@ -2,7 +2,6 @@

 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
@ -74,9 +73,6 @@ function _wrapTweening(target, tweeningParameters) {
        }
    }

-    if (!Gtk.Settings.get_default().gtk_enable_animations)
-        tweeningParameters['time'] = 0.000001;
-
    _addHandler(target, tweeningParameters, 'onStart', _tweenStarted);
    _addHandler(target, tweeningParameters, 'onComplete', _tweenCompleted);
 }
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@ -14,19 +14,98 @@ const St = imports.gi.St;

 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 Batch = imports.gdm.batch;
 const GdmUtil = imports.gdm.util;
-const LoginDialog = imports.gdm.loginDialog;

 // The timeout before going back automatically to the lock screen (in seconds)
 const IDLE_TIMEOUT = 2 * 60;

+function versionCompare(required, reference) {
+    required = required.split('.');
+    reference = reference.split('.');
+
+    for (let i = 0; i < required.length; i++) {
+        if (required[i] != reference[i])
+            return required[i] < reference[i];
+    }
+
+    return true;
+}
+
+function isSupported() {
+    try {
+        let params = GLib.Variant.new('(ss)', ['org.gnome.DisplayManager.Manager', 'Version']);
+        let result = Gio.DBus.system.call_sync('org.gnome.DisplayManager',
+                                               '/org/gnome/DisplayManager/Manager',
+                                               'org.freedesktop.DBus.Properties',
+                                               'Get', params, null,
+                                               Gio.DBusCallFlags.NONE,
+                                               -1, null);
+
+        let version = result.deep_unpack()[0].deep_unpack();
+        return versionCompare('3.5.91', version);
+    } catch(e) {
+        return false;
+    }
+}
+
+// A widget showing the user avatar and name
+const UserWidget = new Lang.Class({
+    Name: 'UserWidget',
+
+    _init: function(user) {
+        this._user = user;
+
+        this.actor = new St.BoxLayout({ style_class: 'unlock-dialog-user-name-container',
+                                        vertical: false });
+
+        this._avatar = new UserMenu.UserAvatarWidget(user);
+        this.actor.add(this._avatar.actor,
+                       { x_fill: true, y_fill: true });
+
+        this._label = new St.Label({ style_class: 'login-dialog-username' });
+        this.actor.add(this._label,
+                       { expand: true,
+                         x_fill: true,
+                         y_fill: false,
+                         y_align: St.Align.MIDDLE });
+
+        this._userLoadedId = this._user.connect('notify::is-loaded',
+                                                Lang.bind(this, this._updateUser));
+        this._userChangedId = this._user.connect('changed',
+                                                 Lang.bind(this, this._updateUser));
+        if (this._user.is_loaded)
+            this._updateUser();
+    },
+
+    destroy: function() {
+        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.actor.destroy();
+    },
+
+    _updateUser: function() {
+        if (this._user.is_loaded)
+            this._label.text = this._user.get_real_name();
+        else
+            this._label.text = '';
+
+        this._avatar.update();
+    }
+});
+
 const UnlockDialog = new Lang.Class({
    Name: 'UnlockDialog',
    Extends: ModalDialog.ModalDialog,
@ -34,7 +113,6 @@ const UnlockDialog = new Lang.Class({
    _init: function(parentActor) {
        this.parent({ shellReactive: true,
                      styleClass: 'login-dialog',
-                      keybindingMode: Shell.KeyBindingMode.UNLOCK_SCREEN,
                      parentActor: parentActor
                    });

@ -47,7 +125,6 @@ const UnlockDialog = new Lang.Class({

        this._greeterClient = new Gdm.Client();
        this._userVerifier = new GdmUtil.ShellUserVerifier(this._greeterClient, { reauthenticationOnly: true });
-        this._userVerified = false;

        this._userVerifier.connect('ask-question', Lang.bind(this, this._onAskQuestion));
        this._userVerifier.connect('show-message', Lang.bind(this, this._showMessage));
@ -58,7 +135,7 @@ const UnlockDialog = new Lang.Class({
        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._userWidget = new UserWidget(this._user);
        this.contentLayout.add_actor(this._userWidget.actor);

        this._promptLayout = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
@ -70,13 +147,10 @@ const UnlockDialog = new Lang.Class({

        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._promptEntry.clutter_text.connect('activate', Lang.bind(this, this._doUnlock));

        this._promptLayout.add(this._promptEntry,
                               { expand: true,
@ -91,99 +165,46 @@ const UnlockDialog = new Lang.Class({
        this._promptLoginHint.hide();
        this.contentLayout.add_actor(this._promptLoginHint);

-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
-        this._workSpinner = new Panel.AnimatedIcon(spinnerIcon, LoginDialog.WORK_SPINNER_ICON_SIZE);
-        this._workSpinner.actor.opacity = 0;
-
-        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.buttonLayout.add(this._workSpinner.actor,
-                              { 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')) {
-            let otherUserLabel = new St.Label({ text: _("Log in as another user"),
-                                                style_class: 'login-dialog-not-listed-label' });
-            this._otherUserButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
-                                                    can_focus: true,
-                                                    child: otherUserLabel,
-                                                    reactive: true,
-                                                    x_align: St.Align.START,
-                                                    x_fill: true });
-            this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked));
-            this.dialogLayout.add(this._otherUserButton,
-                                  { x_align: St.Align.START,
-                                    x_fill: false });
-        } else {
-            this._otherUserButton = null;
-        }
+        let cancelButton = { label: _("Cancel"),
+                             action: Lang.bind(this, this._escape),
+                             key: Clutter.KEY_Escape };
+        this._okButton = { label: _("Unlock"),
+                           action: Lang.bind(this, this._doUnlock),
+                           default: true };
+        this.setButtons([cancelButton, this._okButton]);

        this._updateSensitivity(true);

+        let otherUserLabel = new St.Label({ text: _("Log in as another user"),
+                                            style_class: 'login-dialog-not-listed-label' });
+        this._otherUserButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
+                                                can_focus: true,
+                                                child: otherUserLabel,
+                                                reactive: true,
+                                                x_align: St.Align.START,
+                                                x_fill: true });
+        this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked));
+        this.dialogLayout.add(this._otherUserButton,
+                              { x_align: St.Align.START,
+                                x_fill: false });
+
        let batch = new Batch.Hold();
        this._userVerifier.begin(this._userName, batch);

-        Main.ctrlAltTabManager.addGroup(this.dialogLayout, _("Unlock Window"), 'dialog-password-symbolic');
+        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+            this.emit('loaded');
+            return false;
+        }));

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

    _updateSensitivity: function(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;
-        }
-    },
-
-    _updateOkButtonSensitivity: function(sensitive) {
-        this._okButton.reactive = sensitive;
-        this._okButton.can_focus = sensitive;
-    },
-
-    _setWorking: function(working) {
-        if (working) {
-            this._workSpinner.play();
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 255,
-                               delay: LoginDialog.WORK_SPINNER_ANIMATION_DELAY,
-                               time: LoginDialog.WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear'
-                             });
-        } else {
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 0,
-                               time: LoginDialog.WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear',
-                               onCompleteScope: this,
-                               onComplete: function() {
-                                   this._workSpinner.stop();
-                               }
-                             });
-        }
+        this._okButton.button.reactive = sensitive;
+        this._okButton.button.can_focus = sensitive;
    },

    _showMessage: function(userVerifier, message, styleClass) {
@ -216,7 +237,6 @@ const UnlockDialog = new Lang.Class({

        this._currentQuery = serviceName;
        this._updateSensitivity(true);
-        this._setWorking(false);
    },

    _showLoginHint: function(verifier, message) {
@ -235,7 +255,6 @@ const UnlockDialog = new Lang.Class({
            // the actual reply to GDM will be sent as soon as asked
            this._firstQuestionAnswer = this._promptEntry.text;
            this._updateSensitivity(false);
-            this._setWorking(true);
            return;
        }

@ -246,54 +265,33 @@ const UnlockDialog = new Lang.Class({
        this._currentQuery = null;

        this._updateSensitivity(false);
-        this._setWorking(true);

        this._userVerifier.answerQuery(query, this._promptEntry.text);
    },

-    _finishUnlock: function() {
+    _onVerificationComplete: 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');
-        }
+        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._userVerifier.cancel();
-            this.emit('failed');
-        }
+        this._userVerifier.cancel();
+        this.emit('failed');
    },

    _otherUserClicked: function(button, event) {
@ -319,8 +317,4 @@ const UnlockDialog = new Lang.Class({

        this.destroy();
    },
-
-    addCharacter: function(unichar) {
-        this._promptEntry.clutter_text.insert_unichar(unichar);
-    },
 });
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@ -4,20 +4,17 @@ 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;
@ -25,17 +22,14 @@ 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 LOCK_ENABLED_KEY = 'lock-enabled';
 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,
@ -46,17 +40,6 @@ const IMStatus = {
    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>.
@ -84,7 +67,7 @@ const UserAvatarWidget = new Lang.Class({

    update: function() {
        let iconFile = this._user.get_icon_file();
-        if (iconFile && !GLib.file_test(iconFile, GLib.FileTest.EXISTS))
+        if (!GLib.file_test(iconFile, GLib.FileTest.EXISTS))
            iconFile = null;

        if (iconFile) {
@ -493,7 +476,6 @@ const UserMenuButton = new Lang.Class({

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

@ -568,14 +550,9 @@ const UserMenuButton = new Lang.Class({
                                       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();
@ -600,8 +577,6 @@ const UserMenuButton = new Lang.Class({
                                       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();
    },

@ -614,7 +589,6 @@ const UserMenuButton = new Lang.Class({

        this.setSensitive(!Main.sessionMode.isLocked);
        this._updatePresenceIcon();
-        this._updateUserName();
    },

    _onDestroy: function() {
@ -623,10 +597,7 @@ const UserMenuButton = new Lang.Class({
    },

    _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))
+        if (this._user.is_loaded)
            this._name.set_text(this._user.get_real_name());
        else
            this._name.set_text("");
@ -657,7 +628,7 @@ const UserMenuButton = new Lang.Class({

    _updateLockScreen: function() {
        let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
-        this._lockScreenItem.actor.visible = allowLockScreen && LoginManager.canLock();
+        this._lockScreenItem.actor.visible = allowLockScreen;
    },

    _updateInstallUpdates: function() {
@ -721,11 +692,6 @@ const UserMenuButton = new Lang.Class({
            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() {
@ -786,7 +752,7 @@ const UserMenuButton = new Lang.Class({
        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

-        item = new PopupMenu.PopupMenuItem(_("Settings"));
+        item = new PopupMenu.PopupMenuItem(_("System Settings"));
        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
        this.menu.addMenuItem(item);
        this._systemSettings = item;
@ -846,7 +812,7 @@ const UserMenuButton = new Lang.Class({

    _onMyAccountActivate: function() {
        Main.overview.hide();
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-user-accounts-panel.desktop');
+        let app = Shell.AppSystem.get_default().lookup_setting('gnome-user-accounts-panel.desktop');
        app.activate();
    },

@ -865,8 +831,7 @@ const UserMenuButton = new Lang.Class({
    _onLoginScreenActivate: function() {
        this.menu.close(BoxPointer.PopupAnimation.NONE);
        Main.overview.hide();
-        if (Main.screenShield)
-            Main.screenShield.lock(false);
+        Main.screenShield.lock(false);
        Gdm.goto_login_session_sync(null);
    },

@ -882,117 +847,25 @@ const UserMenuButton = new Lang.Class({
        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();
-            }));
+            this._session.ShutdownRemote();
        } else {
-            this.menu.close(BoxPointer.PopupAnimation.NONE);
-            this._loginManager.suspend();
+            if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY)) {
+                let tmpId = Main.screenShield.connect('lock-screen-shown', Lang.bind(this, function() {
+                    Main.screenShield.disconnect(tmpId);
+
+                    this._loginManager.suspend();
+                }));
+
+                this.menu.close(BoxPointer.PopupAnimation.NONE);
+                Main.screenShield.lock(true);
+            } else {
+                this._loginManager.suspend();
+            }
        }
    }
 });
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@ -1,61 +0,0 @@
-
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-//
-// A widget showing the user avatar and name
-const AccountsService = imports.gi.AccountsService;
-const Lang = imports.lang;
-const St = imports.gi.St;
-
-const UserMenu = imports.ui.userMenu;
-
-const UserWidget = new Lang.Class({
-    Name: 'UserWidget',
-
-    _init: function(user) {
-        this._user = user;
-
-        this.actor = new St.BoxLayout({ style_class: 'user-widget',
-                                        vertical: false });
-
-        this._avatar = new UserMenu.UserAvatarWidget(user);
-        this.actor.add(this._avatar.actor,
-                       { x_fill: true, y_fill: true });
-
-        this._label = new St.Label({ style_class: 'user-widget-label' });
-        this.actor.add(this._label,
-                       { expand: true,
-                         x_fill: true,
-                         y_fill: false,
-                         y_align: St.Align.MIDDLE });
-
-        this._userLoadedId = this._user.connect('notify::is-loaded',
-                                                Lang.bind(this, this._updateUser));
-        this._userChangedId = this._user.connect('changed',
-                                                 Lang.bind(this, this._updateUser));
-        if (this._user.is_loaded)
-            this._updateUser();
-    },
-
-    destroy: function() {
-        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.actor.destroy();
-    },
-
-    _updateUser: function() {
-        if (this._user.is_loaded)
-            this._label.text = this._user.get_real_name();
-        else
-            this._label.text = '';
-
-        this._avatar.update();
-    }
-});
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -12,8 +12,6 @@ const St = imports.gi.St;

 const AppDisplay = imports.ui.appDisplay;
 const Main = imports.ui.main;
-const OverviewControls = imports.ui.overviewControls;
-const Params = imports.misc.params;
 const RemoteSearch = imports.ui.remoteSearch;
 const Search = imports.ui.search;
 const SearchDisplay = imports.ui.searchDisplay;
@ -24,12 +22,6 @@ const WorkspacesView = imports.ui.workspacesView;

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

-const ViewPage = {
-    WINDOWS: 1,
-    APPS: 2,
-    SEARCH: 3
-};
-
 const FocusTrap = new Lang.Class({
    Name: 'FocusTrap',
    Extends: St.Widget,
@ -42,28 +34,26 @@ const FocusTrap = new Lang.Class({
    }
 });

-function getTermsForSearchString(searchString) {
-    searchString = searchString.replace(/^\s+/g, '').replace(/\s+$/g, '');
-    if (searchString == '')
-        return [];
-
-    let terms = searchString.split(/\s+/);
-    return terms;
-}

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

    _init : function(searchEntry, showAppsButton) {
-        this.actor = new Shell.Stack({ name: 'viewSelector' });
+        this.actor = new St.BoxLayout({ name: 'viewSelector',
+                                        vertical: true });

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

+        this._pageArea = new Shell.Stack();
+        this.actor.add(this._pageArea, { x_fill: true,
+                                         y_fill: true,
+                                         expand: true });
+
        this._activePage = null;

-        this._searchActive = false;
+        this.entryNonEmpty = false;
+        this._searchPending = false;
        this._searchTimeoutId = 0;

        this._searchSystem = new Search.SearchSystem();
@ -83,36 +73,32 @@ const ViewSelector = new Lang.Class({
        this._entry.connect('notify::mapped', Lang.bind(this, this._onMapped));
        global.stage.connect('notify::key-focus', Lang.bind(this, this._onStageKeyFocusChanged));

-        this._entry.set_primary_icon(new St.Icon({ style_class: 'search-entry-icon',
-                                                   icon_name: 'edit-find-symbolic' }));
-        this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                        icon_name: 'edit-clear-symbolic' });
+        this._inactiveIcon = new St.Icon({ style_class: 'search-entry-icon',
+                                           icon_name: 'edit-find-symbolic' });
+        this._activeIcon = new St.Icon({ style_class: 'search-entry-icon',
+                                         icon_name: 'edit-clear-symbolic' });
+        this._entry.set_secondary_icon(this._inactiveIcon);

        this._iconClickedId = 0;
        this._capturedEventId = 0;

        this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
-        this._workspacesPage = this._addPage(this._workspacesDisplay.actor,
-                                             _("Windows"), 'emblem-documents-symbolic');
+        this._workspacesPage = this._addPage(this._workspacesDisplay.actor, null,
+                                             _("Windows"), 'text-x-generic-symbolic');

-        this._appDisplay = new AppDisplay.AppDisplay();
-        this._appsPage = this._addPage(this._appDisplay.actor,
-                                       _("Applications"), 'view-grid-symbolic');
+        this._appDisplay = new AppDisplay.AllAppDisplay();
+        this._appsPage = this._addPage(this._appDisplay.actor, null,
+                                       _("Applications"), 'system-run-symbolic');

-        this._searchResults = new SearchDisplay.SearchResults(this._searchSystem);
-        this._searchPage = this._addPage(this._searchResults.actor,
-                                         _("Search"), 'edit-find-symbolic',
-                                         { a11yFocus: this._entry });
-
-        this._searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
-        this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
-        this._searchSettings.connect('changed::disable-external', Lang.bind(this, this._reloadRemoteProviders));
-        this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));
+        this._searchResults = new SearchDisplay.SearchDisplay(this._searchSystem);
+        this._searchPage = this._addPage(this._searchResults.actor, this._entry,
+                                         _("Search"), 'edit-find-symbolic');

        // Default search providers
        // Wanda comes obviously first
        this.addSearchProvider(new Wanda.WandaSearchProvider());
        this.addSearchProvider(new AppDisplay.AppSearchProvider());
+        this.addSearchProvider(new AppDisplay.SettingsSearchProvider());

        // Load remote search providers provided by applications
        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
@ -144,23 +130,20 @@ const ViewSelector = new Lang.Class({
                }
            }));

-        Main.wm.addKeybinding('toggle-application-view',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
-                              Shell.KeyBindingMode.OVERVIEW,
-                              Lang.bind(this, this._toggleAppsPage));
+        global.display.add_keybinding('toggle-application-view',
+                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this._showWithAppsPage));
    },

-    _toggleAppsPage: function() {
+    _showWithAppsPage: function() {
        Main.overview.show();
-        this._showAppsButton.checked = !this._showAppsButton.checked;
+        this._showAppsButton.set_checked(true);
    },

    show: function() {
        this._activePage = this._workspacesPage;

-        this.reset();
        this._appsPage.hide();
        this._searchPage.hide();
        this._workspacesDisplay.show();
@ -168,7 +151,7 @@ const ViewSelector = new Lang.Class({
        if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
            Main.overview.fadeOutDesktop();

-        this._showPage(this._workspacesPage, true);
+        this._showPage(this._workspacesPage);
    },

    zoomFromOverview: function() {
@ -182,16 +165,14 @@ const ViewSelector = new Lang.Class({
        this._workspacesDisplay.hide();
    },

-    _addPage: function(actor, name, a11yIcon, params) {
-        params = Params.parse(params, { a11yFocus: null });
-
+    _addPage: function(actor, a11yFocus, name, a11yIcon) {
        let page = new St.Bin({ child: actor,
                                x_align: St.Align.START,
                                y_align: St.Align.START,
                                x_fill: true,
                                y_fill: true });
-        if (params.a11yFocus)
-            Main.ctrlAltTabManager.addGroup(params.a11yFocus, name, a11yIcon);
+        if (a11yFocus)
+            Main.ctrlAltTabManager.addGroup(a11yFocus, name, a11yIcon);
        else
            Main.ctrlAltTabManager.addGroup(actor, name, a11yIcon,
                                            { proxy: this.actor,
@ -200,44 +181,33 @@ const ViewSelector = new Lang.Class({
                                                      this._a11yFocusPage(page);
                                                  })
                                            });;
-        this.actor.add_actor(page);
-        return page;
+        this._pageArea.add_actor(page);
+        return page
    },

-    _fadePageIn: function(oldPage) {
-        if (oldPage)
-            oldPage.hide();
-
-        this.emit('page-empty');
-
-        this._activePage.show();
-        Tweener.addTween(this._activePage,
-            { opacity: 255,
-              time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
-              transition: 'easeOutQuad'
-            });
-    },
-
-    _showPage: function(page, noFade) {
-        if (page == this._activePage)
+    _showPage: function(page) {
+        if(page == this._activePage)
            return;

-        let oldPage = this._activePage;
-        this._activePage = page;
-        this.emit('page-changed');
-
-        if (oldPage && !noFade)
-            Tweener.addTween(oldPage,
+        if(this._activePage) {
+            Tweener.addTween(this._activePage,
                             { opacity: 0,
-                               time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
+                               time: 0.1,
                               transition: 'easeOutQuad',
                               onComplete: Lang.bind(this,
                                   function() {
-                                       this._fadePageIn(oldPage);
+                                       this._activePage.hide();
+                                       this._activePage = page;
                                   })
                             });
-        else
-            this._fadePageIn(oldPage);
+        }
+
+        page.show();
+        Tweener.addTween(page,
+                         { opacity: 255,
+                           time: 0.1,
+                           transition: 'easeOutQuad'
+                         });
    },

    _a11yFocusPage: function(page) {
@ -246,41 +216,35 @@ const ViewSelector = new Lang.Class({
    },

    _onShowAppsButtonToggled: function() {
-        if (this._showAppsBlocked)
-            return;
+        this.emit('apps-button-checked', this._showAppsButton.checked);

-        this._showPage(this._showAppsButton.checked ?
-                       this._appsPage : this._workspacesPage);
+        if (this.entryNonEmpty)
+            this.reset();
+        else
+            this._showPage(this._showAppsButton.checked ? this._appsPage
+                                                        : this._workspacesPage);
    },

    _resetShowAppsButton: function() {
-        this._showAppsBlocked = true;
        this._showAppsButton.checked = false;
-        this._showAppsBlocked = false;
-
-        this._showPage(this._workspacesPage, true);
    },

    _onStageKeyPress: function(actor, event) {
-        // Ignore events while anything but the overview has
-        // pushed a modal (system modals, looking glass, ...)
-        if (Main.modalCount > 1)
-            return false;
-
        let modifiers = event.get_state();
        let symbol = event.get_key_symbol();

        if (symbol == Clutter.Escape) {
-            if (this._searchActive)
+            if (this.entryNonEmpty)
                this.reset();
            else if (this._showAppsButton.checked)
-                this._showAppsButton.checked = false;
+                this._resetShowAppsButton();
            else
                Main.overview.hide();
            return true;
-        } else if (this._shouldTriggerSearch(symbol)) {
+        } else if (Clutter.keysym_to_unicode(symbol) ||
+                   (symbol == Clutter.BackSpace && this.entryNonEmpty)) {
            this.startSearch(event);
-        } else if (!this._searchActive) {
+        } else if (!this.entryNonEmpty) {
            if (symbol == Clutter.Tab || symbol == Clutter.Down) {
                this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
                return true;
@ -293,6 +257,7 @@ const ViewSelector = new Lang.Class({
    },

    _searchCancelled: function() {
+        this.emit('search-cancelled');
        this._showPage(this._showAppsButton.checked ? this._appsPage
                                                    : this._workspacesPage);

@ -343,17 +308,6 @@ const ViewSelector = new Lang.Class({
        }
    },

-    _shouldTriggerSearch: function(symbol) {
-        let unicode = Clutter.keysym_to_unicode(symbol);
-        if (unicode == 0)
-            return false;
-
-        if (getTermsForSearchString(String.fromCharCode(unicode)).length > 0)
-            return true;
-
-        return symbol == Clutter.BackSpace && this._searchActive;
-    },
-
    startSearch: function(event) {
        global.stage.set_key_focus(this._text);
        this._text.event(event, true);
@ -365,39 +319,40 @@ const ViewSelector = new Lang.Class({
    },

    _onTextChanged: function (se, prop) {
-        let terms = getTermsForSearchString(this._entry.get_text());
-
-        let searchPreviouslyActive = this._searchActive;
-        this._searchActive = (terms.length > 0);
-
-        let startSearch = this._searchActive && !searchPreviouslyActive;
-        if (startSearch)
+        let searchPreviouslyActive = this.entryNonEmpty;
+        this.entryNonEmpty = this._entry.get_text() != '';
+        this._searchPending = this.entryNonEmpty && !searchPreviouslyActive;
+        if (this._searchPending) {
            this._searchResults.startingSearch();
+        }
+        if (this.entryNonEmpty) {
+            this.emit('search-begin');
+            this._entry.set_secondary_icon(this._activeIcon);

-        if (this._searchActive) {
-            this._entry.set_secondary_icon(this._clearIcon);
-
-            if (this._iconClickedId == 0)
+            if (this._iconClickedId == 0) {
                this._iconClickedId = this._entry.connect('secondary-icon-clicked',
-                    Lang.bind(this, this.reset));
-
-            if (this._searchTimeoutId == 0)
-                this._searchTimeoutId = Mainloop.timeout_add(150,
-                    Lang.bind(this, this._doSearch));
-        } else {
-            if (this._iconClickedId > 0) {
-                this._entry.disconnect(this._iconClickedId);
-                this._iconClickedId = 0;
+                    Lang.bind(this, function() {
+                        this.reset();
+                    }));
            }
+        } else {
+            if (this._iconClickedId > 0)
+                this._entry.disconnect(this._iconClickedId);
+            this._iconClickedId = 0;

+            this._entry.set_secondary_icon(this._inactiveIcon);
+            this._searchCancelled();
+        }
+        if (!this.entryNonEmpty) {
            if (this._searchTimeoutId > 0) {
                Mainloop.source_remove(this._searchTimeoutId);
                this._searchTimeoutId = 0;
            }
-
-            this._entry.set_secondary_icon(null);
-            this._searchCancelled();
+            return;
        }
+        if (this._searchTimeoutId > 0)
+            return;
+        this._searchTimeoutId = Mainloop.timeout_add(150, Lang.bind(this, this._doSearch));
    },

    _onKeyPress: function(entry, event) {
@ -407,7 +362,16 @@ const ViewSelector = new Lang.Class({
                this.reset();
                return true;
            }
-        } else if (this._searchActive) {
+        } else if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
+            // We can't connect to 'activate' here because search providers
+            // might want to do something with the modifiers in activateDefault.
+            if (this._searchTimeoutId > 0) {
+                Mainloop.source_remove(this._searchTimeoutId);
+                this._doSearch();
+            }
+            this._searchResults.activateDefault();
+            return true;
+        } else if (this.entryNonEmpty) {
            let arrowNext, nextDirection;
            if (entry.get_text_direction() == Clutter.TextDirection.RTL) {
                arrowNext = Clutter.Left;
@ -431,15 +395,6 @@ const ViewSelector = new Lang.Class({
            } else if (symbol == arrowNext && this._text.position == -1) {
                this._searchResults.navigateFocus(nextDirection);
                return true;
-            } else if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
-                // We can't connect to 'activate' here because search providers
-                // might want to do something with the modifiers in activateDefault.
-                if (this._searchTimeoutId > 0) {
-                    Mainloop.source_remove(this._searchTimeoutId);
-                    this._doSearch();
-                }
-                this._searchResults.activateDefault();
-                return true;
            }
        }
        return false;
@ -462,39 +417,13 @@ const ViewSelector = new Lang.Class({

    _doSearch: function () {
        this._searchTimeoutId = 0;
+        let text = this._text.get_text().replace(/^\s+/g, '').replace(/\s+$/g, '');
+        this._searchResults.doSearch(text);

-        let terms = getTermsForSearchString(this._entry.get_text());
-
-        this._searchSystem.updateSearchResults(terms);
        this._showPage(this._searchPage);
    },

-    _shouldUseSearchProvider: function(provider) {
-        // the disable-external GSetting only affects remote providers
-        if (!provider.isRemoteProvider)
-            return true;
-
-        if (this._searchSettings.get_boolean('disable-external'))
-            return false;
-
-        let appId = provider.appInfo.get_id();
-        let disable = this._searchSettings.get_strv('disabled');
-        return disable.indexOf(appId) == -1;
-    },
-
-    _reloadRemoteProviders: function() {
-        // removeSearchProvider() modifies the provider list we iterate on,
-        // so make a copy first
-        let remoteProviders = this._searchSystem.getRemoteProviders().slice(0);
-
-        remoteProviders.forEach(Lang.bind(this, this.removeSearchProvider));
-        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
-    },
-
    addSearchProvider: function(provider) {
-        if (!this._shouldUseSearchProvider(provider))
-            return;
-
        this._searchSystem.registerProvider(provider);
        this._searchResults.createProviderMeta(provider);
    },
@ -502,31 +431,6 @@ const ViewSelector = new Lang.Class({
    removeSearchProvider: function(provider) {
        this._searchSystem.unregisterProvider(provider);
        this._searchResults.destroyProviderMeta(provider);
-    },
-
-    getActivePage: function() {
-        if (this._activePage == this._workspacesPage)
-            return ViewPage.WINDOWS;
-        else if (this._activePage == this._appsPage)
-            return ViewPage.APPS;
-        else
-            return ViewPage.SEARCH;
-    },
-
-    fadeIn: function() {
-        let actor = this._activePage;
-        Tweener.addTween(actor, { opacity: 255,
-                                  time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME / 2,
-                                  transition: 'easeInQuad'
-                                });
-    },
-
-    fadeHalf: function() {
-        let actor = this._activePage;
-        Tweener.addTween(actor, { opacity: 128,
-                                  time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME / 2,
-                                  transition: 'easeOutQuad'
-                                });
    }
 });
 Signals.addSignalMethods(ViewSelector.prototype);
--- a/js/ui/wanda.js
+++ b/js/ui/wanda.js
@ -9,16 +9,14 @@ const St = imports.gi.St;
 const IconGrid = imports.ui.iconGrid;
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
-const Panel = imports.ui.panel;
+const Search = imports.ui.search;

+// we could make these gsettings
 const FISH_NAME = 'wanda';
-const FISH_FILENAME = 'wanda.png';
 const FISH_SPEED = 300;
 const FISH_COMMAND = 'fortune';
-// The size of an individual frame in the animation
-const FISH_HEIGHT = 22;
-const FISH_WIDTH = 36;

+const GNOME_PANEL_PIXMAPDIR = '../gnome-panel/fish';
 const FISH_GROUP = 'Fish Animation';

 const MAGIC_FISH_KEY = 'free the fish';
@ -28,19 +26,47 @@ const WandaIcon = new Lang.Class({
    Extends: IconGrid.BaseIcon,

    _init : function(fish, label, params) {
-        this.parent(label, params);
-
        this._fish = fish;
-        this._imageFile = GLib.build_filenamev([global.datadir, fish + '.png']);
+        let file = GLib.build_filenamev([global.datadir, GNOME_PANEL_PIXMAPDIR, fish + '.fish']);

-        this._imgHeight = FISH_HEIGHT;
-        this._imgWidth = FISH_WIDTH;
+        if (GLib.file_test(file, GLib.FileTest.EXISTS)) {
+            this._keyfile = new GLib.KeyFile();
+            this._keyfile.load_from_file(file, GLib.KeyFileFlags.NONE);
+
+            this._imageFile = GLib.build_filenamev([global.datadir, GNOME_PANEL_PIXMAPDIR,
+                                                    this._keyfile.get_string(FISH_GROUP, 'image')]);
+
+            let tmpPixbuf = GdkPixbuf.Pixbuf.new_from_file(this._imageFile);
+
+            this._imgHeight = tmpPixbuf.height;
+            this._imgWidth = tmpPixbuf.width / this._keyfile.get_integer(FISH_GROUP, 'frames');
+        } else {
+            this._imageFile = null;
+        }
+
+        this.parent(label, params);
    },

    createIcon: function(iconSize) {
-        this._animations = new Panel.Animation(this._imageFile, this._imgWidth, this._imgHeight, FISH_SPEED);
-        this._animations.play();
-        return this._animations.actor;
+        if (!this._imageFile) {
+            return new St.Icon({ icon_name: 'face-smile',
+                                 icon_size: iconSize });
+        }
+
+        this._animations = St.TextureCache.get_default().load_sliced_image(this._imageFile, this._imgWidth, this._imgHeight);
+        this._animations.connect('notify::mapped', Lang.bind(this, function() {
+            if (this._animations.mapped && !this._timeoutId) {
+                this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, FISH_SPEED, Lang.bind(this, this._update));
+
+                this._i = 0;
+                this._update();
+            } else if (!this._animations.mapped && this._timeoutId) {
+                GLib.source_remove(this._timeoutId);
+                this._timeoutId = 0;
+            }
+        }));
+
+        return this._animations;
    },

    _createIconTexture: function(size) {
@ -48,14 +74,28 @@ const WandaIcon = new Lang.Class({
            return;

        this.parent(size);
-    }
+    },
+
+    _update: function() {
+        let n = this._animations.get_n_children();
+        if (n == 0) {
+            return true;
+        }
+
+        this._animations.get_child_at_index(this._i).hide();
+        this._i = (this._i + 1) % n;
+        this._animations.get_child_at_index(this._i).show();
+
+        return true;
+    },
 });

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

    _init: function(fish, label, params) {
-        this.actor = new St.Bin({ reactive: true,
+        this.actor = new St.Bin({ style_class: 'search-result-content',
+                                  reactive: true,
                                  track_hover: true });
        this.icon = new WandaIcon(fish, label, params);

@ -116,9 +156,10 @@ function capitalize(str) {

 const WandaSearchProvider = new Lang.Class({
    Name: 'WandaSearchProvider',
+    Extends: Search.SearchProvider,

    _init: function() {
-        this.id = 'wanda';
+        this.parent(_("Your favorite Easter Egg"));
    },

    getResultMetas: function(fish, callback) {
@ -144,7 +185,7 @@ const WandaSearchProvider = new Lang.Class({
        this.getInitialResultSet(terms);
    },

-    activateResult: function(fish) {
+    activateResult: function(fish, params) {
        if (this._dialog)
            this._dialog.destroy();
        this._dialog = new FortuneDialog(capitalize(fish), FISH_COMMAND);
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@ -39,8 +39,6 @@ const WindowAttentionHandler = new Lang.Class({
        let [title, banner] = this._getTitleAndBanner(app, window);

        let notification = new MessageTray.Notification(source, title, banner);
-        notification.setForFeedback(true);
-
        source.notify(notification);

        source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function() {
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -83,8 +83,6 @@ const WindowManager = new Lang.Class({

        this._animationBlockCount = 0;

-        this._allowedKeybindings = {};
-
        this._switchData = null;
        this._shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
        this._shellwm.connect('kill-window-effects', Lang.bind(this, function (shellwm, actor) {
@ -101,79 +99,38 @@ const WindowManager = new Lang.Class({
        this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
        this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
        this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
-        this._shellwm.connect('filter-keybinding', Lang.bind(this, this._filterKeybinding));

        this._workspaceSwitcherPopup = null;
-        this.setCustomKeybindingHandler('switch-to-workspace-left',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-right',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-up',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-down',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-left',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-right',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-up',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-down',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-applications',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-group',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-applications-backward',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-group-backward',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-windows',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._startWindowSwitcher));
-        this.setCustomKeybindingHandler('switch-windows-backward',
-                                        Shell.KeyBindingMode.NORMAL,
-                                        Lang.bind(this, this._startWindowSwitcher));
-        this.setCustomKeybindingHandler('switch-panels',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW |
-                                        Shell.KeyBindingMode.LOCK_SCREEN |
-                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
-                                        Shell.KeyBindingMode.LOGIN_SCREEN,
-                                        Lang.bind(this, this._startA11ySwitcher));
-        this.setCustomKeybindingHandler('switch-panels-backward',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW |
-                                        Shell.KeyBindingMode.LOCK_SCREEN |
-                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
-                                        Shell.KeyBindingMode.LOGIN_SCREEN,
-                                        Lang.bind(this, this._startA11ySwitcher));
-
-        this.addKeybinding('open-application-menu',
-                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                           Meta.KeyBindingFlags.NONE,
-                           Shell.KeyBindingMode.NORMAL,
-                           Lang.bind(this, this._openAppMenu));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-left',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-right',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-up',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-down',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-left',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-right',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-up',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-down',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-windows',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-group',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-windows-backward',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-group-backward',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-panels',
+                                            Lang.bind(this, this._startA11ySwitcher));
+        global.display.add_keybinding('open-application-menu',
+                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this._openAppMenu));

        Main.overview.connect('showing', Lang.bind(this, function() {
            for (let i = 0; i < this._dimmedWindows.length; i++)
@ -185,27 +142,6 @@ const WindowManager = new Lang.Class({
        }));
    },

-    setCustomKeybindingHandler: function(name, modes, handler) {
-        if (Meta.keybindings_set_custom_handler(name, handler))
-            this.allowKeybinding(name, modes);
-    },
-
-    addKeybinding: function(name, settings, flags, modes, handler) {
-        let action = global.display.add_keybinding(name, settings, flags, handler);
-        if (action != Meta.KeyBindingAction.NONE)
-            this.allowKeybinding(name, modes);
-        return action;
-    },
-
-    removeKeybinding: function(name) {
-        if (global.display.remove_keybinding(name))
-            this.allowKeybinding(name, Shell.KeyBindingMode.NONE);
-    },
-
-    allowKeybinding: function(name, modes) {
-        this._allowedKeybindings[name] = modes;
-    },
-
    blockAnimations: function() {
        this._animationBlockCount++;
    },
@ -221,9 +157,7 @@ const WindowManager = new Lang.Class({
    _shouldAnimateActor: function(actor) {
        if (!this._shouldAnimate())
            return false;
-        let windowType = actor.meta_window.get_window_type();
-        return windowType == Meta.WindowType.NORMAL ||
-            windowType == Meta.WindowType.MODAL_DIALOG;
+        return actor.meta_window.get_window_type() == Meta.WindowType.NORMAL;
    },

    _removeEffect : function(list, actor) {
@ -242,12 +176,23 @@ const WindowManager = new Lang.Class({
        }

        actor.set_scale(1.0, 1.0);
+        actor.move_anchor_point_from_gravity(Clutter.Gravity.CENTER);

+        /* scale window down to 0x0.
+         * maybe TODO: get icon geometry passed through and move the window towards it?
+         */
        this._minimizing.push(actor);

-        if (actor.meta_window.is_monitor_sized()) {
-            Tweener.addTween(actor,
-                         { opacity: 0,
+        let primary = Main.layoutManager.primaryMonitor;
+        let xDest = primary.x;
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+            xDest += primary.width;
+
+        Tweener.addTween(actor,
+                         { scale_x: 0.0,
+                           scale_y: 0.0,
+                           x: xDest,
+                           y: 0,
                           time: WINDOW_ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: this._minimizeWindowDone,
@ -257,46 +202,12 @@ const WindowManager = new Lang.Class({
                           onOverwriteScope: this,
                           onOverwriteParams: [shellwm, actor]
                         });
-        } else {
-            let xDest, yDest, xScale, yScale;
-            let [success, geom] = actor.meta_window.get_icon_geometry();
-            if (success) {
-                xDest = geom.x;
-                yDest = geom.y;
-                xScale = geom.width / actor.width;
-                yScale = geom.height / actor.height;
-            } else {
-                let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
-                xDest = monitor.x;
-                yDest = monitor.y;
-                if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-                    xDest += monitor.width;
-                xScale = 0;
-                yScale = 0;
-            }
-
-            Tweener.addTween(actor,
-                             { scale_x: xScale,
-                               scale_y: yScale,
-                               x: xDest,
-                               y: yDest,
-                               time: WINDOW_ANIMATION_TIME,
-                               transition: 'easeOutQuad',
-                               onComplete: this._minimizeWindowDone,
-                               onCompleteScope: this,
-                               onCompleteParams: [shellwm, actor],
-                               onOverwrite: this._minimizeWindowOverwritten,
-                               onOverwriteScope: this,
-                               onOverwriteParams: [shellwm, actor]
-                             });
-        }
    },

    _minimizeWindowDone : function(shellwm, actor) {
        if (this._removeEffect(this._minimizing, actor)) {
            Tweener.removeTweens(actor);
            actor.set_scale(1.0, 1.0);
-            actor.set_opacity(255);
            actor.move_anchor_point_from_gravity(Clutter.Gravity.NORTH_WEST);

            shellwm.completed_minimize(actor);
@ -396,56 +307,57 @@ const WindowManager = new Lang.Class({

            actor._windowType = type;
        }));
+        if (actor.meta_window.is_attached_dialog()) {
+            this._checkDimming(actor.get_meta_window().get_transient_for());
+            if (this._shouldAnimate()) {
+                actor.set_scale(1.0, 0.0);
+                actor.scale_gravity = Clutter.Gravity.CENTER;
+                actor.show();
+                this._mapping.push(actor);

+                Tweener.addTween(actor,
+                                 { scale_y: 1,
+                                   time: WINDOW_ANIMATION_TIME,
+                                   transition: "easeOutQuad",
+                                   onComplete: this._mapWindowDone,
+                                   onCompleteScope: this,
+                                   onCompleteParams: [shellwm, actor],
+                                   onOverwrite: this._mapWindowOverwrite,
+                                   onOverwriteScope: this,
+                                   onOverwriteParams: [shellwm, actor]
+                                 });
+                return;
+            }
+            shellwm.completed_map(actor);
+            return;
+        }
        if (!this._shouldAnimateActor(actor)) {
            shellwm.completed_map(actor);
            return;
        }

-        if (actor.meta_window.is_attached_dialog()) {
-            /* Scale the window from the center of the parent */
-            this._checkDimming(actor.get_meta_window().get_transient_for());
-            actor.set_scale(1.0, 0.0);
-            actor.scale_gravity = Clutter.Gravity.CENTER;
-            actor.show();
-            this._mapping.push(actor);
+        actor.opacity = 0;
+        actor.show();

-            Tweener.addTween(actor,
-                             { scale_y: 1,
-                               time: WINDOW_ANIMATION_TIME,
-                               transition: "easeOutQuad",
-                               onComplete: this._mapWindowDone,
-                               onCompleteScope: this,
-                               onCompleteParams: [shellwm, actor],
-                               onOverwrite: this._mapWindowOverwrite,
-                               onOverwriteScope: this,
-                               onOverwriteParams: [shellwm, actor]
-                             });
-        } else {
-            /* Fade window in */
-            actor.opacity = 0;
-            actor.show();
-            this._mapping.push(actor);
-
-            Tweener.addTween(actor,
-                             { opacity: 255,
-                               time: WINDOW_ANIMATION_TIME,
-                               transition: 'easeOutQuad',
-                               onComplete: this._mapWindowDone,
-                               onCompleteScope: this,
-                               onCompleteParams: [shellwm, actor],
-                               onOverwrite: this._mapWindowOverwrite,
-                               onOverwriteScope: this,
-                               onOverwriteParams: [shellwm, actor]
-                             });
-        }
+        /* Fade window in */
+        this._mapping.push(actor);
+        Tweener.addTween(actor,
+                         { opacity: 255,
+                           time: WINDOW_ANIMATION_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: this._mapWindowDone,
+                           onCompleteScope: this,
+                           onCompleteParams: [shellwm, actor],
+                           onOverwrite: this._mapWindowOverwrite,
+                           onOverwriteScope: this,
+                           onOverwriteParams: [shellwm, actor]
+                         });
    },

    _mapWindowDone : function(shellwm, actor) {
        if (this._removeEffect(this._mapping, actor)) {
            Tweener.removeTweens(actor);
            actor.opacity = 255;
-            actor.scale_y = 1;
            shellwm.completed_map(actor);
        }
    },
@ -467,21 +379,18 @@ const WindowManager = new Lang.Class({
                                                                 return win != window;
                                                             });
        }
-
-        if (!this._shouldAnimateActor(actor)) {
-            shellwm.completed_destroy(actor);
-            return;
-        }
-
-        this._destroying.push(actor);
-
        if (window.is_attached_dialog()) {
            let parent = window.get_transient_for();
            this._checkDimming(parent, window);
+            if (!this._shouldAnimate()) {
+                shellwm.completed_destroy(actor);
+                return;
+            }

            actor.set_scale(1.0, 1.0);
            actor.scale_gravity = Clutter.Gravity.CENTER;
            actor.show();
+            this._destroying.push(actor);

            actor._parentDestroyId = parent.connect('unmanaged', Lang.bind(this, function () {
                Tweener.removeTweens(actor);
@ -515,21 +424,6 @@ const WindowManager = new Lang.Class({
        }
    },

-    _filterKeybinding: function(shellwm, binding) {
-        if (Main.keybindingMode == Shell.KeyBindingMode.NONE)
-            return true;
-
-        // There's little sense in implementing a keybinding in mutter and
-        // not having it work in NORMAL mode; handle this case generically
-        // so we don't have to explicitly allow all builtin keybindings in
-        // NORMAL mode.
-        if (Main.keybindingMode == Shell.KeyBindingMode.NORMAL &&
-            binding.is_builtin())
-            return false;
-
-        return !(this._allowedKeybindings[binding.get_name()] & Main.keybindingMode);
-    },
-
    _switchWorkspace : function(shellwm, from, to, direction) {
        if (!this._shouldAnimate()) {
            shellwm.completed_switch_workspace();
@ -547,11 +441,11 @@ const WindowManager = new Lang.Class({
        if (direction == Meta.MotionDirection.UP ||
            direction == Meta.MotionDirection.UP_LEFT ||
            direction == Meta.MotionDirection.UP_RIGHT)
-                yDest = global.screen_height - Main.panel.actor.height;
+                yDest = global.screen_height;
        else if (direction == Meta.MotionDirection.DOWN ||
            direction == Meta.MotionDirection.DOWN_LEFT ||
            direction == Meta.MotionDirection.DOWN_RIGHT)
-                yDest = -global.screen_height + Main.panel.actor.height;
+                yDest = -global.screen_height;

        if (direction == Meta.MotionDirection.LEFT ||
            direction == Meta.MotionDirection.UP_LEFT ||
@ -564,9 +458,9 @@ const WindowManager = new Lang.Class({

        let switchData = {};
        this._switchData = switchData;
-        switchData.inGroup = new Clutter.Actor();
-        switchData.outGroup = new Clutter.Actor();
-        switchData.movingWindowBin = new Clutter.Actor();
+        switchData.inGroup = new Clutter.Group();
+        switchData.outGroup = new Clutter.Group();
+        switchData.movingWindowBin = new Clutter.Group();
        switchData.windows = [];

        let wgroup = global.window_group;
@ -593,7 +487,7 @@ const WindowManager = new Lang.Class({
                switchData.windows.push({ window: window,
                                          parent: window.get_parent() });
                window.reparent(switchData.inGroup);
-                window.show();
+                window.show_all();
            }
        }

@ -652,20 +546,7 @@ const WindowManager = new Lang.Class({
        if (this._workspaceSwitcherPopup != null)
            this._workspaceSwitcherPopup.destroy();

-        let tabPopup = new AltTab.AppSwitcherPopup();
-
-        let modifiers = binding.get_modifiers();
-        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
-        if (!tabPopup.show(backwards, binding.get_name(), binding.get_mask()))
-            tabPopup.destroy();
-    },
-
-    _startWindowSwitcher : function(display, screen, window, binding) {
-        /* prevent a corner case where both popups show up at once */
-        if (this._workspaceSwitcherPopup != null)
-            this._workspaceSwitcherPopup.destroy();
-
-        let tabPopup = new AltTab.WindowSwitcherPopup();
+        let tabPopup = new AltTab.AltTabPopup();

        let modifiers = binding.get_modifiers();
        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
@ -676,7 +557,7 @@ const WindowManager = new Lang.Class({
    _startA11ySwitcher : function(display, screen, window, binding) {
        let modifiers = binding.get_modifiers();
        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
-        Main.ctrlAltTabManager.popup(backwards, binding.get_name(), binding.get_mask());
+        Main.ctrlAltTabManager.popup(backwards, binding.get_mask());
    },

    _openAppMenu : function(display, screen, window, event, binding) {
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -55,9 +55,10 @@ const WorkspaceSwitcherPopup = new Lang.Class({

    _getPreferredHeight : function (actor, forWidth, alloc) {
        let children = this._list.get_children();
-        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
+        let primary = Main.layoutManager.primaryMonitor;

-        let availHeight = workArea.height;
+        let availHeight = primary.height;
+        availHeight -= Main.panel.actor.height;
        availHeight -= this.actor.get_theme_node().get_vertical_padding();
        availHeight -= this._container.get_theme_node().get_vertical_padding();
        availHeight -= this._list.get_theme_node().get_vertical_padding();
@ -66,7 +67,7 @@ const WorkspaceSwitcherPopup = new Lang.Class({
        for (let i = 0; i < children.length; i++) {
            let [childMinHeight, childNaturalHeight] = children[i].get_preferred_height(-1);
            let [childMinWidth, childNaturalWidth] = children[i].get_preferred_width(childNaturalHeight);
-            height += childNaturalHeight * workArea.width / workArea.height;
+            height += childNaturalHeight * primary.width / primary.height;
        }

        let spacing = this._itemSpacing * (global.screen.n_workspaces - 1);
@ -80,8 +81,8 @@ const WorkspaceSwitcherPopup = new Lang.Class({
    },

    _getPreferredWidth : function (actor, forHeight, alloc) {
-        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
-        this._childWidth = Math.round(this._childHeight * workArea.width / workArea.height);
+        let primary = Main.layoutManager.primaryMonitor;
+        this._childWidth = Math.round(this._childHeight * primary.width / primary.height);

        alloc.min_size = this._childWidth;
        alloc.natural_size = this._childWidth;
@ -121,11 +122,12 @@ const WorkspaceSwitcherPopup = new Lang.Class({

        }

-        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
+        let primary = Main.layoutManager.primaryMonitor;
        let [containerMinHeight, containerNatHeight] = this._container.get_preferred_height(global.screen_width);
        let [containerMinWidth, containerNatWidth] = this._container.get_preferred_width(containerNatHeight);
-        this._container.x = workArea.x + Math.floor((workArea.width - containerNatWidth) / 2);
-        this._container.y = workArea.y + Math.floor((workArea.height - containerNatHeight) / 2);
+        this._container.x = primary.x + Math.floor((primary.width - containerNatWidth) / 2);
+        this._container.y = primary.y + Main.panel.actor.height +
+                            Math.floor(((primary.height - Main.panel.actor.height) - containerNatHeight) / 2);
    },

    _show : function() {
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@ -9,7 +8,6 @@ const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;

-const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@ -29,8 +27,6 @@ const WORKSPACE_CUT_SIZE = 10;

 const WORKSPACE_KEEP_ALIVE_TIME = 100;

-const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
-
 const WindowClone = new Lang.Class({
    Name: 'WindowClone',

@ -62,35 +58,12 @@ const WindowClone = new Lang.Class({
        this.inDrag = false;
    },

-    // Find the actor just below us, respecting reparenting done
-    // by DND code
-    getActualStackAbove: function() {
-        if (this._stackAbove == null)
-            return null;
-
-        if (this.inDrag) {
-            if (this._stackAbove._delegate)
-                return this._stackAbove._delegate.getActualStackAbove();
-            else
-                return null;
-        } else {
-            return this._stackAbove;
-        }
-    },
-
    setStackAbove: function (actor) {
        this._stackAbove = actor;
-
-        // Don't apply the new stacking now, it will be applied
-        // when dragging ends and window are stacked again
-        if (actor.inDrag)
-            return;
-
-        let actualAbove = this.getActualStackAbove();
-        if (actualAbove == null)
+        if (this._stackAbove == null)
            this.actor.lower_bottom();
        else
-            this.actor.raise(actualAbove);
+            this.actor.raise(this._stackAbove);
    },

    destroy: function () {
@ -189,20 +162,18 @@ const WorkspaceThumbnail = new Lang.Class({
                                     style_class: 'workspace-thumbnail' });
        this.actor._delegate = this;

-        this._contents = new Clutter.Actor();
-        this.actor.add_child(this._contents);
+        this._contents = new Clutter.Group();
+        this.actor.add_actor(this._contents);

        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

-        this._createBackground();
+        this._background = Meta.BackgroundActor.new_for_screen(global.screen);
+        this._contents.add_actor(this._background);

        let monitor = Main.layoutManager.primaryMonitor;
        this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height);

-        let windows = global.get_window_actors().filter(Lang.bind(this, function(actor) {
-            let win = actor.meta_window;
-            return win.located_on_workspace(metaWorkspace);
-        }));
+        let windows = global.get_window_actors().filter(this._isWorkspaceWindow, this);

        // Create clones for windows that should be visible in the Overview
        this._windows = [];
@ -236,12 +207,6 @@ const WorkspaceThumbnail = new Lang.Class({
        this._collapseFraction = 0; // Not collapsed
    },

-    _createBackground: function() {
-        this._bgManager = new Background.BackgroundManager({ monitorIndex: Main.layoutManager.primaryIndex,
-                                                             container: this._contents,
-                                                             effects: Meta.BackgroundEffects.NONE });
-    },
-
    setPorthole: function(x, y, width, height) {
        this._portholeX = x;
        this._portholeY = y;
@ -265,7 +230,7 @@ const WorkspaceThumbnail = new Lang.Class({
            let clone = this._windows[i];
            let metaWindow = clone.metaWindow;
            if (i == 0) {
-                clone.setStackAbove(this._bgManager.background.actor);
+                clone.setStackAbove(this._background);
            } else {
                let previousClone = this._windows[i - 1];
                clone.setStackAbove(previousClone.actor);
@ -384,8 +349,7 @@ const WorkspaceThumbnail = new Lang.Class({
    },

    destroy : function() {
-        if (this.actor)
-          this.actor.destroy();
+        this.actor.destroy();
    },

    workspaceRemoved : function() {
@ -406,20 +370,19 @@ const WorkspaceThumbnail = new Lang.Class({
    _onDestroy: function(actor) {
        this.workspaceRemoved();

-        if (this._bgManager) {
-          this._bgManager.destroy();
-          this._bgManager = null;
-        }
-
        this._windows = [];
        this.actor = null;
    },

-    // Tests if @actor belongs to this workspace and monitor
-    _isMyWindow : function (actor) {
-        let win = actor.meta_window;
-        return win.located_on_workspace(this.metaWorkspace) &&
-            (win.get_monitor() == this.monitorIndex);
+    // Tests if @win belongs to this workspace
+    _isWorkspaceWindow : function (win) {
+        return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index());
+    },
+
+    // Tests if @win belongs to this workspace and monitor
+    _isMyWindow : function (win) {
+        return this._isWorkspaceWindow(win) &&
+            (!win.get_meta_window() || win.get_meta_window().get_monitor() == this.monitorIndex);
    },

    // Tests if @win should be shown in the Overview
@ -452,7 +415,7 @@ const WorkspaceThumbnail = new Lang.Class({
        this._contents.add_actor(clone.actor);

        if (this._windows.length == 0)
-            clone.setStackAbove(this._bgManager.background.actor);
+            clone.setStackAbove(this._background);
        else
            clone.setStackAbove(this._windows[this._windows.length - 1].actor);

@ -530,6 +493,7 @@ const ThumbnailsBox = new Lang.Class({
    _init: function() {
        this.actor = new Shell.GenericContainer({ reactive: true,
                                                  style_class: 'workspace-thumbnails',
+                                                  can_focus: true,
                                                  request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT });
        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
@ -562,7 +526,8 @@ const ThumbnailsBox = new Lang.Class({
        this._dropPlaceholderPos = -1;
        this._dropPlaceholder = new St.Bin({ style_class: 'placeholder' });
        this.actor.add_actor(this._dropPlaceholder);
-        this._spliceIndex = -1;
+
+        this.visible = true;

        this._targetScale = 0;
        this._scale = 0;
@ -579,17 +544,21 @@ const ThumbnailsBox = new Lang.Class({

        this.actor.connect('button-press-event', function() { return true; });
        this.actor.connect('button-release-event', Lang.bind(this, this._onButtonRelease));
+        this.actor.connect('scroll-event',
+                           Lang.bind(this, this._onScrollEvent));
+        this.actor.connect('key-release-event',
+                           Lang.bind(this, this._onKeyRelease));

        Main.overview.connect('showing',
                              Lang.bind(this, this._createThumbnails));
        Main.overview.connect('hidden',
                              Lang.bind(this, this._destroyThumbnails));

-        Main.overview.connect('item-drag-begin',
+        Main.overview.connect('app-drag-begin',
                              Lang.bind(this, this._onDragBegin));
-        Main.overview.connect('item-drag-end',
+        Main.overview.connect('app-drag-end',
                              Lang.bind(this, this._onDragEnd));
-        Main.overview.connect('item-drag-cancelled',
+        Main.overview.connect('app-drag-cancelled',
                              Lang.bind(this, this._onDragCancelled));
        Main.overview.connect('window-drag-begin',
                              Lang.bind(this, this._onDragBegin));
@ -597,16 +566,6 @@ const ThumbnailsBox = new Lang.Class({
                              Lang.bind(this, this._onDragEnd));
        Main.overview.connect('window-drag-cancelled',
                              Lang.bind(this, this._onDragCancelled));
-
-        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
-        this._settings.connect('changed::dynamic-workspaces',
-            Lang.bind(this, this._updateSwitcherVisibility));
-    },
-
-    _updateSwitcherVisibility: function() {
-        this.actor.visible =
-            this._settings.get_boolean('dynamic-workspaces') ||
-                global.screen.n_workspaces > 1;
    },

    _onButtonRelease: function(actor, event) {
@ -617,7 +576,7 @@ const ThumbnailsBox = new Lang.Class({
            let thumbnail = this._thumbnails[i]
            let [w, h] = thumbnail.actor.get_transformed_size();
            if (y >= thumbnail.actor.y && y <= thumbnail.actor.y + h) {
-                thumbnail.activate(event.get_time());
+                thumbnail.activate(event.time);
                break;
            }
        }
@ -745,8 +704,6 @@ const ThumbnailsBox = new Lang.Class({
                    return win.get_workspace() >= newWorkspaceIndex;
            });

-            this._spliceIndex = newWorkspaceIndex;
-
            // ... move them down one.
            windows.forEach(function(win) {
                win.meta_window.change_workspace_by_index(win.get_workspace() + 1,
@ -768,14 +725,6 @@ const ThumbnailsBox = new Lang.Class({
                                        WORKSPACE_KEEP_ALIVE_TIME);
            }

-            // Start the animation on the workspace (which is actually
-            // an old one which just became empty)
-            let thumbnail = this._thumbnails[newWorkspaceIndex];
-            this._setThumbnailState(thumbnail, ThumbnailState.NEW);
-            thumbnail.slidePosition = 1;
-
-            this._queueUpdateStates();
-
            return true;
        } else {
            return false;
@ -790,8 +739,8 @@ const ThumbnailsBox = new Lang.Class({
            global.screen.connect('notify::n-workspaces',
                                  Lang.bind(this, this._workspacesChanged));
        this._syncStackingId =
-            Main.overview.connect('windows-restacked',
-                                  Lang.bind(this, this._syncStacking));
+            Main.overview.connect('sync-window-stacking',
+                                  Lang.bind(this, this.syncStacking));

        this._targetScale = 0;
        this._scale = 0;
@ -803,11 +752,16 @@ const ThumbnailsBox = new Lang.Class({
            this._stateCounts[ThumbnailState[key]] = 0;

        // The "porthole" is the portion of the screen that we show in the workspaces
-        this._porthole = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
+        let panelHeight = Main.panel.actor.height;
+        let monitor = Main.layoutManager.primaryMonitor;
+        this._porthole = {
+            x: monitor.x,
+            y: monitor.y + panelHeight,
+            width: monitor.width,
+            height: monitor.height - panelHeight
+        };

        this.addThumbnails(0, global.screen.n_workspaces);
-
-        this._updateSwitcherVisibility();
    },

    _destroyThumbnails: function() {
@ -819,7 +773,6 @@ const ThumbnailsBox = new Lang.Class({
            global.screen.disconnect(this._nWorkspacesNotifyId);
            this._nWorkspacesNotifyId = 0;
        }
-
        if (this._syncStackingId > 0) {
            Main.overview.disconnect(this._syncStackingId);
            this._syncStackingId = 0;
@ -830,6 +783,45 @@ const ThumbnailsBox = new Lang.Class({
        this._thumbnails = [];
    },

+    _computeThumbnailsX: function() {
+        this._targetX = this.actor.get_x();
+
+        let rtl = (this.actor.get_text_direction() == Clutter.TextDirection.RTL);
+
+        if (rtl)
+            this._hiddenX = -this.actor.width;
+        else
+            this._hiddenX = this._targetX + this.actor.width;
+    },
+
+    show: function() {
+        if (this.visible)
+            return;
+
+        this.visible = true;
+
+        this.actor.show();
+        Tweener.addTween(this.actor, { translation_x: this._targetX,
+                                       transition: 'easeOutQuad',
+                                       time: SLIDE_ANIMATION_TIME
+                                     });
+    },
+
+    hide: function() {
+        if (!this.visible)
+            return;
+
+        this.visible = false;
+
+        Tweener.addTween(this.actor, { translation_x: this._hiddenX,
+                                       transition: 'easeOutQuad',
+                                       time: SLIDE_ANIMATION_TIME,
+                                       onComplete: Lang.bind(this, function () {
+                                           this.actor.hide();
+                                       })
+                                     });
+    },
+
    _workspacesChanged: function() {
        let oldNumWorkspaces = this._thumbnails.length;
        let newNumWorkspaces = global.screen.n_workspaces;
@ -850,8 +842,6 @@ const ThumbnailsBox = new Lang.Class({

            this.removeThumbnails(removedIndex, removedNum);
        }
-
-        this._updateSwitcherVisibility();
    },

    addThumbnails: function(start, count) {
@ -863,8 +853,7 @@ const ThumbnailsBox = new Lang.Class({
            this._thumbnails.push(thumbnail);
            this.actor.add_actor(thumbnail.actor);

-            if (start > 0 && this._spliceIndex == -1) {
-                // not the initial fill, and not splicing via DND
+            if (start > 0) { // not the initial fill
                thumbnail.state = ThumbnailState.NEW;
                thumbnail.slidePosition = 1; // start slid out
                this._haveNewThumbnails = true;
@ -879,9 +868,6 @@ const ThumbnailsBox = new Lang.Class({

        // The thumbnails indicator actually needs to be on top of the thumbnails
        this._indicator.raise_top();
-
-        // Clear the splice index, we got the message
-        this._spliceIndex = -1;
    },

    removeThumbnails: function(start, count) {
@ -903,7 +889,7 @@ const ThumbnailsBox = new Lang.Class({
        this._queueUpdateStates();
    },

-    _syncStacking: function(overview, stackIndices) {
+    syncStacking: function(actor, stackIndices) {
        for (let i = 0; i < this._thumbnails.length; i++)
            this._thumbnails[i].syncStacking(stackIndices);
    },
@ -1025,6 +1011,8 @@ const ThumbnailsBox = new Lang.Class({
                                   onCompleteScope: this
                                 });
            });
+
+        this._computeThumbnailsX();
    },

    _queueUpdateStates: function() {
@ -1041,6 +1029,8 @@ const ThumbnailsBox = new Lang.Class({
        // See comment about this._background in _init()
        let themeNode = this._background.get_theme_node();

+        forWidth = themeNode.adjust_for_width(forWidth);
+
        // Note that for getPreferredWidth/Height we cheat a bit and skip propagating
        // the size request to our children because we know how big they are and know
        // that the actors aren't depending on the virtual functions being called.
@ -1256,5 +1246,30 @@ const ThumbnailsBox = new Lang.Class({
                           },
                           onCompleteScope: this
                         });
+    },
+
+    _onScrollEvent: function (actor, event) {
+        switch (event.get_scroll_direction()) {
+        case Clutter.ScrollDirection.UP:
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+            break;
+        case Clutter.ScrollDirection.DOWN:
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
+            break;
+        }
+    },
+
+    _onKeyRelease: function (actor, event) {
+        switch (event.get_key_symbol()) {
+        case Clutter.KEY_Up:
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+            break;
+        case Clutter.KEY_Down:
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
+            break;
+        case Clutter.KEY_Return:
+            Main.overview.toggle();
+            break;
+        }
    }
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jasper St. Pierre	555d45f06c	wip center layout garbage	2012-11-01 12:58:12 -04:00
Jasper St. Pierre	0a8713770b	overview, viewSelector: Don't use two signals for checking the app button Just one will do.	2012-11-01 12:58:12 -04:00
Tanner Doshier	7d3ea1ac68	overview, viewSelector: show/hide workspaces and message tray on apps button	2012-11-01 12:58:12 -04:00
Tanner Doshier	7785710964	messageTray: Always show message tray upon entering overview We hide the message tray while searching, but it should always be visible when not searching, including when initially entering overview.	2012-11-01 12:58:12 -04:00
Tanner Doshier	3730dc01cf	viewSelector: remove switching from search results on app-drag-begin https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:12 -04:00
Tanner Doshier	66bf0df737	viewSelector: this.active --> this.entryNonEmpty 'active' isn't terribly clear about just what is active, this variable is true/false depending on whether or not the search entry has text. https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:12 -04:00
Tanner Doshier	4590b33f2e	messageTray, viewSelector: show/hide message tray on search signals https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:12 -04:00
Tanner Doshier	6538f60322	overview: Connect app-drag signals to show/hide overview elements Anytime we begin dragging an app launcher, ensure the overview elements are showing. While searching, if an app-drag ends or is cancelled, hide the overview elements, but don't switch back to windows (which was the old behavior). https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:12 -04:00
Tanner Doshier	4b0ba8b7b8	viewSelector, overview: Add search signals and connect them to hide/show Hide the elements when the search entry is non-empty. Show them if the search is cancelled. https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:11 -04:00
Jasper St. Pierre	bc8965fe63	overview: Center the main overview group accordingly Using the same logic as the panel which smartly centers everything, smartly center the overview contents if we have enough space to do so.	2012-11-01 12:58:11 -04:00
Tanner Doshier	e7fcce3484	overview, workspacesView: Use ThumbnailsBox for independent workspace thumbnails Both WorkspacesDisplay and ThumbnailsBox need to know when windows have been restacked. Instead of each tracking changes on their own or trying to call each other, have the overview keep track and do the calculations, emitting a signal with the result. https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:11 -04:00
Tanner Doshier	b1e4d3335c	workspaceThumbnail: Add keyboard nav to ThumbnailsBox https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:11 -04:00
Tanner Doshier	a3a3f24ed3	workspaceThumbnail: Rename show(), hide() and add new methods show() and hide() now slide the thumbnails in and out, respectively. The old show and hide are now _createThumbnails and _destroyThumbnails. We only care about these thumbnails while in the overview, so create them when entering and destroy them on exit. https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:11 -04:00
Tanner Doshier	96191a9c96	workspaceThumbnail: React to scroll event https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:11 -04:00
Tanner Doshier	f4814d200b	workspaceThumbnail: Make ThumbnailsBox track workspace changes itself https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:11 -04:00
Jasper St. Pierre	52156930d3	overview: Respect multi-monitor situations	2012-11-01 12:58:11 -04:00
Tanner Doshier	cbaa999ced	overview: overview as boxlayouts https://bugzilla.gnome.org/show_bug.cgi?id=682286	2012-11-01 12:58:10 -04:00
Tanner Doshier	9491f6bd23	dash: fix for shrinking dash while animating The this.actor.height > this._maxHeight check is needed because animating the dash out causes constant notify::height signals and so after each one the max height would shrink to the actor height causing the icons to shrink until eventually we get to 16px icons. This way, only increase maxHeight if the actor can be drawn bigger than it is currently set. https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:10 -04:00
Tanner Doshier	afe8198d4b	dash: Add show/hide methods https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:10 -04:00
Tanner Doshier	6aa8f14285	overview and others: Rename item-drag signals to app-drag Since results other than apps should not be draggable, be more descriptive and rename item-drag signals to app-drag signals. https://bugzilla.gnome.org/show_bug.cgi?id=682050	2012-11-01 12:58:09 -04:00
Jasper St. Pierre	e073670c4d	workspace: Don't recalculate window positions when leaving the overview https://bugzilla.gnome.org/show_bug.cgi?id=682286	2012-11-01 12:58:09 -04:00
Jasper St. Pierre	17a3d2c63f	searchDisplay: Put the grid search results in the middle This is still "off-balance" due to the dash on the left.	2012-11-01 12:58:09 -04:00
Tanner Doshier	ca38e05ed4	appDisplay: Don't use icons in results for settings The search results are not necessarily improved by including icons, so don't. https://bugzilla.gnome.org/show_bug.cgi?id=681797	2012-11-01 12:58:09 -04:00
Tanner Doshier	9841e56ebf	remoteSearch: We do not need a fallback for createIcon Remote providers no longer have access to a grid layout, where an icon is a requirement. If they don't specify an icon, don't create one. https://bugzilla.gnome.org/show_bug.cgi?id=681797	2012-11-01 12:58:09 -04:00
Tanner Doshier	c0d3a14ac2	popupMenu: Break separator drawing code out of PopupSeparatorMenuItem https://bugzilla.gnome.org/show_bug.cgi?id=681797	2012-11-01 12:58:09 -04:00
Tanner Doshier	d485fcf9ec	appDisplay: Add provider icons for the search system Only temporary, to test with, unless a remote provider for Settings doesn't materialize. this.icon should be a GIcon since that is what remote providers will return. https://bugzilla.gnome.org/show_bug.cgi?id=681797	2012-11-01 12:58:09 -04:00
Tanner Doshier	ce2c5106f8	theme: Update for search redesign https://bugzilla.gnome.org/show_bug.cgi?id=681797	2012-11-01 12:58:09 -04:00
Tanner Doshier	5e96c3dfb4	searchDisplay: Set can_focus on provider icon only if its results have focus This way, the search results take priority, but while the user is in the search section, they can navigate to that provider icon to launch a search. https://bugzilla.gnome.org/show_bug.cgi?id=681797	2012-11-01 12:58:09 -04:00
Tanner Doshier	a72b642f3e	searchDisplay: Add ListSearchResult and ListSearchResults These are for all search results except apps. https://bugzilla.gnome.org/show_bug.cgi?id=681797	2012-11-01 12:58:09 -04:00
Tanner Doshier	8507d3c4e4	searchDisplay, and others: Switch from provider title to provider icon Display a '+' icon on the provider icon if there are more results that are hidden. If the provider icon is clicked, ask the provider to launch itself and perform a search with the current terms. https://bugzilla.gnome.org/show_bug.cgi?id=681797	2012-11-01 12:58:09 -04:00
Rui Matos	c985fdccba	iconGrid: Handle preferred height requests for infinite widths Request enough height to fit all children in a single line instead of requesting 0. https://bugzilla.gnome.org/show_bug.cgi?id=679168	2012-11-01 12:58:08 -04:00
Jasper St. Pierre	1d7c2b1c26	centerLayout: Add some utilities to connect us up to CSS This allows us to automatically adjust the "spacing" property of the layout manager whenever the CSS changes.	2012-11-01 12:58:07 -04:00
Jasper St. Pierre	ab60c628e7	panel: Abstract the centered panel logic out into a ClutterLayoutManager Since we want to use this in the overview as well, put it into centerLayout.js Panel corners are disabled for now. They'll be added back eventually.	2012-11-01 12:58:07 -04:00