loginDialog: handle really long messages better

Right now if a long message comes in, the whole dialog grows. This
commit fixes that by making the label a label of the entire screen,
instead of a child of the prompt box. To ensure there's still height
allocated for it, this commit introduces a dummy placeholder actor.

.gitignore

@@ -19,8 +19,6 @@ configure
 data/50-gnome-shell-*.xml
 data/gnome-shell.desktop
 data/gnome-shell.desktop.in
-data/gnome-shell-wayland.desktop
-data/gnome-shell-wayland.desktop.in
 data/gnome-shell-extension-prefs.desktop
 data/gnome-shell-extension-prefs.desktop.in
 data/gschemas.compiled
@@ -43,8 +41,6 @@ docs/reference/*/xml/
 docs/reference/shell/doc-gen-*
 gtk-doc.make
 js/misc/config.js
-js/js-resources.c
-js/js-resources.h
 intltool-extract.in
 intltool-merge.in
 intltool-update.in
@@ -75,11 +71,13 @@ src/calendar-server/evolution-calendar.desktop.in
 src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
 src/gnome-shell-calendar-server
-src/gnome-shell-extension-prefs
 src/gnome-shell-extension-tool
+src/gnome-shell-extension-prefs
 src/gnome-shell-hotplug-sniffer
+src/gnome-shell-jhbuild
 src/gnome-shell-perf-helper
 src/gnome-shell-perf-tool
+src/gnome-shell-real
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
 src/run-js-test
 src/test-recorder

COPYING

@@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,16 +303,17 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.

HACKING

@@ -138,8 +138,8 @@ GObjects, although this feature isn't used very often in the Shell itself.
 
         _init: function(icon, label) {
             this.parent({ reactive: false });
-            this.actor.add_child(icon);
-            this.actor.add_child(label);
+            this.addActor(icon);
+            this.addActor(label);
         },
 
         open: function() {

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  tests po docs
-
-if BUILD_BROWSER_PLUGIN
-SUBDIRS += browser-plugin
-endif
+SUBDIRS = data js src browser-plugin tests po docs
 
 if ENABLE_MAN
 SUBDIRS += man

NEWS

@@ -1,579 +1,3 @@
-3.13.1
-======
-* Ensure the currently focused app icon is viewable [Rui; #726759]
-* Improve language in location menu [Zeeshan; #726498]
-* Improve HiDpi support [Cosimo; #726907]
-* Set accessible role for window previews [Alejandro; #726670]
-* Fix bad antialiasing on panel menu buttons [Carlos; #727336]
-* Don't hide location menu [Zeeshan; #727398]
-* Fix IM candidate window obscuring current text [Rui; #727579]
-* Don't always extend struts to the screen edge [Florian; #663690]
-* Add shortcuts for switching to the last workspace [Elad; #659288]
-* Show OSD window on all monitors [Adel; #722684]
-* Improve consistency of labels in network menu [Paul; #727163]
-* Fix zombie search providers showing up [Jasper; #728597]
-* Remove ConsoleKit support [Florian; #686626]
-* Fix region screenshots with open shell menus [Florian; #709126]
-* Support <shift>insert in text entries [Florian; #648318]
-* Improve app picker scrolling on touch [Jasper; #729064]
-* Don't make date button clickable when on current date [Carlos; #726724]
-* Tweak heuristic for hiding workspace switcher [Florian; #662457]
-* Add option to show in Software to app context menu [Matthias; #643043]
-* Misc. bug fixes and cleanups [Bastien, Florian, Giovanni, Adel, Vadim,
-  Carlos; #727983, #727948, #728512, #728681, #728897, #727384, #728820,
-  #715042, #728449, #728343]
-
-Contributors:
-  Elad Alfassa, Zeeshan Ali (Khattak), Giovanni Campagna, Cosimo Cecchi,
-  Matthias Clasen, Piotr Drąg, Adel Gadllah, Paul Lange, Rui Matos,
-  Simon McVittie, Florian Müllner, Bastien Nocera, Alejandro Piñeiro,
-  Vadim Rutkovsky, Carlos Soriano, Jasper St. Pierre
-
-Translations:
-  Khaled Hosny [ar], Piotr Drąg [pl], Yosef Or Boczko [he],
-  Antonio Fernandes C. Neto [pt_BR], Marek Černocký [cs], maria thukididu [el],
-  Andika Triwidada [id], Daniel Mustieles [es], Changwoo Ryu [ko],
-  Benjamin Steinwender [de], Sphinx Jiang [zh_CN],
-  Inaki Larranaga Murgoitio [eu], Marcus Lundblad [sv], Aurimas Černius [lt],
-  Stas Solovey [ru], Alexandre Franke [fr], Matej Urbančič [sl],
-  Fran Diéguez [gl], Pau Iranzo [ca], Luca Ferretti [it], Milo Casagrande [it],
-  Tiago S [pt], Victor Ibragimov [tg], Dirgita [id], Khoem Sokhem [km],
-  Rūdolfs Mazurs [lv], Balázs Úr [hu], Ask H. Larsen [da], Ikuya Awashiro [ja],
-  Wouter Bolsterlee [nl], Daniel Korostil [uk], Daniel Șerbănescu [ro],
-  Enrico Nicoletto [pt_BR]
-
-3.12.0
-======
-* gdm: Reset greeter when coming back to login screen [Jasper; #726989]
-
-Contributors:
-  Jasper St. Pierre
-
-Translations:
-  Daniel Martinez [an], Yuri Myasoedov [ru], Inaki Larranaga Murgoitio [eu],
-  Abderrahim Kitouni [ar], Praveen Illa [te], Matej Urbančič [sl],
-  Chao-Hsiung Liao [zh_HK, zh_TW], Frédéric Péters [fr],
-  Мирослав Николић [sr, sr@latin], Ask H. Larsen [da], Kenneth Nielsen [da],
-  Jiro Matsuzawa [ja], Dušan Kazik [sk]
-
-3.11.92
-=======
-* calendar: Grab key focus after changing day [Volker; #725606]
-* gdm: Don't load user list if disabled [Florian; #725905]
-* Don't show network-offline in the top bar [Jasper; #725340]
-* Improve radial shade effect of modal dialogs [Giovanni; #725830]
-* Fix broken suspend-on-idle functionality [Giovanni; #712706]
-* Close wifi selection dialog when device disappears [Giovanni; #723935]
-* Don't close chats when pressing Escape [Giovanni; #724178]
-* Improve smartcard support in login/lock screen [Ray; #726262, #726263]
-* Wake up screen when resuming from suspend [Giovanni; #726378]
-* Make bluetooth and location items insensitive when locked [Florian; #726319]
-* Don't show bluetooth icon when there is no adapter [Giovanni; #725057]
-* Make sure to keep the OSK on top of modal dialogs [Rui; #719451]
-* Misc. bug fixes and cleanups [Giovanni, Ray, Adel, Daniel, Jasper, Florian;
-  #725832, #725958, #722149, #724977, #724798, #725020, #723976, #726119,
-  #726238, #585500, #704844, #726323, #726322, #726120, #726414]
-
-Contributors:
-  Giovanni Campagna, Daniel Drake, Adel Gadllah, Rui Matos, Florian Müllner,
-  Volker Sobek, Jasper St. Pierre, Ray Strode
-
-Translations:
-  Fabio Tomat [fur], Rafael Ferreira [pt_BR], Fran Diéguez [gl],
-  Marek Černocký [cs], Baurzhan Muftakhidinov [kk], Andika Triwidada [id],
-  A S Alam [pa], Rūdolfs Mazurs [lv], Wylmer Wang [zh_CN],
-  Aurimas Černius [lt], Cheng-Chia Tseng [zh_TW], Stas Solovey [ru],
-  Tiagosdot [pt], Benjamin Steinwender [de], Frédéric Peters [fr],
-  Daniel Korostil [uk], Yaron Shahrabani [he], Ville-Pekka Vainio [fi],
-  maria thukididu [el], Victor Ibragimov [tg], Kjartan Maraas [nb],
-  Gábor Kelemen [hu], Ask H. Larsen [da]
-
-3.11.91
-=======
-* Don't use network profile name in menu [Giovanni; #725586]
-* calendar: Make date label clickable to return to current date [Vit; #641366]
-* Misc. bug fixes [Florian, Zeeshan, Adel, Jasper, Dan, Volker; #724813,
-  #724686, #725082, #724870, #724779, #725533]
-
-Contributors:
-  Zeeshan Ali (Khattak), Giovanni Campagna, Piotr Drąg, Adel Gadllah,
-  Florian Müllner, Volker Sobek, Vit Stanislav, Jasper St. Pierre, Dan Williams
-
-Translations:
-  Victor Ibragimov [tg], Aurimas Černius [lt], Dimitris Spingos [el],
-  Andika Triwidada [id], Rafael Ferreira [pt_BR], Daniel Mustieles [es],
-  Baurzhan Muftakhidinov [kk], Marek Černocký [cs], Ihar Hrachyshka [be],
-  eternalhui [zh_CN], Yosef Or Boczko [he], Fran Diéguez [gl],
-  Khaled Hosny [ar], Ville-Pekka Vainio [fi], Piotr Drąg [pl],
-  Kjartan Maraas [nb], Changwoo Ryu [ko]
-
-3.11.90
-=======
-* Stop showing two bluetooth entries [Giovanni; #709353]
-* Improve styling of login/lock screen [Reda; #723833]
-* Fix magnifier crosshairs [Magdalen; #723709]
-* Make NetworkManager support optional [Michael; #669495]
-* Make middle-click open a new instance [Florian; #695010]
-* Scale the UI on high resolution displays [Cosimo, Adel; #705410, #724607]
-* Remove notification counter on screen shield [Carlos; #709275]
-* Improve app picker transition [Carlos; #722331]
-* Add geolocation indicator to status menu [Zeeshan; #723684]
-* Improve timestamps in chat notifications [Carlos; #708031, #715158]
-* Improve network menus [Giovanni; #723570]
-* Add "VPN Setting" item to VPN submenu [Giovanni; #709167]
-* Improve appearance of disclosure arrows [Carlos; #720206]
-* Add GSetting key to disable version validation of extensions [Adel; #724683]
-* Delay auto-removing empty workspaces [Florian; #709064]
-* Offer offline updates in the shutdown dialog [Kalev; #722898]
-* Animate tile previews [Florian; #665758]
-* Misc. bug fixes and cleanups [Giovanni, Ryan, Debarshi, Florian; #709128,
-  #722342, #723661, #724184, #724256, #724293, #724305, #722554, #724282,
-  #724690, #722928]
-
-Contributors:
-  Zeeshan Ali (Khattak), Magdalen Berns, Michael Biebl, Giovanni Campagna,
-  Cosimo Cecchi, Adel Gadllah, Reda Lazri, Kalev Lember, Ryan Lortie,
-  Florian Müllner, Debarshi Ray, Carlos Soriano, Jasper St. Pierre,
-  Colin Walters
-
-Translations:
-  Victor Ibragimov [tg], Daniel Mustieles [es], Khaled Hosny [ar],
-  Enrico Nicoletto [pt_BR], Yosef Or Boczko [he], Fran Diéguez [gl],
-  Marek Černocký [cs], Baurzhan Muftakhidinov [kk], Jorge Pérez Pérez [an],
-  Kjartan Maraas [nb], David Lüder [de], Daniel Korostil [uk], ngoswami [as],
-  Rafael Ferreira [pt_BR]
-
-3.11.5
-======
-* Fix extension preference tool [Florian; #722334]
-* Fix keyboard activation of legacy tray icons [Giovanni; #721267]
-* Add radial background shade for modal dialogs [Giovanni; #669798]
-* Show attached modal windows in the overview [Giovanni; #650843]
-* Add support for desktop actions [Giovanni; #669603]
-* Indicate in system status when location service is used [Zeeshan; #709372]
-* Add support for extended app folder schema [Jasper; #723179]
-* Show status icon for wired network connections [Jasper; #708966]
-* Indicate airplane mode in network selection dialog [Giovanni; #709128]
-* Misc bug fixes and cleanups [Florian, Sebastian, Giovanni, Tim, Matt, Jasper;
-  #722417, #722494, #722547, #722593, #722434, #722787, #722690, #722840,
-  #722660, #722812, #723197, #722927, #723306, #723308, #723523, #709685,
-  #723570]
-
-Contributors:
-  Zeeshan Ali (Khattak), Magdalen Berns, Giovanni Campagna, William Jon McCann,
-  Sebastian Keller, Tim Lunn, Florian Müllner, Carlos Soriano,
-  Jasper St. Pierre, Rico Tzschichholz, Matt Watson
-
-Translations:
-  Marek Černocký [cs], Mattias Põldaru [et], Tong Hui [zh_CN],
-  Victor Ibragimov [tg], Enrico Nicoletto [pt_BR], Daniel Mustieles [es],
-  Fran Diéguez [gl], Kjartan Maraas [nb], Nilamdyuti Goswami [as],
-  Aurimas Černius [lt], Stas Solovey [ru], Yosef Or Boczko [he],
-  Jorge Pérez Pérez [an], Dimitris Spingos [el], Baurzhan Muftakhidinov [kk],
-  Chao-Hsiung Liao [zh_HK, zh_TW], Shankar Prasad [kn], Yaron Shahrabani [he],
-  Andika Triwidada [id]
-
-3.11.4
-======
-* Fix removal of workspacaes that are not at the end [Giovanni; #721417]
-* Allow session mode to be specified in the environment [Ray; #720894]
-* Special-case launching of terminals [Debarshi; #695010]
-* Always show arrow if app switcher is scrollable [Jonh; #711467]
-* Implement new app folders system [Jasper; #722117]
-* Remove arrow from background menu [Tarun; #699608]
-* Misc bug fixes and cleanups [Giovanni, Andika, Florian, Ray; #721039,
-  #721439, #721507, #721629, #721868, #722210]
-
-Contributors:
-  Giovanni Campagna, Piotr Drąg, Tarun Kumar Joshi, Florian Müllner,
-  Debarshi Ray, Jasper St. Pierre, Ray Strode, Andika Triwidada, Jonh Wendell
-
-Translations:
-  Dušan Kazik [sk], Tong Hui [zh_CN], Benjamin Steinwender [de],
-  Matej Urbančič [sl], Jorge Pérez Pérez [an], Kjartan Maraas [nb],
-  Milo Casagrande [it], Rafael Ferreira [pt_BR], Marek Černocký [cs],
-  Daniel Mustieles [es], Adorilson Bezerra [pt_BR], Christian Kirbach [de],
-  Aurimas Černius [lt], Andika Triwidada [id], Baurzhan Muftakhidinov [kk],
-  Victor Ibragimov [tg], Yosef Or Boczko [he], Dimitris Spingos [el],
-  Fran Diéguez [gl]
-
-3.11.3
-======
-* Fix fade effect of desktop icons [Florian; #707671]
-* Fix issues with background management code [Jasper; #709313]
-* Use new Glib facilities for application search [Jasper; #711631]
-* Add focus indication to session menu button [Sebastien; #710539]
-* Fix hover tracking for StEntries [Jasper; #706749]
-* Fix reentrancy issue in message tray [Jasper; #711694]
-* Tone down zoom animation on login/unlock [Jasper; #712362]
-* Allow specifying monitor for OSD [Carlos; #712664]
-* Fix resetting prompt on user switch [Ray; #710456]
-* Stop using gnome-bluetooth-applet [Bastien; #719341]
-* Add support for EAP-FAST password requests [Dan; #719813]
-* Fix entry focus of chat notifications [Jasper; #709853]
-* Make window previews keyboard navigatable [Jasper; #644306]
-* Fix app switcher order with dialog windows [Florian; #719824]
-* Allow remote search providers without icons [Debarshi; #719965]
-* Fix various alignment issues in RTL locales [Yosef; #712638, #712596,
-  #712594, #712600, #712579]
-* Misc. bug fixes and cleanups [Jasper, Florian, Giovanni, Dan; #712727,
-  #712753, #719378, #719730, #719803, #710115, #720017, #719815, #719567,
-  #720298]
-
-Contributors:
-  Giovanni Campagna, Carlos Garnacho, Sebastien Lafargue, Tim Lunn,
-  Florian Müllner, Bastien Nocera, Yosef Or Boczko, Debarshi Ray,
-  Jasper St. Pierre, Ray Strode, Dan Williams
-
-Translations:
-  Kjartan Maraas [nb], Reinout van Schouwen [nl], Rafael Ferreira [pt_BR],
-  Mattias Põldaru [et], Emin Tufan Çetin [tr], Jiri Grönroos [fi],
-  Khaled Hosny [ar], Fran Diéguez [gl], Victor Ibragimov [tg],
-  Daniel Mustieles [es]
-
-3.11.2
-======
-* Cache search result display actors [Jasper; #704912]
-* Use username in userWidget if real name doesn't fit [Jasper; #706851]
-* Support shell_global_reexec_self() on OpenBSD [Antoine; #709571]
-* Support disabling browser plugin [Colin; #711218]
-* Restore support for 'disable-restart-buttons' [Florian; #711244]
-* Validate parameters of exposed DBus methods [Florian; #699752]
-* Connect applications to systemd journal if available [Colin; #711626]
-* Misc bug fixes and cleanups [Florian, Jasper; #711205, #698486, #711416,
-  #644306, #711555, #709806, #711631, #711732]
-
-Contributors:
-  Cosimo Cecchi, Antoine Jacoutot, Florian Müllner, Jasper St. Pierre,
-  Rico Tzschichholz, Colin Walters
-
-Translations:
-  Yuri Myasoedov [ru], Kjartan Maraas [nb], Efstathios Iosifidis [el],
-  Benjamin Steinwender [de], eternalhui [zh_CN], Shantha kumar [ta]
-
-3.11.1
-======
-* power: Use UPower directly instead of gnome-settings-daemon [Bastien; #710273]
-* Implement support for new GTK+ notification API [Jasper, Giovanni, Florian;
-  #710137, #710596]
-* gdm: Don't allow user-list to fill up the entire screen [Florian; #710555]
-* Don't autostart remote search providers at login [Giovanni; #708830]
-* Fix spacing in end-session dialog [Sebastien; #710543]
-* Prepare for js24 [Tim; #711052]
-* Misc bug fixes and cleanups [Jasper, Florian, Adel, Tim, Sebastien; #710347,
-  #710144, #710541, #691409, #710745, #688331, #704912]
-
-Contributors:
-  Giovanni Campagna, Adel Gadllah, Sebastien Lafargue, Tim Lunn,
-  Florian Müllner, Bastien Nocera, Jasper St. Pierre, Rico Tzschichholz
-
-Translations:
-  Stas Solovey [ru], Yosef Or Boczko [he], Rafael Ferreira [pt_BR]
-
-3.10.1
-======
-* Make sure lock screen is drawn once before switching user [Giovanni; #708051]
-* Fix signal strength indicators in network selector [Jasper; #708442]
-* Scroll search results when focusing provider icons [Jasper; #708868]
-* Add separate hover/active states to page indicators [Carlos; #708852]
-* Tweak appearance of user name and avatar [Yash; #702309]
-* Hide "Turn On" in network menu when disabled by hardware [Giovanni; #709635]
-* Cancel open keyring prompts when the screen is locked [Florian; #708910]
-* Differentiate "Not Connected" and "Off" in network menu [Giovanni; #709043]
-* Make network settings items point to the right device [Giovanni; #709246]
-* Remove animation of window preview titles [Sebastien; #709392]
-* Add 'Notifications' switch to tray menu [Florian; #707073]
-* Make dropdown arrows consistent [Carlos; #709564]
-* power: Use icon from primary device for status [Jasper; #709925]
-* Fix XDND drags to overview [Adel; #708887]
-* Fix workspace switcher disappearing with too many workspaces [Jasper; #694881]
-* Handle search results with 'special:' prefix specially [Giovanni; #707055]
-* gdm: Support pre-authenticated logins from oVirt [Vinzenz; #702162]
-* Use ARROW role for labels representing arrows [Alejandro; #710120]
-* Make selected view in app picker persistent [Florian; #710042]
-* Make network selector navigable by keyboard [Alejandro; #710144]
-* Misc bug fixes [Florian, Adel, Jasper, Aleksander, Giovanni, Dan, Michael,
-  Tim; #709034, #709263, #698486, #709286, #709248, #709543, #696564, #703265,
-  #709638, #709866, #709998, #710019, #710104, #710115]
-
-Contributors:
-  Giovanni Campagna, Michael Catanzaro, Vinzenz Feenstra, Adel Gadllah,
-  Yash Girdhar, Sebastien Lafargue, Tim Lunn, Aleksander Morgado,
-  Florian Müllner, Alejandro Piñeiro, Carlos Soriano, Jasper St. Pierre,
-  Dieter Verfaillie, Dan Winship
-
-Translations:
-  Inaki Larranaga Murgoitio [eu], Christian Kirbach [de], Muhammet Kara [tr],
-  Aurimas Černius [lt], Ryan Lortie [eo], Rūdolfs Mazurs [lv],
-  Dušan Kazik [sk], Fran Diéguez [gl], Enrico Nicoletto [pt_BR],
-  Kjartan Maraas [nb], Victor Ibragimov [tg], Matej Urbančič [sl],
-  A S Alam [pa], Nilamdyuti Goswami [as], Daniel Mustieles [es],
-  Cheng-Chia Tseng [zh_HK, zh_TW], Mattias Põldaru [et], Kenneth Nielsen [da],
-  Milo Casagrande [it], Marek Černocký [cs], Ihar Hrachyshka [be],
-  Мирослав Николић [sr, sr@latin], Arash Mousavi [fa], Yuri Myasoedov [ru],
-  Gil Forcada [ca], Carles Ferrando [ca@valencia], Andika Triwidada [id],
-  Timo Jyrinki [fi], Piotr Drąg [pl], Rafael Ferreira [pt_BR],
-  Gabor Kelemen [hu], Yosef Or Boczko [he], Daniel Korostil [uk],
-  Wouter Bolsterlee [nl], António Lima [pt]
-
-3.10.0.1
-=========
-* Fix login screen [Ray; #708691]
-
-Contributors:
-  Ray Strode, Giovanni Campagna, Jasper St. Pierree
-
-Translations:
-  Kjartan Maraas [nb], Marek Černocký [cs], A S Alam [pa], Daniel Mustieles [es],
-  Ihar Hrachyshka [be], Chao-Hsiung Liao [zh_HK], Nilamdyuti Goswami [as],
-  Yuri Myasoedov [ru], Baurzhan Muftakhidinov [kk]
-
-3.10.0
-======
-* Fix fade effect in ScrollViews [Carlos; #708256]
-* network: Resync when activating connection changes [Jasper; #708322]
-* Close run dialog when the screen locks [Florian; #708218]
-* Fix entry growing out of password dialogs [Florian; #708324, #703833]
-* Vertically center labels in submenu items [Jasper; #708330]
-* https://bugzilla.gnome.org/show_bug.cgi?id=708387 [Mike; #708387]
-* Fix bluetooth icon not being added to status menu [Jasper; #708541]
-* Fix GNOME 2 keyring dialogs appearing on lock screen [Florian; #708187]
-* Fix passwords being cleared twice when authentication fails [Florian; #708186]
-* Fix message tray appearing in a11y popup on login screen [Florian; #708380]
-* Increase width of aggregate menu popup [Adel; #708472]
-
-Contributors:
-  Adel Gadllah, Mike Gorse, Ryan Lortie, Florian Müllner, Frédéric Péters,
-  Carlos Soriano, Jasper St. Pierre, Rico Tzschichholz
-
-Translations:
-  Daniel Șerbănescu [ro], Ryan Lortie [eo], Ihar Hrachyshka [be],
-  A S Alam [pa], Jiro Matsuzawa [ja], Chao-Hsiung Liao [zh_HK, zh_TW],
-  Piotr Drąg [pl], Kristjan SCHMIDT [eo], Daniel Korostil [uk],
-  Rūdolfs Mazurs [lv], Reinout van Schouwen [nl], Yosef Or Boczko [he],
-  Fran Diéguez [gl], António Lima [pt], Andika Triwidada [id],
-  Alexandre Franke [fr], Rafael Ferreira [pt_BR], Milo Casagrande [it],
-  Kenneth Nielsen [da], Matej Urbančič [sl]
-
-3.9.92
-======
-* Don't show page indicators if there's only one page [Florian; #707363]
-* Make :active style of app and non-app results consistent [Jakub; #704714]
-* Fade app pages when scrolled [Florian; #707409]
-* Don't block scrolling on page indicators [Carlos; #707609]
-* Tweak visual appearance of folder views [Florian; #707662]
-* Don't put minimized apps at the end of the app switcher [Florian; #707663]
-* Merge the wayland branch [Giovanni, Neil; #707467]
-* Make search entry behave better in RTL locales [Matthias, Florian; #705779]
-* Allow to change app pages with pageUp/pageDown keys [Carlos; #707979]
-* Set approriate a11y states on expandable menu items [Alejandro; #708038]
-* Improve page indicator animation [Carlos; #707565]
-* Misc bug fixes and cleanups [Florian, Olivier, Jasper, Giovanni, Magdalen,
-  Adel, Carlos, Rico, Joanmarie; #707308, #707430, #707508, #707557, #707600,
-  #707614, #707666, #707814, #707806, #707801, #707889, #707892, #707935,
-  #707842, #707940, #707996, #708007, #708009, #708020, #707580, #708080]
-
-Contributors:
-  Magdalen Berns, Olivier Blin, Giovanni Campagna, Matthias Clasen,
-  Joanmarie Diggs, Adel Gadllah, Florian Müllner, Alejandro Piñeiro,
-  Neil Roberts, Carlos Soriano, Jasper St. Pierre, Jakub Steiner,
-  Rico Tzschichholz
-
-Translations:
-  Rafael Ferreira [pt_BR], Fran Diéguez [gl], Daniel Mustieles [es],
-  Aurimas Černius [lt], Luca Ferretti [it], Piotr Drąg [pl],
-  Chao-Hsiung Liao [zh_HK, zh_TW], Timo Jyrinki [fi], Daniel Korostil [uk],
-  Dušan Kazik [sk], Adam Matoušek [cs], Marek Černocký [cs],
-  Jiro Matsuzawa [ja], Yuri Myasoedov [ru], Tobias Endrigkeit [de],
-  Kjartan Maraas [nb], Victor Ibragimov [tg], Мирослав Николић [sr, sr@latin],
-  A S Alam [pa], Khaled Hosny [ar], Andika Triwidada [id],
-  Nilamdyuti Goswami [as], Ihar Hrachyshka [be], Rūdolfs Mazurs [lv],
-  Mattias Põldaru [et], Gabor Kelemen [hu], Bruce Cowan [en_GB],
-  Matej Urbančič [sl], Enrico Nicoletto [pt_BR], Benjamin Steinwender [de],
-  Changwoo Ryu [ko], Kris Thomsen [da], Alexandre Franke [fr],
-  Evgeny Bobkin [ru], Baurzhan Muftakhidinov [kk], Peter Mráz [sk],
-  Inaki Larranaga Murgoitio [eu], Yosef Or Boczko [he]
-
-3.9.91
-======
-* Improve submenu styling [Jakub; #706037]
-* Fix changing slider values via keyboard [Alejandro; #706386]
-* Fix accessibility of sliders [Alejandro; #706391]
-* Tweak system actions style [Jakub; #706638]
-* Add support for auth without username / fix Not Listed? [Ray; #706607]
-* Dash: Don't show tooltips for apps with open popups [Giovanni; #705611]
-* Implement new end-session/power-off dialog design [Jasper, Matthias; #706612]
-* Implement building separate binaries for x11 and wayland [Giovanni; #705497]
-* authPrompt: Fix controls moving when showing messages [Ray; #706670]
-* Tweak padding between system status icons [Allan; #706796]
-* Add a generic accessible usable by JS code [Alejandro; #648623]
-* Improve keynav and accessibility of the calendar [Alejandro; #706903]
-* Update to new NetworkManager APIs [Jasper; #706098]
-* Hide system actions section in the lock screen [Jasper; #706852]
-* Don't show other logged in users at log out [Giovanni; #707124]
-* Remove "Session" subtitle heading in login dialog [Jasper; #707072]
-* dash: Reload favorites when installed apps change [Giovanni; #706878]
-* Don't open overview after closing last window on workspace [Florian; #662581]
-* Add FocusApp DBus method [Giovanni; #654086]
-* Add ShowApplications DBus method [Giovanni; #698743]
-* Implement new app picker design [Carlos, Florian; #706081]
-* Improve frequent apps being empty by default [Carlos, Florian; #694710]
-* Extend clickable area of page indicators [Giovanni; #707314]
-
-* Misc bug fixes [Ray, Giovanni, Jasper, Emmanuele; #706542, #706654, #706005,
-  #706681, #706841, #706843, #707064, #706262, #707197, #707269]
-
-Contributors:
-  Emmanuele Bassi, Giovanni Campagna, Matthias Clasen, Allan Day, Adel Gadllah,
-  Florian Müllner, Alejandro Piñeiro, Carlos Soriano, Jasper St. Pierre,
-  Jakub Steiner, Ray Strode, Seán de Búrca
-
-Translations:
-  Piotr Drąg [pl], Kjartan Maraas [nb], Victor Ibragimov [tg],
-  Enrico Nicoletto [pt_BR], Benjamin Steinwender [de],
-  Baurzhan Muftakhidinov [kk], Aurimas Černius [lt], Seán de Búrca [ga],
-  Fran Diéguez [gl], Daniel Mustieles [es], Dušan Kazik [sk],
-  Matej Urbančič [sl], Andika Triwidada [id], Jordi Mas [ca],
-  Ihar Hrachyshka [be]
-
-3.9.90
-======
-* workspaceThumbnails: Exclude transient windows when shifting workspaces
-  [Bradley; #705174]
-* Never show a horizontal scrollbar on lock screen [Jasper; #704327]
-* authPrompt: Fix disable-user-list / Not Listed? [Ray; #705370]
-* Animate the lock screen notification transitions [Giovanni; #687660]
-* Wake up the screen when new notifications appear [Giovanni; #703084]
-* Use StartupWMClass for application matching [Giovanni; #673657, #705801]
-* dateMenu: Add style class for the clock label [Jonh; #705634]
-* keyboard: Translate IBus IME name if possible [Daiki; #695673]
-* power: Display single digit minutes correctly [Sebastian; #705803]
-* Implement new aggregate status menu [Jasper; #705845]
-* Improve triangle animation when expanding sub-menus [Tarun; #703109]
-* Fix alignment of search provider icons [Tarun; #695760]
-* Slide dash and workspace switcher on overview transitions [Tarun; #694262]
-* Respect always-show-universal-access-status setting [Tanner; #705733]
-* Handle .desktop files with capital letters [Giovanni; #706252]
-* authPrompt: Add smartcard support [Ray; #683437]
-* Fix call notifications in busy mode [Emilio; #666221]
-* Improve triangle animation when expanding sub-menus [Tarun; #703109]
-* Move message tray menu to a tray button [Jasper; #699272]
-* Wi-fi dialog improvements [Jasper, Allan; #705916, #706136]
-* Work towards running as wayland compositor [Giovanni]
- - Switch to Mutter abstraction layer for cursor tracking [#705911]
- - Add confirmation dialog for display changes [#706208]
-* Use a different background in screen shield [Giovanni; #688210]
-* Add fade animation before blanking the screen [Giovanni; #699112]
-* Misc. bugfixes and cleanups [Jasper, Giovanni, Adel, Colin, Ray, Florian,
-  Magdalen; #704448, #702536, #686855, #695581, #700901, #701761, #701495,
-  #701848, #697833, #701731, #705664, #705840, #705898, #706089, #706153,
-  #704646, #706262, #706324, #703810, #703811, #704015, #706232, #705917,
-  #706536]
-
-Contributors:
-  Magdalen Berns, Giovanni Campagna, Allan Day, Tanner Doshier, Adel Gadllah,
-  Sebastian Keller, Tarun Kumar Joshi, Florian Müllner, Bradley Pankow,
-  Emilio Pozuelo Monfort, Jasper St. Pierre, Ray Strode, Rico Tzschichholz,
-  Daiki Ueno, Colin Walters, Jonh Wendell
-
-Translations:
-  Kjartan Maraas [nb], Aurimas Černius [lt], Yaron Shahrabani [he],
-  Fran Diéguez [gl], Gabor Kelemen [hu],
-  Juan Diego Martins da Costa Cruz [pt_BR], Inaki Larranaga Murgoitio [eu],
-  Yuri Myasoedov [ru], Daniel Mustieles [es], Seán de Búrca [ga],
-  Khaled Hosny [ar], Victor Ibragimov [tg], Friedel Wolff [af],
-  Marek Černocký [cs], Matej Urbančič [sl], A S Alam [pa],
-  Rafael Ferreira [pt_BR], Andika Triwidada [id], Dušan Kazik [sk]
-
-3.9.5
-=====
-* Fix width changes of the calendar popup [Florian; #704200]
-* Work towards aggregate status menu [Jasper; #702539, #704336, #704368,
-  #704670]
-* Update design of lock screen notifications [Allan; #702305]
-* Don't show empty backgroundMenu [Michael; #703868]
-* Add option to limit app switcher to current workspace [Adel; #703538]
-* Consolidate design of login screen and unlock dialog [Ray; #702308, #704795]
-* Respect hasWorkspace property of session mode [Jasper; #698593]
-* Fix fade of app menu icon in RTL locales [Jasper; #704583]
-* Destroy notifications when the close button is clicked [Adel; #687016]
-* Fix clicks on legacy tray icons in the message tray [Florian; #704095]
-* authPrompt: Fade out message if users start to type [Ray; #704817]
-* Export timestamps of global shortcuts on DBus [Bastien; #704859]
-* Fix duplicate search provider results [Jasper; #700283]
-* Misc bug fixes and cleanups [Lionel, Florian, Emilio, Ray, Jasper; #703859,
-  #703540, #704077, #703997, #704318, #704347, #704265, #704411, #704430,
-  #704347, #704453, #704471, #704542, #704707, #703905, #705037]
-
-Contributors:
-  Allan Day, Adel Gadllah, Lionel Landwerlin, Florian Müllner, Bastien Nocera,
-  Emilio Pozuelo Monfort, Jasper St. Pierre, Ray Strode, Colin Walters,
-  Michael Wood
-
-Translations:
-  eternalhui [zh_CN], Victor Ibragimov [tg], Dušan Kazik [sk],
-  Jiro Matsuzawa [ja], Kjartan Maraas [nb], Milo Casagrande [it],
-  Marek Černocký [cs], Daniel Mustieles [es], Benjamin Steinwender [de]
-
-3.9.4
-=====
-* Fix chat entries not being focused when expanded [Jasper; #698778]
-* Fix alignment of "Not Listed?" label [Mathieu; #702307]
-* Fix alignment of time stamps in chat notifications [Carlos; #687809]
-* Round the ends of slider trough [Jasper; #702825]
-* Add support for "box-shadow: none" [Cosimo; #702782]
-* Keep chrome below popup windows [Florian; #702338]
-* Move the session list to a popup menu [Ray; #702818]
-* Fix autorun notifications for "non-native" volumes [Matthias; #703418]
-* dnd: Speed up by not picking on each motion event [Jasper; #703443]
-* Fix management of asynchronous background loading [Lionel; #703001]
-* Rework focus handling [Jasper; #700735]
-* Optimize box-shadow rendering [Lionel; #689858]
-* Remove support for fixed positioning in BoxLayouts [Florian; #703808]
-* Misc bug fixes and cleanups [Adel, Jasper, Florian, Ray, Lionel, Emilio;
-  #702849, #610279, #703132, #703105, #703160, #703126, #703304, #703403,
-  #698593, #703442, #703565, #700901, #703874, #703807, #703893, #703909]
-
-Contributors:
-  Mathieu Bridon, Giovanni Campagna, Cosimo Cecchi, Matthias Clasen,
-  Fran Diéguez, Adel Gadllah, Lionel Landwerlin, Florian Müllner,
-  Emilio Pozuelo Monfort, Carlos Soriano, Jasper St. Pierre, Ray Strode
-
-Translations:
-  Baurzhan Muftakhidinov [kk], Marek Černocký [cs], Daniel Mustieles [es],
-  Fran Diéguez [gl], Kjartan Maraas [nb], Andika Triwidada [id],
-  Benjamin Steinwender [de], Nguyễn Thái Ngọc Duy [vi], Trần Ngọc Quân [vi]
-
-3.9.3
-=====
-* Don't push window thumbs when workspace switcher is hidden [Jasper; #701167]
-* Tweak timeout for activating windows during XDND [Adel; #700150]
-* Fix ellipsization in control buttons in app picker [Carlos; #696307]
-* Fix DND to empty dash [Florian; #684618]
-* Fix OSD window appearing below system modal dialogs [Rui; #701269]
-* Clear clipboard on screen lock to prevent information leak [Florian; #698922]
-* Allow session mode specific overrides schema [Florian; #701717]
-* window-switcher: Only show windows from current workspace by default
-  [Florian; #701214]
-* logout dialog: Show the correct text right away [Matthias; #702056]
-* bluetooth: Port to bluez 5 [Emilio; #700891]
-* dateMenu: Allow events to span multiple lines [Giovanni; #701231]
-* gdm: Clear message queue when no more messages are pending [Jonh; #702458]
-* Misc bug fixes and cleanups [Jasper, Florian, Adel, Giovanni; #693836,
-  #700972, #701386, #700877, #701755, #698918, #701224, #702125, #701954,
-  #701849, #702121]
-
-Contributors:
-  Giovanni Campagna, Matthias Clasen, Fran Diéguez, Adel Gadllah, Rui Matos,
-  Florian Müllner, Emilio Pozuelo Monfort, Carlos Soriano, Jasper St. Pierre,
-  Jonh Wendell
-
-Translations:
-  Marek Černocký [cs], Victor Ibragimov [tg], Fran Diéguez [gl],
-  Benjamin Steinwender [de], Cheng-Chia Tseng [zh_HK, zh_TW],
-  eternalhui [zh_CN], Ivaylo Valkov [bg], Kjartan Maraas [nb],
-  Daniel Mustieles [es]
-
 3.9.2
 =====
 * Use a symbolic icon for DESKTOP windows [Matthias; #697914]

README

@@ -8,7 +8,7 @@ For more information about GNOME Shell, including instructions on how
 to build GNOME Shell from source and how to get involved with the project,
 see:
 
- https://wiki.gnome.org/Projects/GnomeShell
+ http://live.gnome.org/GnomeShell
 
 Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
 product.

autogen.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Run this to generate all the initial makefiles, etc.
 
 srcdir=`dirname $0`

browser-plugin/Makefile.am

@@ -17,4 +17,5 @@ libgnome_shell_browser_plugin_la_SOURCES = 	\
 
 libgnome_shell_browser_plugin_la_CFLAGS = 	\
 	$(BROWSER_PLUGIN_CFLAGS)		\
+	-DG_DISABLE_DEPRECATED			\
 	-DG_LOG_DOMAIN=\"GnomeShellBrowserPlugin\"

browser-plugin/browser-plugin.c

@@ -13,7 +13,9 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
  *
  * Authors:
  *      Jasper St. Pierre <jstpierre@mecheye.net>
@@ -41,8 +43,6 @@
 
 #define PLUGIN_API_VERSION 5
 
-#define EXTENSION_DISABLE_VERSION_CHECK_KEY "disable-extension-version-validation"
-
 typedef struct {
   GDBusProxy *proxy;
 } PluginData;
@@ -833,16 +833,6 @@ plugin_get_shell_version (PluginObject  *obj,
   return ret;
 }
 
-static gboolean
-plugin_get_version_validation_enabled (PluginObject  *obj,
-                                       NPVariant     *result)
-{
-  gboolean is_enabled = !g_settings_get_boolean (obj->settings, EXTENSION_DISABLE_VERSION_CHECK_KEY);
-  BOOLEAN_TO_NPVARIANT(is_enabled, *result);
-
-  return TRUE;
-}
-
 #define METHODS                                 \
   METHOD (list_extensions)                      \
   METHOD (get_info)                             \
@@ -862,8 +852,6 @@ static NPIdentifier api_version_id;
 static NPIdentifier shell_version_id;
 static NPIdentifier onextension_changed_id;
 static NPIdentifier onrestart_id;
-static NPIdentifier version_validation_enabled_id;
-
 
 static bool
 plugin_object_has_method (NPObject     *npobj,
@@ -906,8 +894,7 @@ plugin_object_has_property (NPObject     *npobj,
   return (name == onextension_changed_id ||
           name == onrestart_id ||
           name == api_version_id ||
-          name == shell_version_id ||
-          name == version_validation_enabled_id);
+          name == shell_version_id);
 }
 
 static bool
@@ -925,8 +912,6 @@ plugin_object_get_property (NPObject     *npobj,
     return plugin_get_api_version (obj, result);
   else if (name == shell_version_id)
     return plugin_get_shell_version (obj, result);
-  else if (name == version_validation_enabled_id)
-    return plugin_get_version_validation_enabled (obj, result);
   else if (name == onextension_changed_id)
     {
       if (obj->listener)
@@ -1005,7 +990,6 @@ init_methods_and_properties (void)
   /* this is the JS public API; it is manipulated through NPIdentifiers for speed */
   api_version_id = funcs.getstringidentifier ("apiVersion");
   shell_version_id = funcs.getstringidentifier ("shellVersion");
-  version_validation_enabled_id = funcs.getstringidentifier ("versionValidationEnabled");
 
   get_info_id = funcs.getstringidentifier ("getExtensionInfo");
   list_extensions_id = funcs.getstringidentifier ("listExtensions");

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.13.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.9.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -16,7 +16,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_CXX
 
 # Initialize libtool
 LT_PREREQ([2.2.6])
@@ -25,6 +24,9 @@ LT_INIT([disable-static])
 # i18n
 IT_PROG_INTLTOOL([0.40])
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 GETTEXT_PACKAGE=gnome-shell
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
@@ -51,32 +53,17 @@ 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)
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
 else
    AC_MSG_RESULT(no)
 fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-AC_ARG_ENABLE([systemd],
-              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-              [enable_systemd=$enableval],
-              [enable_systemd=auto])
-AS_IF([test x$enable_systemd != xno], [
-  AC_MSG_CHECKING([for libsystemd-journal])
-  PKG_CHECK_EXISTS([libsystemd-journal],
-                   [have_systemd=yes
-                    AC_DEFINE([HAVE_SYSTEMD], [1], [Define if we have systemd])],
-                   [have_systemd=no])
-  AC_MSG_RESULT($have_systemd)
-])
-
-AC_MSG_RESULT($enable_systemd)
-
-CLUTTER_MIN_VERSION=1.15.90
+CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.13.1
+GJS_MIN_VERSION=1.35.4
+MUTTER_MIN_VERSION=3.9.2
 GTK_MIN_VERSION=3.7.9
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
@@ -84,58 +71,56 @@ LIBEDATASERVER_MIN_VERSION=3.5.3
 TELEPATHY_GLIB_MIN_VERSION=0.17.5
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
-GCR_MIN_VERSION=3.7.5
+GCR_MIN_VERSION=3.3.90
 GNOME_DESKTOP_REQUIRED_VERSION=3.7.90
+GNOME_MENUS_REQUIRED_VERSION=3.5.3
 NETWORKMANAGER_MIN_VERSION=0.9.8
 PULSE_MIN_VERS=2.0
 
 # Collect more than 20 libraries for a prize!
-SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
-            libxml-2.0
-            gtk+-3.0 >= $GTK_MIN_VERSION
-            atk-bridge-2.0
-            gjs-internals-1.0 >= $GJS_MIN_VERSION
-            $recorder_modules
-            gdk-x11-3.0 libsoup-2.4
-            xtst
-            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
-            telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
-            polkit-agent-1 >= $POLKIT_MIN_VERSION
-            gcr-base-3 >= $GCR_MIN_VERSION"
-if test x$have_systemd = xyes; then
-  SHARED_PCS="${SHARED_PCS} libsystemd-journal"
-fi
-
-PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
-PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION)
+PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
+			       libxml-2.0
+                               gtk+-3.0 >= $GTK_MIN_VERSION
+                               atk-bridge-2.0
+                               libmutter >= $MUTTER_MIN_VERSION
+                               gjs-internals-1.0 >= $GJS_MIN_VERSION
+			       libgnome-menu-3.0 >= $GNOME_MENUS_REQUIRED_VERSION
+                               $recorder_modules
+                               gdk-x11-3.0 libsoup-2.4
+			       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
+                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+                               libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
+                               libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
+                               libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION)
 
 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)
 
-AC_ARG_ENABLE(browser-plugin,
-              [AS_HELP_STRING([--enable-browser-plugin],
-                              [Enable browser plugin [default=yes]])],,
-              enable_browser_plugin=yes)
-AS_IF([test x$enable_browser_plugin = xyes], [
-  PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
-])
-AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
-
-PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0,
-        [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-	 AC_SUBST([HAVE_BLUETOOTH],[1])],
+AC_MSG_CHECKING([for bluetooth support])
+PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
+	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
+	 AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
+	 AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"])
+	 AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
+	 AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
+	 AC_SUBST([HAVE_BLUETOOTH],[1])
+	 AC_MSG_RESULT([yes])],
 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
-	 AC_SUBST([HAVE_BLUETOOTH],[0])])
+	 AC_SUBST([HAVE_BLUETOOTH],[0])
+	 AC_MSG_RESULT([no])])
 
 PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
 AC_SUBST(CALENDAR_SERVER_CFLAGS)
@@ -147,17 +132,13 @@ AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
 GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
 
 MUTTER_GIR_DIR=`$PKG_CONFIG --variable=girdir libmutter`
-AC_SUBST(MUTTER_GIR_DIR)
-
 MUTTER_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter`
+AC_SUBST(MUTTER_GIR_DIR)
 AC_SUBST(MUTTER_TYPELIB_DIR)
 
 GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
 AC_SUBST(GJS_CONSOLE)
 
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
-
 AC_CHECK_FUNCS(fdwalk)
 AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_HEADERS([sys/resource.h])
@@ -173,38 +154,6 @@ if test "$langinfo_ok" = "yes"; then
             [Define if _NL_TIME_FIRST_WEEKDAY is available])
 fi
 
-AC_ARG_ENABLE(networkmanager,
-             AS_HELP_STRING([--disable-networkmanager],
-                            [disable NetworkManager support  @<:@default=auto@:>@]),,
-              [enable_networkmanager=auto])
-
-if test "x$enable_networkmanager" != "xno"; then
-   PKG_CHECK_MODULES(NETWORKMANAGER,
-                     [libnm-glib
-                     libnm-util >= $NETWORKMANAGER_MIN_VERSION
-                     libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
-                     libsecret-unstable],
-                     [have_networkmanager=yes],
-                     [have_networkmanager=no])
-
-   GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
-   GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
-else
-   have_networkmanager="no  (disabled)"
-fi
-
-if test "x$have_networkmanager" = "xyes"; then
-   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
-   AC_SUBST([HAVE_NETWORKMANAGER], [1])
-else
-   if test "x$enable_networkmanager" = "xyes"; then
-      AC_MSG_ERROR([Couldn't find NetworkManager.])
-   fi
-   AC_SUBST([HAVE_NETWORKMANAGER], [0])
-fi
-
-AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
-
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()
 
@@ -224,6 +173,10 @@ AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
 
 GNOME_COMPILE_WARNINGS([error])
 
+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)
+AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)
+
 BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
 
@@ -246,15 +199,3 @@ AC_CONFIG_FILES([
   man/Makefile
 ])
 AC_OUTPUT
-
-echo "
-Build configuration:
-
-       Prefix:                                 ${prefix}
-       Source code location:                   ${srcdir}
-       Compiler:                               ${CC}
-       Compiler Warnings:                      $enable_compile_warnings
-
-       Support for NetworkManager:             $have_networkmanager
-       Support for GStreamer recording:        $build_recorder
-"

data/50-gnome-shell-screenshot.xml.in

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.shell.keybindings"
+                group="system"
+                _name="Screenshots"
+                wm_name="GNOME Shell"
+                package="gnome-shell">
+
+	<KeyListEntry name="toggle-recording"
+                      _description="Record a screencast"/>
+
+</KeyListEntries>
+

data/Makefile.am

@@ -1,5 +1,8 @@
+wandadir = $(pkgdatadir)
+dist_wanda_DATA = wanda.png
+
 desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop gnome-shell-wayland.desktop  gnome-shell-extension-prefs.desktop
+desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
 
 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
@@ -35,14 +38,9 @@ dist_theme_DATA =				\
 	theme/filter-selected-rtl.svg		\
 	theme/gnome-shell.css			\
 	theme/logged-in-indicator.svg		\
-	theme/menu-arrow-symbolic.svg		    \
 	theme/message-tray-background.png	\
 	theme/more-results.svg			\
 	theme/noise-texture.png			\
-	theme/page-indicator-active.svg		\
-	theme/page-indicator-inactive.svg	\
-	theme/page-indicator-checked.svg	\
-	theme/page-indicator-hover.svg		\
 	theme/panel-button-border.svg		\
 	theme/panel-button-highlight-narrow.svg	\
 	theme/panel-button-highlight-wide.svg	\
@@ -58,7 +56,10 @@ dist_theme_DATA =				\
 	theme/ws-switch-arrow-down.png
 
 keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
-keys_in_files = 50-gnome-shell-system.xml.in
+keys_in_files =					\
+	50-gnome-shell-screenshot.xml.in	\
+	50-gnome-shell-system.xml.in		\
+	$(NULL)
 keys_DATA = $(keys_in_files:.xml.in=.xml)
 
 gsettings_SCHEMAS = org.gnome.shell.gschema.xml
@@ -83,7 +84,6 @@ convert_DATA = gnome-shell-overrides.convert
 
 EXTRA_DIST =						\
 	gnome-shell.desktop.in.in			\
-	gnome-shell-wayland.desktop.in.in		\
 	gnome-shell-extension-prefs.desktop.in.in	\
 	$(introspection_DATA)				\
 	$(menu_DATA)					\
@@ -93,7 +93,6 @@ EXTRA_DIST =						\
 
 CLEANFILES =						\
 	gnome-shell.desktop.in				\
-	gnome-shell-wayland.desktop.in			\
 	gnome-shell-extension-prefs.in			\
 	$(desktop_DATA)					\
 	$(keys_DATA)					\

data/gnome-shell-wayland.desktop.in.in

@@ -1,15 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=GNOME Shell (wayland compositor)
-_Comment=Window management and application launching
-Exec=@bindir@/mutter-launch -- gnome-shell --wayland --display-server
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-shell
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;Core;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=DisplayServer
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=false

data/org.gnome.shell.gschema.xml.in.in

@@ -13,21 +13,12 @@
     </key>
     <key name="enabled-extensions" type="as">
       <default>[]</default>
-      <_summary>UUIDs of extensions to enable</_summary>
+      <_summary>Uuids of extensions to enable</_summary>
       <_description>
-        GNOME Shell extensions have a UUID property; this key lists extensions
+        GNOME Shell extensions have a uuid property; this key lists extensions
         which should be loaded. Any extension that wants to be loaded needs
         to be in this list. You can also manipulate this list with the
-        EnableExtension and DisableExtension D-Bus methods on org.gnome.Shell.
-      </_description>
-    </key>
-    <key name="disable-extension-version-validation" type="b">
-      <default>false</default>
-      <_summary>Disables the validation of extension version compatibility</_summary>
-      <_description>
-        GNOME Shell will only load extensions that claim to support the current
-        running version. Enabling this option will disable this check and try to
-        load all extensions regardless of the versions they claim to support.
+        EnableExtension and DisableExtension DBus methods on org.gnome.Shell.
       </_description>
     </key>
     <key name="favorite-apps" type="as">
@@ -38,12 +29,13 @@
         will be displayed in the favorites area.
       </_description>
     </key>
-    <key name="app-picker-view" type="u">
-      <default>0</default>
-      <summary>App Picker View</summary>
-      <description>
-        Index of the currently selected view in the application picker.
-      </description>
+    <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>
@@ -53,12 +45,22 @@
       <default>[]</default>
       <_summary>History for the looking glass dialog</_summary>
     </key>
+    <key name="saved-im-presence" type="i">
+      <default>1</default>
+      <_summary>Internally used to store the last IM presence explicitly set by the user. The
+value here is from the TpConnectionPresenceType enumeration.</_summary>
+    </key>
+    <key name="saved-session-presence" type="i">
+      <default>0</default>
+      <_summary>Internally used to store the last session presence status for the user. The
+value here is from the GsmPresenceStatus enumeration.</_summary>
+    </key>
     <key name="always-show-log-out" type="b">
       <default>false</default>
-      <_summary>Always show the 'Log out' menu item in the user menu.</_summary>
+      <_summary>Always show the 'Log out' menuitem in the user menu.</_summary>
       <_description>
         This key overrides the automatic hiding of the 'Log out'
-        menu item in single-user, single-session situations.
+        menuitem in single-user, single-session situations.
       </_description>
     </key>
     <key name="remember-mount-password" type="b">
@@ -72,9 +74,9 @@
       </_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"/>
     <child name="keyboard" schema="org.gnome.shell.keyboard"/>
-    <child name="location" schema="org.gnome.shell.location"/>
   </schema>
 
   <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
@@ -126,10 +128,12 @@
         Keybinding to focus the active notification.
       </_description>
     </key>
-    <key name="pause-resume-tweens" type="as">
-      <default>[]</default>
-      <summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</summary>
-      <description></description>
+    <key name="toggle-recording" type="as">
+      <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
+      <_summary>Keybinding to toggle the screen recorder</_summary>
+      <_description>
+        Keybinding to start/stop the builtin screen recorder.
+      </_description>
     </key>
   </schema>
 
@@ -144,42 +148,41 @@
     </key>
   </schema>
 
-  <enum id="org.gnome.shell.geoclue.AccuracyLevel">
-    <value value="0" nick="off"/>
-    <value value="1" nick="country"/>
-    <value value="4" nick="city"/>
-    <value value="5" nick="neighborhood"/>
-    <value value="6" nick="street"/>
-    <value value="8" nick="exact"/>
-  </enum>
-  <schema id="org.gnome.shell.location"
-          path="/org/gnome/shell/location/"
+  <schema id="org.gnome.shell.recorder" path="/org/gnome/shell/recorder/"
           gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="max-accuracy-level" enum="org.gnome.shell.geoclue.AccuracyLevel">
-      <default>'exact'</default>
-      <_summary>The maximum accuracy level of location.</_summary>
+    <key name="framerate" type="i">
+      <default>30</default>
+      <_summary>Framerate used for recording screencasts.</_summary>
       <_description>
-        Configures the maximum level of location accuracy applications are
-        allowed to see. Valid options are 'off' (disable location tracking),
-        'country', 'city', 'neighborhood', 'street', and 'exact' (typically
-        requires GPS receiver). Please keep in mind that this only controls
-        what GeoClue will allow applications to see and they can find user's
-        location on their own using network resources (albeit with street-level
-        accuracy at best).
+        The framerate of the resulting screencast recordered
+        by GNOME Shell's screencast recorder in frames-per-second.
       </_description>
     </key>
-  </schema>
-
-  <schema id="org.gnome.shell.app-switcher"
-          path="/org/gnome/shell/app-switcher/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key type="b" name="current-workspace-only">
-      <default>false</default>
-      <summary>Limit switcher to current workspace.</summary>
-      <description>
-	If true, only applications that have windows on the current workspace are shown in the switcher.
-	Otherwise, all applications are included.
-      </description>
+    <key name="pipeline" type="s">
+      <default>''</default>
+      <_summary>The gstreamer pipeline used to encode the screencast</_summary>
+      <_description>
+        Sets the GStreamer pipeline used to encode recordings.
+        It follows the syntax used for gst-launch. The pipeline should have
+        an unconnected sink pad where the recorded video is recorded. It will
+        normally have a unconnected source pad; output from that pad
+        will be written into the output file. However the pipeline can also
+        take care of its own output - this might be used to send the output
+        to an icecast server via shout2send or similar. When unset or set
+        to an empty value, the default pipeline will be used. This is currently
+        'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux'
+        and records to WEBM using the VP8 codec. %T is used as a placeholder
+        for a guess at the optimal thread count on the system.
+      </_description>
+    </key>
+    <key name="file-extension" type="s">
+      <default>'webm'</default>
+      <_summary>File extension used for storing the screencast</_summary>
+      <_description>
+        The filename for recorded screencasts will be a unique filename
+        based on the current date, and use this extension. It should be
+        changed when recording to a different container format.
+      </_description>
     </key>
   </schema>
 
@@ -201,7 +204,7 @@
       </_description>
     </key>
     <key type="b" name="current-workspace-only">
-      <default>true</default>
+      <default>false</default>
       <summary>Limit switcher to current workspace.</summary>
       <description>
 	If true, only windows from the current workspace are shown in the switcher.
@@ -256,10 +259,10 @@
 
     <key name="focus-change-on-pointer-rest" type="b">
       <default>true</default>
-      <_summary>Delay focus changes in mouse mode until the pointer stops moving</_summary>
-      <_description>
+      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
+      <description>
         This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>

data/theme/menu-arrow-symbolic.svg

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

data/theme/more-results.svg

@@ -14,7 +14,7 @@
    height="16"
    id="svg12430"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.3.1 r9886"
    sodipodi:docname="more-results.svg">
   <defs
      id="defs12432" />
@@ -25,18 +25,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="90.509668"
-     inkscape:cx="6.5009792"
-     inkscape:cy="8.3589595"
+     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="1440"
-     inkscape:window-height="840"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-x="1200"
+     inkscape:window-y="187"
      inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -90,11 +90,6 @@
          transform="translate(-2,0)"
          width="16"
          height="16" />
-      <path
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-         d="M 7 5 L 7 7 L 5 7 L 5 9 L 7 9 L 7 11 L 9 11 L 9 9 L 11 9 L 11 7 L 9 7 L 9 5 L 7 5 z "
-         transform="translate(141.99984,397.99107)"
-         id="rect3757" />
       <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"

data/theme/page-indicator-active.svg

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg4703"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-pushed.svg">
-  <defs
-     id="defs4705" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.392433"
-     inkscape:cx="1.0245308"
-     inkscape:cy="13.3715"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid6140" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4708">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,2)">
-    <path
-       transform="matrix(0.54617904,0,0,0.62523128,-1131.9904,-392.39214)"
-       d="m 2099.9808,638.83099 a 10.985409,9.5964489 0 1 1 -21.9708,0 10.985409,9.5964489 0 1 1 21.9708,0 z"
-       sodipodi:ry="9.5964489"
-       sodipodi:rx="10.985409"
-       sodipodi:cy="638.83099"
-       sodipodi:cx="2088.9954"
-       id="path4711"
-       style="fill:#fdffff;fill-opacity:1;stroke:none"
-       sodipodi:type="arc" />
-  </g>
-</svg>

data/theme/page-indicator-checked.svg

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg4703"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-active.svg">
-  <defs
-     id="defs4705" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="2.1522887"
-     inkscape:cy="16.782904"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4708">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,2)">
-    <path
-       transform="matrix(0.72823872,0,0,0.8336417,-1512.2872,-525.55618)"
-       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
-       sodipodi:ry="9.5964489"
-       sodipodi:rx="10.985409"
-       sodipodi:cy="638.83099"
-       sodipodi:cx="2088.9954"
-       id="path4711"
-       style="fill:#fdffff;fill-opacity:0.94117647;stroke:none"
-       sodipodi:type="arc" />
-  </g>
-</svg>

data/theme/page-indicator-hover.svg

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg5266"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-inactive.svg">
-  <defs
-     id="defs5268" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-2.307566"
-     inkscape:cy="17.859535"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5271">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,2)">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path5274"
-       sodipodi:cx="2088.9954"
-       sodipodi:cy="638.83099"
-       sodipodi:rx="10.985409"
-       sodipodi:ry="9.5964489"
-       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
-       transform="matrix(0.63720887,0,0,0.72943648,-1322.1264,-458.98661)" />
-  </g>
-</svg>

data/theme/page-indicator-inactive.svg

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg5266"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-inactive.svg">
-  <defs
-     id="defs5268" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-2.307566"
-     inkscape:cy="17.859535"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5271">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,2)">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:0.39215686000000000;stroke-dasharray:none"
-       id="path5274"
-       sodipodi:cx="2088.9954"
-       sodipodi:cy="638.83099"
-       sodipodi:rx="10.985409"
-       sodipodi:ry="9.5964489"
-       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
-       transform="matrix(0.63720887,0,0,0.72943648,-1322.1264,-458.98661)" />
-  </g>
-</svg>

docs/reference/shell/Makefile.am

@@ -112,7 +112,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS)
-GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la
+GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(BLUETOOTH_LIBS) $(top_builddir)/src/libgnome-shell.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

docs/reference/shell/shell-docs.sgml.in

@@ -48,6 +48,7 @@
     <xi:include href="xml/shell-global.xml"/>
     <xi:include href="xml/shell-keybinding-modes.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-network-agent.xml"/>

gnome-shell.doap

@@ -17,15 +17,17 @@ packages. If you are interested in building GNOME Shell from source,
 we would recommend building from version control using the build
 script described at:
 
- https://wiki.gnome.org/Projects/GnomeShell
+ http://live.gnome.org/GnomeShell
 
 Not only will that give you the very latest version of this rapidly
 changing project, it will be much easier than get GNOME Shell and
 its dependencies to build from tarballs.</description>
-  <homepage rdf:resource="https://wiki.gnome.org/Projects/GnomeShell" />
+  <!--
+  <homepage rdf:resource="http://live.gnome.org/GnomeShell" />
+  -->
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell/" />
-  <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=gnome-shell" />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
 

js/Makefile.am

@@ -1,38 +1,122 @@
 NULL =
-BUILT_SOURCES =
+
+EXTRA_DIST = misc/config.js.in
+CLEANFILES = misc/config.js
 
 misc/config.js: misc/config.js.in Makefile
 	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
 	sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
 	    -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
 	    -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
-	    -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
 	    -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
 	    -e "s|[@]datadir@|$(datadir)|g" \
 	    -e "s|[@]libexecdir@|$(libexecdir)|g" \
 	    -e "s|[@]sysconfdir@|$(sysconfdir)|g" \
                $< > $@
 
-js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/js-resources.gresource.xml)
-js-resources.h: js-resources.gresource.xml $(js_resource_files) misc/config.js
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate --c-name shell_js_resources $<
-js-resources.c: js-resources.gresource.xml $(js_resource_files) misc/config.js
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate --c-name shell_js_resources $<
+jsdir = $(pkgdatadir)/js
 
-js_built_sources = js-resources.c js-resources.h
-
-BUILT_SOURCES += $(js_built_sources)
-
-all-local: $(js_built_sources)
-
-js_resource_dist_files = $(filter-out misc/config.js, $(js_resource_files))
-
-EXTRA_DIST = \
-	$(js_resource_dist_files) \
-	js-resources.gresource.xml \
-	misc/config.js.in \
-	$(NULL)
-
-CLEANFILES = \
-	$(js_built_sources) \
+nobase_dist_js_DATA = 	\
+	extensionPrefs/main.js	\
+	misc/batch.js		\
+	misc/config.js		\
+	misc/extensionUtils.js	\
+	misc/fileUtils.js	\
+	misc/gnomeSession.js	\
+	misc/hash.js		\
+	misc/history.js		\
+	misc/jsParse.js		\
+	misc/loginManager.js	\
+	misc/modemManager.js	\
+	misc/params.js		\
+	misc/util.js		\
+	perf/core.js		\
+	ui/altTab.js		\
+	ui/animation.js		\
+	ui/appDisplay.js	\
+	ui/appFavorites.js	\
+	ui/backgroundMenu.js	\
+	ui/background.js	\
+	ui/boxpointer.js	\
+	ui/calendar.js		\
+	ui/checkBox.js		\
+	ui/ctrlAltTab.js	\
+	ui/dash.js		\
+	ui/dateMenu.js		\
+	ui/dnd.js		\
+	ui/endSessionDialog.js	\
+	ui/extensionSystem.js	\
+	ui/extensionDownloader.js \
+	ui/environment.js	\
+	ui/ibusCandidatePopup.js\
+	ui/grabHelper.js	\
+	ui/iconGrid.js		\
+	ui/keyboard.js		\
+	ui/layout.js		\
+	ui/lightbox.js		\
+	ui/lookingGlass.js	\
+	ui/magnifier.js		\
+	ui/magnifierDBus.js	\
+	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/remoteMenu.js	\
+	ui/runDialog.js		\
+	ui/screencast.js	\
+	ui/screenshot.js	\
+        ui/screenShield.js	\
+	ui/scripting.js		\
+	ui/search.js		\
+	ui/searchDisplay.js	\
+	ui/shellDBus.js		\
+	ui/status/accessibility.js	\
+	ui/status/keyboard.js	\
+	ui/status/lockScreenMenu.js	\
+	ui/status/network.js	\
+	ui/status/power.js	\
+	ui/status/volume.js	\
+	ui/status/bluetooth.js	\
+	ui/switcherPopup.js	\
+	ui/tweener.js		\
+	ui/userAvatar.js	\
+	ui/userMenu.js		\
+	ui/userWidget.js	\
+	ui/viewSelector.js	\
+	ui/wanda.js		\
+	ui/windowAttentionHandler.js	\
+	ui/windowManager.js	\
+	ui/workspace.js		\
+	ui/workspaceThumbnail.js	\
+	ui/workspacesView.js	\
+	ui/workspaceSwitcherPopup.js    \
+	ui/xdndHandler.js	\
+	ui/auth/fingerprint.js	\
+	ui/auth/loginDialog.js	\
+	ui/auth/powerMenu.js	\
+	ui/auth/realmd.js	\
+	ui/auth/sessionList.js	\
+	ui/auth/unlockDialog.js	\
+	ui/auth/userList.js	\
+	ui/auth/util.js		\
+	ui/components/__init__.js		\
+	ui/components/autorunManager.js		\
+	ui/components/automountManager.js	\
+	ui/components/networkAgent.js		\
+	ui/components/polkitAgent.js		\
+	ui/components/recorder.js		\
+	ui/components/telepathyClient.js	\
+	ui/components/keyring.js		\
 	$(NULL)

js/extensionPrefs/main.js

@@ -13,15 +13,13 @@ const _ = Gettext.gettext;
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
 
-const GnomeShellIface = '<node> \
-<interface name="org.gnome.Shell.Extensions"> \
-<signal name="ExtensionStatusChanged"> \
-    <arg type="s" name="uuid"/> \
-    <arg type="i" name="state"/> \
-    <arg type="s" name="error"/> \
-</signal> \
-</interface> \
-</node>';
+const GnomeShellIface = <interface name="org.gnome.Shell.Extensions">
+<signal name="ExtensionStatusChanged">
+    <arg type="s" name="uuid"/>
+    <arg type="i" name="state"/>
+    <arg type="s" name="error"/>
+</signal>
+</interface>;
 
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
 
@@ -206,11 +204,11 @@ 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();
-        this._extensionsLoaded();
     },
 
-    _extensionFound: function(finder, extension) {
+    _extensionFound: function(signals, extension) {
         let iter = this._model.append();
         this._model.set(iter, [0, 1], [extension.uuid, extension.metadata.name]);
         this._extensionIters[extension.uuid] = iter;

js/gdm/authPrompt.js

@@ -1,505 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const Animation = imports.ui.animation;
-const Batch = imports.gdm.batch;
-const GdmUtil = imports.gdm.util;
-const Params = imports.misc.params;
-const ShellEntry = imports.ui.shellEntry;
-const Tweener = imports.ui.tweener;
-const UserWidget = imports.ui.userWidget;
-
-const DEFAULT_BUTTON_WELL_ICON_SIZE = 24;
-const DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0;
-const DEFAULT_BUTTON_WELL_ANIMATION_TIME = 0.3;
-
-const MESSAGE_FADE_OUT_ANIMATION_TIME = 0.5;
-
-const AuthPromptMode = {
-    UNLOCK_ONLY: 0,
-    UNLOCK_OR_LOG_IN: 1
-};
-
-const AuthPromptStatus = {
-    NOT_VERIFYING: 0,
-    VERIFYING: 1,
-    VERIFICATION_FAILED: 2,
-    VERIFICATION_SUCCEEDED: 3
-};
-
-const BeginRequestType = {
-    PROVIDE_USERNAME: 0,
-    DONT_PROVIDE_USERNAME: 1
-};
-
-const AuthPrompt = new Lang.Class({
-    Name: 'AuthPrompt',
-
-    _init: function(gdmClient, mode) {
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-
-        this._gdmClient = gdmClient;
-        this._mode = mode;
-
-        let reauthenticationOnly;
-        if (this._mode == AuthPromptMode.UNLOCK_ONLY)
-            reauthenticationOnly = true;
-        else if (this._mode == AuthPromptMode.UNLOCK_OR_LOG_IN)
-            reauthenticationOnly = false;
-
-        this._userVerifier = new GdmUtil.ShellUserVerifier(this._gdmClient, { reauthenticationOnly: reauthenticationOnly });
-
-        this._userVerifier.connect('ask-question', Lang.bind(this, this._onAskQuestion));
-        this._userVerifier.connect('show-message', Lang.bind(this, this._onShowMessage));
-        this._userVerifier.connect('verification-failed', Lang.bind(this, this._onVerificationFailed));
-        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
-        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
-        this._userVerifier.connect('smartcard-status-changed', Lang.bind(this, this._onSmartcardStatusChanged));
-        this._userVerifier.connect('ovirt-user-authenticated', Lang.bind(this, this._onOVirtUserAuthenticated));
-        this.smartcardDetected = this._userVerifier.smartcardDetected;
-
-        this.connect('next', Lang.bind(this, function() {
-                         this.updateSensitivity(false);
-                         this.startSpinning();
-                         if (this._queryingService) {
-                             this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-                         } else {
-                             this._preemptiveAnswer = this._entry.text;
-                         }
-                     }));
-
-        this.actor = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
-                                        vertical: true });
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this.actor.connect('key-press-event',
-                           Lang.bind(this, function(actor, event) {
-                               if (event.get_key_symbol() == Clutter.KEY_Escape) {
-                                   this.cancel();
-                               }
-                               return Clutter.EVENT_PROPAGATE;
-                           }));
-
-        this._userWell = new St.Bin({ x_fill: true,
-                                      x_align: St.Align.START });
-        this.actor.add(this._userWell,
-                       { x_align: St.Align.START,
-                         x_fill: true,
-                         y_fill: true,
-                         expand: true });
-        this._label = new St.Label({ style_class: 'login-dialog-prompt-label' });
-
-        this.actor.add(this._label,
-                       { expand: true,
-                         x_fill: false,
-                         y_fill: true,
-                         x_align: St.Align.START });
-        this._entry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
-                                     can_focus: true });
-        ShellEntry.addContextMenu(this._entry, { isPassword: true });
-
-        this.actor.add(this._entry,
-                       { expand: true,
-                         x_fill: true,
-                         y_fill: false,
-                         x_align: St.Align.START });
-
-        this._entry.grab_key_focus();
-
-        this._message = new St.Label({ opacity: 0,
-                                       styleClass: 'login-dialog-message' });
-        this._message.clutter_text.line_wrap = true;
-        this.actor.add(this._message, { x_fill: false, x_align: St.Align.START, y_align: St.Align.START });
-
-        this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
-                                             vertical: false });
-        this.actor.add(this._buttonBox,
-                       { expand:  true,
-                         x_align: St.Align.MIDDLE,
-                         y_align: St.Align.END });
-
-        this._defaultButtonWell = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-        this._defaultButtonWellActor = null;
-
-        this._initButtons();
-
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
-        this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
-        this._spinner.actor.opacity = 0;
-        this._spinner.actor.show();
-        this._defaultButtonWell.add_child(this._spinner.actor);
-    },
-
-    _onDestroy: function() {
-        this._userVerifier.clear();
-        this._userVerifier.disconnectAll();
-        this._userVerifier = null;
-    },
-
-    _initButtons: function() {
-        this.cancelButton = new St.Button({ style_class: 'modal-dialog-button',
-                                            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                            reactive: true,
-                                            can_focus: true,
-                                            label: _("Cancel") });
-        this.cancelButton.connect('clicked',
-                                   Lang.bind(this, function() {
-                                       this.cancel();
-                                   }));
-        this._buttonBox.add(this.cancelButton,
-                            { expand: false,
-                              x_fill: false,
-                              y_fill: false,
-                              x_align: St.Align.START,
-                              y_align: St.Align.END });
-
-        this._buttonBox.add(this._defaultButtonWell,
-                            { expand: true,
-                              x_fill: false,
-                              y_fill: false,
-                              x_align: St.Align.END,
-                              y_align: St.Align.MIDDLE });
-        this.nextButton = new St.Button({ style_class: 'modal-dialog-button',
-                                          button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                          reactive: true,
-                                          can_focus: true,
-                                          label: _("Next") });
-        this.nextButton.connect('clicked',
-                                 Lang.bind(this, function() {
-                                     this.emit('next');
-                                 }));
-        this.nextButton.add_style_pseudo_class('default');
-        this._buttonBox.add(this.nextButton,
-                            { expand: false,
-                              x_fill: false,
-                              y_fill: false,
-                              x_align: St.Align.END,
-                              y_align: St.Align.END });
-
-        this._updateNextButtonSensitivity(this._entry.text.length > 0);
-
-        this._entry.clutter_text.connect('text-changed',
-                                         Lang.bind(this, function() {
-                                             if (!this._userVerifier.hasPendingMessages)
-                                                 this._fadeOutMessage();
-
-                                             this._updateNextButtonSensitivity(this._entry.text.length > 0);
-                                         }));
-        this._entry.clutter_text.connect('activate', Lang.bind(this, function() {
-            this.emit('next');
-        }));
-    },
-
-    _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
-        if (this._preemptiveAnswer) {
-            if (this._queryingService)
-                this._userVerifier.answerQuery(this._queryingService, this._preemptiveAnswer);
-            this._preemptiveAnswer = null;
-            return;
-        }
-
-        if (this._queryingService)
-            this.clear();
-
-        this._queryingService = serviceName;
-        this.setPasswordChar(passwordChar);
-        this.setQuestion(question);
-
-        if (passwordChar) {
-            if (this._userVerifier.reauthenticating)
-                this.nextButton.label = _("Unlock");
-            else
-                this.nextButton.label = C_("button", "Sign In");
-        } else {
-            this.nextButton.label = _("Next");
-        }
-
-        this.updateSensitivity(true);
-        this.emit('prompted');
-    },
-
-    _onOVirtUserAuthenticated: function() {
-        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            this.reset();
-    },
-
-    _onSmartcardStatusChanged: function() {
-        this.smartcardDetected = this._userVerifier.smartcardDetected;
-
-        // Most of the time we want to reset if the user inserts or removes
-        // a smartcard. Smartcard insertion "preempts" what the user was
-        // doing, and smartcard removal aborts the preemption.
-        // The exceptions are: 1) Don't reset on smartcard insertion if we're already verifying
-        //                        with a smartcard
-        //                     2) Don't reset if we've already succeeded at verification and
-        //                        the user is getting logged in.
-        if (this._userVerifier.serviceIsDefault(GdmUtil.SMARTCARD_SERVICE_NAME) &&
-            this.verificationStatus == AuthPromptStatus.VERIFYING &&
-            this.smartcardDetected)
-            return;
-
-        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            this.reset();
-    },
-
-    _onShowMessage: function(userVerifier, message, type) {
-        this.setMessage(message, type);
-        this.emit('prompted');
-    },
-
-    _onVerificationFailed: function() {
-        this._queryingService = null;
-        this.clear();
-
-        this.updateSensitivity(true);
-        this.setActorInDefaultButtonWell(null);
-        this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
-    },
-
-    _onVerificationComplete: function() {
-        this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
-    },
-
-    _onReset: function() {
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-        this.reset();
-    },
-
-    addActorToDefaultButtonWell: function(actor) {
-        this._defaultButtonWell.add_child(actor);
-    },
-
-    setActorInDefaultButtonWell: function(actor, animate) {
-        if (!this._defaultButtonWellActor &&
-            !actor)
-            return;
-
-        let oldActor = this._defaultButtonWellActor;
-
-        if (oldActor)
-            Tweener.removeTweens(oldActor);
-
-        let isSpinner;
-        if (actor == this._spinner.actor)
-            isSpinner = true;
-        else
-            isSpinner = false;
-
-        if (this._defaultButtonWellActor != actor && oldActor) {
-            if (!animate) {
-                oldActor.opacity = 0;
-            } else {
-                Tweener.addTween(oldActor,
-                                 { opacity: 0,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear',
-                                   onCompleteScope: this,
-                                   onComplete: function() {
-                                      if (isSpinner) {
-                                          if (this._spinner)
-                                              this._spinner.stop();
-                                      }
-                                   }
-                                 });
-            }
-        }
-
-        if (actor) {
-            if (isSpinner)
-                this._spinner.play();
-
-            if (!animate)
-                actor.opacity = 255;
-            else
-                Tweener.addTween(actor,
-                                 { opacity: 255,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear' });
-        }
-
-        this._defaultButtonWellActor = actor;
-    },
-
-    startSpinning: function() {
-        this.setActorInDefaultButtonWell(this._spinner.actor, true);
-    },
-
-    stopSpinning: function() {
-        this.setActorInDefaultButtonWell(null, false);
-    },
-
-    clear: function() {
-        this._entry.text = '';
-        this.stopSpinning();
-    },
-
-    setPasswordChar: function(passwordChar) {
-        this._entry.clutter_text.set_password_char(passwordChar);
-        this._entry.menu.isPassword = passwordChar != '';
-    },
-
-    setQuestion: function(question) {
-        this._label.set_text(question);
-
-        this._label.show();
-        this._entry.show();
-
-        this._entry.grab_key_focus();
-    },
-
-    getAnswer: function() {
-        let text;
-
-        if (this._preemptiveAnswer) {
-            text = this._preemptiveAnswer;
-            this._preemptiveAnswer = null;
-        } else {
-            text = this._entry.get_text();
-        }
-
-        return text;
-    },
-
-    _fadeOutMessage: function() {
-        if (this._message.opacity == 0)
-            return;
-        Tweener.removeTweens(this._message);
-        Tweener.addTween(this._message,
-                         { opacity: 0,
-                           time: MESSAGE_FADE_OUT_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
-    },
-
-    setMessage: function(message, type) {
-        if (type == GdmUtil.MessageType.ERROR)
-            this._message.add_style_class_name('login-dialog-message-warning');
-        else
-            this._message.remove_style_class_name('login-dialog-message-warning');
-
-        if (type == GdmUtil.MessageType.HINT)
-            this._message.add_style_class_name('login-dialog-message-hint');
-        else
-            this._message.remove_style_class_name('login-dialog-message-hint');
-
-        if (message) {
-            Tweener.removeTweens(this._message);
-            this._message.text = message;
-            this._message.opacity = 255;
-        } else {
-            this._message.opacity = 0;
-        }
-    },
-
-    _updateNextButtonSensitivity: function(sensitive) {
-        this.nextButton.reactive = sensitive;
-        this.nextButton.can_focus = sensitive;
-    },
-
-    updateSensitivity: function(sensitive) {
-        this._updateNextButtonSensitivity(sensitive);
-        this._entry.reactive = sensitive;
-        this._entry.clutter_text.editable = sensitive;
-    },
-
-    hide: function() {
-        this.setActorInDefaultButtonWell(null, true);
-        this.actor.hide();
-        this._message.opacity = 0;
-
-        this.setUser(null);
-
-        this.updateSensitivity(true);
-        this._entry.set_text('');
-    },
-
-    setUser: function(user) {
-        if (user) {
-            let userWidget = new UserWidget.UserWidget(user);
-            this._userWell.set_child(userWidget.actor);
-        } else {
-            this._userWell.set_child(null);
-        }
-    },
-
-    reset: function() {
-        let oldStatus = this.verificationStatus;
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-
-        if (oldStatus == AuthPromptStatus.VERIFYING)
-            this._userVerifier.cancel();
-
-        this._queryingService = null;
-        this.clear();
-        this._message.opacity = 0;
-        this.setUser(null);
-        this.stopSpinning();
-
-        if (oldStatus == AuthPromptStatus.VERIFICATION_FAILED)
-            this.emit('failed');
-
-        let beginRequestType;
-
-        if (this._mode == AuthPromptMode.UNLOCK_ONLY) {
-            // The user is constant at the unlock screen, so it will immediately
-            // respond to the request with the username
-            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        } else if (this._userVerifier.serviceIsForeground(GdmUtil.OVIRT_SERVICE_NAME) ||
-                   this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME)) {
-            // We don't need to know the username if the user preempted the login screen
-            // with a smartcard or with preauthenticated oVirt credentials
-            beginRequestType = BeginRequestType.DONT_PROVIDE_USERNAME;
-        } else {
-            // In all other cases, we should get the username up front.
-            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        }
-
-        this.emit('reset', beginRequestType);
-    },
-
-    addCharacter: function(unichar) {
-        if (!this._entry.visible)
-            return;
-
-        this._entry.grab_key_focus();
-        this._entry.clutter_text.insert_unichar(unichar);
-    },
-
-    begin: function(params) {
-        params = Params.parse(params, { userName: null,
-                                        hold: null });
-
-        this.updateSensitivity(false);
-
-        let hold = params.hold;
-        if (!hold)
-            hold = new Batch.Hold();
-
-        this._userVerifier.begin(params.userName, hold);
-        this.verificationStatus = AuthPromptStatus.VERIFYING;
-    },
-
-    finish: function(onComplete) {
-        if (!this._userVerifier.hasPendingMessages) {
-            onComplete();
-            return;
-        }
-
-        let signalId = this._userVerifier.connect('no-more-messages',
-                                                  Lang.bind(this, function() {
-                                                      this._userVerifier.disconnect(signalId);
-                                                      onComplete();
-                                                  }));
-    },
-
-    cancel: function() {
-        this.reset();
-        this.emit('cancelled');
-    }
-});
-Signals.addSignalMethods(AuthPrompt.prototype);

js/gdm/loginDialog.js

@@ -1,955 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/*
- * Copyright 2011 Red Hat, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-const AccountsService = imports.gi.AccountsService;
-const Atk = imports.gi.Atk;
-const Clutter = imports.gi.Clutter;
-const Gdm = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const AuthPrompt = imports.gdm.authPrompt;
-const Batch = imports.gdm.batch;
-const BoxPointer = imports.ui.boxpointer;
-const CtrlAltTab = imports.ui.ctrlAltTab;
-const GdmUtil = imports.gdm.util;
-const Layout = imports.ui.layout;
-const LoginManager = imports.misc.loginManager;
-const Main = imports.ui.main;
-const PopupMenu = imports.ui.popupMenu;
-const Realmd = imports.gdm.realmd;
-const Tweener = imports.ui.tweener;
-const UserWidget = imports.ui.userWidget;
-
-const _FADE_ANIMATION_TIME = 0.25;
-const _SCROLL_ANIMATION_TIME = 0.5;
-const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
-const _LOGO_ICON_HEIGHT = 48;
-
-let _loginDialog = null;
-
-const UserListItem = new Lang.Class({
-    Name: 'UserListItem',
-
-    _init: function(user) {
-        this.user = user;
-        this._userChangedId = this.user.connect('changed',
-                                                 Lang.bind(this, this._onUserChanged));
-
-        let layout = new St.BoxLayout({ vertical: true });
-        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,
-                                     x_align: St.Align.START,
-                                     x_fill: true });
-
-        this._userWidget = new UserWidget.UserWidget(this.user);
-        layout.add(this._userWidget.actor);
-
-        this._timedLoginIndicator = new St.Bin({ style_class: 'login-dialog-timed-login-indicator',
-                                                 scale_x: 0 });
-        layout.add(this._timedLoginIndicator);
-
-        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-        this._onUserChanged();
-    },
-
-    _onUserChanged: function() {
-        this._updateLoggedIn();
-    },
-
-    _updateLoggedIn: function() {
-        if (this.user.is_logged_in())
-            this.actor.add_style_pseudo_class('logged-in');
-        else
-            this.actor.remove_style_pseudo_class('logged-in');
-    },
-
-    _onClicked: function() {
-        this.emit('activate');
-    },
-
-    showTimedLoginIndicator: function(time) {
-        let hold = new Batch.Hold();
-
-        this.hideTimedLoginIndicator();
-        Tweener.addTween(this._timedLoginIndicator,
-                         { scale_x: 1.,
-                           time: time,
-                           transition: 'linear',
-                           onComplete: function() {
-                               hold.release();
-                           },
-                           onCompleteScope: this
-                         });
-        return hold;
-    },
-
-    hideTimedLoginIndicator: function() {
-        Tweener.removeTweens(this._timedLoginIndicator);
-        this._timedLoginIndicator.scale_x = 0.;
-    }
-});
-Signals.addSignalMethods(UserListItem.prototype);
-
-const UserList = new Lang.Class({
-    Name: 'UserList',
-
-    _init: function() {
-        this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view'});
-        this.actor.set_policy(Gtk.PolicyType.NEVER,
-                              Gtk.PolicyType.AUTOMATIC);
-
-        this._box = new St.BoxLayout({ vertical: true,
-                                       style_class: 'login-dialog-user-list',
-                                       pseudo_class: 'expanded' });
-
-        this.actor.add_actor(this._box);
-        this._items = {};
-
-        this.actor.connect('key-focus-in', Lang.bind(this, this._moveFocusToItems));
-    },
-
-    _moveFocusToItems: function() {
-        let hasItems = Object.keys(this._items).length > 0;
-
-        if (!hasItems)
-            return;
-
-        if (global.stage.get_key_focus() != this.actor)
-            return;
-
-        let focusSet = this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-        if (!focusSet) {
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-                this._moveFocusToItems();
-                return false;
-            }));
-        }
-    },
-
-    _onItemActivated: function(activatedItem) {
-        this.emit('activate', activatedItem);
-    },
-
-    updateStyle: function(isExpanded) {
-        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.sync_hover();
-        }
-    },
-
-    scrollToItem: function(item) {
-        let box = item.actor.get_allocation_box();
-
-        let adjustment = this.actor.get_vscroll_bar().get_adjustment();
-
-        let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
-        Tweener.removeTweens(adjustment);
-        Tweener.addTween (adjustment,
-                          { value: value,
-                            time: _SCROLL_ANIMATION_TIME,
-                            transition: 'easeOutQuad' });
-    },
-
-    jumpToItem: function(item) {
-        let box = item.actor.get_allocation_box();
-
-        let adjustment = this.actor.get_vscroll_bar().get_adjustment();
-
-        let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
-
-        adjustment.set_value(value);
-    },
-
-    getItemFromUserName: function(userName) {
-        let item = this._items[userName];
-
-        if (!item)
-            return null;
-
-        return item;
-    },
-
-    addUser: function(user) {
-        if (!user.is_loaded)
-            return;
-
-        if (user.is_system_account())
-            return;
-
-        if (user.locked)
-           return;
-
-        let userName = user.get_user_name();
-
-        if (!userName)
-            return;
-
-        this.removeUser(user);
-
-        let item = new UserListItem(user);
-        this._box.add(item.actor, { x_fill: true });
-
-        this._items[userName] = item;
-
-        item.connect('activate',
-                     Lang.bind(this, this._onItemActivated));
-
-        // Try to keep the focused item front-and-center
-        item.actor.connect('key-focus-in',
-                           Lang.bind(this,
-                                     function() {
-                                         this.scrollToItem(item);
-                                     }));
-
-        this._moveFocusToItems();
-
-        this.emit('item-added', item);
-    },
-
-    removeUser: function(user) {
-        if (!user.is_loaded)
-            return;
-
-        let userName = user.get_user_name();
-
-        if (!userName)
-            return;
-
-        let item = this._items[userName];
-
-        if (!item)
-            return;
-
-        item.actor.destroy();
-        delete this._items[userName];
-    }
-});
-Signals.addSignalMethods(UserList.prototype);
-
-const SessionMenuButton = new Lang.Class({
-    Name: 'SessionMenuButton',
-
-    _init: function() {
-        let gearIcon = new St.Icon({ icon_name: 'emblem-system-symbolic' });
-        this._button = new St.Button({ style_class: 'login-dialog-session-list-button',
-                                       reactive: true,
-                                       track_hover: true,
-                                       can_focus: true,
-                                       accessible_name: _("Choose Session"),
-                                       accessible_role: Atk.Role.MENU,
-                                       child: gearIcon });
-
-        this.actor = new St.Bin({ child: this._button });
-
-        this._menu = new PopupMenu.PopupMenu(this._button, 0, St.Side.TOP);
-        Main.uiGroup.add_actor(this._menu.actor);
-        this._menu.actor.hide();
-
-        this._menu.connect('open-state-changed',
-                           Lang.bind(this, function(menu, isOpen) {
-                                if (isOpen)
-                                    this._button.add_style_pseudo_class('active');
-                                else
-                                    this._button.remove_style_pseudo_class('active');
-                           }));
-
-        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button });
-        this._manager.addMenu(this._menu);
-
-        this._button.connect('clicked', Lang.bind(this, function() {
-            this._menu.toggle();
-        }));
-
-        this._items = {};
-        this._activeSessionId = null;
-        this._populate();
-    },
-
-    updateSensitivity: function(sensitive) {
-        this._button.reactive = sensitive;
-        this._button.can_focus = sensitive;
-        this._menu.close(BoxPointer.PopupAnimation.NONE);
-    },
-
-    _updateOrnament: function() {
-        let itemIds = Object.keys(this._items);
-        for (let i = 0; i < itemIds.length; i++) {
-            if (itemIds[i] == this._activeSessionId)
-                this._items[itemIds[i]].setOrnament(PopupMenu.Ornament.DOT);
-            else
-                this._items[itemIds[i]].setOrnament(PopupMenu.Ornament.NONE);
-        }
-    },
-
-    setActiveSession: function(sessionId) {
-         if (sessionId == this._activeSessionId)
-             return;
-
-         this._activeSessionId = sessionId;
-         this._updateOrnament();
-
-         this.emit('session-activated', this._activeSessionId);
-    },
-
-    close: function() {
-        this._menu.close();
-    },
-
-    _populate: function() {
-        let ids = Gdm.get_session_ids();
-        ids.sort();
-
-        if (ids.length <= 1) {
-            this._button.hide();
-            return;
-        }
-
-        for (let i = 0; i < ids.length; i++) {
-            let [sessionName, sessionDescription] = Gdm.get_session_name_and_description(ids[i]);
-
-            let id = ids[i];
-            let item = new PopupMenu.PopupMenuItem(sessionName);
-            this._menu.addMenuItem(item);
-            this._items[id] = item;
-
-            if (!this._activeSessionId)
-                this.setActiveSession(id);
-
-            item.connect('activate', Lang.bind(this, function() {
-                this.setActiveSession(id);
-            }));
-        }
-    }
-});
-Signals.addSignalMethods(SessionMenuButton.prototype);
-
-const LoginDialog = new Lang.Class({
-    Name: 'LoginDialog',
-
-    _init: function(parentActor) {
-        this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,
-                                     layout_manager: new Clutter.BinLayout(),
-                                     style_class: 'login-dialog',
-                                     visible: false });
-
-        this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        parentActor.add_child(this.actor);
-
-        this._userManager = AccountsService.UserManager.get_default()
-        let gdmClient = new Gdm.Client();
-
-        if (GLib.getenv('GDM_GREETER_TEST') != '1') {
-            this._greeter = gdmClient.get_greeter_sync(null);
-
-            this._greeter.connect('default-session-name-changed',
-                                  Lang.bind(this, this._onDefaultSessionChanged));
-
-            this._greeter.connect('session-opened',
-                                  Lang.bind(this, this._onSessionOpened));
-            this._greeter.connect('timed-login-requested',
-                                  Lang.bind(this, this._onTimedLoginRequested));
-        }
-
-        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
-
-        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
-                               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._settings.connect('changed::' + GdmUtil.LOGO_KEY,
-                               Lang.bind(this, this._updateLogo));
-
-        this._textureCache = St.TextureCache.get_default();
-        this._textureCache.connect('texture-file-changed',
-                                   Lang.bind(this, this._updateLogoTexture));
-
-        this._userSelectionBox = new St.BoxLayout({ style_class: 'login-dialog-user-selection-box',
-                                                    x_align: Clutter.ActorAlign.CENTER,
-                                                    y_align: Clutter.ActorAlign.CENTER,
-                                                    x_expand: true,
-                                                    y_expand: true,
-                                                    vertical: true,
-                                                    visible: false });
-        this.actor.add_child(this._userSelectionBox);
-
-        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
-                                           text: '' });
-        this._userSelectionBox.add(this._bannerLabel);
-        this._updateBanner();
-
-        this._userList = new UserList();
-        this._userSelectionBox.add(this._userList.actor,
-                                   { expand: true,
-                                     x_fill: true,
-                                     y_fill: true });
-
-        this._authPrompt = new AuthPrompt.AuthPrompt(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
-        this._authPrompt.connect('prompted', Lang.bind(this, this._onPrompted));
-        this._authPrompt.connect('reset', Lang.bind(this, this._onReset));
-        this._authPrompt.hide();
-        this.actor.add_child(this._authPrompt.actor);
-
-        // translators: this message is shown below the user list on the
-        // login screen. It can be activated to reveal an entry for
-        // manually entering the username.
-        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._hideUserListAskForUsernameAndBeginVerification));
-
-        this._notListedButton.hide();
-
-        this._userSelectionBox.add(this._notListedButton,
-                                   { expand: false,
-                                     x_align: St.Align.START,
-                                     x_fill: true });
-
-        this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',
-                                        x_align: Clutter.ActorAlign.CENTER,
-                                        y_align: Clutter.ActorAlign.END,
-                                        x_expand: true,
-                                        y_expand: true });
-        this.actor.add_child(this._logoBin);
-        this._updateLogo();
-
-        this._userList.connect('activate',
-                               Lang.bind(this, function(userList, item) {
-                                   this._onUserListActivated(item);
-                               }));
-
-
-        this._sessionMenuButton = new SessionMenuButton();
-        this._sessionMenuButton.connect('session-activated',
-                                  Lang.bind(this, function(list, sessionId) {
-                                                this._greeter.call_select_session_sync (sessionId, null);
-                                            }));
-        this._sessionMenuButton.actor.opacity = 0;
-        this._sessionMenuButton.actor.show();
-        this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton.actor);
-
-        this._disableUserList = undefined;
-        this._userListLoaded = false;
-
-        LoginManager.getLoginManager().getCurrentSessionProxy(Lang.bind(this, this._gotGreeterSessionProxy));
-
-        // If the user list is enabled, it should take key focus; make sure the
-        // screen shield is initialized first to prevent it from stealing the
-        // focus later
-        Main.layoutManager.connect('startup-complete',
-                                   Lang.bind(this, this._updateDisableUserList));
-    },
-
-    _ensureUserListLoaded: function() {
-        if (!this._userManager.is_loaded) {
-            this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',
-                                                                  Lang.bind(this, function() {
-                                                                      if (this._userManager.is_loaded) {
-                                                                          this._loadUserList();
-                                                                          this._userManager.disconnect(this._userManagerLoadedId);
-                                                                          this._userManagerLoadedId = 0;
-                                                                      }
-                                                                  }));
-        } else {
-            let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, this._loadUserList));
-            GLib.Source.set_name_by_id(id, '[gnome-shell] _loadUserList');
-        }
-    },
-
-    _updateDisableUserList: function() {
-        let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);
-
-        if (disableUserList != this._disableUserList) {
-            this._disableUserList = disableUserList;
-
-            if (this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-                this._authPrompt.reset();
-        }
-    },
-
-    _updateCancelButton: function() {
-        let cancelVisible;
-
-        // Hide the cancel button if the user list is disabled and we're asking for
-        // a username
-        if (this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING && this._disableUserList)
-            cancelVisible = false;
-        else
-            cancelVisible = true;
-
-        this._authPrompt.cancelButton.visible = cancelVisible;
-    },
-
-    _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();
-        } else {
-            this._bannerLabel.hide();
-        }
-    },
-
-    _updateLogoTexture: function(cache, uri) {
-        if (this._logoFileUri != uri)
-            return;
-
-        this._logoBin.destroy_all_children();
-        if (this._logoFileUri) {
-            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            this._logoBin.add_child(this._textureCache.load_uri_async(this._logoFileUri,
-                                                                      -1, _LOGO_ICON_HEIGHT,
-                                                                      scaleFactor));
-        }
-    },
-
-    _updateLogo: function() {
-        let path = this._settings.get_string(GdmUtil.LOGO_KEY);
-
-        this._logoFileUri = path ? Gio.file_new_for_path(path).get_uri() : null;
-        this._updateLogoTexture(this._textureCache, this._logoFileUri);
-    },
-
-    _onPrompted: function() {
-        this._sessionMenuButton.updateSensitivity(true);
-
-        if (this._shouldShowSessionMenuButton())
-            this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton.actor);
-        this._showPrompt();
-    },
-
-    _onReset: function(authPrompt, beginRequest) {
-        this._sessionMenuButton.updateSensitivity(true);
-
-        this._user = null;
-
-        if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) {
-            if (!this._disableUserList)
-                this._showUserList();
-            else
-                this._hideUserListAskForUsernameAndBeginVerification();
-        } else {
-            this._hideUserListAndBeginVerification();
-        }
-    },
-
-    _onDefaultSessionChanged: function(client, sessionId) {
-        this._sessionMenuButton.setActiveSession(sessionId);
-    },
-
-    _shouldShowSessionMenuButton: function() {
-        if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFYING &&
-            this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_FAILED)
-          return false;
-
-        if (this._user && this._user.is_loaded && this._user.is_logged_in())
-          return false;
-
-        return true;
-    },
-
-    _showPrompt: function() {
-        if (this._authPrompt.actor.visible)
-            return;
-        this._authPrompt.actor.opacity = 0;
-        this._authPrompt.actor.show();
-        Tweener.addTween(this._authPrompt.actor,
-                         { opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad' });
-    },
-
-    _showRealmLoginHint: function(realmManager, hint) {
-        if (!hint)
-            return;
-
-        hint = hint.replace(/%U/g, 'user');
-        hint = hint.replace(/%D/g, 'DOMAIN');
-        hint = hint.replace(/%[^UD]/g, '');
-
-        // Translators: this message is shown below the username entry field
-        // to clue the user in on how to login to the local network realm
-        this._authPrompt.setMessage(_("(e.g., user or %s)").format(hint), GdmUtil.MessageType.HINT);
-    },
-
-    _askForUsernameAndBeginVerification: function() {
-        this._authPrompt.setPasswordChar('');
-        this._authPrompt.setQuestion(_("Username: "));
-
-        let realmManager = new Realmd.Manager();
-        let realmSignalId = realmManager.connect('login-format-changed',
-                                                 Lang.bind(this, this._showRealmLoginHint));
-        this._showRealmLoginHint(realmManager.loginFormat);
-
-        let nextSignalId = this._authPrompt.connect('next',
-                                                    Lang.bind(this, function() {
-                                                        this._authPrompt.disconnect(nextSignalId);
-                                                        this._authPrompt.updateSensitivity(false);
-                                                        let answer = this._authPrompt.getAnswer();
-                                                        this._user = this._userManager.get_user(answer);
-                                                        this._authPrompt.clear();
-                                                        this._authPrompt.startSpinning();
-                                                        this._authPrompt.begin({ userName: answer });
-                                                        this._updateCancelButton();
-
-                                                        realmManager.disconnect(realmSignalId)
-                                                        realmManager.release();
-                                                    }));
-        this._updateCancelButton();
-        this._showPrompt();
-    },
-
-    _loginScreenSessionActivated: function() {
-        if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            return;
-
-        Tweener.addTween(this.actor,
-                         { opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onUpdate: function() {
-                               let children = Main.layoutManager.uiGroup.get_children();
-
-                               for (let i = 0; i < children.length; i++) {
-                                   if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.actor.opacity;
-                               }
-                           },
-                           onUpdateScope: this,
-                           onComplete: function() {
-                               this._authPrompt.reset();
-                           },
-                           onCompleteScope: this });
-    },
-
-    _gotGreeterSessionProxy: function(proxy) {
-        proxy.connect('g-properties-changed', Lang.bind(this, function() {
-            if (proxy.Active)
-                this._loginScreenSessionActivated();
-        }));
-    },
-
-    _startSession: function(serviceName) {
-        Tweener.addTween(this.actor,
-                         { opacity: 0,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onUpdate: function() {
-                               let children = Main.layoutManager.uiGroup.get_children();
-
-                               for (let i = 0; i < children.length; i++) {
-                                   if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.actor.opacity;
-                               }
-                           },
-                           onUpdateScope: this,
-                           onComplete: function() {
-                               let id = Mainloop.idle_add(Lang.bind(this, function() {
-                                   this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
-                                   return GLib.SOURCE_REMOVE;
-                               }));
-                               GLib.Source.set_name_by_id(id, '[gnome-shell] this._greeter.call_start_session_when_ready_sync');
-                           },
-                           onCompleteScope: this });
-    },
-
-    _onSessionOpened: function(client, serviceName) {
-        this._authPrompt.finish(Lang.bind(this, function() {
-            this._startSession(serviceName);
-        }));
-    },
-
-    _waitForItemForUser: function(userName) {
-        let item = this._userList.getItemFromUserName(userName);
-
-        if (item)
-          return null;
-
-        let hold = new Batch.Hold();
-        let signalId = this._userList.connect('item-added',
-                                              Lang.bind(this, function() {
-                                                  let item = this._userList.getItemFromUserName(userName);
-
-                                                  if (item)
-                                                      hold.release();
-                                              }));
-
-        hold.connect('release', Lang.bind(this, function() {
-                         this._userList.disconnect(signalId);
-                     }));
-
-        return hold;
-    },
-
-    _showTimedLoginAnimation: function() {
-        this._timedLoginItem.actor.grab_key_focus();
-        return this._timedLoginItem.showTimedLoginIndicator(this._timedLoginAnimationTime);
-    },
-
-    _blockTimedLoginUntilIdle: function() {
-        // This blocks timed login from starting until a few
-        // seconds after the user stops interacting with the
-        // login screen.
-        //
-        // We skip this step if the timed login delay is very
-        // short.
-        if ((this._timedLoginDelay - _TIMED_LOGIN_IDLE_THRESHOLD) <= 0)
-          return null;
-
-        let hold = new Batch.Hold();
-
-        this._timedLoginIdleTimeOutId = Mainloop.timeout_add_seconds(_TIMED_LOGIN_IDLE_THRESHOLD,
-                                                                     function() {
-                                                                         this._timedLoginAnimationTime -= _TIMED_LOGIN_IDLE_THRESHOLD;
-                                                                         hold.release();
-                                                                         return GLib.SOURCE_REMOVE;
-                                                                     });
-        GLib.Source.set_name_by_id(this._timedLoginIdleTimeOutId, '[gnome-shell] this._timedLoginAnimationTime');
-        return hold;
-    },
-
-    _startTimedLogin: function(userName, delay) {
-        this._timedLoginItem = null;
-        this._timedLoginDelay = delay;
-        this._timedLoginAnimationTime = delay;
-
-        let tasks = [function() {
-                         return this._waitForItemForUser(userName);
-                     },
-
-                     function() {
-                         this._timedLoginItem = this._userList.getItemFromUserName(userName);
-                     },
-
-                     function() {
-                         // If we're just starting out, start on the right
-                         // item.
-                         if (!this._userManager.is_loaded) {
-                             this._userList.jumpToItem(this._timedLoginItem);
-                         }
-                     },
-
-                     this._blockTimedLoginUntilIdle,
-
-                     function() {
-                         this._userList.scrollToItem(this._timedLoginItem);
-                     },
-
-                     this._showTimedLoginAnimation,
-
-                     function() {
-                         this._timedLoginBatch = null;
-                         this._greeter.call_begin_auto_login_sync(userName, null);
-                     }];
-
-        this._timedLoginBatch = new Batch.ConsecutiveBatch(this, tasks);
-
-        return this._timedLoginBatch.run();
-    },
-
-    _resetTimedLogin: function() {
-        if (this._timedLoginBatch) {
-            this._timedLoginBatch.cancel();
-            this._timedLoginBatch = null;
-        }
-
-        if (this._timedLoginItem)
-            this._timedLoginItem.hideTimedLoginIndicator();
-
-        let userName = this._timedLoginItem.user.get_user_name();
-
-        if (userName)
-            this._startTimedLogin(userName, this._timedLoginDelay);
-    },
-
-    _onTimedLoginRequested: function(client, userName, seconds) {
-        this._startTimedLogin(userName, seconds);
-
-        global.stage.connect('captured-event',
-                             Lang.bind(this, function(actor, event) {
-                                if (this._timedLoginDelay == undefined)
-                                    return Clutter.EVENT_PROPAGATE;
-
-                                if (event.type() == Clutter.EventType.KEY_PRESS ||
-                                    event.type() == Clutter.EventType.BUTTON_PRESS) {
-                                    if (this._timedLoginBatch) {
-                                        this._timedLoginBatch.cancel();
-                                        this._timedLoginBatch = null;
-                                    }
-                                } else if (event.type() == Clutter.EventType.KEY_RELEASE ||
-                                           event.type() == Clutter.EventType.BUTTON_RELEASE) {
-                                    this._resetTimedLogin();
-                                }
-
-                                return Clutter.EVENT_PROPAGATE;
-                             }));
-    },
-
-    _setUserListExpanded: function(expanded) {
-        this._userList.updateStyle(expanded);
-        this._userSelectionBox.visible = expanded;
-    },
-
-    _hideUserList: function() {
-        this._setUserListExpanded(false);
-        if (this._userSelectionBox.visible)
-            GdmUtil.cloneAndFadeOutActor(this._userSelectionBox);
-    },
-
-    _hideUserListAskForUsernameAndBeginVerification: function() {
-        this._hideUserList();
-        this._askForUsernameAndBeginVerification();
-    },
-
-    _hideUserListAndBeginVerification: function() {
-        this._hideUserList();
-        this._authPrompt.begin();
-    },
-
-    _showUserList: function() {
-        this._ensureUserListLoaded();
-        this._authPrompt.hide();
-        this._sessionMenuButton.close();
-        this._setUserListExpanded(true);
-        this._notListedButton.show();
-        this._userList.actor.grab_key_focus();
-    },
-
-    _beginVerificationForItem: function(item) {
-        this._authPrompt.setUser(item.user);
-
-        let userName = item.user.get_user_name();
-        let hold = new Batch.Hold();
-
-        this._authPrompt.begin({ userName: userName,
-                                 hold: hold });
-        return hold;
-    },
-
-    _onUserListActivated: function(activatedItem) {
-        let tasks = [function() {
-                         return GdmUtil.cloneAndFadeOutActor(this._userSelectionBox);
-                     },
-                     function() {
-                         this._setUserListExpanded(false);
-                     }];
-
-        this._user = activatedItem.user;
-
-        this._updateCancelButton();
-
-        let batch = new Batch.ConcurrentBatch(this, [new Batch.ConsecutiveBatch(this, tasks),
-                                                     this._beginVerificationForItem(activatedItem)]);
-        batch.run();
-    },
-
-    _onDestroy: function() {
-        if (this._userManagerLoadedId) {
-            this._userManager.disconnect(this._userManagerLoadedId);
-            this._userManagerLoadedId = 0;
-        }
-    },
-
-    _loadUserList: function() {
-        if (this._userListLoaded)
-            return GLib.SOURCE_REMOVE;
-
-        this._userListLoaded = true;
-
-        let users = this._userManager.list_users();
-
-        for (let i = 0; i < users.length; i++) {
-            this._userList.addUser(users[i]);
-        }
-
-        this._userManager.connect('user-added',
-                                  Lang.bind(this, function(userManager, user) {
-                                      this._userList.addUser(user);
-                                  }));
-
-        this._userManager.connect('user-removed',
-                                  Lang.bind(this, function(userManager, user) {
-                                      this._userList.removeUser(user);
-                                  }));
-
-        return GLib.SOURCE_REMOVE;
-    },
-
-    open: function() {
-        Main.ctrlAltTabManager.addGroup(this.actor,
-                                        _("Login Window"),
-                                        'dialog-password-symbolic',
-                                        { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
-        this._userList.actor.grab_key_focus();
-        this.actor.show();
-        this.actor.opacity = 0;
-
-        Tweener.addTween(this.actor,
-                         { opacity: 255,
-                           time: 1,
-                           transition: 'easeInQuad' });
-
-        return true;
-    },
-
-    close: function() {
-        Main.ctrlAltTabManager.removeGroup(this.dialogLayout);
-    },
-
-    cancel: function() {
-        this._authPrompt.cancel();
-    },
-
-    addCharacter: function(unichar) {
-        this._authPrompt.addCharacter(unichar);
-    },
-
-    finish: function(onComplete) {
-        this._authPrompt.finish(onComplete);
-    },
-});
-Signals.addSignalMethods(LoginDialog.prototype);

js/gdm/oVirt.js

@@ -1,64 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Signals = imports.signals;
-
-const OVirtCredentialsIface = '<node> \
-<interface name="org.ovirt.vdsm.Credentials"> \
-<signal name="UserAuthenticated"> \
-    <arg type="s" name="token"/> \
-</signal> \
-</interface> \
-</node>';
-
-const OVirtCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(OVirtCredentialsIface);
-
-let _oVirtCredentialsManager = null;
-
-function OVirtCredentials() {
-    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
-                                   g_interface_name: OVirtCredentialsInfo.name,
-                                   g_interface_info: OVirtCredentialsInfo,
-                                   g_name: 'org.ovirt.vdsm.Credentials',
-                                   g_object_path: '/org/ovirt/vdsm/Credentials',
-                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-    self.init(null);
-    return self;
-}
-
-const OVirtCredentialsManager = new Lang.Class({
-    Name: 'OVirtCredentialsManager',
-    _init: function() {
-        this._token = null;
-
-        this._credentials = new OVirtCredentials();
-        this._credentials.connectSignal('UserAuthenticated',
-                                        Lang.bind(this, this._onUserAuthenticated));
-    },
-
-    _onUserAuthenticated: function(proxy, sender, [token]) {
-        this._token = token;
-        this.emit('user-authenticated', token);
-    },
-
-    hasToken: function() {
-        return this._token != null;
-    },
-
-    getToken: function() {
-        return this._token;
-    },
-
-    resetToken: function() {
-        this._token = null;
-    }
-});
-Signals.addSignalMethods(OVirtCredentialsManager.prototype);
-
-function getOVirtCredentialsManager() {
-    if (!_oVirtCredentialsManager)
-        _oVirtCredentialsManager = new OVirtCredentialsManager();
-
-    return _oVirtCredentialsManager;
-}

js/js-resources.gresource.xml

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/shell">
-    <file>gdm/authPrompt.js</file>
-    <file>gdm/batch.js</file>
-    <file>gdm/fingerprint.js</file>
-    <file>gdm/loginDialog.js</file>
-    <file>gdm/oVirt.js</file>
-    <file>gdm/realmd.js</file>
-    <file>gdm/util.js</file>
-
-    <file>extensionPrefs/main.js</file>
-
-    <file>misc/config.js</file>
-    <file>misc/extensionUtils.js</file>
-    <file>misc/fileUtils.js</file>
-    <file>misc/gnomeSession.js</file>
-    <file>misc/history.js</file>
-    <file>misc/jsParse.js</file>
-    <file>misc/loginManager.js</file>
-    <file>misc/modemManager.js</file>
-    <file>misc/objectManager.js</file>
-    <file>misc/params.js</file>
-    <file>misc/smartcardManager.js</file>
-    <file>misc/util.js</file>
-
-    <file>perf/core.js</file>
-
-    <file>ui/altTab.js</file>
-    <file>ui/animation.js</file>
-    <file>ui/appDisplay.js</file>
-    <file>ui/appFavorites.js</file>
-    <file>ui/backgroundMenu.js</file>
-    <file>ui/background.js</file>
-    <file>ui/boxpointer.js</file>
-    <file>ui/calendar.js</file>
-    <file>ui/checkBox.js</file>
-    <file>ui/ctrlAltTab.js</file>
-    <file>ui/dash.js</file>
-    <file>ui/dateMenu.js</file>
-    <file>ui/dnd.js</file>
-    <file>ui/endSessionDialog.js</file>
-    <file>ui/environment.js</file>
-    <file>ui/extensionDownloader.js</file>
-    <file>ui/extensionSystem.js</file>
-    <file>ui/focusCaretTracker.js</file>
-    <file>ui/grabHelper.js</file>
-    <file>ui/ibusCandidatePopup.js</file>
-    <file>ui/iconGrid.js</file>
-    <file>ui/keyboard.js</file>
-    <file>ui/layout.js</file>
-    <file>ui/lightbox.js</file>
-    <file>ui/lookingGlass.js</file>
-    <file>ui/magnifier.js</file>
-    <file>ui/magnifierDBus.js</file>
-    <file>ui/main.js</file>
-    <file>ui/messageTray.js</file>
-    <file>ui/modalDialog.js</file>
-    <file>ui/notificationDaemon.js</file>
-    <file>ui/osdWindow.js</file>
-    <file>ui/overview.js</file>
-    <file>ui/overviewControls.js</file>
-    <file>ui/panel.js</file>
-    <file>ui/panelMenu.js</file>
-    <file>ui/pointerWatcher.js</file>
-    <file>ui/popupMenu.js</file>
-    <file>ui/remoteMenu.js</file>
-    <file>ui/remoteSearch.js</file>
-    <file>ui/runDialog.js</file>
-    <file>ui/screenShield.js</file>
-    <file>ui/screencast.js</file>
-    <file>ui/screenshot.js</file>
-    <file>ui/scripting.js</file>
-    <file>ui/search.js</file>
-    <file>ui/separator.js</file>
-    <file>ui/sessionMode.js</file>
-    <file>ui/shellDBus.js</file>
-    <file>ui/shellEntry.js</file>
-    <file>ui/shellMountOperation.js</file>
-    <file>ui/slider.js</file>
-    <file>ui/switcherPopup.js</file>
-    <file>ui/tweener.js</file>
-    <file>ui/unlockDialog.js</file>
-    <file>ui/userWidget.js</file>
-    <file>ui/viewSelector.js</file>
-    <file>ui/windowAttentionHandler.js</file>
-    <file>ui/windowManager.js</file>
-    <file>ui/workspace.js</file>
-    <file>ui/workspaceSwitcherPopup.js</file>
-    <file>ui/workspaceThumbnail.js</file>
-    <file>ui/workspacesView.js</file>
-    <file>ui/xdndHandler.js</file>
-
-    <file>ui/components/__init__.js</file>
-    <file>ui/components/autorunManager.js</file>
-    <file>ui/components/automountManager.js</file>
-    <file>ui/components/networkAgent.js</file>
-    <file>ui/components/polkitAgent.js</file>
-    <file>ui/components/telepathyClient.js</file>
-    <file>ui/components/keyring.js</file>
-
-    <file>ui/status/accessibility.js</file>
-    <file>ui/status/brightness.js</file>
-    <file>ui/status/location.js</file>
-    <file>ui/status/keyboard.js</file>
-    <file>ui/status/network.js</file>
-    <file>ui/status/power.js</file>
-    <file>ui/status/rfkill.js</file>
-    <file>ui/status/volume.js</file>
-    <file>ui/status/bluetooth.js</file>
-    <file>ui/status/screencast.js</file>
-    <file>ui/status/system.js</file>
-  </gresource>
-</gresources>

js/misc/batch.js

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

js/misc/config.js.in

@@ -6,8 +6,6 @@ const PACKAGE_NAME = '@PACKAGE_NAME@';
 const PACKAGE_VERSION = '@PACKAGE_VERSION@';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-/* 1 if networkmanager is available, 0 otherwise */
-const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
 /* gettext package */
 const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
 /* locale dir */

js/misc/extensionUtils.js

@@ -174,9 +174,17 @@ const ExtensionFinder = new Lang.Class({
         this.emit('extension-found', extension);
     },
 
+    _extensionsLoaded: function() {
+        this.emit('extensions-loaded');
+    },
+
     scanExtensions: function() {
         let perUserDir = Gio.File.new_for_path(global.userdatadir);
-        FileUtils.collectFromDatadirs('extensions', true, Lang.bind(this, this._loadExtension, perUserDir));
+        FileUtils.collectFromDatadirsAsync('extensions',
+                                           { processFile: Lang.bind(this, this._loadExtension),
+                                             loadedCallback: Lang.bind(this, this._extensionsLoaded),
+                                             includeUserDir: true,
+                                             data: perUserDir });
     }
 });
 Signals.addSignalMethods(ExtensionFinder.prototype);

js/misc/fileUtils.js

@@ -5,27 +5,80 @@ const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Params = imports.misc.params;
 
-function collectFromDatadirs(subdir, includeUserDir, processFile) {
+function listDirAsync(file, callback) {
+    let allFiles = [];
+    file.enumerate_children_async('standard::name,standard::type',
+                                  Gio.FileQueryInfoFlags.NONE,
+                                  GLib.PRIORITY_LOW, null, function (obj, res) {
+        let enumerator = obj.enumerate_children_finish(res);
+        function onNextFileComplete(obj, res) {
+            let files = obj.next_files_finish(res);
+            if (files.length) {
+                allFiles = allFiles.concat(files);
+                enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, onNextFileComplete);
+            } else {
+                enumerator.close(null);
+                callback(allFiles);
+            }
+        }
+        enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, onNextFileComplete);
+    });
+}
+
+function _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 (includeUserDir)
+    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);
 
-        let fileEnum;
-        try {
-            fileEnum = dir.enumerate_children('standard::name,standard::type',
-                                              Gio.FileQueryInfoFlags.NONE, null);
-        } catch (e) {
-            fileEnum = null;
-        }
-        if (fileEnum != null) {
-            let info;
-            while ((info = fileEnum.next_file(null)))
-                processFile(fileEnum.get_child(info), info);
-        }
+        _collectFromDirectoryAsync(dir, loadState);
     }
 }
 
@@ -64,6 +117,7 @@ function recursivelyMoveDir(srcDir, destDir) {
         let type = info.get_file_type();
         let srcChild = srcDir.get_child(info.get_name());
         let destChild = destDir.get_child(info.get_name());
+        log([srcChild.get_path(), destChild.get_path()]);
         if (type == Gio.FileType.REGULAR)
             srcChild.move(destChild, Gio.FileCopyFlags.NONE, null, null);
         else if (type == Gio.FileType.DIRECTORY)

js/misc/gnomeSession.js

@@ -4,17 +4,15 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 
-const PresenceIface = '<node> \
-<interface name="org.gnome.SessionManager.Presence"> \
-<method name="SetStatus"> \
-    <arg type="u" direction="in"/> \
-</method> \
-<property name="status" type="u" access="readwrite"/> \
-<signal name="StatusChanged"> \
-    <arg type="u" direction="out"/> \
-</signal> \
-</interface> \
-</node>';
+const PresenceIface = <interface name="org.gnome.SessionManager.Presence">
+<method name="SetStatus">
+    <arg type="u" direction="in"/>
+</method>
+<property name="status" type="u" access="readwrite"/>
+<signal name="StatusChanged">
+    <arg type="u" direction="out"/>
+</signal>
+</interface>;
 
 const PresenceStatus = {
     AVAILABLE: 0,
@@ -32,16 +30,14 @@ function Presence(initCallback, cancellable) {
 // Note inhibitors are immutable objects, so they don't
 // change at runtime (changes always come in the form
 // of new inhibitors)
-const InhibitorIface = '<node> \
-<interface name="org.gnome.SessionManager.Inhibitor"> \
-<method name="GetAppId"> \
-    <arg type="s" direction="out" /> \
-</method> \
-<method name="GetReason"> \
-    <arg type="s" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const InhibitorIface = <interface name="org.gnome.SessionManager.Inhibitor">
+<method name="GetAppId">
+    <arg type="s" direction="out" />
+</method>
+<method name="GetReason">
+    <arg type="s" direction="out" />
+</method>
+</interface>;
 
 var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
 function Inhibitor(objectPath, initCallback, cancellable) {
@@ -49,29 +45,27 @@ function Inhibitor(objectPath, initCallback, cancellable) {
 }
 
 // Not the full interface, only the methods we use
-const SessionManagerIface = '<node> \
-<interface name="org.gnome.SessionManager"> \
-<method name="Logout"> \
-    <arg type="u" direction="in" /> \
-</method> \
-<method name="Shutdown" /> \
-<method name="Reboot" /> \
-<method name="CanShutdown"> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="IsInhibited"> \
-    <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> \
-<signal name="InhibitorRemoved"> \
-    <arg type="o" direction="out"/> \
-</signal> \
-</interface> \
-</node>';
+const SessionManagerIface = <interface name="org.gnome.SessionManager">
+<method name="Logout">
+    <arg type="u" direction="in" />
+</method>
+<method name="Shutdown" />
+<method name="Reboot" />
+<method name="CanShutdown">
+    <arg type="b" direction="out" />
+</method>
+<method name="IsInhibited">
+    <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>
+<signal name="InhibitorRemoved">
+    <arg type="o" direction="out"/>
+</signal>
+</interface>;
 
 var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);
 function SessionManager(initCallback, cancellable) {

js/misc/hash.js

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

js/misc/history.js

@@ -89,7 +89,7 @@ const HistoryManager = new Lang.Class({
         } else if (symbol == Clutter.KEY_Down) {
             return this._setNextItem(entry.get_text());
         }
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     },
 
     _indexChanged: function() {

js/misc/loginManager.js

@@ -7,45 +7,74 @@ const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const SystemdLoginManagerIface = '<node> \
-<interface name="org.freedesktop.login1.Manager"> \
-<method name="Suspend"> \
-    <arg type="b" direction="in"/> \
-</method> \
-<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> \
-</node>';
+const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
+<method name='PowerOff'>
+    <arg type='b' direction='in'/>
+</method>
+<method name='Reboot'>
+    <arg type='b' direction='in'/>
+</method>
+<method name='Suspend'>
+    <arg type='b' direction='in'/>
+</method>
+<method name='CanPowerOff'>
+    <arg type='s' direction='out'/>
+</method>
+<method name='CanReboot'>
+    <arg type='s' direction='out'/>
+</method>
+<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 = '<node> \
-<interface name="org.freedesktop.login1.Session"> \
-<signal name="Lock" /> \
-<signal name="Unlock" /> \
-<property name="Active" type="b" access="read" /> \
-</interface> \
-</node>';
+const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
+<signal name='Lock' />
+<signal name='Unlock' />
+</interface>;
 
 const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
 const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
 
+const ConsoleKitManagerIface = <interface name='org.freedesktop.ConsoleKit.Manager'>
+<method name='CanRestart'>
+    <arg type='b' direction='out'/>
+</method>
+<method name='CanStop'>
+    <arg type='b' direction='out'/>
+</method>
+<method name='Restart' />
+<method name='Stop' />
+<method name='GetCurrentSession'>
+    <arg type='o' direction='out' />
+</method>
+</interface>;
+
+const ConsoleKitSessionIface = <interface name='org.freedesktop.ConsoleKit.Session'>
+<signal name='Lock' />
+<signal name='Unlock' />
+</interface>;
+
+const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
+const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
+
 function haveSystemd() {
     return GLib.access("/run/systemd/seats", 0) >= 0;
 }
@@ -55,10 +84,8 @@ function versionCompare(required, reference) {
     reference = reference.split('.');
 
     for (let i = 0; i < required.length; i++) {
-        let requiredInt = parseInt(required[i]);
-        let referenceInt = parseInt(reference[i]);
-        if (requiredInt != referenceInt)
-            return requiredInt < referenceInt;
+        if (required[i] != reference[i])
+            return required[i] < reference[i];
     }
 
     return true;
@@ -75,7 +102,7 @@ function canLock() {
                                                -1, null);
 
         let version = result.deep_unpack()[0].deep_unpack();
-        return haveSystemd() && versionCompare('3.5.91', version);
+        return versionCompare('3.5.91', version);
     } catch(e) {
         return false;
     }
@@ -93,7 +120,7 @@ function getLoginManager() {
         if (haveSystemd())
             _loginManager = new LoginManagerSystemd();
         else
-            _loginManager = new LoginManagerDummy();
+            _loginManager = new LoginManagerConsoleKit();
     }
 
     return _loginManager;
@@ -110,6 +137,9 @@ const LoginManagerSystemd = new Lang.Class({
                                   Lang.bind(this, this._prepareForSleep));
     },
 
+    // Having this function is a bit of a hack since the Systemd and ConsoleKit
+    // session objects have different interfaces - but in both cases there are
+    // Lock/Unlock signals, and that's all we count upon at the moment.
     getCurrentSessionProxy: function(callback) {
         if (this._currentSession) {
             callback (this._currentSession);
@@ -129,6 +159,24 @@ const LoginManagerSystemd = new Lang.Class({
             }));
     },
 
+    canPowerOff: function(asyncCallback) {
+        this._proxy.CanPowerOffRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0] != 'no');
+        });
+    },
+
+    canReboot: function(asyncCallback) {
+        this._proxy.CanRebootRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0] != 'no');
+        });
+    },
+
     canSuspend: function(asyncCallback) {
         this._proxy.CanSuspendRemote(function(result, error) {
             if (error)
@@ -147,6 +195,14 @@ const LoginManagerSystemd = new Lang.Class({
         });
     },
 
+    powerOff: function() {
+        this._proxy.PowerOffRemote(true);
+    },
+
+    reboot: function() {
+        this._proxy.RebootRemote(true);
+    },
+
     suspend: function() {
         this._proxy.SuspendRemote(true);
     },
@@ -162,7 +218,7 @@ const LoginManagerSystemd = new Lang.Class({
                 let fd = -1;
                 try {
                     let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
-                    fd = fdList.steal_fds()[0];
+                    fd = fdList.steal_fds(outVariant.deep_unpack())[0];
                     callback(new Gio.UnixInputStream({ fd: fd }));
                 } catch(e) {
                     logError(e, "Error getting systemd inhibitor");
@@ -177,13 +233,53 @@ const LoginManagerSystemd = new Lang.Class({
 });
 Signals.addSignalMethods(LoginManagerSystemd.prototype);
 
-const LoginManagerDummy = new Lang.Class({
-    Name: 'LoginManagerDummy',
+const LoginManagerConsoleKit = new Lang.Class({
+    Name: 'LoginManagerConsoleKit',
 
+    _init: function() {
+        this._proxy = new ConsoleKitManager(Gio.DBus.system,
+                                            'org.freedesktop.ConsoleKit',
+                                            '/org/freedesktop/ConsoleKit/Manager');
+    },
+
+    // Having this function is a bit of a hack since the Systemd and ConsoleKit
+    // session objects have different interfaces - but in both cases there are
+    // Lock/Unlock signals, and that's all we count upon at the moment.
     getCurrentSessionProxy: function(callback) {
-        // we could return a DummySession object that fakes whatever callers
-        // expect (at the time of writing: connect() and connectSignal()
-        // methods), but just never calling the callback should be safer
+        if (this._currentSession) {
+            callback (this._currentSession);
+            return;
+        }
+
+        this._proxy.GetCurrentSessionRemote(Lang.bind(this,
+            function(result, error) {
+                if (error) {
+                    logError(error, 'Could not get a proxy for the current session');
+                } else {
+                    this._currentSession = new ConsoleKitSession(Gio.DBus.system,
+                                                                 'org.freedesktop.ConsoleKit',
+                                                                 result[0]);
+                    callback(this._currentSession);
+                }
+            }));
+    },
+
+    canPowerOff: function(asyncCallback) {
+        this._proxy.CanStopRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0]);
+        });
+    },
+
+    canReboot: function(asyncCallback) {
+        this._proxy.CanRestartRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0]);
+        });
     },
 
     canSuspend: function(asyncCallback) {
@@ -194,6 +290,14 @@ const LoginManagerDummy = new Lang.Class({
         asyncCallback([]);
     },
 
+    powerOff: function() {
+        this._proxy.StopRemote();
+    },
+
+    reboot: function() {
+        this._proxy.RestartRemote();
+    },
+
     suspend: function() {
         this.emit('prepare-for-sleep', true);
         this.emit('prepare-for-sleep', false);
@@ -203,4 +307,4 @@ const LoginManagerDummy = new Lang.Class({
         callback(null);
     }
 });
-Signals.addSignalMethods(LoginManagerDummy.prototype);
+Signals.addSignalMethods(LoginManagerConsoleKit.prototype);

js/misc/modemManager.js

@@ -92,41 +92,37 @@ function _findProviderForSid(sid) {
 // The following are not the complete interfaces, just the methods we need
 // (or may need in the future)
 
-const ModemGsmNetworkInterface = '<node> \
-<interface name="org.freedesktop.ModemManager.Modem.Gsm.Network"> \
-<method name="GetRegistrationInfo"> \
-    <arg type="(uss)" direction="out" /> \
-</method> \
-<method name="GetSignalQuality"> \
-    <arg type="u" direction="out" /> \
-</method> \
-<property name="AccessTechnology" type="u" access="read" /> \
-<signal name="SignalQuality"> \
-    <arg type="u" direction="out" /> \
-</signal> \
-<signal name="RegistrationInfo"> \
-    <arg type="u" direction="out" /> \
-    <arg type="s" direction="out" /> \
-    <arg type="s" direction="out" /> \
-</signal> \
-</interface> \
-</node>';
+const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
+<method name="GetRegistrationInfo">
+    <arg type="(uss)" direction="out" />
+</method>
+<method name="GetSignalQuality">
+    <arg type="u" direction="out" />
+</method>
+<property name="AccessTechnology" type="u" access="read" />
+<signal name="SignalQuality">
+    <arg type="u" direction="out" />
+</signal>
+<signal name="RegistrationInfo">
+    <arg type="u" direction="out" />
+    <arg type="s" direction="out" />
+    <arg type="s" direction="out" />
+</signal>
+</interface>;
 
 const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface);
 
-const ModemCdmaInterface = '<node> \
-<interface name="org.freedesktop.ModemManager.Modem.Cdma"> \
-<method name="GetSignalQuality"> \
-    <arg type="u" direction="out" /> \
-</method> \
-<method name="GetServingSystem"> \
-    <arg type="(usu)" direction="out" /> \
-</method> \
-<signal name="SignalQuality"> \
-    <arg type="u" direction="out" /> \
-</signal> \
-</interface> \
-</node>';
+const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.Cdma">
+<method name="GetSignalQuality">
+    <arg type="u" direction="out" />
+</method>
+<method name="GetServingSystem">
+    <arg type="(usu)" direction="out" />
+</method>
+<signal name="SignalQuality">
+    <arg type="u" direction="out" />
+</signal>
+</interface>;
 
 const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
 
@@ -222,26 +218,20 @@ Signals.addSignalMethods(ModemCdma.prototype);
 // Support for the new ModemManager1 interface (MM >= 0.7)
 //------------------------------------------------------------------------------
 
-const BroadbandModemInterface = '<node> \
-<interface name="org.freedesktop.ModemManager1.Modem"> \
-<property name="SignalQuality" type="(ub)" access="read" /> \
-</interface> \
-</node>';
+const BroadbandModemInterface = <interface name="org.freedesktop.ModemManager1.Modem">
+<property name="SignalQuality" type="(ub)" access="read" />
+</interface>;
 const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface);
 
-const BroadbandModem3gppInterface = '<node> \
-<interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp"> \
-<property name="OperatorCode" type="s" access="read" /> \
-<property name="OperatorName" type="s" access="read" /> \
-</interface> \
-</node>';
+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 = '<node> \
-<interface name="org.freedesktop.ModemManager1.Modem.ModemCdma"> \
-<property name="Sid" type="u" access="read" /> \
-</interface> \
-</node>';
+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({

js/misc/objectManager.js

@@ -1,259 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Params = imports.misc.params;
-const Signals = imports.signals;
-
-// Specified in the D-Bus specification here:
-// http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager
-const ObjectManagerIface = '<node> \
-<interface name="org.freedesktop.DBus.ObjectManager"> \
-  <method name="GetManagedObjects"> \
-    <arg name="objects" type="a{oa{sa{sv}}}" direction="out"/> \
-  </method> \
-  <signal name="InterfacesAdded"> \
-    <arg name="objectPath" type="o"/> \
-    <arg name="interfaces" type="a{sa{sv}}" /> \
-  </signal> \
-  <signal name="InterfacesRemoved"> \
-    <arg name="objectPath" type="o"/> \
-    <arg name="interfaces" type="as" /> \
-  </signal> \
-</interface> \
-</node>';
-
-const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface);
-
-const ObjectManager = new Lang.Class({
-    Name: 'ObjectManager',
-    _init: function(params) {
-        params = Params.parse(params, { connection: null,
-                                        name: null,
-                                        objectPath: null,
-                                        knownInterfaces: null,
-                                        cancellable: null,
-                                        onLoaded: null });
-
-        this._connection = params.connection;
-        this._serviceName = params.name;
-        this._managerPath = params.objectPath;
-        this._cancellable = params.cancellable;
-
-        this._managerProxy = new Gio.DBusProxy({ g_connection: this._connection,
-                                                 g_interface_name: ObjectManagerInfo.name,
-                                                 g_interface_info: ObjectManagerInfo,
-                                                 g_name: this._serviceName,
-                                                 g_object_path: this._managerPath,
-                                                 g_flags: Gio.DBusProxyFlags.NONE });
-
-        this._interfaceInfos = {};
-        this._objects = {};
-        this._interfaces = {};
-        this._onLoaded = params.onLoaded;
-
-        if (params.knownInterfaces)
-            this._registerInterfaces(params.knownInterfaces);
-
-        // Start out inhibiting load until at least the proxy
-        // manager is loaded and the remote objects are fetched
-        this._numLoadInhibitors = 1;
-        this._managerProxy.init_async(GLib.PRIORITY_DEFAULT,
-                                      this._cancellable,
-                                      Lang.bind(this, this._onManagerProxyLoaded));
-    },
-
-    _tryToCompleteLoad: function() {
-        this._numLoadInhibitors--;
-        if (this._numLoadInhibitors == 0) {
-            if (this._onLoaded)
-                this._onLoaded();
-        }
-    },
-
-    _addInterface: function(objectPath, interfaceName, onFinished) {
-        let info = this._interfaceInfos[interfaceName];
-
-        if (!info) {
-           if (onFinished)
-               onFinished();
-           return;
-        }
-
-        let proxy = new Gio.DBusProxy({ g_connection: this._connection,
-                                       g_name: this._serviceName,
-                                       g_object_path: objectPath,
-                                       g_interface_name: interfaceName,
-                                       g_interface_info: info,
-                                       g_flags: Gio.DBusProxyFlags.NONE });
-
-        proxy.init_async(GLib.PRIORITY_DEFAULT,
-                         this._cancellable,
-                         Lang.bind(this, function(initable, result) {
-               let error = null;
-               try {
-                   initable.init_finish(result);
-               } catch(e) {
-                   logError(e, 'could not initialize proxy for interface ' + interfaceName);
-
-                   if (onFinished)
-                       onFinished();
-                   return;
-               }
-
-               let isNewObject;
-               if (!this._objects[objectPath]) {
-                   this._objects[objectPath] = {};
-                   isNewObject = true;
-               } else {
-                   isNewObject = false;
-               }
-
-               this._objects[objectPath][interfaceName] = proxy;
-
-               if (!this._interfaces[interfaceName])
-                   this._interfaces[interfaceName] = [];
-
-               this._interfaces[interfaceName].push(proxy);
-
-               if (isNewObject)
-                   this.emit('object-added', objectPath);
-
-               this.emit('interface-added', interfaceName, proxy);
-
-               if (onFinished)
-                   onFinished();
-        }));
-    },
-
-    _removeInterface: function(objectPath, interfaceName) {
-        if (!this._objects[objectPath])
-            return;
-
-        let proxy = this._objects[objectPath][interfaceName];
-
-        if (this._interfaces[interfaceName]) {
-            let index = this._interfaces[interfaceName].indexOf(proxy);
-
-            if (index >= 0)
-                this._interfaces[interfaceName].splice(index, 1);
-
-            if (this._interfaces[interfaceName].length == 0)
-                delete this._interfaces[interfaceName];
-        }
-
-        this.emit('interface-removed', interfaceName, proxy);
-
-        this._objects[objectPath][interfaceName] = null;
-
-        if (Object.keys(this._objects[objectPath]).length == 0) {
-            delete this._objects[objectPath];
-            this.emit('object-removed', objectPath);
-        }
-    },
-
-    _onManagerProxyLoaded: function(initable, result) {
-        let error = null;
-        try {
-            initable.init_finish(result);
-        } catch(e) {
-            logError(e, 'could not initialize object manager for object ' + params.name);
-
-            this._tryToCompleteLoad();
-            return;
-        }
-
-        this._managerProxy.connectSignal('InterfacesAdded',
-                                         Lang.bind(this, function(objectManager, sender, [objectPath, interfaces]) {
-                                             let interfaceNames = Object.keys(interfaces);
-                                             for (let i = 0; i < interfaceNames.length; i++)
-                                                 this._addInterface(objectPath, interfaceNames[i]);
-                                         }));
-        this._managerProxy.connectSignal('InterfacesRemoved',
-                                         Lang.bind(this, function(objectManager, sender, [objectPath, interfaceNames]) {
-                                             for (let i = 0; i < interfaceNames.length; i++)
-                                                 this._removeInterface(objectPath, interfaceNames[i]);
-                                         }));
-
-        if (Object.keys(this._interfaceInfos).length == 0) {
-            this._tryToCompleteLoad();
-            return;
-        }
-
-        this._managerProxy.GetManagedObjectsRemote(Lang.bind(this, function(result, error) {
-            if (!result) {
-                if (error) {
-                   logError(error, 'could not get remote objects for service ' + this._serviceName + ' path ' + this._managerPath);
-                }
-
-                this._tryToCompleteLoad();
-                return;
-            }
-
-            let [objects] = result;
-
-            let objectPaths = Object.keys(objects);
-            for (let i = 0; i < objectPaths.length; i++) {
-                let objectPath = objectPaths[i];
-                let object = objects[objectPath];
-
-                let interfaceNames = Object.getOwnPropertyNames(object);
-                for (let j = 0; j < interfaceNames.length; j++) {
-                    let interfaceName = interfaceNames[j];
-
-                    // Prevent load from completing until the interface is loaded
-                    this._numLoadInhibitors++;
-                    this._addInterface(objectPath,
-                                       interfaceName,
-                                       Lang.bind(this, this._tryToCompleteLoad));
-                }
-            }
-            this._tryToCompleteLoad();
-        }));
-    },
-
-    _registerInterfaces: function(interfaces) {
-        for (let i = 0; i < interfaces.length; i++) {
-            let info = Gio.DBusInterfaceInfo.new_for_xml(interfaces[i]);
-            this._interfaceInfos[info.name] = info;
-        }
-    },
-
-    getProxy: function(objectPath, interfaceName) {
-        let object = this._objects[objectPath];
-
-        if (!object)
-            return null;
-
-        return object[interfaceName];
-    },
-
-    getProxiesForInterface: function(interfaceName) {
-        let proxyList = this._interfaces[interfaceName];
-
-        if (!proxyList)
-            return [];
-
-        return proxyList;
-    },
-
-    getAllProxies: function() {
-        let proxies = [];
-
-        let objectPaths = Object.keys(this._objects);
-        for (let i = 0; i < objectPaths.length; i++) {
-            let object = this._objects[objectPaths];
-
-            let interfaceNames = Object.keys(object);
-            for (let j = 0; i < interfaceNames.length; i++) {
-                let interfaceName = interfaceNames[i];
-                if (object[interfaceName])
-                    proxies.push(object(interfaceName));
-            }
-        }
-
-        return proxies;
-    }
-});
-Signals.addSignalMethods(ObjectManager.prototype);

js/misc/smartcardManager.js

@@ -1,119 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-
-const ObjectManager = imports.misc.objectManager;
-
-const SmartcardTokenIface = '<node> \
-<interface name="org.gnome.SettingsDaemon.Smartcard.Token"> \
-  <property name="Name" type="s" access="read"/> \
-  <property name="Driver" type="o" access="read"/> \
-  <property name="IsInserted" type="b" access="read"/> \
-  <property name="UsedToLogin" type="b" access="read"/> \
-</interface> \
-</node>';
-
-let _smartcardManager = null;
-
-function getSmartcardManager() {
-    if (_smartcardManager == null)
-        _smartcardManager = new SmartcardManager();
-
-    return _smartcardManager;
-}
-
-const SmartcardManager = new Lang.Class({
-    Name: 'SmartcardManager',
-    _init: function() {
-        this._objectManager = new ObjectManager.ObjectManager({ connection: Gio.DBus.session,
-                                                                name: "org.gnome.SettingsDaemon.Smartcard",
-                                                                objectPath: '/org/gnome/SettingsDaemon/Smartcard',
-                                                                knownInterfaces: [ SmartcardTokenIface ],
-                                                                onLoaded: Lang.bind(this, this._onLoaded) });
-        this._insertedTokens = {};
-        this._loginToken = null;
-    },
-
-    _onLoaded: function() {
-        let tokens = this._objectManager.getProxiesForInterface('org.gnome.SettingsDaemon.Smartcard.Token');
-
-        for (let i = 0; i < tokens.length; i++)
-            this._addToken(tokens[i]);
-
-        this._objectManager.connect('interface-added', Lang.bind(this, function(objectManager, interfaceName, proxy) {
-            if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token')
-                this._addToken(proxy);
-        }));
-
-        this._objectManager.connect('interface-removed', Lang.bind(this, function(objectManager, interfaceName, proxy) {
-            if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token')
-                this._removeToken(proxy);
-        }));
-    },
-
-    _updateToken: function(token) {
-        let objectPath = token.get_object_path();
-
-        delete this._insertedTokens[objectPath];
-
-        if (token.IsInserted)
-            this._insertedTokens[objectPath] = token;
-
-        if (token.UsedToLogin)
-            this._loginToken = token;
-    },
-
-    _addToken: function(token) {
-        this._updateToken(token);
-
-        token.connect('g-properties-changed',
-                      Lang.bind(this, function(proxy, properties) {
-                          if ('IsInserted' in properties.deep_unpack()) {
-                              this._updateToken(token);
-
-                              if (token.IsInserted) {
-                                  this.emit('smartcard-inserted', token);
-                              } else {
-                                  this.emit('smartcard-removed', token);
-                              }
-                          }
-                      }));
-
-        // Emit a smartcard-inserted at startup if it's already plugged in
-        if (token.IsInserted)
-            this.emit('smartcard-inserted', token);
-    },
-
-    _removeToken: function(token) {
-        let objectPath = token.get_object_path();
-
-        if (this._insertedTokens[objectPath] == token) {
-            delete this._insertedTokens[objectPath];
-            this.emit('smartcard-removed', token);
-        }
-
-        if (this._loginToken == token)
-            this._loginToken = null;
-
-        token.disconnectAll();
-    },
-
-    hasInsertedTokens: function() {
-        return Object.keys(this._insertedTokens).length > 0;
-    },
-
-    hasInsertedLoginToken: function() {
-        if (!this._loginToken)
-            return false;
-
-        if (!this._loginToken.IsInserted)
-            return false;
-
-        return true;
-    }
-
-});
-Signals.addSignalMethods(SmartcardManager.prototype);

js/misc/util.js

@@ -1,9 +1,7 @@
 // -*- 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 St = imports.gi.St;
 
 const Main = imports.ui.main;
@@ -80,22 +78,6 @@ function spawnCommandLine(command_line) {
     }
 }
 
-// spawnApp:
-// @argv: an argv array
-//
-// Runs @argv as if it was an application, handling startup notification
-function spawnApp(argv) {
-    try {
-        let app = Gio.AppInfo.create_from_commandline(argv.join(' '), null,
-                                                      Gio.AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION);
-
-        let context = global.create_app_launch_context(0, -1);
-        app.launch([], context);
-    } catch(err) {
-        _handleSpawnError(argv[0], err);
-    }
-}
-
 // trySpawn:
 // @argv: an argv array
 //
@@ -129,7 +111,7 @@ function trySpawn(argv)
     // Dummy child watch; we don't want to double-fork internally
     // because then we lose the parent-child relationship, which
     // can break polkit.  See https://bugzilla.redhat.com//show_bug.cgi?id=819275
-    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function () {});
+    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function () {}, null);
 }
 
 // trySpawnCommandLine:
@@ -153,10 +135,35 @@ function trySpawnCommandLine(command_line) {
 }
 
 function _handleSpawnError(command, err) {
-    let title = _("Execution of “%s” failed:").format(command);
+    let title = _("Execution of '%s' failed:").format(command);
     Main.notifyError(title, err.message);
 }
 
+// killall:
+// @processName: a process name
+//
+// Kills @processName. If no process with the given name is found,
+// this will fail silently.
+function killall(processName) {
+    try {
+        // pkill is more portable than killall, but on Linux at least
+        // it won't match if you pass more than 15 characters of the
+        // process name... However, if you use the '-f' flag to match
+        // the entire command line, it will work, but we have to be
+        // careful in that case that we can match
+        // '/usr/bin/processName' but not 'gedit processName.c' or
+        // whatever...
+
+        let argv = ['pkill', '-f', '^([^ ]*/)?' + processName + '($| )'];
+        GLib.spawn_sync(null, argv, null, GLib.SpawnFlags.SEARCH_PATH, null);
+        // It might be useful to return success/failure, but we'd need
+        // a wrapper around WIFEXITED and WEXITSTATUS. Since none of
+        // the current callers care, we don't bother.
+    } catch (e) {
+        logError(e, 'Failed to kill ' + processName);
+    }
+}
+
 // lowerBound:
 // @array: an array or array-like object, already sorted
 //         according to @cmp
@@ -207,57 +214,28 @@ function insertSorted(array, val, cmp) {
     return pos;
 }
 
-const CloseButton = new Lang.Class({
-    Name: 'CloseButton',
-    Extends: St.Button,
+function makeCloseButton() {
+    let closeButton = new St.Button({ style_class: 'notification-close'});
 
-    _init: function(boxpointer) {
-        this.parent({ 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);
 
-        // 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.
-        this.set_x_align(Clutter.ActorAlign.END);
-        this.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);
 
-        // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
-        // to respect the alignments.
-        this.set_x_expand(true);
-        this.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');
+    });
 
-        this._boxPointer = boxpointer;
-        if (boxpointer)
-            this._boxPointer.connect('arrow-side-changed', Lang.bind(this, this._sync));
-    },
-
-    _computeBoxPointerOffset: function() {
-        if (!this._boxPointer || !this._boxPointer.actor.get_stage())
-            return 0;
-
-        let side = this._boxPointer.arrowSide;
-        if (side == St.Side.TOP)
-            return this._boxPointer.getArrowHeight();
-        else
-            return 0;
-    },
-
-    _sync: function() {
-        let themeNode = this.get_theme_node();
-
-        let offY = this._computeBoxPointerOffset();
-        this.translation_x = themeNode.get_length('-shell-close-overlap-x')
-        this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY;
-    },
-
-    vfunc_style_changed: function() {
-        this._sync();
-        this.parent();
-    },
-});
-
-function makeCloseButton(boxpointer) {
-    return new CloseButton(boxpointer);
+    return closeButton;
 }
 
 function ensureActorVisibleInScrollView(scrollView, actor) {

js/ui/altTab.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 Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@@ -24,7 +23,7 @@ const WINDOW_PREVIEW_SIZE = 128;
 const APP_ICON_SIZE = 96;
 const APP_ICON_SIZE_SMALL = 48;
 
-const baseIconSizes = [96, 64, 48, 32, 22];
+const iconSizes = [96, 64, 48, 32, 22];
 
 const AppIconMode = {
     THUMBNAIL_ONLY: 1,
@@ -107,8 +106,6 @@ const AppSwitcherPopup = new Lang.Class({
 
         this._switcherList = new AppSwitcher(apps, this);
         this._items = this._switcherList.icons;
-        if (this._items.length == 0)
-            return false;
 
         return true;
     },
@@ -305,7 +302,6 @@ const AppSwitcherPopup = new Lang.Class({
             this._thumbnailTimeoutId = Mainloop.timeout_add (
                 THUMBNAIL_POPUP_TIME,
                 Lang.bind(this, this._timeoutPopupThumbnails));
-            GLib.Source.set_name_by_id(this._thumbnailTimeoutId, '[gnome-shell] this._timeoutPopupThumbnails');
         }
     },
 
@@ -314,7 +310,7 @@ const AppSwitcherPopup = new Lang.Class({
             this._createThumbnails();
         this._thumbnailTimeoutId = 0;
         this._thumbnailsFocused = false;
-        return GLib.SOURCE_REMOVE;
+        return false;
     },
 
     _destroyThumbnails : function() {
@@ -359,13 +355,10 @@ const WindowSwitcherPopup = new Lang.Class({
     Name: 'WindowSwitcherPopup',
     Extends: SwitcherPopup.SwitcherPopup,
 
-    _init: function(items) {
-        this.parent(items);
-        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });
-    },
-
     _getWindowList: function() {
-        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
+        let settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });
+        let workspace = settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace()
+                                                                       : null;
         return global.display.get_tab_list(Meta.TabList.NORMAL, global.screen, workspace);
     },
 
@@ -375,13 +368,9 @@ const WindowSwitcherPopup = new Lang.Class({
         if (windows.length == 0)
             return false;
 
-        let mode = this._settings.get_enum('app-icon-mode');
-        this._switcherList = new WindowList(windows, mode);
+        this._switcherList = new WindowList(windows);
         this._items = this._switcherList.icons;
 
-        if (this._items.length == 0)
-            return false;
-
         return true;
     },
 
@@ -431,6 +420,7 @@ const AppIcon = new Lang.Class({
 
     set_size: function(size) {
         this.icon = this.app.create_icon_texture(size);
+        this._iconBin.set_size(size, size);
         this._iconBin.child = this.icon;
     }
 });
@@ -446,11 +436,8 @@ const AppSwitcher = new Lang.Class({
         this._arrows = [];
 
         let windowTracker = Shell.WindowTracker.get_default();
-        let settings = new Gio.Settings({ schema: 'org.gnome.shell.app-switcher' });
-        let workspace = settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace()
-                                                                       : null;
         let allWindows = global.display.get_tab_list(Meta.TabList.NORMAL,
-                                                     global.screen, workspace);
+                                                     global.screen, null);
 
         // Construct the AppIcons, add to the popup
         for (let i = 0; i < apps.length; i++) {
@@ -460,10 +447,7 @@ const AppSwitcher = new Lang.Class({
             appIcon.cachedWindows = allWindows.filter(function(w) {
                 return windowTracker.get_window_app (w) == appIcon.app;
             });
-            if (appIcon.cachedWindows.length > 0)
-                this._addIcon(appIcon);
-            else if (workspace == null)
-                throw new Error('%s appears to be running, but doesn\'t have any windows'.format(appIcon.app.get_name()));
+            this._addIcon(appIcon);
         }
 
         this._curApp = -1;
@@ -479,13 +463,12 @@ const AppSwitcher = new Lang.Class({
             Mainloop.source_remove(this._mouseTimeOutId);
     },
 
-    _setIconSize: function() {
+    _getPreferredHeight: function (actor, forWidth, alloc) {
         let j = 0;
         while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
                 j++;
         }
         let themeNode = this._items[j].get_theme_node();
-
         let iconPadding = themeNode.get_horizontal_padding();
         let iconBorder = themeNode.get_border_width(St.Side.LEFT) + themeNode.get_border_width(St.Side.RIGHT);
         let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
@@ -496,22 +479,19 @@ const AppSwitcher = new Lang.Class({
         let primary = Main.layoutManager.primaryMonitor;
         let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
         let availWidth = primary.width - parentPadding - this.actor.get_theme_node().get_horizontal_padding();
+        let height = 0;
 
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        let iconSizes = baseIconSizes.map(function(s) {
-            return s * scaleFactor;
-        });
-
-        if (this._items.length == 1) {
-            this._iconSize = baseIconSizes[0];
-        } else {
-            for(let i =  0; i < baseIconSizes.length; i++) {
-                this._iconSize = baseIconSizes[i];
-                let height = iconSizes[i] + iconSpacing;
+        for(let i =  0; i < iconSizes.length; i++) {
+                this._iconSize = iconSizes[i];
+                height = iconSizes[i] + iconSpacing;
                 let w = height * this._items.length + totalSpacing;
                 if (w <= availWidth)
-                    break;
-            }
+                        break;
+        }
+
+        if (this._items.length == 1) {
+            this._iconSize = iconSizes[0];
+            height = iconSizes[0] + iconSpacing;
         }
 
         for(let i = 0; i < this.icons.length; i++) {
@@ -519,11 +499,9 @@ const AppSwitcher = new Lang.Class({
                 break;
             this.icons[i].set_size(this._iconSize);
         }
-    },
 
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        this._setIconSize();
-        this.parent(actor, forWidth, alloc);
+        alloc.min_size = height;
+        alloc.natural_size = height;
     },
 
     _allocate: function (actor, box, flags) {
@@ -555,9 +533,8 @@ const AppSwitcher = new Lang.Class({
                                                         Lang.bind(this, function () {
                                                                             this._enterItem(index);
                                                                             this._mouseTimeOutId = 0;
-                                                                            return GLib.SOURCE_REMOVE;
+                                                                            return false;
                                                         }));
-            GLib.Source.set_name_by_id(this._mouseTimeOutId, '[gnome-shell] this._enterItem');
         } else
            this._itemEntered(index);
     },
@@ -657,19 +634,17 @@ const ThumbnailList = new Lang.Class({
         totalPadding += this.actor.get_theme_node().get_horizontal_padding() + this.actor.get_theme_node().get_vertical_padding();
         let [labelMinHeight, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
         let spacing = this._items[0].child.get_theme_node().get_length('spacing');
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        let thumbnailSize = THUMBNAIL_DEFAULT_SIZE * scaleFactor;
 
-        availHeight = Math.min(availHeight - labelNaturalHeight - totalPadding - spacing, thumbnailSize);
+        availHeight = Math.min(availHeight - labelNaturalHeight - totalPadding - spacing, THUMBNAIL_DEFAULT_SIZE);
         let binHeight = availHeight + this._items[0].get_theme_node().get_vertical_padding() + this.actor.get_theme_node().get_vertical_padding() - spacing;
-        binHeight = Math.min(thumbnailSize, binHeight);
+        binHeight = Math.min(THUMBNAIL_DEFAULT_SIZE, binHeight);
 
         for (let i = 0; i < this._thumbnailBins.length; i++) {
             let mutterWindow = this._windows[i].get_compositor_private();
             if (!mutterWindow)
                 continue;
 
-            let clone = _createWindowClone(mutterWindow, thumbnailSize);
+            let clone = _createWindowClone(mutterWindow, THUMBNAIL_DEFAULT_SIZE);
             this._thumbnailBins[i].set_height(binHeight);
             this._thumbnailBins[i].add_actor(clone);
             this._clones.push(clone);
@@ -683,7 +658,7 @@ const ThumbnailList = new Lang.Class({
 const WindowIcon = new Lang.Class({
     Name: 'WindowIcon',
 
-    _init: function(window, mode) {
+    _init: function(window) {
         this.window = window;
 
         this.actor = new St.BoxLayout({ style_class: 'alt-tab-app',
@@ -701,7 +676,8 @@ const WindowIcon = new Lang.Class({
 
         this._icon.destroy_all_children();
 
-        switch (mode) {
+        let settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });
+        switch (settings.get_enum('app-icon-mode')) {
             case AppIconMode.THUMBNAIL_ONLY:
                 size = WINDOW_PREVIEW_SIZE;
                 this._icon.add_actor(_createWindowClone(mutterWindow, WINDOW_PREVIEW_SIZE));
@@ -739,7 +715,7 @@ const WindowList = new Lang.Class({
     Name: 'WindowList',
     Extends: SwitcherPopup.SwitcherList,
 
-    _init : function(windows, mode) {
+    _init : function(windows) {
         this.parent(true);
 
         this._label = new St.Label({ x_align: Clutter.ActorAlign.CENTER,
@@ -751,7 +727,7 @@ const WindowList = new Lang.Class({
 
         for (let i = 0; i < windows.length; i++) {
             let win = windows[i];
-            let icon = new WindowIcon(win, mode);
+            let icon = new WindowIcon(win);
 
             this.addItem(icon.actor, icon.label);
             this.icons.push(icon);

js/ui/animation.js

@@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const St = imports.gi.St;
@@ -21,9 +20,7 @@ const Animation = new Lang.Class({
         this._isPlaying = false;
         this._timeoutId = 0;
         this._frame = 0;
-
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height, scaleFactor,
+        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
                                                                             Lang.bind(this, this._animationsLoaded));
         this.actor.set_child(this._animations);
     },
@@ -34,7 +31,6 @@ const Animation = new Lang.Class({
                 this._showFrame(0);
 
             this._timeoutId = Mainloop.timeout_add(this._speed, Lang.bind(this, this._update));
-            GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._update');
         }
 
         this._isPlaying = true;
@@ -63,7 +59,7 @@ const Animation = new Lang.Class({
 
     _update: function() {
         this._showFrame(this._frame + 1);
-        return GLib.SOURCE_CONTINUE;
+        return true;
     },
 
     _animationsLoaded: function() {

js/ui/appFavorites.js

@@ -14,15 +14,15 @@ const AppFavorites = new Lang.Class({
     _init: function() {
         this._favorites = {};
         global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, Lang.bind(this, this._onFavsChanged));
-        this.reload();
+        this._reload();
     },
 
     _onFavsChanged: function() {
-        this.reload();
+        this._reload();
         this.emit('changed');
     },
 
-    reload: function() {
+    _reload: function() {
         let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
         let appSys = Shell.AppSystem.get_default();
         let apps = ids.map(function (id) {

js/ui/auth/fingerprint.js

@@ -5,13 +5,11 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const FprintManagerIface = '<node> \
-<interface name="net.reactivated.Fprint.Manager"> \
-<method name="GetDefaultDevice"> \
-    <arg type="o" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const FprintManagerIface = <interface name='net.reactivated.Fprint.Manager'>
+<method name='GetDefaultDevice'>
+    <arg type='o' direction='out' />
+</method>
+</interface>;
 
 const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface);
 

js/ui/auth/loginDialog.js

@@ -0,0 +1,834 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
+ * Copyright 2011 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+const AccountsService = imports.gi.AccountsService;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const CtrlAltTab = imports.ui.ctrlAltTab;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+const Mainloop = imports.mainloop;
+const Meta = imports.gi.Meta;
+const Lang = imports.lang;
+const Pango = imports.gi.Pango;
+const Realmd = imports.ui.auth.realmd;
+const Signals = imports.signals;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Gdm = imports.gi.Gdm;
+
+const Animation = imports.ui.animation;
+const AuthUtil = imports.ui.auth.util;
+const Batch = imports.misc.batch;
+const Fprint = imports.ui.auth.fingerprint;
+const Layout = imports.ui.layout;
+const Main = imports.ui.main;
+const ModalDialog = imports.ui.modalDialog;
+const SessionList = imports.ui.auth.sessionList;
+const Tweener = imports.ui.tweener;
+const UserAvatar = imports.ui.userAvatar;
+const UserList = imports.ui.auth.userList;
+const UserWidget = imports.ui.userWidget;
+
+const _FADE_ANIMATION_TIME = 0.25;
+const _SCROLL_ANIMATION_TIME = 0.5;
+const _WORK_SPINNER_ICON_SIZE = 24;
+const _WORK_SPINNER_ANIMATION_DELAY = 1.0;
+const _WORK_SPINNER_ANIMATION_TIME = 0.3;
+const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
+const _LOGO_ICON_HEIGHT = 48;
+
+let _loginDialog = null;
+
+const LoginDialog = new Lang.Class({
+    Name: 'LoginDialog',
+
+    _init: function(parentActor) {
+        this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,
+                                     style_class: 'login-dialog' });
+
+        this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+        parentActor.add_child(this.actor);
+
+        Main.ctrlAltTabManager.addGroup(this.actor,
+                                        _("Login Window"),
+                                        'dialog-password-symbolic',
+                                        { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
+        this._userManager = AccountsService.UserManager.get_default()
+        this._greeterClient = new Gdm.Client();
+
+        if (GLib.getenv('GDM_GREETER_TEST') != '1') {
+            this._greeter = this._greeterClient.get_greeter_sync(null);
+
+            this._greeter.connect('default-session-name-changed',
+                                  Lang.bind(this, this._onDefaultSessionChanged));
+
+            this._greeter.connect('session-opened',
+                                  Lang.bind(this, this._onSessionOpened));
+            this._greeter.connect('timed-login-requested',
+                                  Lang.bind(this, this._onTimedLoginRequested));
+        }
+
+        this._userVerifier = new AuthUtil.ShellUserVerifier(this._greeterClient);
+        this._userVerifier.connect('ask-question', Lang.bind(this, this._askQuestion));
+        this._userVerifier.connect('show-message', Lang.bind(this, this._onShowMessage));
+        this._userVerifier.connect('verification-failed', Lang.bind(this, this._verificationFailed));
+        this._userVerifier.connect('reset', Lang.bind(this, this._reset));
+        this._userVerifier.connect('show-login-hint', Lang.bind(this, this._showLoginHint));
+        this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._hideLoginHint));
+        this._verifyingUser = false;
+
+        this._settings = new Gio.Settings({ schema: AuthUtil.LOGIN_SCREEN_SCHEMA });
+
+        this._settings.connect('changed::' + AuthUtil.BANNER_MESSAGE_KEY,
+                               Lang.bind(this, this._updateBanner));
+        this._settings.connect('changed::' + AuthUtil.BANNER_MESSAGE_TEXT_KEY,
+                               Lang.bind(this, this._updateBanner));
+        this._settings.connect('changed::' + AuthUtil.DISABLE_USER_LIST_KEY,
+                               Lang.bind(this, this._updateDisableUserList));
+        this._settings.connect('changed::' + AuthUtil.LOGO_KEY,
+                               Lang.bind(this, this._updateLogo));
+
+        this._textureCache = St.TextureCache.get_default();
+        this._textureCache.connect('texture-file-changed',
+                                   Lang.bind(this, this._updateLogoTexture));
+
+        this._userSelectionBox = new St.BoxLayout({ style_class: 'login-dialog-user-selection-box',
+                                                    vertical: true });
+
+        this._userSelectionBox.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
+                                                                            align_axis: Clutter.AlignAxis.BOTH,
+                                                                            factor: 0.5 }));
+        this.actor.add_child(this._userSelectionBox);
+
+        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
+                                           text: '' });
+        this._userSelectionBox.add(this._bannerLabel);
+        this._updateBanner();
+
+        this._userList = new UserList.UserList();
+        this._userSelectionBox.add(this._userList.actor,
+                                   { expand: true,
+                                     x_fill: true,
+                                     y_fill: true });
+
+        this._userList.actor.grab_key_focus();
+
+        this._promptBox = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
+                                             vertical: true });
+        this._promptBox.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
+                                                                     align_axis: Clutter.AlignAxis.BOTH,
+                                                                     factor: 0.5 }));
+        this.actor.add_child(this._promptBox);
+        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,
+                            { expand: true,
+                              x_fill: true,
+                              y_fill: true,
+                              x_align: St.Align.START });
+        this._promptEntry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
+                                           can_focus: true });
+        this._promptEntryTextChangedId = 0;
+        this._promptEntryActivateId = 0;
+        this._promptBox.add(this._promptEntry,
+                            { expand: false,
+                              x_fill: false });
+
+        this._promptMessage = new St.Label({ opacity: 0 });
+        this.actor.add_child(this._promptMessage);
+
+        this._promptMessagePlaceholder = new Clutter.Actor({ width: 1, height: 1 });
+        this._promptBox.add_child(this._promptMessagePlaceholder);
+
+        this._promptMessagePlaceholder.add_constraint(new Clutter.BindConstraint({ source: this._promptMessage,
+                                                                                   coordinate: Clutter.BindCoordinate.HEIGHT }));
+
+        this._promptMessage.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
+                                                                         align_axis: Clutter.AlignAxis.X_AXIS,
+                                                                         factor: 0.5 }));
+
+        this._promptMessagePlaceholder.connect("notify::y", Lang.bind(this, function() {
+                                                   let [placeholderX , placeholderY] = this._promptMessagePlaceholder.get_transformed_position();
+                                                   let [actorX, actorY] = this.actor.get_transformed_position();
+                                                   this._promptMessage.y = placeholderY - actorY;
+                                               }));
+
+        this._sessionList = new SessionList.SessionList();
+        this._sessionList.connect('session-activated',
+                                  Lang.bind(this, function(list, sessionId) {
+                                                this._greeter.call_select_session_sync (sessionId, null);
+                                            }));
+
+        this._promptBox.add(this._sessionList.actor,
+                            { expand: true,
+                              x_fill: false,
+                              y_fill: true,
+                              x_align: St.Align.START });
+
+        this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
+                                             vertical: false });
+        this._promptBox.add(this._buttonBox,
+                            { expand:  true,
+                              x_align: St.Align.MIDDLE,
+                              y_align: St.Align.END });
+        this._cancelButton = null;
+        this._signInButton = null;
+
+        this._promptBox.hide();
+
+        // translators: this message is shown below the user list on the
+        // login screen. It can be activated to reveal an entry for
+        // manually entering the username.
+        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._userSelectionBox.add(this._notListedButton,
+                                   { expand: false,
+                                     x_align: St.Align.START,
+                                     x_fill: true });
+
+        this._logoBin = new St.Bin({ style_class: 'login-dialog-logo-bin', y_expand: true });
+        this._logoBin.set_y_align(Clutter.ActorAlign.END);
+        this._logoBin.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
+                                                                   align_axis: Clutter.AlignAxis.X_AXIS,
+                                                                   factor: 0.5 }));
+        this._logoBin.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
+                                                                   align_axis: Clutter.AlignAxis.Y_AXIS,
+                                                                   factor: 1.0 }));
+        this.actor.add_actor(this._logoBin);
+        this._updateLogo();
+
+        if (!this._userManager.is_loaded)
+            this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',
+                                                                  Lang.bind(this, function() {
+                                                                      if (this._userManager.is_loaded) {
+                                                                          this._loadUserList();
+                                                                          this._userManager.disconnect(this._userManagerLoadedId);
+                                                                          this._userManagerLoadedId = 0;
+                                                                      }
+                                                                  }));
+        else
+            this._loadUserList();
+
+        this._userList.connect('activate',
+                               Lang.bind(this, function(userList, item) {
+                                   this._onUserListActivated(item);
+                               }));
+
+   },
+
+    _updateDisableUserList: function() {
+        let disableUserList = this._settings.get_boolean(AuthUtil.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(AuthUtil.BANNER_MESSAGE_KEY);
+        let text = this._settings.get_string(AuthUtil.BANNER_MESSAGE_TEXT_KEY);
+
+        if (enabled && text) {
+            this._bannerLabel.set_text(text);
+            this._bannerLabel.show();
+        } else {
+            this._bannerLabel.hide();
+        }
+    },
+
+    _updateLogoTexture: function(cache, uri) {
+        if (this._logoFileUri != uri)
+            return;
+
+        let icon = null;
+        if (this._logoFileUri)
+            icon = this._textureCache.load_uri_async(this._logoFileUri,
+                                                     -1, _LOGO_ICON_HEIGHT);
+        this._logoBin.set_child(icon);
+    },
+
+    _updateLogo: function() {
+        let path = this._settings.get_string(AuthUtil.LOGO_KEY);
+
+        this._logoFileUri = path ? Gio.file_new_for_path(path).get_uri() : null;
+        this._updateLogoTexture(this._textureCache, this._logoFileUri);
+    },
+
+    _reset: function() {
+        this._userVerifier.clear();
+
+        this._updateSensitivity(true);
+        this._promptMessage.opacity = 0;
+        this._user = null;
+        this._verifyingUser = false;
+
+        if (this._disableUserList)
+            this._hideUserListAndLogIn();
+        else
+            this._showUserList();
+    },
+
+    _setWorking: function(working) {
+        if (!this._workSpinner)
+            return;
+
+        Tweener.removeTweens(this._workSpinner.actor);
+        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();
+                               }
+                             });
+        }
+    },
+
+    _verificationFailed: function() {
+        this._promptEntry.text = '';
+
+        this._updateSensitivity(true);
+        this._setWorking(false);
+    },
+
+    _onDefaultSessionChanged: function(client, sessionId) {
+        this._sessionList.setActiveSession(sessionId);
+    },
+
+    _showMessage: function(message, styleClass) {
+        if (message) {
+            this._promptMessage.text = message;
+            this._promptMessage.styleClass = styleClass;
+            this._promptMessage.opacity = 255;
+        } else {
+            this._promptMessage.opacity = 0;
+        }
+    },
+
+    _onShowMessage: function(userVerifier, message, styleClass) {
+        this._showMessage(message, styleClass);
+        this._loginHintShown = false;
+    },
+
+    _showLoginHint: function(verifier, message) {
+        this._showMessage(message, 'login-dialog-prompt-login-hint-message');
+        this._loginHintShown = true;
+    },
+
+    _hideLoginHint: function() {
+        if (!this._loginHintShown)
+            return;
+        this._showMessage('', 'login-dialog-prompt-login-hint-message');
+        this._loginHintShown = false;
+    },
+
+    cancel: function() {
+        if (this._verifyingUser)
+            this._userVerifier.cancel();
+        else
+            this._reset();
+    },
+
+    _showPrompt: function(forSecret) {
+        this._sessionList.actor.hide();
+        this._promptLabel.show();
+        this._promptEntry.show();
+        this._promptBox.opacity = 0;
+        this._promptBox.show();
+        Tweener.addTween(this._promptBox,
+                         { opacity: 255,
+                           time: _FADE_ANIMATION_TIME,
+                           transition: 'easeOutQuad' });
+
+        if ((this._user && !this._user.is_logged_in()) || this._verifyingUser)
+            this._sessionList.actor.show();
+
+        this._promptEntry.grab_key_focus();
+
+        let hold = new Batch.Hold();
+        let tasks = [function() {
+                         this._prepareDialog(forSecret, hold);
+                     },
+
+                     hold];
+
+        let batch = new Batch.ConcurrentBatch(this, tasks);
+
+        return batch.run();
+    },
+
+    _prepareDialog: function(forSecret, hold) {
+        this._buttonBox.visible = true;
+        this._buttonBox.destroy_all_children();
+
+        if (!this._disableUserList || this._verifyingUser) {
+            this._cancelButton = new St.Button({ style_class: 'modal-dialog-button',
+                                                 button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                                 reactive: true,
+                                                 can_focus: true,
+                                                 label: _("Cancel") });
+            this._cancelButton.connect('clicked',
+                                       Lang.bind(this, function() {
+                                           this.cancel();
+                                       }));
+            global.stage.connect('captured-event',
+                                 Lang.bind(this, function(actor, event) {
+                                    if (event.type() == Clutter.EventType.KEY_PRESS &&
+                                        event.get_key_symbol() == Clutter.KEY_Escape) {
+                                        this.cancel();
+                                    }
+                                 }));
+            this._buttonBox.add(this._cancelButton,
+                                { expand: true,
+                                  x_fill: false,
+                                  y_fill: false,
+                                  x_align: St.Align.START,
+                                  y_align: St.Align.END });
+        }
+
+        let spinnerIcon = global.datadir + '/theme/process-working.svg';
+        this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, _WORK_SPINNER_ICON_SIZE);
+        this._workSpinner.actor.opacity = 0;
+        this._workSpinner.actor.show();
+
+        this._buttonBox.add(this._workSpinner.actor,
+                            { expand: false,
+                              x_fill: false,
+                              y_fill: false,
+                              x_align: St.Align.END,
+                              y_align: St.Align.MIDDLE });
+
+        this._signInButton = new St.Button({ style_class: 'modal-dialog-button',
+                                             button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                             reactive: true,
+                                             can_focus: true,
+                                             label: forSecret ? C_("button", "Sign In") : _("Next") });
+        this._signInButton.connect('clicked',
+                                   Lang.bind(this, function() {
+                                       hold.release();
+                                   }));
+        this._signInButton.add_style_pseudo_class('default');
+        this._buttonBox.add(this._signInButton,
+                            { expand: true,
+                              x_fill: false,
+                              y_fill: false,
+                              x_align: St.Align.END,
+                              y_align: St.Align.END });
+
+        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._buttonBox.destroy_all_children();
+
+        if (this._promptEntryTextChangedId > 0) {
+            this._promptEntry.clutter_text.disconnect(this._promptEntryTextChangedId);
+            this._promptEntryTextChangedId = 0;
+        }
+
+        if (this._promptEntryActivateId > 0) {
+            this._promptEntry.clutter_text.disconnect(this._promptEntryActivateId);
+            this._promptEntryActivateId = 0;
+        }
+
+        this._setWorking(false);
+        this._promptBox.hide();
+
+        this._promptUser.set_child(null);
+
+        this._updateSensitivity(true);
+        this._promptEntry.set_text('');
+
+        this._sessionList.close();
+
+        this._buttonBox.destroy_all_children();
+        this._signInButton = null;
+        this._cancelButton = null;
+    },
+
+    _askQuestion: function(verifier, serviceName, question, passwordChar) {
+        this._promptLabel.set_text(question);
+
+        this._updateSensitivity(true);
+        this._promptEntry.set_text('');
+        this._promptEntry.clutter_text.set_password_char(passwordChar);
+
+        let tasks = [function() {
+                         return this._showPrompt(!!passwordChar);
+                     },
+
+                     function() {
+                         let text = this._promptEntry.get_text();
+                         this._updateSensitivity(false);
+                         this._setWorking(true);
+                         this._userVerifier.answerQuery(serviceName, text);
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        return batch.run();
+    },
+
+    _showRealmLoginHint: function(realmManager, hint) {
+        if (!hint)
+            return;
+
+        hint = hint.replace(/%U/g, 'user');
+        hint = hint.replace(/%D/g, 'DOMAIN');
+        hint = hint.replace(/%[^UD]/g, '');
+
+        // Translators: this message is shown below the username entry field
+        // to clue the user in on how to login to the local network realm
+        this._showLoginHint(null, _("(e.g., user or %s)").format(hint));
+    },
+
+    _askForUsernameAndLogIn: function() {
+        this._promptLabel.set_text(_("Username: "));
+        this._promptEntry.set_text('');
+        this._promptEntry.clutter_text.set_password_char('');
+
+        let realmManager = new Realmd.Manager();
+        let signalId = realmManager.connect('login-format-changed',
+	                                        Lang.bind(this, this._showRealmLoginHint));
+        this._showRealmLoginHint(realmManager.loginFormat);
+
+        let tasks = [this._showPrompt,
+
+                     function() {
+                         let userName = this._promptEntry.get_text();
+                         this._promptEntry.reactive = false;
+                         return this._beginVerificationForUser(userName);
+                     },
+
+                     function() {
+                         realmManager.disconnect(signalId)
+                         realmManager.release();
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        return batch.run();
+    },
+
+    _startSession: function(serviceName) {
+        Tweener.addTween(this.actor,
+                         { 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.actor.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);
+                                                      }));
+        }
+    },
+
+    _waitForItemForUser: function(userName) {
+        let item = this._userList.getItemFromUserName(userName);
+
+        if (item)
+          return null;
+
+        let hold = new Batch.Hold();
+        let signalId = this._userList.connect('item-added',
+                                              Lang.bind(this, function() {
+                                                  let item = this._userList.getItemFromUserName(userName);
+
+                                                  if (item)
+                                                      hold.release();
+                                              }));
+
+        hold.connect('release', Lang.bind(this, function() {
+                         this._userList.disconnect(signalId);
+                     }));
+
+        return hold;
+    },
+
+    _showTimedLoginAnimation: function() {
+        this._timedLoginItem.actor.grab_key_focus();
+        return this._timedLoginItem.showTimedLoginIndicator(this._timedLoginAnimationTime);
+    },
+
+    _blockTimedLoginUntilIdle: function() {
+        // This blocks timed login from starting until a few
+        // seconds after the user stops interacting with the
+        // login screen.
+        //
+        // We skip this step if the timed login delay is very
+        // short.
+        if ((this._timedLoginDelay - _TIMED_LOGIN_IDLE_THRESHOLD) <= 0)
+          return null;
+
+        let hold = new Batch.Hold();
+
+        this._timedLoginIdleTimeOutId = Mainloop.timeout_add_seconds(_TIMED_LOGIN_IDLE_THRESHOLD,
+                                                                     function() {
+                                                                         this._timedLoginAnimationTime -= _TIMED_LOGIN_IDLE_THRESHOLD;
+                                                                         hold.release();
+                                                                     });
+        return hold;
+    },
+
+    _startTimedLogin: function(userName, delay) {
+        this._timedLoginItem = null;
+        this._timedLoginDelay = delay;
+        this._timedLoginAnimationTime = delay;
+
+        let tasks = [function() {
+                         return this._waitForItemForUser(userName);
+                     },
+
+                     function() {
+                         this._timedLoginItem = this._userList.getItemFromUserName(userName);
+                     },
+
+                     function() {
+                         // If we're just starting out, start on the right
+                         // item.
+                         if (!this._userManager.is_loaded) {
+                             this._userList.jumpToItem(this._timedLoginItem);
+                         }
+                     },
+
+                     this._blockTimedLoginUntilIdle,
+
+                     function() {
+                         this._userList.scrollToItem(this._timedLoginItem);
+                     },
+
+                     this._showTimedLoginAnimation,
+
+                     function() {
+                         this._timedLoginBatch = null;
+                         this._greeter.call_begin_auto_login_sync(userName, null);
+                     }];
+
+        this._timedLoginBatch = new Batch.ConsecutiveBatch(this, tasks);
+
+        return this._timedLoginBatch.run();
+    },
+
+    _resetTimedLogin: function() {
+        if (this._timedLoginBatch) {
+            this._timedLoginBatch.cancel();
+            this._timedLoginBatch = null;
+        }
+
+        if (this._timedLoginItem)
+            this._timedLoginItem.hideTimedLoginIndicator();
+
+        let userName = this._timedLoginItem.user.get_user_name();
+
+        if (userName)
+            this._startTimedLogin(userName, this._timedLoginDelay);
+    },
+
+    _onTimedLoginRequested: function(client, userName, seconds) {
+        this._startTimedLogin(userName, seconds);
+
+        global.stage.connect('captured-event',
+                             Lang.bind(this, function(actor, event) {
+                                if (this._timedLoginDelay == undefined)
+                                    return false;
+
+                                if (event.type() == Clutter.EventType.KEY_PRESS ||
+                                    event.type() == Clutter.EventType.BUTTON_PRESS) {
+                                    if (this._timedLoginBatch) {
+                                        this._timedLoginBatch.cancel();
+                                        this._timedLoginBatch = null;
+                                    }
+                                } else if (event.type() == Clutter.EventType.KEY_RELEASE ||
+                                           event.type() == Clutter.EventType.BUTTON_RELEASE) {
+                                    this._resetTimedLogin();
+                                }
+
+                                return false;
+                             }));
+    },
+
+    _setUserListExpanded: function(expanded) {
+        this._userList.updateStyle(expanded);
+        this._userSelectionBox.visible = expanded;
+    },
+
+    _hideUserListAndLogIn: function() {
+        this._setUserListExpanded(false);
+        AuthUtil.cloneAndFadeOutActor(this._userSelectionBox);
+        this._askForUsernameAndLogIn();
+    },
+
+    _showUserList: function() {
+        this._hidePrompt();
+        this._setUserListExpanded(true);
+        this._userList.actor.grab_key_focus();
+    },
+
+    _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 tasks = [function() {
+                         return AuthUtil.cloneAndFadeOutActor(this._userSelectionBox);
+                     },
+                     function() {
+                         this._setUserListExpanded(false);
+                     }];
+
+        this._user = activatedItem.user;
+
+        let batch = new Batch.ConcurrentBatch(this, [new Batch.ConsecutiveBatch(this, tasks),
+                                                     this._beginVerificationForItem(activatedItem)]);
+        batch.run();
+    },
+
+    _onDestroy: function() {
+        if (this._userManagerLoadedId) {
+            this._userManager.disconnect(this._userManagerLoadedId);
+            this._userManagerLoadedId = 0;
+        }
+
+        Main.ctrlAltTabManager.removeGroup(this.actor);
+    },
+
+    _loadUserList: function() {
+        let users = this._userManager.list_users();
+
+        for (let i = 0; i < users.length; i++) {
+            this._userList.addUser(users[i]);
+        }
+
+        this._updateDisableUserList();
+
+        this._userManager.connect('user-added',
+                                  Lang.bind(this, function(userManager, user) {
+                                      this._userList.addUser(user);
+                                  }));
+
+        this._userManager.connect('user-removed',
+                                  Lang.bind(this, function(userManager, user) {
+                                      this._userList.removeUser(user);
+                                  }));
+    },
+
+    addCharacter: function(unichar) {
+        this._promptEntry.clutter_text.insert_unichar(unichar);
+    },
+});

js/ui/auth/powerMenu.js

@@ -0,0 +1,129 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
+ * Copyright 2011 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+
+const LoginManager = imports.misc.loginManager;
+
+const AuthUtil = imports.ui.auth.util;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const PowerMenuButton = new Lang.Class({
+    Name: 'PowerMenuButton',
+    Extends: PanelMenu.SystemStatusButton,
+
+    _init: function() {
+        /* Translators: accessible name of the power menu in the login screen */
+        this.parent('system-shutdown-symbolic', _("Power"));
+
+        this._loginManager = LoginManager.getLoginManager();
+
+        this._settings = new Gio.Settings({ schema: AuthUtil.LOGIN_SCREEN_SCHEMA });
+        this._settings.connect('changed::disable-restart-buttons',
+                               Lang.bind(this, this._updateVisibility));
+
+        this._createSubMenu();
+
+        // ConsoleKit doesn't send notifications when shutdown/reboot
+        // are disabled, so we update the menu item each time the menu opens
+        this.menu.connect('open-state-changed', Lang.bind(this,
+            function(menu, open) {
+                if (open) {
+                    this._updateHaveShutdown();
+                    this._updateHaveRestart();
+                    this._updateHaveSuspend();
+                }
+            }));
+        this._updateHaveShutdown();
+        this._updateHaveRestart();
+        this._updateHaveSuspend();
+    },
+
+    _updateVisibility: function() {
+        let shouldBeVisible = (this._haveSuspend || this._haveShutdown || this._haveRestart);
+        this.actor.visible = shouldBeVisible && !this._settings.get_boolean('disable-restart-buttons');
+    },
+
+    _updateHaveShutdown: function() {
+        this._loginManager.canPowerOff(Lang.bind(this, function(result) {
+            this._haveShutdown = result;
+            this._powerOffItem.actor.visible = this._haveShutdown;
+            this._updateVisibility();
+        }));
+    },
+
+    _updateHaveRestart: function() {
+        this._loginManager.canReboot(Lang.bind(this, function(result) {
+            this._haveRestart = result;
+            this._restartItem.actor.visible = this._haveRestart;
+            this._updateVisibility();
+        }));
+    },
+
+    _updateHaveSuspend: function() {
+        this._loginManager.canSuspend(Lang.bind(this, function(result) {
+            this._haveSuspend = result;
+            this._suspendItem.actor.visible = this._haveSuspend;
+            this._updateVisibility();
+        }));
+    },
+
+    _createSubMenu: function() {
+        let item;
+
+        item = new PopupMenu.PopupMenuItem(_("Suspend"));
+        item.connect('activate', Lang.bind(this, this._onActivateSuspend));
+        this.menu.addMenuItem(item);
+        this._suspendItem = item;
+
+        item = new PopupMenu.PopupMenuItem(_("Restart"));
+        item.connect('activate', Lang.bind(this, this._onActivateRestart));
+        this.menu.addMenuItem(item);
+        this._restartItem = item;
+
+        item = new PopupMenu.PopupMenuItem(_("Power Off"));
+        item.connect('activate', Lang.bind(this, this._onActivatePowerOff));
+        this.menu.addMenuItem(item);
+        this._powerOffItem = item;
+    },
+
+    _onActivateSuspend: function() {
+        if (!this._haveSuspend)
+            return;
+
+        this._loginManager.suspend();
+    },
+
+    _onActivateRestart: function() {
+        if (!this._haveRestart)
+            return;
+
+        this._loginManager.reboot();
+    },
+
+    _onActivatePowerOff: function() {
+        if (!this._haveShutdown)
+            return;
+
+        this._loginManager.powerOff();
+    }
+});

js/ui/auth/realmd.js

@@ -5,58 +5,52 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const ProviderIface = '<node> \
-<interface name="org.freedesktop.realmd.Provider"> \
-    <property name="Name" type="s" access="read"/> \
-    <property name="Version" type="s" access="read"/> \
-    <property name="Realms" type="ao" access="read"/> \
-    <method name="Discover"> \
-        <arg name="string" type="s" direction="in"/> \
-        <arg name="options" type="a{sv}" direction="in"/> \
-        <arg name="relevance" type="i" direction="out"/> \
-        <arg name="realm" type="ao" direction="out"/> \
-    </method> \
-</interface> \
-</node>';
+const ProviderIface = <interface name='org.freedesktop.realmd.Provider'>
+    <property name="Name" type="s" access="read"/>
+    <property name="Version" type="s" access="read"/>
+    <property name="Realms" type="ao" access="read"/>
+    <method name="Discover">
+        <arg name="string" type="s" direction="in"/>
+        <arg name="options" type="a{sv}" direction="in"/>
+        <arg name="relevance" type="i" direction="out"/>
+        <arg name="realm" type="ao" direction="out"/>
+    </method>
+</interface>;
 const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface);
 
-const ServiceIface = '<node> \
-<interface name="org.freedesktop.realmd.Service"> \
-    <method name="Cancel"> \
-        <arg name="operation" type="s" direction="in"/> \
-    </method> \
-    <method name="Release" /> \
-    <method name="SetLocale"> \
-        <arg name="locale" type="s" direction="in"/> \
-    </method> \
-    <signal name="Diagnostics"> \
-        <arg name="data" type="s"/> \
-        <arg name="operation" type="s"/> \
-    </signal> \
-</interface> \
-</node>';
+const ServiceIface = <interface name="org.freedesktop.realmd.Service">
+    <method name="Cancel">
+        <arg name="operation" type="s" direction="in"/>
+    </method>
+    <method name="Release" />
+    <method name="SetLocale">
+        <arg name="locale" type="s" direction="in"/>
+    </method>
+    <signal name="Diagnostics">
+        <arg name="data" type="s"/>
+        <arg name="operation" type="s"/>
+    </signal>
+</interface>;
 const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface);
 
-const RealmIface = '<node> \
-<interface name="org.freedesktop.realmd.Realm"> \
-    <property name="Name" type="s" access="read"/> \
-    <property name="Configured" type="s" access="read"/> \
-    <property name="Details" type="a(ss)" access="read"/> \
-    <property name="LoginFormats" type="as" access="read"/> \
-    <property name="LoginPolicy" type="s" access="read"/> \
-    <property name="PermittedLogins" type="as" access="read"/> \
-    <property name="SupportedInterfaces" type="as" access="read"/> \
-    <method name="ChangeLoginPolicy"> \
-        <arg name="login_policy" type="s" direction="in"/> \
-        <arg name="permitted_add" type="as" direction="in"/> \
-        <arg name="permitted_remove" type="as" direction="in"/> \
-        <arg name="options" type="a{sv}" direction="in"/> \
-    </method> \
-    <method name="Deconfigure"> \
-        <arg name="options" type="a{sv}" direction="in"/> \
-    </method> \
-</interface> \
-</node>';
+const RealmIface = <interface name="org.freedesktop.realmd.Realm">
+    <property name="Name" type="s" access="read"/>
+    <property name="Configured" type="s" access="read"/>
+    <property name="Details" type="a(ss)" access="read"/>
+    <property name="LoginFormats" type="as" access="read"/>
+    <property name="LoginPolicy" type="s" access="read"/>
+    <property name="PermittedLogins" type="as" access="read"/>
+    <property name="SupportedInterfaces" type="as" access="read"/>
+    <method name="ChangeLoginPolicy">
+        <arg name="login_policy" type="s" direction="in"/>
+        <arg name="permitted_add" type="as" direction="in"/>
+        <arg name="permitted_remove" type="as" direction="in"/>
+        <arg name="options" type="a{sv}" direction="in"/>
+    </method>
+    <method name="Deconfigure">
+        <arg name="options" type="a{sv}" direction="in"/>
+    </method>
+</interface>;
 const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);
 
 const Manager = new Lang.Class({

js/ui/auth/sessionList.js

@@ -0,0 +1,230 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
+ * Copyright 2011 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Signals = imports.signals;
+const St = imports.gi.St;
+const Gdm = imports.gi.Gdm;
+
+const SessionListItem = new Lang.Class({
+    Name: 'SessionListItem',
+
+    _init: function(id, name) {
+        this.id = id;
+
+        this.actor = new St.Button({ style_class: 'login-dialog-session-list-item',
+                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                     can_focus: true,
+                                     reactive: true,
+                                     x_fill: true,
+                                     x_align: St.Align.START });
+
+        this._box = new St.BoxLayout({ style_class: 'login-dialog-session-list-item-box' });
+
+        this.actor.add_actor(this._box);
+        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+
+        this._dot = new St.DrawingArea({ style_class: 'login-dialog-session-list-item-dot' });
+        this._dot.connect('repaint', Lang.bind(this, this._onRepaintDot));
+        this._box.add_actor(this._dot);
+        this.setShowDot(false);
+
+        let label = new St.Label({ style_class: 'login-dialog-session-list-item-label',
+                                   text: name });
+        this.actor.label_actor = label;
+
+        this._box.add_actor(label);
+    },
+
+    setShowDot: function(show) {
+        if (show)
+            this._dot.opacity = 255;
+        else
+            this._dot.opacity = 0;
+    },
+
+    _onRepaintDot: function(area) {
+        let cr = area.get_context();
+        let [width, height] = area.get_surface_size();
+        let color = area.get_theme_node().get_foreground_color();
+
+        cr.setSourceRGBA (color.red / 255,
+                          color.green / 255,
+                          color.blue / 255,
+                          color.alpha / 255);
+        cr.arc(width / 2, height / 2, width / 3, 0, 2 * Math.PI);
+        cr.fill();
+        cr.$dispose();
+    },
+
+    _onClicked: function() {
+        this.emit('activate');
+    }
+});
+Signals.addSignalMethods(SessionListItem.prototype);
+
+const SessionList = new Lang.Class({
+    Name: 'SessionList',
+
+    _init: function() {
+        this.actor = new St.Bin();
+
+        this._box = new St.BoxLayout({ style_class: 'login-dialog-session-list',
+                                       vertical: true});
+        this.actor.child = this._box;
+
+        this._button = new St.Button({ style_class: 'login-dialog-session-list-button',
+                                       button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                       can_focus: true,
+                                       x_fill: true,
+                                       y_fill: true });
+        let box = new St.BoxLayout();
+        this._button.add_actor(box);
+
+        this._triangle = new St.Label({ style_class: 'login-dialog-session-list-triangle',
+                                        text: '\u25B8' });
+        box.add_actor(this._triangle);
+
+        let label = new St.Label({ style_class: 'login-dialog-session-list-label',
+                                   text: _("Session…") });
+        box.add_actor(label);
+
+        this._button.connect('clicked',
+                             Lang.bind(this, this._onClicked));
+        this._box.add_actor(this._button);
+        this._scrollView = new St.ScrollView({ style_class: 'login-dialog-session-list-scroll-view'});
+        this._scrollView.set_policy(Gtk.PolicyType.NEVER,
+                                    Gtk.PolicyType.AUTOMATIC);
+        this._box.add_actor(this._scrollView);
+        this._itemList = new St.BoxLayout({ style_class: 'login-dialog-session-item-list',
+                                            vertical: true });
+        this._scrollView.add_actor(this._itemList);
+        this._hideSessions();
+        this.isOpen = false;
+        this._populate();
+    },
+
+    _hideSessions: function() {
+        this._itemList.can_focus = false;
+        this._itemList.reactive = false;
+        this._scrollView.opacity = 0;
+    },
+
+    _showSessions: function() {
+        this._scrollView.opacity = 255;
+        this._itemList.reactive = true;
+        this._itemList.can_focus = true;
+    },
+
+    open: function() {
+        if (this.isOpen)
+            return;
+
+        this._button.add_style_pseudo_class('open');
+        this._showSessions();
+        this._triangle.set_text('\u25BE');
+
+        this.isOpen = true;
+    },
+
+    close: function() {
+        if (!this.isOpen)
+            return;
+
+        this._button.remove_style_pseudo_class('open');
+        this._hideSessions();
+        this._triangle.set_text('\u25B8');
+
+        this.isOpen = false;
+    },
+
+    _onClicked: function() {
+        if (!this.isOpen)
+            this.open();
+        else
+            this.close();
+    },
+
+    updateSensitivity: function(sensitive) {
+        this._button.reactive = sensitive;
+        this._button.can_focus = sensitive;
+
+        for (let id in this._items)
+            this._items[id].actor.reactive = sensitive;
+    },
+
+    setActiveSession: function(sessionId) {
+         if (sessionId == this._activeSessionId)
+             return;
+
+         if (this._activeSessionId)
+             this._items[this._activeSessionId].setShowDot(false);
+
+         this._items[sessionId].setShowDot(true);
+         this._activeSessionId = sessionId;
+
+         this.emit('session-activated', this._activeSessionId);
+    },
+
+    _populate: function() {
+        this._itemList.destroy_all_children();
+        this._activeSessionId = null;
+        this._items = {};
+
+        let ids = Gdm.get_session_ids();
+        ids.sort();
+
+        if (ids.length <= 1) {
+            this._box.hide();
+            this._button.hide();
+        } else {
+            this._button.show();
+            this._box.show();
+        }
+
+        for (let i = 0; i < ids.length; i++) {
+            let [sessionName, sessionDescription] = Gdm.get_session_name_and_description(ids[i]);
+
+            let item = new SessionListItem(ids[i], sessionName);
+            this._itemList.add_actor(item.actor);
+            this._items[ids[i]] = item;
+
+            if (!this._activeSessionId)
+                this.setActiveSession(ids[i]);
+
+            item.connect('activate',
+                         Lang.bind(this, function() {
+                             this.setActiveSession(item.id);
+                         }));
+
+            item.actor.can_focus = this._itemList.can_focus;
+            let signalId = this._itemList.connect('notify::can-focus',
+                                                  Lang.bind(this, function() {
+                                                      item.actor.can_focus = this._itemList.can_focus;
+                                                  }));
+            item.actor.connect('destroy',
+                               Lang.bind(this, function() {
+                                   this._itemList.disconnect(signalId);
+                               }));
+        }
+    }
+});
+Signals.addSignalMethods(SessionList.prototype);

js/ui/auth/unlockDialog.js

@@ -0,0 +1,293 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const AccountsService = imports.gi.AccountsService;
+const Clutter = imports.gi.Clutter;
+const Gdm  = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const Main = imports.ui.main;
+const ModalDialog = imports.ui.modalDialog;
+const ShellEntry = imports.ui.shellEntry;
+const UserWidget = imports.ui.userWidget;
+
+const AuthUtil = imports.ui.auth.util;
+const Batch = imports.misc.batch;
+
+// The timeout before going back automatically to the lock screen (in seconds)
+const IDLE_TIMEOUT = 2 * 60;
+
+const UnlockDialog = new Lang.Class({
+    Name: 'UnlockDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init: function(parentActor) {
+        this.parent({ shellReactive: true,
+                      styleClass: 'login-dialog',
+                      keybindingMode: Shell.KeyBindingMode.UNLOCK_SCREEN,
+                      parentActor: parentActor
+                    });
+
+        this._userManager = AccountsService.UserManager.get_default();
+        this._userName = GLib.get_user_name();
+        this._user = this._userManager.get_user(this._userName);
+
+        this._failCounter = 0;
+        this._firstQuestion = true;
+
+        this._greeterClient = new Gdm.Client();
+        this._userVerifier = new AuthUtil.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));
+        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
+        this._userVerifier.connect('verification-failed', Lang.bind(this, this._onVerificationFailed));
+        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
+
+        this._userVerifier.connect('show-login-hint', Lang.bind(this, this._showLoginHint));
+        this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._hideLoginHint));
+
+        this._userWidget = new UserWidget.UserWidget(this._user);
+        this.contentLayout.add_actor(this._userWidget.actor);
+
+        this._promptLayout = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
+                                                vertical: true });
+
+        this._promptLabel = new St.Label({ style_class: 'login-dialog-prompt-label' });
+        this._promptLayout.add(this._promptLabel,
+                               { x_align: St.Align.START });
+
+        this._promptEntry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
+                                           can_focus: true });
+        this._promptEntry.clutter_text.connect('activate', Lang.bind(this, this._doUnlock));
+        this._promptEntry.clutter_text.set_password_char('\u25cf');
+        ShellEntry.addContextMenu(this._promptEntry, { isPassword: true });
+        this.setInitialKeyFocus(this._promptEntry);
+        this._promptEntry.clutter_text.connect('text-changed', Lang.bind(this, function() {
+            this._updateOkButtonSensitivity(this._promptEntry.text.length > 0);
+        }));
+
+        this._promptLayout.add(this._promptEntry,
+                               { expand: true,
+                                 x_fill: true });
+
+        this.contentLayout.add_actor(this._promptLayout);
+
+        this._promptMessage = new St.Label({ visible: false });
+        this.contentLayout.add(this._promptMessage, { x_fill: true });
+
+        this._promptLoginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint' });
+        this._promptLoginHint.hide();
+        this.contentLayout.add_actor(this._promptLoginHint);
+
+        this.allowCancel = false;
+        this.buttonLayout.visible = true;
+        this.addButton({ label: _("Cancel"),
+                         action: Lang.bind(this, this._escape),
+                         key: Clutter.KEY_Escape },
+                       { expand: true,
+                         x_fill: false,
+                         y_fill: false,
+                         x_align: St.Align.START,
+                         y_align: St.Align.MIDDLE });
+        this.placeSpinner({ expand: false,
+                            x_fill: false,
+                            y_fill: false,
+                            x_align: St.Align.END,
+                            y_align: St.Align.MIDDLE });
+        this._okButton = this.addButton({ label: _("Unlock"),
+                                          action: Lang.bind(this, this._doUnlock),
+                                          default: true },
+                                        { expand: false,
+                                          x_fill: false,
+                                          y_fill: false,
+                                          x_align: St.Align.END,
+                                          y_align: St.Align.MIDDLE });
+
+        let screenSaverSettings = new Gio.Settings({ schema: 'org.gnome.desktop.screensaver' });
+        if (screenSaverSettings.get_boolean('user-switch-enabled')) {
+            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;
+        }
+
+        this._updateSensitivity(true);
+
+        let batch = new Batch.Hold();
+        this._userVerifier.begin(this._userName, batch);
+
+        Main.ctrlAltTabManager.addGroup(this.dialogLayout, _("Unlock Window"), 'dialog-password-symbolic');
+
+        this._idleMonitor = new GnomeDesktop.IdleMonitor();
+        this._idleWatchId = this._idleMonitor.add_idle_watch(IDLE_TIMEOUT * 1000, Lang.bind(this, this._escape));
+    },
+
+    _updateSensitivity: function(sensitive) {
+        this._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;
+    },
+
+    _showMessage: function(userVerifier, message, styleClass) {
+        if (message) {
+            this._promptMessage.text = message;
+            this._promptMessage.styleClass = styleClass;
+            AuthUtil.fadeInActor(this._promptMessage);
+        } else {
+            AuthUtil.fadeOutActor(this._promptMessage);
+        }
+    },
+
+    _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
+        if (this._firstQuestion && this._firstQuestionAnswer) {
+            this._userVerifier.answerQuery(serviceName, this._firstQuestionAnswer);
+            this._firstQuestionAnswer = null;
+            this._firstQuestion = false;
+            return;
+        }
+
+        this._promptLabel.text = question;
+
+        if (!this._firstQuestion)
+            this._promptEntry.text = '';
+        else
+            this._firstQuestion = false;
+
+        this._promptEntry.clutter_text.set_password_char(passwordChar);
+        this._promptEntry.menu.isPassword = passwordChar != '';
+
+        this._currentQuery = serviceName;
+        this._updateSensitivity(true);
+        this.setWorking(false);
+    },
+
+    _showLoginHint: function(verifier, message) {
+        this._promptLoginHint.set_text(message)
+        AuthUtil.fadeInActor(this._promptLoginHint);
+    },
+
+    _hideLoginHint: function() {
+        AuthUtil.fadeOutActor(this._promptLoginHint);
+    },
+
+    _doUnlock: function() {
+        if (this._firstQuestion) {
+            // we haven't received a query yet, so stash the answer
+            // and make ourself non-reactive
+            // the actual reply to GDM will be sent as soon as asked
+            this._firstQuestionAnswer = this._promptEntry.text;
+            this._updateSensitivity(false);
+            this.setWorking(true);
+            return;
+        }
+
+        if (!this._currentQuery)
+            return;
+
+        let query = this._currentQuery;
+        this._currentQuery = null;
+
+        this._updateSensitivity(false);
+        this.setWorking(true);
+
+        this._userVerifier.answerQuery(query, this._promptEntry.text);
+    },
+
+    _finishUnlock: function() {
+        this._userVerifier.clear();
+        this.emit('unlocked');
+    },
+
+    _onVerificationComplete: function() {
+        this._userVerified = true;
+        if (!this._userVerifier.hasPendingMessages) {
+            this._finishUnlock();
+        } else {
+            let signalId = this._userVerifier.connect('no-more-messages',
+                                                      Lang.bind(this, function() {
+                                                          this._userVerifier.disconnect(signalId);
+                                                          this._finishUnlock();
+                                                      }));
+        }
+    },
+
+    _onReset: function() {
+        if (!this._userVerified) {
+            this._userVerifier.clear();
+            this.emit('failed');
+        }
+    },
+
+    _onVerificationFailed: function() {
+        this._currentQuery = null;
+        this._firstQuestion = true;
+        this._userVerified = false;
+
+        this._promptEntry.text = '';
+        this._promptEntry.clutter_text.set_password_char('\u25cf');
+        this._promptEntry.menu.isPassword = true;
+
+        this._updateSensitivity(false);
+        this.setWorking(false);
+    },
+
+    _escape: function() {
+        if (this.allowCancel) {
+            this._userVerifier.cancel();
+            this.emit('failed');
+        }
+    },
+
+    _otherUserClicked: function(button, event) {
+        Gdm.goto_login_session_sync(null);
+
+        this._userVerifier.cancel();
+        this.emit('failed');
+    },
+
+    destroy: function() {
+        this._userVerifier.clear();
+
+        if (this._idleWatchId) {
+            this._idleMonitor.remove_watch(this._idleWatchId);
+            this._idleWatchId = 0;
+        }
+
+        this.parent();
+    },
+
+    cancel: function() {
+        this._userVerifier.cancel(null);
+
+        this.destroy();
+    },
+
+    addCharacter: function(unichar) {
+        this._promptEntry.clutter_text.insert_unichar(unichar);
+    },
+});

js/ui/auth/userList.js

@@ -0,0 +1,251 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const AccountsService = imports.gi.AccountsService;
+const Gtk = imports.gi.Gtk;
+const Meta = imports.gi.Meta;
+const Lang = imports.lang;
+const Signals = imports.signals;
+const St = imports.gi.St;
+const Gdm = imports.gi.Gdm;
+
+const Batch = imports.misc.batch;
+const Tweener = imports.ui.tweener;
+const UserAvatar = imports.ui.userAvatar;
+
+const _SCROLL_ANIMATION_TIME = 0.5;
+
+const UserListItem = new Lang.Class({
+    Name: 'UserListItem',
+
+    _init: function(user) {
+        this.user = user;
+        this._userChangedId = this.user.connect('changed',
+                                                 Lang.bind(this, this._onUserChanged));
+
+        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,
+                                     x_align: St.Align.START,
+                                     x_fill: true });
+
+        this._userAvatar = new UserAvatar.UserAvatar(this.user,
+                                                     { styleClass: 'login-dialog-user-list-item-icon' });
+        layout.add(this._userAvatar.actor);
+        let textLayout = new St.BoxLayout({ style_class: 'login-dialog-user-list-item-text-box',
+                                            vertical:    true });
+        layout.add(textLayout, { expand: true });
+
+        this._nameLabel = new St.Label({ style_class: 'login-dialog-user-list-item-name' });
+        this.actor.label_actor = this._nameLabel;
+        textLayout.add(this._nameLabel,
+                       { y_fill: false,
+                         y_align: St.Align.MIDDLE,
+                         expand: true });
+
+        this._timedLoginIndicator = new St.Bin({ style_class: 'login-dialog-timed-login-indicator',
+                                                 scale_x: 0 });
+        textLayout.add(this._timedLoginIndicator,
+                       { x_fill: true,
+                         x_align: St.Align.MIDDLE,
+                         y_fill: false,
+                         y_align: St.Align.END });
+
+        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+        this._onUserChanged();
+    },
+
+    _onUserChanged: function() {
+        this._nameLabel.set_text(this.user.get_real_name());
+        this._userAvatar.update();
+        this._updateLoggedIn();
+    },
+
+    syncStyleClasses: function() {
+        this._updateLoggedIn();
+
+        if (global.stage.get_key_focus() == this.actor)
+            this.actor.add_style_pseudo_class('focus');
+        else
+            this.actor.remove_style_pseudo_class('focus');
+    },
+
+    _updateLoggedIn: function() {
+        if (this.user.is_logged_in())
+            this.actor.add_style_pseudo_class('logged-in');
+        else
+            this.actor.remove_style_pseudo_class('logged-in');
+    },
+
+    _onClicked: function() {
+        this.emit('activate');
+    },
+
+    showTimedLoginIndicator: function(time) {
+        let hold = new Batch.Hold();
+
+        this.hideTimedLoginIndicator();
+        Tweener.addTween(this._timedLoginIndicator,
+                         { scale_x: 1.,
+                           time: time,
+                           transition: 'linear',
+                           onComplete: function() {
+                               hold.release();
+                           },
+                           onCompleteScope: this
+                         });
+        return hold;
+    },
+
+    hideTimedLoginIndicator: function() {
+        Tweener.removeTweens(this._timedLoginIndicator);
+        this._timedLoginIndicator.scale_x = 0.;
+    }
+});
+Signals.addSignalMethods(UserListItem.prototype);
+
+const UserList = new Lang.Class({
+    Name: 'UserList',
+
+    _init: function() {
+        this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view'});
+        this.actor.set_policy(Gtk.PolicyType.NEVER,
+                              Gtk.PolicyType.AUTOMATIC);
+
+        this._box = new St.BoxLayout({ vertical: true,
+                                       style_class: 'login-dialog-user-list',
+                                       pseudo_class: 'expanded' });
+
+        this.actor.add_actor(this._box);
+        this._items = {};
+
+        this.actor.connect('key-focus-in', Lang.bind(this, this._moveFocusToItems));
+    },
+
+    _moveFocusToItems: function() {
+        let hasItems = Object.keys(this._items).length > 0;
+
+        if (!hasItems)
+            return;
+
+        if (global.stage.get_key_focus() != this.actor)
+            return;
+
+        let focusSet = this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        if (!focusSet) {
+            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+                this._moveFocusToItems();
+                return false;
+            }));
+        }
+    },
+
+    _onItemActivated: function(activatedItem) {
+        this.emit('activate', activatedItem);
+    },
+
+    updateStyle: function(isExpanded) {
+        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.sync_hover();
+            item.syncStyleClasses();
+        }
+    },
+
+    scrollToItem: function(item) {
+        let box = item.actor.get_allocation_box();
+
+        let adjustment = this.actor.get_vscroll_bar().get_adjustment();
+
+        let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
+        Tweener.removeTweens(adjustment);
+        Tweener.addTween (adjustment,
+                          { value: value,
+                            time: _SCROLL_ANIMATION_TIME,
+                            transition: 'easeOutQuad' });
+    },
+
+    jumpToItem: function(item) {
+        let box = item.actor.get_allocation_box();
+
+        let adjustment = this.actor.get_vscroll_bar().get_adjustment();
+
+        let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
+
+        adjustment.set_value(value);
+    },
+
+    getItemFromUserName: function(userName) {
+        let item = this._items[userName];
+
+        if (!item)
+            return null;
+
+        return item;
+    },
+
+    addUser: function(user) {
+        if (!user.is_loaded)
+            return;
+
+        if (user.is_system_account())
+            return;
+
+        if (user.locked)
+           return;
+
+        let userName = user.get_user_name();
+
+        if (!userName)
+            return;
+
+        this.removeUser(user);
+
+        let item = new UserListItem(user);
+        this._box.add(item.actor, { x_fill: true });
+
+        this._items[userName] = item;
+
+        item.connect('activate',
+                     Lang.bind(this, this._onItemActivated));
+
+        // Try to keep the focused item front-and-center
+        item.actor.connect('key-focus-in',
+                           Lang.bind(this,
+                                     function() {
+                                         this.scrollToItem(item);
+                                     }));
+
+        this._moveFocusToItems();
+
+        this.emit('item-added', item);
+    },
+
+    removeUser: function(user) {
+        if (!user.is_loaded)
+            return;
+
+        let userName = user.get_user_name();
+
+        if (!userName)
+            return;
+
+        let item = this._items[userName];
+
+        if (!item)
+            return;
+
+        item.actor.destroy();
+        delete this._items[userName];
+    }
+});
+Signals.addSignalMethods(UserList.prototype);

js/ui/auth/util.js

@@ -6,28 +6,20 @@ const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
-const Batch = imports.gdm.batch;
-const Fprint = imports.gdm.fingerprint;
-const OVirt = imports.gdm.oVirt;
+const Batch = imports.misc.batch;
+const Fprint = imports.ui.auth.fingerprint;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
-const ShellEntry = imports.ui.shellEntry;
-const SmartcardManager = imports.misc.smartcardManager;
 const Tweener = imports.ui.tweener;
 
 const PASSWORD_SERVICE_NAME = 'gdm-password';
 const FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
-const SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
-const OVIRT_SERVICE_NAME = 'gdm-ovirtcred';
 const FADE_ANIMATION_TIME = 0.16;
 const CLONE_FADE_ANIMATION_TIME = 0.25;
 
 const LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
-const PASSWORD_AUTHENTICATION_KEY = 'enable-password-authentication';
 const FINGERPRINT_AUTHENTICATION_KEY = 'enable-fingerprint-authentication';
-const SMARTCARD_AUTHENTICATION_KEY = 'enable-smartcard-authentication';
 const BANNER_MESSAGE_KEY = 'banner-message-enable';
 const BANNER_MESSAGE_TEXT_KEY = 'banner-message-text';
 const ALLOWED_FAILURES_KEY = 'allowed-failures';
@@ -38,13 +30,6 @@ const DISABLE_USER_LIST_KEY = 'disable-user-list';
 // Give user 16ms to read each character of a PAM message
 const USER_READ_TIME = 16
 
-const MessageType = {
-    NONE: 0,
-    ERROR: 1,
-    INFO: 2,
-    HINT: 3
-};
-
 function fadeInActor(actor) {
     if (actor.opacity == 255 && actor.visible)
         return null;
@@ -129,45 +114,19 @@ const ShellUserVerifier = new Lang.Class({
         this._client = client;
 
         this._settings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
-        this._settings.connect('changed',
-                               Lang.bind(this, this._updateDefaultService));
-        this._updateDefaultService();
 
         this._fprintManager = new Fprint.FprintManager();
-        this._smartcardManager = SmartcardManager.getSmartcardManager();
-
-        // We check for smartcards right away, since an inserted smartcard
-        // at startup should result in immediately initiating authentication.
-        // This is different than fingeprint readers, where we only check them
-        // after a user has been picked.
-        this._checkForSmartcard();
-
-        this._smartcardManager.connect('smartcard-inserted',
-                                       Lang.bind(this, this._checkForSmartcard));
-        this._smartcardManager.connect('smartcard-removed',
-                                       Lang.bind(this, this._checkForSmartcard));
-
         this._messageQueue = [];
         this._messageQueueTimeoutId = 0;
         this.hasPendingMessages = false;
-        this.reauthenticating = false;
 
         this._failCounter = 0;
-
-        this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
-
-        if (this._oVirtCredentialsManager.hasToken())
-            this._oVirtUserAuthenticated(this._oVirtCredentialsManager.getToken());
-
-        this._oVirtCredentialsManager.connect('user-authenticated',
-                                              Lang.bind(this, this._oVirtUserAuthenticated));
     },
 
     begin: function(userName, hold) {
         this._cancellable = new Gio.Cancellable();
         this._hold = hold;
         this._userName = userName;
-        this.reauthenticating = false;
 
         this._checkForFingerprintReader();
 
@@ -185,10 +144,8 @@ const ShellUserVerifier = new Lang.Class({
         if (this._cancellable)
             this._cancellable.cancel();
 
-        if (this._userVerifier) {
+        if (this._userVerifier)
             this._userVerifier.call_cancel_sync(null);
-            this.clear();
-        }
     },
 
     clear: function() {
@@ -206,14 +163,14 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     answerQuery: function(serviceName, answer) {
-        if (!this.hasPendingMessages) {
+        if (!this._userVerifier.hasPendingMessages) {
             this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
         } else {
-            let signalId = this.connect('no-more-messages',
-                                        Lang.bind(this, function() {
-                                            this.disconnect(signalId);
-                                            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
-                                        }));
+            let signalId = this._userVerifier.connect('no-more-messages',
+                                                      Lang.bind(this, function() {
+                                                          this._userVerifier.disconnect(signalId);
+                                                          this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
+                                                      }));
         }
     },
 
@@ -242,24 +199,21 @@ const ShellUserVerifier = new Lang.Class({
             return;
 
         let message = this._messageQueue.shift();
-
-        this.emit('show-message', message.text, message.type);
+        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();
-                                                           return GLib.SOURCE_REMOVE;
                                                        }));
-        GLib.Source.set_name_by_id(this._messageQueueTimeoutId, '[gnome-shell] this._queueMessageTimeout');
     },
 
-    _queueMessage: function(message, messageType) {
+    _queueMessage: function(message, iconName) {
         let interval = this._getIntervalForMessage(message);
 
         this.hasPendingMessages = true;
-        this._messageQueue.push({ text: message, type: messageType, interval: interval });
+        this._messageQueue.push({ text: message, interval: interval, iconName: iconName });
         this._queueMessageTimeout();
     },
 
@@ -270,57 +224,27 @@ const ShellUserVerifier = new Lang.Class({
             GLib.source_remove(this._messageQueueTimeoutId);
             this._messageQueueTimeoutId = 0;
         }
-        this.emit('show-message', null, MessageType.NONE);
+        this.emit('show-message', null, null);
     },
 
     _checkForFingerprintReader: function() {
         this._haveFingerprintReader = false;
 
-        if (!this._settings.get_boolean(FINGERPRINT_AUTHENTICATION_KEY)) {
-            this._updateDefaultService();
+        if (!this._settings.get_boolean(FINGERPRINT_AUTHENTICATION_KEY))
             return;
-        }
 
         this._fprintManager.GetDefaultDeviceRemote(Gio.DBusCallFlags.NONE, this._cancellable, Lang.bind(this,
             function(device, error) {
                 if (!error && device)
                     this._haveFingerprintReader = true;
-                    this._updateDefaultService();
             }));
     },
 
-    _oVirtUserAuthenticated: function(token) {
-        this._preemptingService = OVIRT_SERVICE_NAME;
-        this.emit('ovirt-user-authenticated');
-    },
-
-    _checkForSmartcard: function() {
-        let smartcardDetected;
-
-        if (!this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY))
-            smartcardDetected = false;
-        else if (this._reauthOnly)
-            smartcardDetected = this._smartcardManager.hasInsertedLoginToken();
-        else
-            smartcardDetected = this._smartcardManager.hasInsertedTokens();
-
-        if (smartcardDetected != this.smartcardDetected) {
-            this.smartcardDetected = smartcardDetected;
-
-            if (this.smartcardDetected)
-                this._preemptingService = SMARTCARD_SERVICE_NAME;
-            else if (this._preemptingService == SMARTCARD_SERVICE_NAME)
-                this._preemptingService = null;
-
-            this.emit('smartcard-status-changed');
-        }
-    },
-
     _reportInitError: function(where, error) {
         logError(error, where);
         this._hold.release();
 
-        this._queueMessage(_("Authentication error"), MessageType.ERROR);
+        this._queueMessage(_("Authentication error"), 'login-dialog-message-warning');
         this._verificationFailed(false);
     },
 
@@ -341,7 +265,6 @@ const ShellUserVerifier = new Lang.Class({
             return;
         }
 
-        this.reauthenticating = true;
         this._connectSignals();
         this._beginVerification();
         this._hold.release();
@@ -372,119 +295,105 @@ const ShellUserVerifier = new Lang.Class({
         this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
     },
 
-    _getForegroundService: function() {
-        if (this._preemptingService)
-            return this._preemptingService;
-
-        return this._defaultService;
-    },
-
-    serviceIsForeground: function(serviceName) {
-        return serviceName == this._getForegroundService();
-    },
-
-    serviceIsDefault: function(serviceName) {
-        return serviceName == this._defaultService;
-    },
-
-    _updateDefaultService: function() {
-        if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
-            this._defaultService = PASSWORD_SERVICE_NAME;
-        else if (this.smartcardDetected)
-            this._defaultService = SMARTCARD_SERVICE_NAME;
-        else if (this._haveFingerprintReader)
-            this._defaultService = FINGERPRINT_SERVICE_NAME;
-    },
-
-    _startService: function(serviceName) {
+    _beginVerification: function() {
         this._hold.acquire();
+
         if (this._userName) {
-           this._userVerifier.call_begin_verification_for_user(serviceName,
-                                                               this._userName,
-                                                               this._cancellable,
-                                                               Lang.bind(this, function(obj, result) {
-               try {
-                   obj.call_begin_verification_for_user_finish(result);
-               } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                   return;
-               } catch(e) {
-                   this._reportInitError('Failed to start verification for user', e);
-                   return;
-               }
+            this._userVerifier.call_begin_verification_for_user(PASSWORD_SERVICE_NAME,
+                                                                this._userName,
+                                                                this._cancellable,
+                                                                Lang.bind(this, function(obj, result) {
+                try {
+                    obj.call_begin_verification_for_user_finish(result);
+                } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+                    return;
+                } catch(e) {
+                    this._reportInitError('Failed to start verification for user', e);
+                    return;
+                }
 
-               this._hold.release();
-           }));
+                this._hold.release();
+            }));
+
+            if (this._haveFingerprintReader) {
+                this._hold.acquire();
+
+                this._userVerifier.call_begin_verification_for_user(FINGERPRINT_SERVICE_NAME,
+                                                                    this._userName,
+                                                                    this._cancellable,
+                                                                    Lang.bind(this, function(obj, result) {
+                    try {
+                        obj.call_begin_verification_for_user_finish(result);
+                    } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+                        return;
+                    } catch(e) {
+                        this._reportInitError('Failed to start fingerprint verification for user', e);
+                        return;
+                    }
+
+                    this._hold.release();
+                }));
+            }
         } else {
-           this._userVerifier.call_begin_verification(serviceName,
-                                                      this._cancellable,
-                                                      Lang.bind(this, function(obj, result) {
-               try {
-                   obj.call_begin_verification_finish(result);
-               } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                   return;
-               } catch(e) {
-                   this._reportInitError('Failed to start verification', e);
-                   return;
-               }
+            this._userVerifier.call_begin_verification(PASSWORD_SERVICE_NAME,
+                                                       this._cancellable,
+                                                       Lang.bind(this, function(obj, result) {
+                try {
+                    obj.call_begin_verification_finish(result);
+                } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+                    return;
+                } catch(e) {
+                    this._reportInitError('Failed to start verification', e);
+                    return;
+                }
 
-               this._hold.release();
-           }));
+                this._hold.release();
+            }));
         }
     },
 
-    _beginVerification: function() {
-        this._startService(this._getForegroundService());
-
-        if (this._userName && this._haveFingerprintReader && !this.serviceIsForeground(FINGERPRINT_SERVICE_NAME))
-            this._startService(FINGERPRINT_SERVICE_NAME);
-    },
-
     _onInfo: function(client, serviceName, info) {
-        if (this.serviceIsForeground(serviceName)) {
-            this._queueMessage(info, MessageType.INFO);
-        } else if (serviceName == FINGERPRINT_SERVICE_NAME &&
+        // We don't display fingerprint messages, because they
+        // have words like UPEK in them. Instead we use the messages
+        // as a cue to display our own message.
+        if (serviceName == FINGERPRINT_SERVICE_NAME &&
             this._haveFingerprintReader) {
-            // We don't show fingerprint messages directly since it's
-            // not the main auth service. Instead we use the messages
-            // as a cue to display our own message.
 
             // Translators: this message is shown below the password entry field
             // to indicate the user can swipe their finger instead
-            this._queueMessage(_("(or swipe finger)"), MessageType.HINT);
+            this.emit('show-login-hint', _("(or swipe finger)"));
+        } else if (serviceName == PASSWORD_SERVICE_NAME) {
+            this._queueMessage(info, 'login-dialog-message-info');
         }
     },
 
     _onProblem: function(client, serviceName, problem) {
-        if (!this.serviceIsForeground(serviceName))
+        // we don't want to show auth failed messages to
+        // users who haven't enrolled their fingerprint.
+        if (serviceName != PASSWORD_SERVICE_NAME)
             return;
-
-        this._queueMessage(problem, MessageType.ERROR);
+        this._queueMessage(problem, 'login-dialog-message-warning');
     },
 
     _onInfoQuery: function(client, serviceName, question) {
-        if (!this.serviceIsForeground(serviceName))
+        // We only expect questions to come from the main auth service
+        if (serviceName != PASSWORD_SERVICE_NAME)
             return;
 
         this.emit('ask-question', serviceName, question, '');
     },
 
     _onSecretInfoQuery: function(client, serviceName, secretQuestion) {
-        if (!this.serviceIsForeground(serviceName))
+        // We only expect secret requests to come from the main auth service
+        if (serviceName != PASSWORD_SERVICE_NAME)
             return;
 
-        if (serviceName == OVIRT_SERVICE_NAME) {
-            // The only question asked by this service is "Token?"
-            this.answerQuery(serviceName, this._oVirtCredentialsManager.getToken());
-            return;
-        }
-
         this.emit('ask-question', serviceName, secretQuestion, '\u25cf');
     },
 
     _onReset: function() {
         // Clear previous attempts to authenticate
         this._failCounter = 0;
-        this._updateDefaultService();
 
         this.emit('reset');
     },
@@ -513,24 +422,24 @@ const ShellUserVerifier = new Lang.Class({
             this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
 
         if (canRetry) {
-            if (!this.hasPendingMessages) {
+            if (!this._userVerifier.hasPendingMessages) {
                 this._retry();
             } else {
-                let signalId = this.connect('no-more-messages',
-                                            Lang.bind(this, function() {
-                                                this.disconnect(signalId);
-                                                this._retry();
-                                            }));
+                let signalId = this._userVerifier.connect('no-more-messages',
+                                                          Lang.bind(this, function() {
+                                                              this._userVerifier.disconnect(signalId);
+                                                              this._retry();
+                                                          }));
             }
         } else {
-            if (!this.hasPendingMessages) {
+            if (!this._userVerifier.hasPendingMessages) {
                 this._cancelAndReset();
             } else {
-                let signalId = this.connect('no-more-messages',
-                                            Lang.bind(this, function() {
-                                                this.disconnect(signalId);
-                                                this._cancelAndReset();
-                                            }));
+                let signalId = this._userVerifier.connect('no-more-messages',
+                                                          Lang.bind(this, function() {
+                                                              this._userVerifier.disconnect(signalId);
+                                                              this._cancelAndReset();
+                                                          }));
             }
         }
 
@@ -538,22 +447,14 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _onConversationStopped: function(client, serviceName) {
-        // If the login failed with the preauthenticated oVirt credentials
-        // then discard the credentials and revert to default authentication
-        // mechanism.
-        if (this.serviceIsForeground(OVIRT_SERVICE_NAME)) {
-            this._oVirtCredentialsManager.resetToken();
-            this._preemptingService = null;
-            this._verificationFailed(false);
-            return;
-        }
-
         // if the password service fails, then cancel everything.
         // But if, e.g., fingerprint fails, still give
         // password authentication a chance to succeed
-        if (this.serviceIsForeground(serviceName)) {
+        if (serviceName == PASSWORD_SERVICE_NAME) {
             this._verificationFailed(true);
         }
+
+        this.emit('hide-login-hint');
     },
 });
 Signals.addSignalMethods(ShellUserVerifier.prototype);

js/ui/background.js

@@ -50,9 +50,11 @@ const BackgroundCache = new Lang.Class({
                                         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;
 
@@ -86,6 +88,7 @@ const BackgroundCache = new Lang.Class({
         }
 
         this._patterns.push(content);
+
         return content;
     },
 
@@ -113,9 +116,9 @@ const BackgroundCache = new Lang.Class({
 
     _removeContent: function(contentList, content) {
         let index = contentList.indexOf(content);
-        if (index < 0)
-            throw new Error("Trying to remove invalid content: " + content);
-        contentList.splice(index, 1);
+
+        if (index >= 0)
+            contentList.splice(index, 1);
     },
 
     removePatternContent: function(content) {
@@ -125,32 +128,12 @@ const BackgroundCache = new Lang.Class({
     removeImageContent: function(content) {
         let filename = content.get_filename();
 
-        let hasOtherUsers = this._images.some(function(content) { return filename == content.get_filename(); });
-        if (!hasOtherUsers)
+        if (filename && this._fileMonitors[filename])
             delete this._fileMonitors[filename];
 
         this._removeContent(this._images, content);
     },
 
-    _attachCallerToFileLoad: function(caller, fileLoad) {
-        fileLoad.callers.push(caller);
-
-        if (!caller.cancellable)
-            return;
-
-        caller.cancellable.connect(Lang.bind(this, function() {
-            let idx = fileLoad.callers.indexOf(caller);
-            fileLoad.callers.splice(idx, 1);
-
-            if (fileLoad.callers.length == 0) {
-                fileLoad.cancellable.cancel();
-
-                let idx = this._pendingFileLoads.indexOf(fileLoad);
-                this._pendingFileLoads.splice(idx, 1);
-            }
-        }));
-    },
-
     _loadImageContent: function(params) {
         params = Params.parse(params, { monitorIndex: 0,
                                         style: null,
@@ -159,28 +142,27 @@ const BackgroundCache = new Lang.Class({
                                         cancellable: null,
                                         onFinished: null });
 
-        let caller = { monitorIndex: params.monitorIndex,
-                       effects: params.effects,
-                       cancellable: params.cancellable,
-                       onFinished: params.onFinished };
-
         for (let i = 0; i < this._pendingFileLoads.length; i++) {
-            let fileLoad = this._pendingFileLoads[i];
-
-            if (fileLoad.filename == params.filename &&
-                fileLoad.style == params.style) {
-                this._attachCallerToFileLoad(caller, fileLoad);
+            if (this._pendingFileLoads[i].filename == params.filename &&
+                this._pendingFileLoads[i].style == params.style) {
+                this._pendingFileLoads[i].callers.push({ shouldCopy: true,
+                                                         monitorIndex: params.monitorIndex,
+                                                         effects: params.effects,
+                                                         onFinished: params.onFinished });
                 return;
             }
         }
 
-        let fileLoad = { filename: params.filename,
-                         style: params.style,
-                         cancellable: new Gio.Cancellable(),
-                         callers: [] };
-        this._attachCallerToFileLoad(caller, fileLoad);
+        this._pendingFileLoads.push({ filename: params.filename,
+                                      style: params.style,
+                                      callers: [{ shouldCopy: false,
+                                                  monitorIndex: params.monitorIndex,
+                                                  effects: params.effects,
+                                                  onFinished: params.onFinished }] });
 
-        let content = new Meta.Background({ meta_screen: global.screen });
+        let content = new Meta.Background({ meta_screen: global.screen,
+                                            monitor: params.monitorIndex,
+                                            effects: params.effects });
 
         content.load_file_async(params.filename,
                                 params.style,
@@ -191,26 +173,31 @@ const BackgroundCache = new Lang.Class({
                                                   content.load_file_finish(result);
 
                                                   this._monitorFile(params.filename);
+                                                  this._images.push(content);
                                               } catch(e) {
                                                   content = null;
                                               }
 
-                                              for (let i = 0; i < fileLoad.callers.length; i++) {
-                                                  let caller = fileLoad.callers[i];
-                                                  if (caller.onFinished) {
-                                                      let newContent;
+                                              for (let i = 0; i < this._pendingFileLoads.length; i++) {
+                                                  let pendingLoad = this._pendingFileLoads[i];
+                                                  if (pendingLoad.filename != params.filename ||
+                                                      pendingLoad.style != params.style)
+                                                      continue;
 
-                                                      if (content) {
-                                                          newContent = content.copy(caller.monitorIndex, caller.effects);
-                                                          this._images.push(newContent);
+                                                  for (let j = 0; j < pendingLoad.callers.length; j++) {
+                                                      if (pendingLoad.callers[j].onFinished) {
+                                                          if (content && pendingLoad.callers[j].shouldCopy) {
+                                                              content = object.copy(pendingLoad.callers[j].monitorIndex,
+                                                                                    pendingLoad.callers[j].effects);
+
+                                                          }
+
+                                                          pendingLoad.callers[j].onFinished(content);
                                                       }
-
-                                                      caller.onFinished(newContent);
                                                   }
-                                              }
 
-                                              let idx = this._pendingFileLoads.indexOf(fileLoad);
-                                              this._pendingFileLoads.splice(idx, 1);
+                                                  this._pendingFileLoads.splice(i, 1);
+                                              }
                                           }));
     },
 
@@ -223,9 +210,11 @@ const BackgroundCache = new Lang.Class({
                                         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;
 
@@ -233,7 +222,7 @@ const BackgroundCache = new Lang.Class({
                 continue;
 
             if (params.style == GDesktopEnums.BackgroundStyle.SPANNED &&
-                this._images[i].monitor != params.monitorIndex)
+                this._images[i].monitor_index != this._monitorIndex)
                 continue;
 
             candidateContent = this._images[i];
@@ -271,11 +260,9 @@ const BackgroundCache = new Lang.Class({
 
         if (this._animationFilename == params.filename) {
             if (params.onLoaded) {
-                let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+                GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
                     params.onLoaded(this._animation);
-                    return GLib.SOURCE_REMOVE;
                 }));
-                GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
             }
         }
 
@@ -287,11 +274,9 @@ const BackgroundCache = new Lang.Class({
                            this._animation = animation;
 
                            if (params.onLoaded) {
-                               let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+                               GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
                                    params.onLoaded(this._animation);
-                                   return GLib.SOURCE_REMOVE;
                                }));
-                               GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
                            }
                        }));
     }
@@ -310,15 +295,14 @@ const Background = new Lang.Class({
     _init: function(params) {
         params = Params.parse(params, { monitorIndex: 0,
                                         layoutManager: Main.layoutManager,
-                                        effects: Meta.BackgroundEffects.NONE,
-                                        settings: null });
+                                        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 = params.settings;
+        this._settings = new Gio.Settings({ schema: BACKGROUND_SCHEMA });
         this._monitorIndex = params.monitorIndex;
         this._layoutManager = params.layoutManager;
         this._effects = params.effects;
@@ -330,12 +314,13 @@ const Background = new Lang.Class({
 
         this._brightness = 1.0;
         this._vignetteSharpness = 0.2;
+        this._saturation = 1.0;
         this._cancellable = new Gio.Cancellable();
         this.isLoaded = false;
 
-        this._settingsChangedSignalId = this._settings.connect('changed', Lang.bind(this, function() {
-                                            this.emit('changed');
-                                        }));
+        this._settings.connect('changed', Lang.bind(this, function() {
+                                   this.emit('changed');
+                               }));
 
         this._load();
     },
@@ -376,10 +361,6 @@ const Background = new Lang.Class({
 
         this.actor.disconnect(this._destroySignalId);
         this._destroySignalId = 0;
-
-        if (this._settingsChangedSignalId != 0)
-            this._settings.disconnect(this._settingsChangedSignalId);
-        this._settingsChangedSignalId = 0;
     },
 
     _setLoaded: function() {
@@ -388,11 +369,10 @@ const Background = new Lang.Class({
 
         this.isLoaded = true;
 
-        let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
             this.emit('loaded');
-            return GLib.SOURCE_REMOVE;
+            return false;
         }));
-        GLib.Source.set_name_by_id(id, '[gnome-shell] this.emit');
     },
 
     _loadPattern: function() {
@@ -430,26 +410,29 @@ const Background = new Lang.Class({
         this._fileWatches[filename] = signalId;
     },
 
-    _ensureImage: function(index) {
-        if (this._images[index])
-            return;
+    _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(index, content, filename) {
+    _updateImage: function(content, index, filename) {
+        content.saturation = this._saturation;
         content.brightness = this._brightness;
         content.vignette_sharpness = this._vignetteSharpness;
 
-        let image = this._images[index];
-        if (image.content)
-            this._cache.removeImageContent(content);
-        image.content = content;
+        this._cache.removeImageContent(this._images[index].content);
+        this._images[index].content = content;
         this._watchCacheFile(filename);
     },
 
@@ -497,8 +480,11 @@ const Background = new Lang.Class({
                                                   return;
                                               }
 
-                                              this._ensureImage(i);
-                                              this._updateImage(i, content, files[i]);
+                                              if (!this._images[i]) {
+                                                  this._addImage(content, i, files[i]);
+                                              } else {
+                                                  this._updateImage(content, i, files[i]);
+                                              }
 
                                               if (numPendingImages == 0) {
                                                   this._setLoaded();
@@ -533,9 +519,8 @@ const Background = new Lang.Class({
                                                       Lang.bind(this, function() {
                                                                     this._updateAnimationTimeoutId = 0;
                                                                     this._updateAnimation();
-                                                                    return GLib.SOURCE_REMOVE;
+                                                                    return false;
                                                                 }));
-        GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
     },
 
     _loadAnimation: function(filename) {
@@ -554,33 +539,30 @@ const Background = new Lang.Class({
                                            });
     },
 
-    _loadImage: function(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) {
-                                              this._ensureImage(0);
-                                              this._updateImage(0, content, filename);
+                                          if (!content) {
+                                              if (!this._cancellable.is_cancelled())
+                                                  this._loadAnimation(filename);
+                                              return;
                                           }
+
+                                          this._addImage(content, 0, filename);
                                           this._setLoaded();
                                       })
                                     });
-    },
 
-    _loadFile: function(filename) {
-        if (filename.endsWith('.xml'))
-            this._loadAnimation(filename);
-        else
-            this._loadImage(filename);
     },
 
     _load: function () {
         this._cache = getBackgroundCache();
 
-        this._loadPattern();
+        this._loadPattern(this._cache);
 
         this._style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
         if (this._style == GDesktopEnums.BackgroundStyle.NONE) {
@@ -589,20 +571,29 @@ const Background = new Lang.Class({
         }
 
         let uri = this._settings.get_string(PICTURE_URI_KEY);
-        let filename;
-        if (GLib.uri_parse_scheme(uri) != null)
-            filename = Gio.File.new_for_uri(uri).get_path();
-        else
-            filename = uri;
-
-        if (!filename) {
-            this._setLoaded();
-            return;
-        }
+        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;
     },
@@ -654,13 +645,7 @@ const SystemBackground = new Lang.Class({
                                           this.emit('loaded');
                                       })
                                     });
-
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-    },
-
-    _onDestroy: function() {
-        this._cache.removeImageContent(this.actor.content);
-    },
+    }
 });
 Signals.addSignalMethods(SystemBackground.prototype);
 
@@ -722,10 +707,8 @@ const BackgroundManager = new Lang.Class({
                                         layoutManager: Main.layoutManager,
                                         monitorIndex: null,
                                         effects: Meta.BackgroundEffects.NONE,
-                                        controlPosition: true,
-                                        settingsSchema: BACKGROUND_SCHEMA });
+                                        controlPosition: true });
 
-        this._settings = new Gio.Settings({ schema: params.settingsSchema });
         this._container = params.container;
         this._layoutManager = params.layoutManager;
         this._effects = params.effects;
@@ -748,31 +731,30 @@ const BackgroundManager = new Lang.Class({
         }
     },
 
-    _updateBackground: function() {
-        let newBackground = this._createBackground();
-        newBackground.vignetteSharpness = this.background.vignetteSharpness;
-        newBackground.brightness = this.background.brightness;
-        newBackground.visible = this.background.visible;
+    _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;
-
-                if (this._newBackground != newBackground) {
-                    /* Not interesting, we queued another load */
-                    newBackground.actor.destroy();
-                    return;
-                }
-
-                Tweener.addTween(this.background.actor,
+                Tweener.addTween(background.actor,
                                  { opacity: 0,
                                    time: FADE_ANIMATION_TIME,
                                    transition: 'easeOutQuad',
                                    onComplete: Lang.bind(this, function() {
-                                       this.background.actor.destroy();
-                                       this.background = newBackground;
-                                       this._newBackground = null;
+                                       if (this._newBackground == newBackground) {
+                                           this.background = newBackground;
+                                           this._newBackground = null;
+                                       } else {
+                                           newBackground.actor.destroy();
+                                       }
+
+                                       background.actor.destroy();
 
                                        this.emit('changed');
                                    })
@@ -785,8 +767,7 @@ const BackgroundManager = new Lang.Class({
     _createBackground: function() {
         let background = new Background({ monitorIndex: this._monitorIndex,
                                           layoutManager: this._layoutManager,
-                                          effects: this._effects,
-                                          settings: this._settings });
+                                          effects: this._effects });
         this._container.add_child(background.actor);
 
         let monitor = this._layoutManager.monitors[this._monitorIndex];
@@ -800,7 +781,7 @@ const BackgroundManager = new Lang.Class({
         background.changeSignalId = background.connect('changed', Lang.bind(this, function() {
             background.disconnect(background.changeSignalId);
             background.changeSignalId = 0;
-            this._updateBackground();
+            this._updateBackground(background, this._monitorIndex);
         }));
 
         background.actor.connect('destroy', Lang.bind(this, function() {

js/ui/backgroundMenu.js

@@ -13,8 +13,8 @@ const BackgroundMenu = new Lang.Class({
     Name: 'BackgroundMenu',
     Extends: PopupMenu.PopupMenu,
 
-    _init: function(layoutManager) {
-        this.parent(layoutManager.dummyCursor, 0, St.Side.TOP);
+    _init: function(source) {
+        this.parent(source, 0, St.Side.TOP);
 
         this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
         this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@@ -22,20 +22,23 @@ const BackgroundMenu = new Lang.Class({
 
         this.actor.add_style_class_name('background-menu');
 
-        layoutManager.uiGroup.add_actor(this.actor);
+        Main.uiGroup.add_actor(this.actor);
         this.actor.hide();
     }
 });
 
-function addBackgroundMenu(actor, layoutManager) {
+function addBackgroundMenu(actor) {
+    let cursor = new St.Bin({ opacity: 0 });
+    Main.uiGroup.add_actor(cursor);
+
     actor.reactive = true;
-    actor._backgroundMenu = new BackgroundMenu(layoutManager);
+    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();
-        Main.layoutManager.setDummyCursorGeometry(x, y, 0, 0);
+        cursor.set_position(x, y);
         actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
     }
 
@@ -56,8 +59,10 @@ function addBackgroundMenu(actor, layoutManager) {
     actor.add_action(clickAction);
 
     actor.connect('destroy', function() {
-        actor._backgroundMenu.destroy();
-        actor._backgroundMenu = null;
-        actor._backgroundManager = null;
-    });
+                      actor._backgroundMenu.destroy();
+                      actor._backgroundMenu = null;
+                      actor._backgroundManager = null;
+
+                      cursor.destroy();
+                  });
 }

js/ui/boxpointer.js

@@ -3,9 +3,8 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
+const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@@ -62,14 +61,10 @@ const BoxPointer = new Lang.Class({
         this._muteInput();
     },
 
-    get arrowSide() {
-        return this._arrowSide;
-    },
-
     _muteInput: function() {
         if (this._capturedEventId == 0)
             this._capturedEventId = this.actor.connect('captured-event',
-                                                       function() { return Clutter.EVENT_STOP; });
+                                                       function() { return true; });
     },
 
     _unmuteInput: function() {
@@ -121,9 +116,6 @@ const BoxPointer = new Lang.Class({
     },
 
     hide: function(animate, onComplete) {
-        if (!this.actor.visible)
-            return;
-
         let xOffset = 0;
         let yOffset = 0;
         let themeNode = this.actor.get_theme_node();
@@ -188,9 +180,7 @@ const BoxPointer = new Lang.Class({
     },
 
     _getPreferredHeight: function(actor, forWidth, alloc) {
-        let themeNode = this.actor.get_theme_node();
-        let borderWidth = themeNode.get_length('-arrow-border-width');
-        let [minSize, naturalSize] = this.bin.get_preferred_height(forWidth - 2 * borderWidth);
+        let [minSize, naturalSize] = this.bin.get_preferred_height(forWidth);
         alloc.min_size = minSize;
         alloc.natural_size = naturalSize;
         this._adjustAllocationForArrow(false, alloc);
@@ -287,40 +277,38 @@ const BoxPointer = new Lang.Class({
         let skipBottomLeft = false;
         let skipBottomRight = false;
 
-        if (rise) {
-            switch (this._arrowSide) {
-            case St.Side.TOP:
-                if (this._arrowOrigin == x1)
-                    skipTopLeft = true;
-                else if (this._arrowOrigin == x2)
-                    skipTopRight = true;
-                break;
+        switch (this._arrowSide) {
+        case St.Side.TOP:
+            if (this._arrowOrigin == x1)
+                skipTopLeft = true;
+            else if (this._arrowOrigin == x2)
+                skipTopRight = true;
+            break;
 
-            case St.Side.RIGHT:
-                if (this._arrowOrigin == y1)
-                    skipTopRight = true;
-                else if (this._arrowOrigin == y2)
-                    skipBottomRight = true;
-                break;
+        case St.Side.RIGHT:
+            if (this._arrowOrigin == y1)
+                skipTopRight = true;
+            else if (this._arrowOrigin == y2)
+                skipBottomRight = true;
+            break;
 
-            case St.Side.BOTTOM:
-                if (this._arrowOrigin == x1)
-                    skipBottomLeft = true;
-                else if (this._arrowOrigin == x2)
-                    skipBottomRight = true;
-                break;
+        case St.Side.BOTTOM:
+            if (this._arrowOrigin == x1)
+                skipBottomLeft = true;
+            else if (this._arrowOrigin == x2)
+                skipBottomRight = true;
+            break;
 
-            case St.Side.LEFT:
-                if (this._arrowOrigin == y1)
-                    skipTopLeft = true;
-                else if (this._arrowOrigin == y2)
-                    skipBottomLeft = true;
-                break;
-            }
+        case St.Side.LEFT:
+            if (this._arrowOrigin == y1)
+                skipTopLeft = true;
+            else if (this._arrowOrigin == y2)
+                skipBottomLeft = true;
+            break;
         }
 
         cr.moveTo(x1 + borderRadius, y1);
-        if (this._arrowSide == St.Side.TOP && rise) {
+        if (this._arrowSide == St.Side.TOP) {
             if (skipTopLeft) {
                 cr.moveTo(x1, y2 - borderRadius);
                 cr.lineTo(x1, y1 - rise);
@@ -342,7 +330,7 @@ const BoxPointer = new Lang.Class({
                    3*Math.PI/2, Math.PI*2);
         }
 
-        if (this._arrowSide == St.Side.RIGHT && rise) {
+        if (this._arrowSide == St.Side.RIGHT) {
             if (skipTopRight) {
                 cr.lineTo(x2 + rise, y1);
                 cr.lineTo(x2 + rise, y1 + halfBase);
@@ -363,7 +351,7 @@ const BoxPointer = new Lang.Class({
                    0, Math.PI/2);
         }
 
-        if (this._arrowSide == St.Side.BOTTOM && rise) {
+        if (this._arrowSide == St.Side.BOTTOM) {
             if (skipBottomLeft) {
                 cr.lineTo(x1 + halfBase, y2);
                 cr.lineTo(x1, y2 + rise);
@@ -384,7 +372,7 @@ const BoxPointer = new Lang.Class({
                    Math.PI/2, Math.PI);
         }
 
-        if (this._arrowSide == St.Side.LEFT && rise) {
+        if (this._arrowSide == St.Side.LEFT) {
             if (skipTopLeft) {
                 cr.lineTo(x1, y1 + halfBase);
                 cr.lineTo(x1 - rise, y1);
@@ -601,12 +589,12 @@ const BoxPointer = new Lang.Class({
                 return St.Side.TOP;
             break;
         case St.Side.LEFT:
-            if (sourceAllocation.x2 + boxWidth > monitor.x + monitor.width &&
+            if (sourceAllocation.y2 + boxWidth > monitor.x + monitor.width &&
                 boxWidth < sourceAllocation.x1 - monitor.x)
                 return St.Side.RIGHT;
             break;
         case St.Side.RIGHT:
-            if (sourceAllocation.x1 - boxWidth < monitor.x &&
+            if (sourceAllocation.y1 - boxWidth < monitor.x &&
                 boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
                 return St.Side.LEFT;
             break;
@@ -624,8 +612,6 @@ const BoxPointer = new Lang.Class({
                 this._container.queue_relayout();
                 return false;
             }));
-
-            this.emit('arrow-side-changed');
         }
     },
 
@@ -653,21 +639,5 @@ const BoxPointer = new Lang.Class({
 
     get opacity() {
         return this.actor.opacity;
-    },
-
-    updateArrowSide: function(side) {
-        this._arrowSide = side;
-        this._border.queue_repaint();
-
-        this.emit('arrow-side-changed');
-    },
-
-    getPadding: function(side) {
-        return this.bin.get_theme_node().get_padding(side);
-    },
-
-    getArrowHeight: function() {
-        return this.actor.get_theme_node().get_length('-arrow-rise');
     }
 });
-Signals.addSignalMethods(BoxPointer.prototype);

js/ui/calendar.js

@@ -14,24 +14,19 @@ const Shell = imports.gi.Shell;
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';
 
-// alias to prevent xgettext from picking up strings translated in GTK+
-const gtk30_ = Gettext_gtk30.gettext;
-
 // in org.gnome.desktop.interface
 const CLOCK_FORMAT_KEY        = 'clock-format';
 
+function _sameDay(dateA, dateB) {
+    return (dateA.getDate() == dateB.getDate() &&
+            dateA.getMonth() == dateB.getMonth() &&
+            dateA.getYear() == dateB.getYear());
+}
+
 function _sameYear(dateA, dateB) {
     return (dateA.getYear() == dateB.getYear());
 }
 
-function _sameMonth(dateA, dateB) {
-    return _sameYear(dateA, dateB) && (dateA.getMonth() == dateB.getMonth());
-}
-
-function _sameDay(dateA, dateB) {
-    return _sameMonth(dateA, dateB) && (dateA.getDate() == dateB.getDate());
-}
-
 /* TODO: maybe needs config - right now we assume that Saturday and
  * Sunday are non-work days (not true in e.g. Israel, it's Sunday and
  * Monday there)
@@ -195,18 +190,16 @@ const EmptyEventSource = new Lang.Class({
 });
 Signals.addSignalMethods(EmptyEventSource.prototype);
 
-const CalendarServerIface = '<node> \
-<interface name="org.gnome.Shell.CalendarServer"> \
-<method name="GetEvents"> \
-    <arg type="x" direction="in" /> \
-    <arg type="x" direction="in" /> \
-    <arg type="b" direction="in" /> \
-    <arg type="a(sssbxxa{sv})" direction="out" /> \
-</method> \
-<property name="HasCalendars" type="b" access="read" /> \
-<signal name="Changed" /> \
-</interface> \
-</node>';
+const CalendarServerIface = <interface name="org.gnome.Shell.CalendarServer">
+<method name="GetEvents">
+    <arg type="x" direction="in" />
+    <arg type="x" direction="in" />
+    <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);
 
@@ -334,22 +327,25 @@ const DBusEventSource = new Lang.Class({
             return;
 
         if (this._curRequestBegin && this._curRequestEnd){
+            let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
+            if (forceReload)
+                callFlags = Gio.DBusCallFlags.NONE;
             this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
                                             this._curRequestEnd.getTime() / 1000,
                                             forceReload,
                                             Lang.bind(this, this._onEventsReceived),
-                                            Gio.DBusCallFlags.NONE);
+                                            callFlags);
         }
     },
 
-    requestRange: function(begin, end) {
-        if (!(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
+    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;
             this._curRequestEnd = end;
-            this._loadEvents(false);
+            this._loadEvents(forceReload);
         }
     },
 
@@ -390,7 +386,7 @@ const Calendar = new Lang.Class({
 
         // Find the ordering for month/year in the calendar heading
         this._headerFormatWithoutYear = '%B';
-        switch (gtk30_('calendar:MY')) {
+        switch (Gettext_gtk30.gettext('calendar:MY')) {
         case 'calendar:MY':
             this._headerFormat = '%B %Y';
             break;
@@ -406,8 +402,6 @@ const Calendar = new Lang.Class({
         // Start off with the current date
         this._selectedDate = new Date();
 
-        this._shouldDateGrabFocus = false;
-
         this.actor = new St.Table({ homogeneous: false,
                                     style_class: 'calendar',
                                     reactive: true });
@@ -423,21 +417,21 @@ const Calendar = new Lang.Class({
     setEventSource: function(eventSource) {
         this._eventSource = eventSource;
         this._eventSource.connect('changed', Lang.bind(this, function() {
-            this._rebuildCalendar();
-            this._update();
+            this._update(false);
         }));
-        this._rebuildCalendar();
-        this._update();
+        this._update(true);
     },
 
     // Sets the calendar to show a specific date
-    setDate: function(date) {
-        if (_sameDay(date, this._selectedDate))
-            return;
-
-        this._selectedDate = date;
-        this._update();
-        this.emit('selected-date-changed', new Date(this._selectedDate));
+    setDate: function(date, forceReload) {
+        if (!_sameDay(date, this._selectedDate)) {
+            this._selectedDate = date;
+            this._update(forceReload);
+            this.emit('selected-date-changed', new Date(this._selectedDate));
+        } else {
+            if (forceReload)
+                this._update(forceReload);
+        }
     },
 
     _buildHeader: function() {
@@ -450,17 +444,14 @@ const Calendar = new Lang.Class({
                        { row: 0, col: 0, col_span: offsetCols + 7 });
 
         this._backButton = new St.Button({ style_class: 'calendar-change-month-back',
-                                           accessible_name: _("Previous month"),
                                            can_focus: true });
         this._topBox.add(this._backButton);
         this._backButton.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
 
-        this._monthLabel = new St.Label({style_class: 'calendar-month-label',
-                                         can_focus: true });
+        this._monthLabel = new St.Label({style_class: 'calendar-month-label'});
         this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
 
         this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward',
-                                              accessible_name: _("Next month"),
                                               can_focus: true });
         this._topBox.add(this._forwardButton);
         this._forwardButton.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));
@@ -501,7 +492,6 @@ const Calendar = new Lang.Class({
             this._onNextMonthButtonClicked();
             break;
         }
-        return Clutter.EVENT_PROPAGATE;
     },
 
     _onPrevMonthButtonClicked: function() {
@@ -525,7 +515,7 @@ const Calendar = new Lang.Class({
 
         this._backButton.grab_key_focus();
 
-        this.setDate(newDate);
+        this.setDate(newDate, false);
     },
 
     _onNextMonthButtonClicked: function() {
@@ -549,26 +539,28 @@ const Calendar = new Lang.Class({
 
         this._forwardButton.grab_key_focus();
 
-        this.setDate(newDate);
+        this.setDate(newDate, false);
     },
 
     _onSettingsChange: function() {
         this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
         this._buildHeader();
-        this._rebuildCalendar();
-        this._update();
+        this._update(false);
     },
 
-    _rebuildCalendar: function() {
+    _update: function(forceReload) {
         let now = new Date();
 
+        if (_sameYear(this._selectedDate, now))
+            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormatWithoutYear);
+        else
+            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormat);
+
         // Remove everything but the topBox and the weekday labels
         let children = this.actor.get_children();
         for (let i = this._firstDayIndex; i < children.length; i++)
             children[i].destroy();
 
-        this._buttons = [];
-
         // 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
@@ -586,13 +578,11 @@ const Calendar = new Lang.Class({
         // 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);
-
-        this._calendarBegin = new Date(beginDate);
-
         let year = beginDate.getYear();
 
         let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
@@ -613,10 +603,13 @@ const Calendar = new Lang.Class({
             if (this._eventSource.isDummy)
                 button.reactive = false;
 
-            button._date = new Date(iter);
+            let iterStr = iter.toUTCString();
             button.connect('clicked', Lang.bind(this, function() {
                 this._shouldDateGrabFocus = true;
-                this.setDate(button._date);
+
+                let newlySelectedDate = new Date(iterStr);
+                this.setDate(newlySelectedDate, false);
+
                 this._shouldDateGrabFocus = false;
             }));
 
@@ -624,9 +617,9 @@ const Calendar = new Lang.Class({
             let styleClass = 'calendar-day-base calendar-day';
 
             if (_isWorkDay(iter))
-                styleClass += ' calendar-work-day';
+                styleClass += ' calendar-work-day'
             else
-                styleClass += ' calendar-nonwork-day';
+                styleClass += ' calendar-nonwork-day'
 
             // Hack used in lieu of border-collapse - see gnome-shell.css
             if (row == 2)
@@ -643,7 +636,7 @@ const Calendar = new Lang.Class({
                 styleClass += ' calendar-other-month-day';
 
             if (hasEvents)
-                styleClass += ' calendar-day-with-events';
+                styleClass += ' calendar-day-with-events'
 
             button.style_class = styleClass;
 
@@ -651,7 +644,12 @@ const Calendar = new Lang.Class({
             this.actor.add(button,
                            { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7 });
 
-            this._buttons.push(button);
+            if (_sameDay(this._selectedDate, iter)) {
+                button.add_style_pseudo_class('active');
+
+                if (this._shouldDateGrabFocus)
+                    button.grab_key_focus();
+            }
 
             if (this._useWeekdate && iter.getDay() == 4) {
                 let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
@@ -665,32 +663,9 @@ const Calendar = new Lang.Class({
             if (iter.getDay() == this._weekStart)
                 row++;
         }
-
         // Signal to the event source that we are interested in events
         // only from this date range
-        this._eventSource.requestRange(beginDate, iter);
-    },
-
-    _update: function() {
-        let now = new Date();
-
-        if (_sameYear(this._selectedDate, now))
-            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormatWithoutYear);
-        else
-            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormat);
-
-        if (!this._calendarBegin || !_sameMonth(this._selectedDate, this._calendarBegin))
-            this._rebuildCalendar();
-
-        this._buttons.forEach(Lang.bind(this, function(button) {
-            if (_sameDay(button._date, this._selectedDate)) {
-                button.add_style_pseudo_class('active');
-                if (this._shouldDateGrabFocus)
-                    button.grab_key_focus();
-            }
-            else
-                button.remove_style_pseudo_class('active');
-        }));
+        this._eventSource.requestRange(beginDate, iter, forceReload);
     }
 });
 
@@ -700,7 +675,7 @@ const EventsList = new Lang.Class({
     Name: 'EventsList',
 
     _init: function() {
-        this.actor = new St.Table({ style_class: 'events-table' });
+        this.actor = new St.BoxLayout({ vertical: true, style_class: 'events-header-vbox'});
         this._date = new Date();
         this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
         this._desktopSettings.connect('changed', Lang.bind(this, this._update));
@@ -712,72 +687,55 @@ const EventsList = new Lang.Class({
         this._eventSource.connect('changed', Lang.bind(this, this._update));
     },
 
-    _addEvent: function(event, index, includeDayName) {
-        let dayString;
-        if (includeDayName)
-            dayString = _getEventDayAbbreviation(event.date.getDay());
-        else
-            dayString = '';
-
-        let dayLabel = new St.Label({ style_class: 'events-day-dayname',
-                                      text: dayString });
-        dayLabel.clutter_text.line_wrap = false;
-        dayLabel.clutter_text.ellipsize = false;
-
-        this.actor.add(dayLabel, { row: index, col: 0,
-                                   x_expand: false, x_align: St.Align.END,
-                                   y_fill: false, y_align: St.Align.START });
-
-        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
-        let timeString = _formatEventTime(event, clockFormat);
-        let timeLabel = new St.Label({ style_class: 'events-day-time',
-                                       text: timeString });
-        timeLabel.clutter_text.line_wrap = false;
-        timeLabel.clutter_text.ellipsize = false;
-
-        this.actor.add(timeLabel, { row: index, col: 1,
-                                    x_expand: false, x_align: St.Align.MIDDLE,
-                                    y_fill: false, y_align: St.Align.START });
-
-        let titleLabel = new St.Label({ style_class: 'events-day-task',
-                                        text: event.summary });
-        titleLabel.clutter_text.line_wrap = true;
-        titleLabel.clutter_text.ellipsize = false;
-
-        this.actor.add(titleLabel, { row: index, col: 2,
-                                     x_expand: true, x_align: St.Align.START,
-                                     y_fill: false, y_align: St.Align.START });
+    _addEvent: function(dayNameBox, timeBox, eventTitleBox, includeDayName, day, time, desc) {
+        if (includeDayName) {
+            dayNameBox.add(new St.Label( { style_class: 'events-day-dayname',
+                                           text: day } ),
+                           { x_fill: true } );
+        }
+        timeBox.add(new St.Label( { style_class: 'events-day-time',
+                                    text: time} ),
+                    { x_fill: true } );
+        eventTitleBox.add(new St.Label( { style_class: 'events-day-task',
+                                          text: desc} ));
     },
 
-    _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
+    _addPeriod: function(header, begin, end, includeDayName, showNothingScheduled) {
         let events = this._eventSource.getEvents(begin, end);
 
-        if (events.length == 0 && !showNothingScheduled)
-            return index;
+        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);;
 
-        this.actor.add(new St.Label({ style_class: 'events-day-header', text: header }),
-                       { row: index, col: 0, col_span: 3,
-                         // In theory, x_expand should be true here, but x_expand
-                         // is a property of the column for StTable, ie all day cells
-                         // get it too
-                         x_expand: false, x_align: St.Align.START,
-                         y_fill: false, y_align: St.Align.START });
-        index++;
+        if (events.length == 0 && !showNothingScheduled)
+            return;
+
+        let vbox = new St.BoxLayout( {vertical: true} );
+        this.actor.add(vbox);
+
+        vbox.add(new St.Label({ style_class: 'events-day-header', text: header }));
+        let box = new St.BoxLayout({style_class: 'events-header-hbox'});
+        let dayNameBox = new St.BoxLayout({ vertical: true, style_class: 'events-day-name-box' });
+        let timeBox = new St.BoxLayout({ vertical: true, style_class: 'events-time-box' });
+        let eventTitleBox = new St.BoxLayout({ vertical: true, style_class: 'events-event-box' });
+        box.add(dayNameBox, {x_fill: false});
+        box.add(timeBox, {x_fill: false});
+        box.add(eventTitleBox, {expand: true});
+        vbox.add(box);
 
         for (let n = 0; n < events.length; n++) {
-            this._addEvent(events[n], index, includeDayName);
-            index++;
+            let event = events[n];
+            let dayString = _getEventDayAbbreviation(event.date.getDay());
+            let timeString = _formatEventTime(event, clockFormat);
+            let summaryString = event.summary;
+            this._addEvent(dayNameBox, timeBox, eventTitleBox, includeDayName, dayString, timeString, summaryString);
         }
 
         if (events.length == 0 && showNothingScheduled) {
             let now = new Date();
             /* Translators: Text to show if there are no events */
             let nothingEvent = new CalendarEvent(now, now, _("Nothing Scheduled"), true);
-            this._addEvent(nothingEvent, index, false);
-            index++;
+            let timeString = _formatEventTime(nothingEvent, clockFormat);
+            this._addEvent(dayNameBox, timeBox, eventTitleBox, false, "", timeString, nothingEvent.summary);
         }
-
-        return index;
     },
 
     _showOtherDay: function(day) {
@@ -794,21 +752,20 @@ const EventsList = new Lang.Class({
         else
             /* Translators: Shown on calendar heading when selected day occurs on different year */
             dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
-        this._addPeriod(dayString, 0, dayBegin, dayEnd, false, true);
+        this._addPeriod(dayString, dayBegin, dayEnd, false, true);
     },
 
     _showToday: function() {
         this.actor.destroy_all_children();
-        let index = 0;
 
         let now = new Date();
         let dayBegin = _getBeginningOfDay(now);
         let dayEnd = _getEndOfDay(now);
-        index = this._addPeriod(_("Today"), index, dayBegin, dayEnd, false, true);
+        this._addPeriod(_("Today"), dayBegin, dayEnd, false, true);
 
         let tomorrowBegin = new Date(dayBegin.getTime() + 86400 * 1000);
         let tomorrowEnd = new Date(dayEnd.getTime() + 86400 * 1000);
-        index = this._addPeriod(_("Tomorrow"), index, tomorrowBegin, tomorrowEnd, false, true);
+        this._addPeriod(_("Tomorrow"), tomorrowBegin, tomorrowEnd, false, true);
 
         let dayInWeek = (dayEnd.getDay() - this._weekStart + 7) % 7;
 
@@ -819,7 +776,7 @@ const EventsList = new Lang.Class({
              */
             let thisWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
             let thisWeekEnd = new Date(dayEnd.getTime() + (6 - dayInWeek) * 86400 * 1000);
-            index = this._addPeriod(_("This week"), index, thisWeekBegin, thisWeekEnd, true, false);
+            this._addPeriod(_("This week"), thisWeekBegin, thisWeekEnd, true, false);
         } else {
             /* otherwise it's one of the two last days of the week ... show
              * "Next week" and include events up until and including *next*
@@ -827,7 +784,7 @@ const EventsList = new Lang.Class({
              */
             let nextWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
             let nextWeekEnd = new Date(dayEnd.getTime() + (13 - dayInWeek) * 86400 * 1000);
-            index = this._addPeriod(_("Next week"), index, nextWeekBegin, nextWeekEnd, true, false);
+            this._addPeriod(_("Next week"), nextWeekBegin, nextWeekEnd, true, false);
         }
     },
 

js/ui/checkBox.js

@@ -1,40 +1,115 @@
 const Clutter = imports.gi.Clutter;
 const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
 const Lang = imports.lang;
 
+const CheckBoxContainer = new Lang.Class({
+    Name: 'CheckBoxContainer',
+
+    _init: function() {
+        this.actor = new Shell.GenericContainer();
+        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('style-changed', Lang.bind(this,
+            function() {
+                let node = this.actor.get_theme_node();
+                this._spacing = node.get_length('spacing');
+            }));
+        this.actor.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH;
+
+        this._box = new St.Bin();
+        this.actor.add_actor(this._box);
+
+        this.label = new St.Label();
+        this.label.clutter_text.set_line_wrap(true);
+        this.label.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE);
+        this.actor.add_actor(this.label);
+
+        this._spacing = 0;
+    },
+
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        let [minWidth, natWidth] = this._box.get_preferred_width(forHeight);
+
+        alloc.min_size = minWidth + this._spacing;
+        alloc.natural_size = natWidth + this._spacing;
+    },
+
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        /* FIXME: StBoxlayout currently does not handle
+           height-for-width children correctly, so hard-code
+           two lines for the label until that problem is fixed.
+
+           https://bugzilla.gnome.org/show_bug.cgi?id=672543 */
+/*
+        let [minBoxHeight, natBoxHeight] =
+            this._box.get_preferred_height(forWidth);
+        let [minLabelHeight, natLabelHeight] =
+            this.label.get_preferred_height(forWidth);
+
+        alloc.min_size = Math.max(minBoxHeight, minLabelHeight);
+        alloc.natural_size = Math.max(natBoxHeight, natLabelHeight);
+*/
+        let [minBoxHeight, natBoxHeight] =
+            this._box.get_preferred_height(-1);
+        let [minLabelHeight, natLabelHeight] =
+            this.label.get_preferred_height(-1);
+
+        alloc.min_size = Math.max(minBoxHeight, 2 * minLabelHeight);
+        alloc.natural_size = Math.max(natBoxHeight, 2 * natLabelHeight);
+    },
+
+    _allocate: function(actor, box, flags) {
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        let childBox = new Clutter.ActorBox();
+        let [minBoxWidth, natBoxWidth] =
+            this._box.get_preferred_width(-1);
+        let [minBoxHeight, natBoxHeight] =
+            this._box.get_preferred_height(-1);
+        childBox.x1 = box.x1;
+        childBox.x2 = box.x1 + natBoxWidth;
+        childBox.y1 = box.y1;
+        childBox.y2 = box.y1 + natBoxHeight;
+        this._box.allocate(childBox, flags);
+
+        childBox.x1 = box.x1 + natBoxWidth + this._spacing;
+        childBox.x2 = availWidth - childBox.x1;
+        childBox.y1 = box.y1;
+        childBox.y2 = box.y2;
+        this.label.allocate(childBox, flags);
+    }
+});
+
 const CheckBox = new Lang.Class({
     Name: 'CheckBox',
 
     _init: function(label) {
-        let container = new St.BoxLayout();
         this.actor = new St.Button({ style_class: 'check-box',
-                                     child: container,
                                      button_mask: St.ButtonMask.ONE,
                                      toggle_mode: true,
                                      can_focus: true,
                                      x_fill: true,
                                      y_fill: true });
-
-        this._box = new St.Bin();
-        this._box.set_y_align(Clutter.ActorAlign.START);
-        container.add_actor(this._box);
-
-        this._label = new St.Label();
-        this._label.clutter_text.set_line_wrap(true);
-        this._label.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE);
-        container.add_actor(this._label);
+        this._container = new CheckBoxContainer();
+        this.actor.set_child(this._container.actor);
 
         if (label)
             this.setLabel(label);
     },
 
     setLabel: function(label) {
-        this._label.set_text(label);
+        this._container.label.set_text(label);
     },
 
     getLabelActor: function() {
-        return this._label;
+        return this._container.label;
     }
 });

js/ui/components/automountManager.js

@@ -43,7 +43,6 @@ const AutomountManager = new Lang.Class({
         this._driveEjectButtonId = this._volumeMonitor.connect('drive-eject-button', Lang.bind(this, this._onDriveEjectButton));
 
         this._mountAllId = Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
-        GLib.Source.set_name_by_id(this._mountAllId, '[gnome-shell] this._startupMountAll');
     },
 
     disable: function() {
@@ -78,7 +77,7 @@ const AutomountManager = new Lang.Class({
         }));
 
         this._mountAllId = 0;
-        return GLib.SOURCE_REMOVE;
+        return false;
     },
 
     _onDriveConnected: function() {
@@ -235,11 +234,10 @@ const AutomountManager = new Lang.Class({
     },
 
     _allowAutorunExpire: function(volume) {
-        let id = Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, function() {
+        Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, function() {
             volume.allowAutorun = false;
-            return GLib.SOURCE_REMOVE;
+            return false;
         });
-        GLib.Source.set_name_by_id(id, '[gnome-shell] volume.allowAutorun');
     }
 });
 const Component = AutomountManager;

js/ui/components/autorunManager.js

@@ -31,7 +31,7 @@ function shouldAutorunMount(mount, forTransient) {
     if (!volume || (!volume.allowAutorun && forTransient))
         return false;
 
-    if (root.is_native() && isMountRootHidden(root))
+    if (!root.is_native() || isMountRootHidden(root))
         return false;
 
     return true;
@@ -64,7 +64,7 @@ function startAppForMount(app, mount) {
 
     try {
         retval = app.launch(files, 
-                            global.create_app_launch_context(0, -1))
+                            global.create_app_launch_context())
     } catch (e) {
         log('Unable to launch the application ' + app.get_name()
             + ': ' + e.toString());
@@ -75,14 +75,12 @@ function startAppForMount(app, mount) {
 
 /******************************************/
 
-const HotplugSnifferIface = '<node> \
-<interface name="org.gnome.Shell.HotplugSniffer"> \
-<method name="SniffURI"> \
-    <arg type="s" direction="in" /> \
-    <arg type="as" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const HotplugSnifferIface = <interface name="org.gnome.Shell.HotplugSniffer">
+<method name="SniffURI">
+    <arg type="s" direction="in" />
+    <arg type="as" direction="out" />
+</method>
+</interface>;
 
 const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
 function HotplugSniffer() {

js/ui/components/keyring.js

@@ -13,6 +13,8 @@ const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 const CheckBox = imports.ui.checkBox;
 
+let prompter = null;
+
 const KeyringDialog = new Lang.Class({
     Name: 'KeyringDialog',
     Extends: ModalDialog.ModalDialog,
@@ -45,9 +47,7 @@ const KeyringDialog = new Lang.Class({
         this.prompt.bind_property('message', subject, 'text', GObject.BindingFlags.SYNC_CREATE);
 
         this._messageBox.add(subject,
-                             { x_fill: false,
-                               y_fill:  false,
-                               x_align: St.Align.START,
+                             { y_fill:  false,
                                y_align: St.Align.START });
 
         let description = new St.Label({ style_class: 'prompt-dialog-description' });
@@ -80,26 +80,23 @@ const KeyringDialog = new Lang.Class({
     },
 
     _buildControlTable: function() {
-        let layout = new Clutter.TableLayout();
-        let table = new St.Widget({ style_class: 'keyring-dialog-control-table',
-                                    layout_manager: layout });
-        layout.hookup_style(table);
+        let table = new St.Table({ style_class: 'keyring-dialog-control-table' });
         let row = 0;
 
         if (this.prompt.password_visible) {
-            let label = new St.Label({ style_class: 'prompt-dialog-password-label' });
+            let label = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
             label.set_text(_("Password:"));
-            label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            layout.pack(label, 0, row);
-            layout.child_set(label, { x_expand: false, y_fill: false,
-                                      x_align: Clutter.TableAlignment.START });
+            table.add(label, { row: row, col: 0,
+                               x_expand: false, x_fill: true,
+                               x_align: St.Align.START,
+                               y_fill: false, y_align: St.Align.MIDDLE });
             this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                                  text: '',
-                                                 can_focus: true });
+                                                 can_focus: true});
             this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
             ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
             this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onPasswordActivate));
-            layout.pack(this._passwordEntry, 1, row);
+            table.add(this._passwordEntry, { row: row, col: 1, x_expand: true, x_fill: true, x_align: St.Align.START });
             row++;
         } else {
             this._passwordEntry = null;
@@ -108,16 +105,17 @@ const KeyringDialog = new Lang.Class({
         if (this.prompt.confirm_visible) {
             var label = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
             label.set_text(_("Type again:"));
-            layout.pack(label, 0, row);
-            layout.child_set(label, { x_expand: false, y_fill: false,
-                                      x_align: Clutter.TableAlignment.START });
+            table.add(label, { row: row, col: 0,
+                               x_expand: false, x_fill: true,
+                               x_align: St.Align.START,
+                               y_fill: false, y_align: St.Align.MIDDLE });
             this._confirmEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                                 text: '',
-                                                can_focus: true });
+                                                can_focus: true});
             this._confirmEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
             ShellEntry.addContextMenu(this._confirmEntry, { isPassword: true });
             this._confirmEntry.clutter_text.connect('activate', Lang.bind(this, this._onConfirmActivate));
-            layout.pack(this._confirmEntry, 1, row);
+            table.add(this._confirmEntry, { row: row, col: 1, x_expand: true, x_fill: true, x_align: St.Align.START });
             row++;
         } else {
             this._confirmEntry = null;
@@ -130,15 +128,14 @@ const KeyringDialog = new Lang.Class({
             let choice = new CheckBox.CheckBox();
             this.prompt.bind_property('choice-label', choice.getLabelActor(), 'text', GObject.BindingFlags.SYNC_CREATE);
             this.prompt.bind_property('choice-chosen', choice.actor, 'checked', GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
-            layout.pack(choice.actor, 1, row);
+            table.add(choice.actor, { row: row, col: 1, x_expand: false, x_fill: true, x_align: St.Align.START });
             row++;
         }
 
         let warning = new St.Label({ style_class: 'prompt-dialog-error-label' });
         warning.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         warning.clutter_text.line_wrap = true;
-        layout.pack(warning, 1, row);
-        layout.child_set(warning, { x_fill: false, x_align: Clutter.TableAlignment.START });
+        table.add(warning, { row: row, col: 1, x_expand: false, x_fill: false, x_align: St.Align.START });
         this.prompt.bind_property('warning-visible', warning, 'visible', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('warning', warning, 'text', GObject.BindingFlags.SYNC_CREATE);
 
@@ -224,56 +221,27 @@ const KeyringDialog = new Lang.Class({
     },
 });
 
-const KeyringDummyDialog = new Lang.Class({
-    Name: 'KeyringDummyDialog',
-
-    _init: function() {
-        this.prompt = new Shell.KeyringPrompt();
-        this.prompt.connect('show-password',
-                            Lang.bind(this, this._cancelPrompt));
-        this.prompt.connect('show-confirm', Lang.bind(this,
-                            this._cancelPrompt));
-    },
-
-    _cancelPrompt: function() {
-        this.prompt.cancel();
-    }
-});
-
 const KeyringPrompter = new Lang.Class({
     Name: 'KeyringPrompter',
 
     _init: function() {
         this._prompter = new Gcr.SystemPrompter();
-        this._prompter.connect('new-prompt', Lang.bind(this,
-            function() {
-                let dialog = this._enabled ? new KeyringDialog()
-                                           : new KeyringDummyDialog();
-                this._currentPrompt = dialog.prompt;
-                return this._currentPrompt;
-            }));
+        this._prompter.connect('new-prompt', function(prompter) {
+            let dialog = new KeyringDialog();
+            return dialog.prompt;
+        });
         this._dbusId = null;
-        this._registered = false;
-        this._enabled = false;
-        this._currentPrompt = null;
     },
 
     enable: function() {
-        if (!this._registered) {
-            this._prompter.register(Gio.DBus.session);
-            this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
-                                                     Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
-            this._registered = true;
-        }
-        this._enabled = true;
+        this._prompter.register(Gio.DBus.session);
+        this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
+                                                 Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
     },
 
     disable: function() {
-        this._enabled = false;
-
-        if (this._prompter.prompting)
-            this._currentPrompt.cancel();
-        this._currentPrompt = null;
+        this._prompter.unregister(false);
+        Gio.DBus.session.unown_name(this._dbusId);
     }
 });
 

js/ui/components/networkAgent.js

@@ -62,9 +62,14 @@ const NetworkSecretDialog = new Lang.Class({
 
         if (this._content.message != null) {
             let descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
-                                                  text: this._content.message });
+                                                  text: this._content.message,
+                                                  // HACK: for reasons unknown to me, the label
+                                                  // is not asked the correct height for width,
+                                                  // and thus is underallocated
+                                                  // place a fixed height to avoid overflowing
+                                                  style: 'height: 3em'
+                                                });
             descriptionLabel.clutter_text.line_wrap = true;
-            descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
 
             messageBox.add(descriptionLabel,
                            { y_fill:  true,
@@ -72,18 +77,13 @@ const NetworkSecretDialog = new Lang.Class({
                              expand: true });
         }
 
-        let layout = new Clutter.TableLayout();
-        let secretTable = new St.Widget({ style_class: 'network-dialog-secret-table',
-                                          layout_manager: layout });
-        layout.hookup_style(secretTable);
-
+        let secretTable = new St.Table({ style_class: 'network-dialog-secret-table' });
         let initialFocusSet = false;
         let pos = 0;
         for (let i = 0; i < this._content.secrets.length; i++) {
             let secret = this._content.secrets[i];
             let label = new St.Label({ style_class: 'prompt-dialog-password-label',
                                        text: secret.label });
-            label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
 
             let reactive = secret.key != null;
 
@@ -116,10 +116,11 @@ const NetworkSecretDialog = new Lang.Class({
             } else
                 secret.valid = true;
 
-            layout.pack(label, 0, pos);
-            layout.child_set(label, { x_expand: false, y_fill: false,
-                                      x_align: Clutter.TableAlignment.START });
-            layout.pack(secret.entry, 1, pos);
+            secretTable.add(label, { row: pos, col: 0,
+                                     x_expand: false, x_fill: true,
+                                     x_align: St.Align.START,
+                                     y_fill: false, y_align: St.Align.MIDDLE });
+            secretTable.add(secret.entry, { row: pos, col: 1, x_expand: true, x_fill: true, y_align: St.Align.END });
             pos++;
 
             if (secret.password)
@@ -138,8 +139,6 @@ const NetworkSecretDialog = new Lang.Class({
                            key:    Clutter.KEY_Escape,
                          },
                          this._okButton]);
-
-        this._updateOkButton();
     },
 
     _updateOkButton: function() {
@@ -255,7 +254,6 @@ const NetworkSecretDialog = new Lang.Class({
         case 'leap':
         case 'ttls':
         case 'peap':
-        case 'fast':
             // TTLS and PEAP are actually much more complicated, but this complication
             // is not visible here since we only care about phase2 authentication
             // (and don't even care of which one)
@@ -309,7 +307,7 @@ const NetworkSecretDialog = new Lang.Class({
             wirelessSetting = this._connection.get_setting_wireless();
             ssid = NetworkManager.utils_ssid_to_utf8(wirelessSetting.get_ssid());
             content.title = _("Authentication required by wireless network");
-            content.message = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
+            content.message = _("Passwords or encryption keys are required to access the wireless network '%s'.").format(ssid);
             this._getWirelessSecrets(content.secrets, wirelessSetting);
             break;
         case '802-3-ethernet':
@@ -336,7 +334,7 @@ const NetworkSecretDialog = new Lang.Class({
         case 'cdma':
         case 'bluetooth':
             content.title = _("Mobile broadband network password");
-            content.message = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
+            content.message = _("A password is required to connect to '%s'.").format(connectionSetting.get_id());
             this._getMobileSecrets(content.secrets, connectionType);
             break;
         default:
@@ -387,7 +385,11 @@ const VPNRequestHandler = new Lang.Class({
             this._childPid = pid;
             this._stdin = new Gio.UnixOutputStream({ fd: stdin, close_fd: true });
             this._stdout = new Gio.UnixInputStream({ fd: stdout, close_fd: true });
-            GLib.close(stderr);
+            // We need this one too, even if don't actually care of what the process
+            // has to say on stderr, because otherwise the fd opened by g_spawn_async_with_pipes
+            // is kept open indefinitely
+            let stderrStream = new Gio.UnixInputStream({ fd: stderr, close_fd: true });
+            stderrStream.close(null);
             this._dataStdout = new Gio.DataInputStream({ base_stream: this._stdout });
 
             if (this._newStylePlugin)
@@ -435,7 +437,6 @@ const VPNRequestHandler = new Lang.Class({
     },
 
     _vpnChildFinished: function(pid, status, requestObj) {
-        this._childWatch = 0;
         if (this._newStylePlugin) {
             // For new style plugin, all work is done in the async reading functions
             // Just reap the process here
@@ -510,12 +511,10 @@ const VPNRequestHandler = new Lang.Class({
 
     _showNewStyleDialog: function() {
         let keyfile = new GLib.KeyFile();
-        let data;
         let contentOverride;
 
         try {
-            data = this._dataStdout.peek_buffer();
-
+            let data = this._dataStdout.peek_buffer();
             keyfile.load_from_data(data.toString(), data.length,
                                    GLib.KeyFileFlags.NONE);
 
@@ -548,16 +547,13 @@ const VPNRequestHandler = new Lang.Class({
                 }
             }
         } catch(e) {
-            // No output is a valid case it means "both secrets are stored"
-            if (data.length > 0) {
-                logError(e, 'error while reading VPN plugin output keyfile');
+            logError(e, 'error while reading VPN plugin output keyfile');
 
-                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-                return;
-            }
+            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+            return;
         }
 
-        if (contentOverride && contentOverride.secrets.length) {
+        if (contentOverride.secrets.length) {
             // Only show the dialog if we actually have something to ask
             this._shellDialog = new NetworkSecretDialog(this._agent, this._requestId, this._connection, 'vpn', [], contentOverride);
             this._shellDialog.open(global.get_current_time());

js/ui/components/polkitAgent.js

@@ -16,7 +16,7 @@ const PolkitAgent = imports.gi.PolkitAgent;
 const Components = imports.ui.components;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
-const UserWidget = imports.ui.userWidget;
+const UserAvatar = imports.ui.userAvatar;
 
 const DIALOG_ICON_SIZE = 48;
 
@@ -54,9 +54,7 @@ const AuthenticationDialog = new Lang.Class({
                                             text: _("Authentication Required") });
 
         messageBox.add(this._subjectLabel,
-                       { x_fill: false,
-                         y_fill:  false,
-                         x_align: St.Align.START,
+                       { y_fill:  false,
                          y_align: St.Align.START });
 
         this._descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
@@ -65,9 +63,7 @@ const AuthenticationDialog = new Lang.Class({
         this._descriptionLabel.clutter_text.line_wrap = true;
 
         messageBox.add(this._descriptionLabel,
-                       { x_fill: false,
-                         y_fill:  true,
-                         x_align: St.Align.START,
+                       { y_fill:  true,
                          y_align: St.Align.START });
 
         if (userNames.length > 1) {
@@ -99,15 +95,14 @@ const AuthenticationDialog = new Lang.Class({
         if (userIsRoot) {
             let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-root-label',
                                             text: userRealName }));
-            messageBox.add(userLabel, { x_fill: false,
-                                        x_align: St.Align.START });
+            messageBox.add(userLabel);
         } else {
             let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout',
                                              vertical: false });
             messageBox.add(userBox);
-            this._userAvatar = new UserWidget.Avatar(this._user,
-                                                     { iconSize: DIALOG_ICON_SIZE,
-                                                       styleClass: 'polkit-dialog-user-icon' });
+            this._userAvatar = new UserAvatar.UserAvatar(this._user,
+                                                         { iconSize: DIALOG_ICON_SIZE,
+                                                           styleClass: 'polkit-dialog-user-icon' });
             this._userAvatar.actor.hide();
             userBox.add(this._userAvatar.actor,
                         { x_fill:  true,
@@ -142,7 +137,7 @@ const AuthenticationDialog = new Lang.Class({
         this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label' });
         this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         this._errorMessageLabel.clutter_text.line_wrap = true;
-        messageBox.add(this._errorMessageLabel, { x_fill: false, x_align: St.Align.START });
+        messageBox.add(this._errorMessageLabel);
         this._errorMessageLabel.hide();
 
         this._infoMessageLabel = new St.Label({ style_class: 'prompt-dialog-info-label' });

js/ui/components/recorder.js

@@ -0,0 +1,61 @@
+
+const Lang = imports.lang;
+const Main = imports.ui.main;
+
+const Gio = imports.gi.Gio;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+
+const Recorder = new Lang.Class({
+    Name: 'Recorder',
+
+    _init: function() {
+        this._recorderSettings = new Gio.Settings({ schema: 'org.gnome.shell.recorder' });
+        this._desktopLockdownSettings = new Gio.Settings({ schema: 'org.gnome.desktop.lockdown' });
+        this._bindingSettings = new Gio.Settings({ schema: 'org.gnome.shell.keybindings' });
+        this._recorder = null;
+    },
+
+    enable: function() {
+        Main.wm.addKeybinding('toggle-recording',
+                              this._bindingSettings,
+                              Meta.KeyBindingFlags.NONE,
+                              Shell.KeyBindingMode.ALL,
+                              Lang.bind(this, this._toggleRecorder));
+    },
+
+    disable: function() {
+        Main.wm.removeKeybinding('toggle-recording');
+    },
+
+    _ensureRecorder: function() {
+        if (this._recorder == null)
+            this._recorder = new Shell.Recorder({ stage: global.stage });
+        return this._recorder;
+    },
+
+    _toggleRecorder: function() {
+        let recorder = this._ensureRecorder();
+        if (recorder.is_recording()) {
+            recorder.close();
+            Meta.enable_unredirect_for_screen(global.screen);
+        } else if (!this._desktopLockdownSettings.get_boolean('disable-save-to-disk')) {
+            // read the parameters from GSettings always in case they have changed
+            recorder.set_framerate(this._recorderSettings.get_int('framerate'));
+            /* Translators: this is a filename used for screencast recording */
+            // xgettext:no-c-format
+            recorder.set_file_template(_("Screencast from %d %t") + '.' + this._recorderSettings.get_string('file-extension'));
+            let pipeline = this._recorderSettings.get_string('pipeline');
+
+            if (!pipeline.match(/^\s*$/))
+                recorder.set_pipeline(pipeline);
+            else
+                recorder.set_pipeline(null);
+
+            Meta.disable_unredirect_for_screen(global.screen);
+            recorder.record();
+        }
+    }
+});
+
+const Component = Recorder;

js/ui/components/telepathyClient.js

@@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
@@ -14,11 +13,12 @@ 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;
 
 // See Notification.appendMessage
-const SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes
+const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute
 const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes
 const SCROLLBACK_RECENT_LENGTH = 20;
 const SCROLLBACK_IDLE_LENGTH = 5;
@@ -29,8 +29,6 @@ const SCROLLBACK_HISTORY_LINES = 10;
 // See Notification._onEntryChanged
 const COMPOSING_STOP_TIMEOUT = 5;
 
-const CLOCK_FORMAT_KEY = 'clock-format';
-
 const NotificationDirection = {
     SENT: 'chat-sent',
     RECEIVED: 'chat-received'
@@ -418,7 +416,7 @@ const TelepathyClient = new Lang.Class({
     _ensureAppSource: function() {
         if (this._appSource == null) {
             this._appSource = new MessageTray.Source(_("Chat"), 'empathy');
-            this._appSource.policy = new MessageTray.NotificationApplicationPolicy('empathy');
+            this._appSource.policy = new NotificationDaemon.NotificationApplicationPolicy('empathy');
 
             Main.messageTray.add(this._appSource);
             this._appSource.connect('destroy', Lang.bind(this, function () {
@@ -449,7 +447,6 @@ const ChatSource = new Lang.Class({
         this._closedId = this._channel.connect('invalidated', Lang.bind(this, this._channelClosed));
 
         this._notification = new ChatNotification(this);
-        this._notification.connect('clicked', Lang.bind(this, this.open));
         this._notification.setUrgency(MessageTray.Urgency.HIGH);
         this._notifyTimeoutId = 0;
 
@@ -491,7 +488,7 @@ const ChatSource = new Lang.Class({
     },
 
     _createPolicy: function() {
-        return new MessageTray.NotificationApplicationPolicy('empathy');
+        return new NotificationDaemon.NotificationApplicationPolicy('empathy');
     },
 
     _updateAlias: function() {
@@ -548,19 +545,20 @@ const ChatSource = new Lang.Class({
         this._notification.update(this._notification.title, null, { customContent: true });
     },
 
-    open: function() {
-        if (this._client.is_handling_channel(this._channel)) {
-            // We are handling the channel, try to pass it to Empathy
-            this._client.delegate_channels_async([this._channel],
-                                                 global.get_current_time(),
-                                                 'org.freedesktop.Telepathy.Client.Empathy.Chat', null);
-        } else {
-            // We are not the handler, just ask to present the channel
-            let dbus = Tp.DBusDaemon.dup();
-            let cd = Tp.ChannelDispatcher.new(dbus);
+    open: function(notification) {
+          if (this._client.is_handling_channel(this._channel)) {
+              // We are handling the channel, try to pass it to Empathy
+              this._client.delegate_channels_async([this._channel],
+                  global.get_current_time(),
+                  'org.freedesktop.Telepathy.Client.Empathy.Chat', null);
+          }
+          else {
+              // We are not the handler, just ask to present the channel
+              let dbus = Tp.DBusDaemon.dup();
+              let cd = Tp.ChannelDispatcher.new(dbus);
 
-            cd.present_channel_async(this._channel, global.get_current_time(), null);
-        }
+              cd.present_channel_async(this._channel, global.get_current_time(), null);
+          }
     },
 
     _getLogMessages: function() {
@@ -624,11 +622,7 @@ const ChatSource = new Lang.Class({
             this.notify();
     },
 
-    destroy: function(reason) {
-        if (this._destroyed)
-            return;
-
-        this._destroyed = true;
+    _channelClosed: function() {
         this._channel.disconnect(this._closedId);
         this._channel.disconnect(this._receivedId);
         this._channel.disconnect(this._pendingId);
@@ -638,14 +632,7 @@ const ChatSource = new Lang.Class({
         this._contact.disconnect(this._notifyAvatarId);
         this._contact.disconnect(this._presenceChangedId);
 
-        if (this._timestampTimeoutId)
-            Mainloop.source_remove(this._timestampTimeoutId);
-
-        this.parent(reason);
-    },
-
-    _channelClosed: function() {
-        this.destroy(MessageTray.NotificationDestroyedReason.SOURCE_CLOSED);
+        this.destroy();
     },
 
     /* All messages are new messages for Telepathy sources */
@@ -681,7 +668,6 @@ const ChatSource = new Lang.Class({
             Mainloop.source_remove(this._notifyTimeoutId);
         this._notifyTimeoutId = Mainloop.timeout_add(500,
             Lang.bind(this, this._notifyTimeout));
-        GLib.Source.set_name_by_id(this._notifyTimeoutId, '[gnome-shell] this._notifyTimeout');
     },
 
     _notifyTimeout: function() {
@@ -690,7 +676,7 @@ const ChatSource = new Lang.Class({
 
         this._notifyTimeoutId = 0;
 
-        return GLib.SOURCE_REMOVE;
+        return false;
     },
 
     // This is called for both messages we send from
@@ -909,14 +895,14 @@ const ChatNotification = new Lang.Class({
 
         let group = props.group;
         if (group != this._lastGroup) {
+            let style = 'chat-group-' + group;
             this._lastGroup = group;
-            let emptyLine = new St.Label({ style_class: 'chat-empty-line' });
-            this.addActor(emptyLine);
+            this._lastGroupActor = new St.BoxLayout({ style_class: style,
+                                                      vertical: true });
+            this.addActor(this._lastGroupActor);
         }
 
-        this._lastMessageBox = new St.BoxLayout({ vertical: false });
-        this._lastMessageBox.add(body, props.childProps);
-        this.addActor(this._lastMessageBox);
+        this._lastGroupActor.add(body, props.childProps);
 
         this.updated();
 
@@ -925,16 +911,14 @@ const ChatNotification = new Lang.Class({
                                 realMessage: group != 'meta' });
 
         if (!props.noTimestamp) {
-            if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME) {
+            if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME)
                 this.appendTimestamp();
-            } else {
+            else
                 // Schedule a new timestamp in SCROLLBACK_IMMEDIATE_TIME
                 // from the timestamp of the message.
                 this._timestampTimeoutId = Mainloop.timeout_add_seconds(
                     SCROLLBACK_IMMEDIATE_TIME - (currentTime - timestamp),
                     Lang.bind(this, this.appendTimestamp));
-                GLib.Source.set_name_by_id(this._timestampTimeoutId, '[gnome-shell] this.appendTimestamp');
-            }
         }
 
         this._filterMessages();
@@ -947,102 +931,49 @@ const ChatNotification = new Lang.Class({
 
         let format;
 
-        let desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
-        let clockFormat = desktopSettings.get_string(CLOCK_FORMAT_KEY);
-
-        switch (clockFormat) {
-            case '24h':
-                // Show only the time if date is on today
-                if(daysAgo < 1){
-                    /* Translators: Time in 24h format */
-                    format = _("%H\u2236%M");
-                }
-                // Show the word "Yesterday" and time if date is on yesterday
-                else if(daysAgo <2){
-                    /* Translators: this is the word "Yesterday" followed by a
-                     time string in 24h format. i.e. "Yesterday, 14:30" */
-                    // xgettext:no-c-format
-                    format = _("Yesterday, %H\u2236%M");
-                }
-                // Show a week day and time if date is in the last week
-                else if (daysAgo < 7) {
-                    /* Translators: this is the week day name followed by a time
-                     string in 24h format. i.e. "Monday, 14:30" */
-                    // xgettext:no-c-format
-                    format = _("%A, %H\u2236%M");
-
-                } else if (date.getYear() == now.getYear()) {
-                    /* Translators: this is the month name and day number
-                     followed by a time string in 24h format.
-                     i.e. "May 25, 14:30" */
-                    // xgettext:no-c-format
-                    format = _("%B %d, %H\u2236%M");
-                } else {
-                    /* Translators: this is the month name, day number, year
-                     number followed by a time string in 24h format.
-                     i.e. "May 25 2012, 14:30" */
-                    // xgettext:no-c-format
-                    format = _("%B %d %Y, %H\u2236%M");
-                }
-                break;
-        default:
-            /* explicit fall-through */
-            case '12h':
-                // Show only the time if date is on today
-                if(daysAgo < 1){
-                    /* Translators: Time in 24h format */
-                    format = _("%l\u2236%M %p");
-                }
-                // Show the word "Yesterday" and time if date is on yesterday
-                else if(daysAgo <2){
-                    /* Translators: this is the word "Yesterday" followed by a
-                     time string in 12h format. i.e. "Yesterday, 2:30 pm" */
-                    // xgettext:no-c-format
-                    format = _("Yesterday, %l\u2236%M %p");
-                }
-                // Show a week day and time if date is in the last week
-                else if (daysAgo < 7) {
-                    /* Translators: this is the week day name followed by a time
-                     string in 12h format. i.e. "Monday, 2:30 pm" */
-                    // xgettext:no-c-format
-                    format = _("%A, %l\u2236%M %p");
-
-                } else if (date.getYear() == now.getYear()) {
-                    /* Translators: this is the month name and day number
-                     followed by a time string in 12h format.
-                     i.e. "May 25, 2:30 pm" */
-                    // xgettext:no-c-format
-                    format = _("%B %d, %l\u2236%M %p");
-                } else {
-                    /* Translators: this is the month name, day number, year
-                     number followed by a time string in 12h format.
-                     i.e. "May 25 2012, 2:30 pm"*/
-                    // xgettext:no-c-format
-                    format = _("%B %d %Y, %l\u2236%M %p");
-                }
-                break;
+        // Show only the hour if date is on today
+        if(daysAgo < 1){
+            format = "<b>%H:%M</b>";
         }
+        // Show the word "Yesterday" and time if date is on yesterday
+        else if(daysAgo <2){
+            /* Translators: this is the word "Yesterday" followed by a time string. i.e. "Yesterday, 14:30"*/
+            // xgettext:no-c-format
+            format = _("<b>Yesterday</b>, <b>%H:%M</b>");
+        }
+        // Show a week day and time if date is in the last week
+        else if (daysAgo < 7) {
+            /* Translators: this is the week day name followed by a time string. i.e. "Monday, 14:30*/
+            // xgettext:no-c-format
+            format = _("<b>%A</b>, <b>%H:%M</b>");
+
+        } else if (date.getYear() == now.getYear()) {
+            /* Translators: this is the month name and day number followed by a time string. i.e. "May 25, 14:30"*/
+            // xgettext:no-c-format
+            format = _("<b>%B</b> <b>%d</b>, <b>%H:%M</b>");
+        } else {
+            /* Translators: this is the month name, day number, year number followed by a time string. i.e. "May 25 2012, 14:30"*/
+            // xgettext:no-c-format
+            format = _("<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> ");
+        }
+
         return date.toLocaleFormat(format);
     },
 
     appendTimestamp: function() {
-        this._timestampTimeoutId = 0;
-
         let lastMessageTime = this._history[0].time;
         let lastMessageDate = new Date(lastMessageTime * 1000);
 
-        let timeLabel = new St.Label({ text: this._formatTimestamp(lastMessageDate),
-                                       style_class: 'chat-meta-message',
-                                       x_expand: true,
-                                       y_expand: true,
-                                       x_align: Clutter.ActorAlign.END,
-                                       y_align: Clutter.ActorAlign.END });
-
-        this._lastMessageBox.add_actor(timeLabel);
+        let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate),
+                                       group: 'meta',
+                                       styles: ['chat-meta-message'],
+                                       childProps: { expand: true, x_fill: false },
+                                       noTimestamp: true,
+                                       timestamp: lastMessageTime });
 
         this._filterMessages();
 
-        return GLib.SOURCE_REMOVE;
+        return false;
     },
 
     appendAliasChange: function(oldAlias, newAlias) {
@@ -1080,7 +1011,7 @@ const ChatNotification = new Lang.Class({
 
         this.source.setChatState(Tp.ChannelChatState.PAUSED);
 
-        return GLib.SOURCE_REMOVE;
+        return false;
     },
 
     _onEntryChanged: function() {
@@ -1103,7 +1034,6 @@ const ChatNotification = new Lang.Class({
             this._composingTimeoutId = Mainloop.timeout_add_seconds(
                 COMPOSING_STOP_TIMEOUT,
                 Lang.bind(this, this._composingStopTimeout));
-            GLib.Source.set_name_by_id(this._composingTimeoutId, '[gnome-shell] this._composingStopTimeout');
         } else {
             this.source.setChatState(Tp.ChannelChatState.ACTIVE);
         }
@@ -1130,7 +1060,7 @@ const ApproverSource = new Lang.Class({
     },
 
     _createPolicy: function() {
-        return new MessageTray.NotificationApplicationPolicy('empathy');
+        return new NotificationDaemon.NotificationApplicationPolicy('empathy');
     },
 
     destroy: function() {
@@ -1165,16 +1095,22 @@ const RoomInviteNotification = new Lang.Class({
          * for example. */
         this.addBody(_("%s is inviting you to join %s").format(inviter.get_alias(), channel.get_identifier()));
 
-        this.addAction(_("Decline"), Lang.bind(this, function() {
-            dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
-                src.leave_channels_finish(result);
-            });
-            this.destroy();
-        }));
-        this.addAction(_("Accept"), Lang.bind(this, function() {
-            dispatchOp.handle_with_time_async('', global.get_current_time(), function(src, result) {
-                src.handle_with_time_finish(result);
-            });
+        this.addButton('decline', _("Decline"));
+        this.addButton('accept', _("Accept"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            switch (action) {
+            case 'decline':
+                dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE,
+                                                '', function(src, result) {
+                    src.leave_channels_finish(result)});
+                break;
+            case 'accept':
+                dispatchOp.handle_with_time_async('', global.get_current_time(),
+                                                  function(src, result) {
+                    src.handle_with_time_finish(result)});
+                break;
+            }
             this.destroy();
         }));
     }
@@ -1198,19 +1134,23 @@ const AudioVideoNotification = new Lang.Class({
         this.parent(source, title, null, { customContent: true });
         this.setResident(true);
 
-        this.setUrgency(MessageTray.Urgency.CRITICAL);
-
-        this.addAction(_("Decline"), Lang.bind(this, function() {
-            dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
-                src.leave_channels_finish(result);
-            });
-            this.destroy();
-        }));
+        this.addButton('reject', _("Decline"));
         /* translators: this is a button label (verb), not a noun */
-        this.addAction(_("Answer"), Lang.bind(this, function() {
-            dispatchOp.handle_with_time_async('', global.get_current_time(), function(src, result) {
-                src.handle_with_time_finish(result);
-            });
+        this.addButton('answer', _("Answer"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            switch (action) {
+            case 'reject':
+                dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE,
+                                                '', function(src, result) {
+                    src.leave_channels_finish(result)});
+                break;
+            case 'answer':
+                dispatchOp.handle_with_time_async('', global.get_current_time(),
+                                                  function(src, result) {
+                    src.handle_with_time_finish(result)});
+                break;
+            }
             this.destroy();
         }));
     }
@@ -1234,16 +1174,22 @@ const FileTransferNotification = new Lang.Class({
                     { customContent: true });
         this.setResident(true);
 
-        this.addAction(_("Decline"), Lang.bind(this, function() {
-            dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
-                src.leave_channels_finish(result);
-            });
-            this.destroy();
-        }));
-        this.addAction(_("Accept"), Lang.bind(this, function() {
-            dispatchOp.handle_with_time_async('', global.get_current_time(), function(src, result) {
-                src.handle_with_time_finish(result);
-            });
+        this.addButton('decline', _("Decline"));
+        this.addButton('accept', _("Accept"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            switch (action) {
+            case 'decline':
+                dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE,
+                                                '', function(src, result) {
+                    src.leave_channels_finish(result)});
+                break;
+            case 'accept':
+                dispatchOp.handle_with_time_async('', global.get_current_time(),
+                                                  function(src, result) {
+                    src.handle_with_time_finish(result)});
+                break;
+            }
             this.destroy();
         }));
     }
@@ -1274,8 +1220,7 @@ const SubscriptionRequestNotification = new Lang.Class({
 
         if (file) {
             let uri = file.get_uri();
-            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
+            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size);
         }
         else {
             iconBox.child = new St.Icon({ icon_name: 'avatar-default',
@@ -1292,20 +1237,27 @@ const SubscriptionRequestNotification = new Lang.Class({
 
         this.addActor(layout);
 
-        this.addAction(_("Decline"), Lang.bind(this, function() {
-            contact.remove_async(function(src, result) {
-                src.remove_finish(result);
-            });
-        }));
-        this.addAction(_("Accept"), Lang.bind(this, function() {
-            // Authorize the contact and request to see his status as well
-            contact.authorize_publication_async(function(src, result) {
-                src.authorize_publication_finish(result);
-            });
+        this.addButton('decline', _("Decline"));
+        this.addButton('accept', _("Accept"));
 
-            contact.request_subscription_async('', function(src, result) {
-                src.request_subscription_finish(result);
-            });
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            switch (action) {
+            case 'decline':
+                contact.remove_async(function(src, result) {
+                    src.remove_finish(result)});
+                break;
+            case 'accept':
+                // Authorize the contact and request to see his status as well
+                contact.authorize_publication_async(function(src, result) {
+                    src.authorize_publication_finish(result)});
+
+                contact.request_subscription_async('', function(src, result) {
+                    src.request_subscription_finish(result)});
+                break;
+            }
+
+            // rely on _subscriptionStatesChangedCb to destroy the
+            // notification
         }));
 
         this._changedId = contact.connect('subscription-states-changed',
@@ -1404,11 +1356,18 @@ const AccountNotification = new Lang.Class({
 
         this._account = account;
 
-        this.addAction(_("View account"), Lang.bind(this, function() {
-            let cmd = 'empathy-accounts --select-account=' +
-                account.get_path_suffix();
-            let app_info = Gio.app_info_create_from_commandline(cmd, null, 0);
-            app_info.launch([], global.create_app_launch_context(0, -1));
+        this.addButton('view', _("View 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();
+                let app_info = Gio.app_info_create_from_commandline(cmd, null, 0);
+                app_info.launch([], global.create_app_launch_context());
+                break;
+            }
+            this.destroy();
         }));
 
         this._enabledId = account.connect('notify::enabled',
@@ -1426,12 +1385,7 @@ const AccountNotification = new Lang.Class({
                 if (status == Tp.ConnectionStatus.CONNECTED) {
                     this.destroy();
                 } else if (status == Tp.ConnectionStatus.DISCONNECTED) {
-                    let connectionError = account.connection_error;
-
-                    if (connectionError == Tp.error_get_dbus_name(Tp.Error.CANCELLED))
-                        this.destroy();
-                    else
-                        this.update(this.title, this._getMessage(connectionError));
+                    this.update(this.title, this._getMessage(account.connection_error));
                 }
             }));
     },

js/ui/ctrlAltTab.js

@@ -58,10 +58,14 @@ const CtrlAltTabManager = new Lang.Class({
     },
 
     focusGroup: function(item, timestamp) {
-        if (item.focusCallback)
+        if (item.focusCallback) {
             item.focusCallback(timestamp);
-        else
+        } else {
+            if (global.stage_input_mode == Shell.StageInputMode.NORMAL)
+                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+
             item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        }
     },
 
     // Sort the items into a consistent order; panel first, tray last,
@@ -132,6 +136,8 @@ const CtrlAltTabManager = new Lang.Class({
     },
 
     _focusWindows: function(timestamp) {
+        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
+        global.stage.key_focus = null;
         global.screen.focus_default_window(timestamp);
     }
 });

js/ui/dash.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
@@ -288,7 +287,13 @@ const ShowAppsIcon = new Lang.Class({
     },
 
     handleDragOver: function(source, actor, x, y, time) {
-        if (!this._canRemoveApp(getAppFromSource(source)))
+        let app = getAppFromSource(source);
+        if (app == null)
+            return DND.DragMotionResult.NO_DROP;
+
+        let id = app.get_id();
+        let isFavorite = AppFavorites.getAppFavorites().isFavorite(id);
+        if (!isFavorite)
             return DND.DragMotionResult.NO_DROP;
 
         return DND.DragMotionResult.MOVE_DROP;
@@ -296,7 +301,7 @@ const ShowAppsIcon = new Lang.Class({
 
     acceptDrop: function(source, actor, x, y, time) {
         let app = getAppFromSource(source);
-        if (!this._canRemoveApp(app))
+        if (app == null)
             return false;
 
         let id = app.get_id();
@@ -321,16 +326,6 @@ const DragPlaceholderItem = new Lang.Class({
     }
 });
 
-const EmptyDropTargetItem = new Lang.Class({
-    Name: 'EmptyDropTargetItem',
-    Extends: DashItemContainer,
-
-    _init: function() {
-        this.parent();
-        this.setChild(new St.Bin({ style_class: 'empty-dash-drop-target' }));
-    }
-});
-
 const DashActor = new Lang.Class({
     Name: 'DashActor',
     Extends: St.Widget,
@@ -381,8 +376,6 @@ const DashActor = new Lang.Class({
     }
 });
 
-const baseIconSizes = [ 16, 22, 24, 32, 48, 64 ];
-
 const Dash = new Lang.Class({
     Name: 'Dash',
 
@@ -426,10 +419,7 @@ const Dash = new Lang.Class({
 
         this._appSystem = Shell.AppSystem.get_default();
 
-        this._appSystem.connect('installed-changed', Lang.bind(this, function() {
-            AppFavorites.getAppFavorites().reload();
-            this._queueRedisplay();
-        }));
+        this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay));
         AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay));
         this._appSystem.connect('app-state-changed', Lang.bind(this, this._queueRedisplay));
 
@@ -451,12 +441,6 @@ const Dash = new Lang.Class({
             dragMotion: Lang.bind(this, this._onDragMotion)
         };
         DND.addDragMonitor(this._dragMonitor);
-
-        if (this._box.get_n_children() == 0) {
-            this._emptyDropTarget = new EmptyDropTargetItem();
-            this._box.insert_child_at_index(this._emptyDropTarget, 0);
-            this._emptyDropTarget.show(true);
-        }
     },
 
     _onDragCancelled: function() {
@@ -473,7 +457,6 @@ const Dash = new Lang.Class({
 
     _endDrag: function() {
         this._clearDragPlaceholder();
-        this._clearEmptyDropTarget();
         this._showAppsIcon.setDragApp(null);
         DND.removeDragMonitor(this._dragMonitor);
     },
@@ -508,21 +491,15 @@ const Dash = new Lang.Class({
         Main.queueDeferredWork(this._workId);
     },
 
-    _hookUpLabel: function(item, appIcon) {
+    _hookUpLabel: function(item) {
         item.child.connect('notify::hover', Lang.bind(this, function() {
-            this._syncLabel(item, appIcon);
+            this._onHover(item);
         }));
 
         Main.overview.connect('hiding', Lang.bind(this, function() {
             this._labelShowing = false;
             item.hideLabel();
         }));
-
-        if (appIcon) {
-            appIcon.connect('sync-tooltip', Lang.bind(this, function() {
-                this._syncLabel(item, appIcon);
-            }));
-        }
     },
 
     _createAppItem: function(app) {
@@ -551,7 +528,7 @@ const Dash = new Lang.Class({
         item.setLabelText(app.get_name());
 
         appIcon.icon.setIconSize(this.iconSize);
-        this._hookUpLabel(item, appIcon);
+        this._hookUpLabel(item);
 
         return item;
     },
@@ -569,20 +546,16 @@ const Dash = new Lang.Class({
         }
     },
 
-    _syncLabel: function (item, appIcon) {
-        let shouldShow = appIcon ? appIcon.shouldShowTooltip() : item.child.get_hover();
-
-        if (shouldShow) {
+    _onHover: function (item) {
+        if (item.child.get_hover()) {
             if (this._showLabelTimeoutId == 0) {
                 let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
                 this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
                     Lang.bind(this, function() {
                         this._labelShowing = true;
                         item.showLabel();
-                        this._showLabelTimeoutId = 0;
-                        return GLib.SOURCE_REMOVE;
+                        return false;
                     }));
-                GLib.Source.set_name_by_id(this._showLabelTimeoutId, '[gnome-shell] item.showLabel');
                 if (this._resetHoverTimeoutId > 0) {
                     Mainloop.source_remove(this._resetHoverTimeoutId);
                     this._resetHoverTimeoutId = 0;
@@ -597,10 +570,8 @@ const Dash = new Lang.Class({
                 this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
                     Lang.bind(this, function() {
                         this._labelShowing = false;
-                        this._resetHoverTimeoutId = 0;
-                        return GLib.SOURCE_REMOVE;
+                        return false;
                     }));
-                GLib.Source.set_name_by_id(this._resetHoverTimeoutId, '[gnome-shell] this._labelShowing');
             }
         }
     },
@@ -636,24 +607,25 @@ const Dash = new Lang.Class({
         let minHeight, natHeight;
 
         // Enforce the current icon size during the size request
-        firstIcon.setIconSize(this.iconSize);
+        let [currentWidth, currentHeight] = firstIcon.icon.get_size();
+
+        firstIcon.icon.set_size(this.iconSize, this.iconSize);
         [minHeight, natHeight] = firstButton.get_preferred_height(-1);
 
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        let iconSizes = baseIconSizes.map(function(s) {
-            return s * scaleFactor;
-        });
+        firstIcon.icon.set_size(currentWidth, currentHeight);
 
         // Subtract icon padding and box spacing from the available height
-        availHeight -= iconChildren.length * (natHeight - this.iconSize * scaleFactor) +
+        availHeight -= iconChildren.length * (natHeight - this.iconSize) +
                        (iconChildren.length - 1) * spacing;
 
         let availSize = availHeight / iconChildren.length;
 
-        let newIconSize = baseIconSizes[0];
+        let iconSizes = [ 16, 22, 24, 32, 48, 64 ];
+
+        let newIconSize = 16;
         for (let i = 0; i < iconSizes.length; i++) {
             if (iconSizes[i] < availSize)
-                newIconSize = baseIconSizes[i];
+                newIconSize = iconSizes[i];
         }
 
         if (newIconSize == this.iconSize)
@@ -825,21 +797,9 @@ const Dash = new Lang.Class({
 
     _clearDragPlaceholder: function() {
         if (this._dragPlaceholder) {
-            this._animatingPlaceholdersCount++;
             this._dragPlaceholder.animateOutAndDestroy();
-            this._dragPlaceholder.connect('destroy',
-                Lang.bind(this, function() {
-                    this._animatingPlaceholdersCount--;
-                }));
             this._dragPlaceholder = null;
-        }
-        this._dragPlaceholderPos = -1;
-    },
-
-    _clearEmptyDropTarget: function() {
-        if (this._emptyDropTarget) {
-            this._emptyDropTarget.animateOutAndDestroy();
-            this._emptyDropTarget = null;
+            this._dragPlaceholderPos = -1;
         }
     },
 
@@ -867,18 +827,23 @@ const Dash = new Lang.Class({
             numChildren--;
         }
 
-        let pos;
-        if (!this._emptyDropTarget)
-            pos = Math.floor(y * numChildren / boxHeight);
-        else
-            pos = 0; // always insert at the top when dash is empty
+        let pos = Math.floor(y * numChildren / boxHeight);
 
         if (pos != this._dragPlaceholderPos && pos <= numFavorites && this._animatingPlaceholdersCount == 0) {
             this._dragPlaceholderPos = pos;
 
             // Don't allow positioning before or after self
             if (favPos != -1 && (pos == favPos || pos == favPos + 1)) {
-                this._clearDragPlaceholder();
+                if (this._dragPlaceholder) {
+                    this._dragPlaceholder.animateOutAndDestroy();
+                    this._animatingPlaceholdersCount++;
+                    this._dragPlaceholder.connect('destroy',
+                        Lang.bind(this, function() {
+                            this._animatingPlaceholdersCount--;
+                        }));
+                }
+                this._dragPlaceholder = null;
+
                 return DND.DragMotionResult.CONTINUE;
             }
 
@@ -903,9 +868,9 @@ const Dash = new Lang.Class({
 
         // Remove the drag placeholder if we are not in the
         // "favorites zone"
-        if (pos > numFavorites)
+        if (pos > numFavorites && this._dragPlaceholder) {
             this._clearDragPlaceholder();
-
+        }
         if (!this._dragPlaceholder)
             return DND.DragMotionResult.NO_DROP;
 

js/ui/dateMenu.js

@@ -49,13 +49,11 @@ const DateMenuButton = new Lang.Class({
             menuAlignment = 1.0 - menuAlignment;
         this.parent(menuAlignment);
 
-        this._clockDisplay = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
-        this.actor.label_actor = this._clockDisplay;
+        this._clockDisplay = new St.Label();
         this.actor.add_actor(this._clockDisplay);
-        this.actor.add_style_class_name ('clock-display');
 
-        hbox = new St.BoxLayout({ name: 'calendarArea' });
-        this.menu.box.add_child(hbox);
+        hbox = new St.BoxLayout({name: 'calendarArea' });
+        this.menu.addActor(hbox);
 
         // Fill up the first column
 
@@ -63,17 +61,10 @@ const DateMenuButton = new Lang.Class({
         hbox.add(vbox);
 
         // Date
-        // Having the ability to go to the current date if the user is already
-        // on the current date can be confusing. So don't make the button reactive
-        // until the selected date changes.
-        this._date = new St.Button({ style_class: 'datemenu-date-label',
-                                     reactive: false
-                                   });
-        this._date.connect('clicked',
-                           Lang.bind(this, function() {
-                               this._calendar.setDate(new Date(), false);
-                           }));
-        vbox.add(this._date, { x_fill: false  });
+        this._date = new St.Label();
+        this.actor.label_actor = this._clockDisplay;
+        this._date.style_class = 'datemenu-date-label';
+        vbox.add(this._date);
 
         this._eventList = new Calendar.EventsList();
         this._calendar = new Calendar.Calendar();
@@ -85,14 +76,12 @@ const DateMenuButton = new Lang.Class({
                                   // and the calender makes those dates unclickable when instantiated with
                                   // a null event source
                                    this._eventList.setDate(date);
-
-                                   // Make the button reactive only if the selected date is not the current date.
-                                   this._date.can_focus = this._date.reactive = !this._isToday(date)
                                }));
         vbox.add(this._calendar.actor);
 
         let separator = new PopupMenu.PopupSeparatorMenuItem();
-        vbox.add(separator.actor, { y_align: St.Align.END, expand: true, y_fill: false });
+        separator.setColumnWidths(1);
+        vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false});
 
         this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
         this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
@@ -118,13 +107,33 @@ const DateMenuButton = new Lang.Class({
         hbox.add(this._separator);
 
         // Fill up the second column
-        hbox.add(this._eventList.actor, { expand: true, y_fill: false, y_align: St.Align.START });
+        vbox = new St.BoxLayout({ name: 'calendarEventsArea',
+                                  vertical: true });
+        hbox.add(vbox, { expand: true });
+
+        // Event list
+        vbox.add(this._eventList.actor, { expand: true });
 
         // Whenever the menu is opened, select today
         this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
             if (isOpen) {
                 let now = new Date();
-                this._calendar.setDate(now);
+                /* Passing true to setDate() forces events to be reloaded. We
+                 * want this behavior, because
+                 *
+                 *   o It will cause activation of the calendar server which is
+                 *     useful if it has crashed
+                 *
+                 *   o It will cause the calendar server to reload events which
+                 *     is useful if dynamic updates are not supported or not
+                 *     properly working
+                 *
+                 * Since this only happens when the menu is opened, the cost
+                 * isn't very big.
+                 */
+                this._calendar.setDate(now, true);
+                // No need to update this._eventList as ::selected-date-changed
+                // signal will fire
             }
         }));
 
@@ -138,13 +147,6 @@ const DateMenuButton = new Lang.Class({
         this._sessionUpdated();
     },
 
-    _isToday: function(date) {
-        let now = new Date();
-        return now.getYear() == date.getYear() &&
-               now.getMonth() == date.getMonth() &&
-               now.getDay() == date.getDay();
-    },
-
     _appInstalledChanged: function() {
         this._calendarApp = undefined;
         this._updateEventsVisibility();
@@ -157,14 +159,15 @@ const DateMenuButton = new Lang.Class({
         this._openClocksItem.actor.visible = visible &&
             (this._getClockApp() != null);
         this._separator.visible = visible;
-        this._eventList.actor.visible = visible;
         if (visible) {
-            let alignment = 0.25;
-            if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-                alignment = 1.0 - alignment;
-            this.menu._arrowAlignment = alignment;
+          let alignment = 0.25;
+          if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+            alignment = 1.0 - alignment;
+          this.menu._arrowAlignment = alignment;
+          this._eventList.actor.get_parent().show();
         } else {
-            this.menu._arrowAlignment = 0.5;
+          this.menu._arrowAlignment = 0.5;
+          this._eventList.actor.get_parent().hide();
         }
     },
 
@@ -204,7 +207,7 @@ const DateMenuButton = new Lang.Class({
          */
         let dateFormat = _("%A %B %e, %Y");
         let displayDate = new Date();
-        this._date.set_label(displayDate.toLocaleFormat(dateFormat));
+        this._date.set_text(displayDate.toLocaleFormat(dateFormat));
     },
 
     _getCalendarApp: function() {
@@ -220,7 +223,7 @@ const DateMenuButton = new Lang.Class({
     },
 
     _getClockApp: function() {
-        return Shell.AppSystem.get_default().lookup_app('org.gnome.clocks.desktop');
+        return Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
     },
 
     _onOpenCalendarActivate: function() {
@@ -229,7 +232,7 @@ const DateMenuButton = new Lang.Class({
         let app = this._getCalendarApp();
         if (app.get_id() == 'evolution.desktop')
             app = Gio.DesktopAppInfo.new('evolution-calendar.desktop');
-        app.launch([], global.create_app_launch_context(0, -1));
+        app.launch([], global.create_app_launch_context());
     },
 
     _onOpenClocksActivate: function() {

js/ui/dnd.js

@@ -1,11 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const St = imports.gi.St;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const Tweener = imports.ui.tweener;
@@ -28,9 +26,9 @@ const DragMotionResult = {
 };
 
 const DRAG_CURSOR_MAP = {
-    0: Meta.Cursor.DND_UNSUPPORTED_TARGET,
-    1: Meta.Cursor.DND_COPY,
-    2: Meta.Cursor.DND_MOVE
+    0: Shell.Cursor.DND_UNSUPPORTED_TARGET,
+    1: Shell.Cursor.DND_COPY,
+    2: Shell.Cursor.DND_MOVE
 };
 
 const DragDropResult = {
@@ -86,6 +84,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)
                 this._cancelDrag(global.get_current_time());
             this.disconnectAll();
@@ -101,15 +104,21 @@ const _Draggable = new Lang.Class({
         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
+        // fix up the hover state after the drag ends.
+        this._firstLeaveActor = null;
+        this._lastEnterActor = null;
+
         this._eventsGrabbed = false;
     },
 
     _onButtonPress : function (actor, event) {
         if (event.get_button() != 1)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         if (Tweener.getTweenCount(actor))
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         this._buttonDown = true;
         this._grabActor();
@@ -118,7 +127,7 @@ const _Draggable = new Lang.Class({
         this._dragStartX = stageX;
         this._dragStartY = stageY;
 
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     },
 
     _grabActor: function() {
@@ -138,16 +147,16 @@ const _Draggable = new Lang.Class({
 
     _grabEvents: function() {
         if (!this._eventsGrabbed) {
-            this._eventsGrabbed = Main.pushModal(_getEventHandlerActor());
-            if (this._eventsGrabbed)
-                Clutter.grab_pointer(_getEventHandlerActor());
+            Clutter.grab_pointer(_getEventHandlerActor());
+            Clutter.grab_keyboard(_getEventHandlerActor());
+            this._eventsGrabbed = true;
         }
     },
 
     _ungrabEvents: function() {
         if (this._eventsGrabbed) {
             Clutter.ungrab_pointer();
-            Main.popModal(_getEventHandlerActor());
+            Clutter.ungrab_keyboard();
             this._eventsGrabbed = false;
         }
     },
@@ -164,11 +173,11 @@ const _Draggable = new Lang.Class({
             } else if (this._dragActor != null && !this._animationInProgress) {
                 // Drag must have been cancelled with Esc.
                 this._dragComplete();
-                return Clutter.EVENT_STOP;
+                return true;
             } else {
                 // Drag has never started.
                 this._ungrabActor();
-                return Clutter.EVENT_PROPAGATE;
+                return false;
             }
         // We intercept MOTION event to figure out if the drag has started and to draw
         // this._dragActor under the pointer when dragging is in progress
@@ -184,11 +193,16 @@ const _Draggable = new Lang.Class({
             let symbol = event.get_key_symbol();
             if (symbol == Clutter.Escape) {
                 this._cancelDrag(event.get_time());
-                return Clutter.EVENT_STOP;
+                return true;
             }
+        } else if (event.type() == Clutter.EventType.LEAVE) {
+            if (this._firstLeaveActor == null)
+                this._firstLeaveActor = event.get_source();
+        } else if (event.type() == Clutter.EventType.ENTER) {
+            this._lastEnterActor = event.get_source();
         }
 
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     },
 
     /**
@@ -229,14 +243,14 @@ const _Draggable = new Lang.Class({
         if (this._onEventId)
             this._ungrabActor();
         this._grabEvents();
-        global.screen.set_cursor(Meta.Cursor.DND_IN_DRAG);
+        global.set_cursor(Shell.Cursor.DND_IN_DRAG);
 
         this._dragX = this._dragStartX = stageX;
         this._dragY = this._dragStartY = stageY;
 
         if (this.actor._delegate && this.actor._delegate.getDragActor) {
             this._dragActor = this.actor._delegate.getDragActor();
-            Main.uiGroup.add_child(this._dragActor);
+            this._dragActor.reparent(Main.uiGroup);
             this._dragActor.raise_top();
             Shell.util_set_hidden_from_pick(this._dragActor, true);
 
@@ -285,8 +299,7 @@ const _Draggable = new Lang.Class({
             this._dragOffsetX = actorStageX - this._dragStartX;
             this._dragOffsetY = actorStageY - this._dragStartY;
 
-            this._dragOrigParent.remove_actor(this._dragActor);
-            Main.uiGroup.add_child(this._dragActor);
+            this._dragActor.reparent(Main.uiGroup);
             this._dragActor.raise_top();
             Shell.util_set_hidden_from_pick(this._dragActor, true);
         }
@@ -345,67 +358,60 @@ const _Draggable = new Lang.Class({
         return true;
     },
 
-    _updateDragHover : function () {
-        this._updateHoverId = 0;
-        let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
-                                                                  this._dragX, this._dragY);
-        let dragEvent = {
-            x: this._dragX,
-            y: this._dragY,
-            dragActor: this._dragActor,
-            source: this.actor._delegate,
-            targetActor: target
-        };
-        for (let i = 0; i < dragMonitors.length; i++) {
-            let motionFunc = dragMonitors[i].dragMotion;
-            if (motionFunc) {
-                let result = motionFunc(dragEvent);
-                if (result != DragMotionResult.CONTINUE) {
-                    global.screen.set_cursor(DRAG_CURSOR_MAP[result]);
-                    return GLib.SOURCE_REMOVE;
-                }
-            }
-        }
-
-        while (target) {
-            if (target._delegate && target._delegate.handleDragOver) {
-                let [r, targX, targY] = target.transform_stage_point(this._dragX, this._dragY);
-                // We currently loop through all parents on drag-over even if one of the children has handled it.
-                // We can check the return value of the function and break the loop if it's true if we don't want
-                // to continue checking the parents.
-                let result = target._delegate.handleDragOver(this.actor._delegate,
-                                                             this._dragActor,
-                                                             targX,
-                                                             targY,
-                                                             0);
-                if (result != DragMotionResult.CONTINUE) {
-                    global.screen.set_cursor(DRAG_CURSOR_MAP[result]);
-                    return GLib.SOURCE_REMOVE;
-                }
-            }
-            target = target.get_parent();
-        }
-        global.screen.set_cursor(Meta.Cursor.DND_IN_DRAG);
-        return GLib.SOURCE_REMOVE;
-    },
-
-    _queueUpdateDragHover: function() {
-        if (this._updateHoverId)
-            return;
-
-        this._updateHoverId = GLib.idle_add(GLib.PRIORITY_DEFAULT,
-                                            Lang.bind(this, this._updateDragHover));
-        GLib.Source.set_name_by_id(this._updateHoverId, '[gnome-shell] this._updateDragHover');
-    },
-
     _updateDragPosition : function (event) {
         let [stageX, stageY] = event.get_coords();
         this._dragX = stageX;
         this._dragY = stageY;
-        this._dragActor.set_position(stageX + this._dragOffsetX,
-                                     stageY + this._dragOffsetY);
 
-        this._queueUpdateDragHover();
+        // If we are dragging, update the position
+        if (this._dragActor) {
+            this._dragActor.set_position(stageX + this._dragOffsetX,
+                                         stageY + this._dragOffsetY);
+
+            let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
+                                                                      stageX, stageY);
+
+            // We call observers only once per motion with the innermost
+            // target actor. If necessary, the observer can walk the
+            // parent itself.
+            let dragEvent = {
+                x: stageX,
+                y: stageY,
+                dragActor: this._dragActor,
+                source: this.actor._delegate,
+                targetActor: target
+            };
+            for (let i = 0; i < dragMonitors.length; i++) {
+                let motionFunc = dragMonitors[i].dragMotion;
+                if (motionFunc) {
+                    let result = motionFunc(dragEvent);
+                    if (result != DragMotionResult.CONTINUE) {
+                        global.set_cursor(DRAG_CURSOR_MAP[result]);
+                        return true;
+                    }
+                }
+            }
+            while (target) {
+                if (target._delegate && target._delegate.handleDragOver) {
+                    let [r, targX, targY] = target.transform_stage_point(stageX, stageY);
+                    // We currently loop through all parents on drag-over even if one of the children has handled it.
+                    // We can check the return value of the function and break the loop if it's true if we don't want
+                    // to continue checking the parents.
+                    let result = target._delegate.handleDragOver(this.actor._delegate,
+                                                                 this._dragActor,
+                                                                 targX,
+                                                                 targY,
+                                                                 event.get_time());
+                    if (result != DragMotionResult.CONTINUE) {
+                        global.set_cursor(DRAG_CURSOR_MAP[result]);
+                        return true;
+                    }
+                }
+                target = target.get_parent();
+            }
+            global.set_cursor(Shell.Cursor.DND_IN_DRAG);
+        }
+
         return true;
     },
 
@@ -458,7 +464,7 @@ const _Draggable = new Lang.Class({
                     }
 
                     this._dragInProgress = false;
-                    global.screen.set_cursor(Meta.Cursor.DEFAULT);
+                    global.unset_cursor();
                     this.emit('drag-end', event.get_time(), true);
                     this._dragComplete();
                     return true;
@@ -510,7 +516,7 @@ const _Draggable = new Lang.Class({
         let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();
 
         if (this._actorDestroyed) {
-            global.screen.set_cursor(Meta.Cursor.DEFAULT);
+            global.unset_cursor();
             if (!this._buttonDown)
                 this._dragComplete();
             this.emit('drag-end', eventTime, false);
@@ -558,14 +564,13 @@ const _Draggable = new Lang.Class({
 
     _onAnimationComplete : function (dragActor, eventTime) {
         if (this._dragOrigParent) {
-            Main.uiGroup.remove_child(this._dragActor);
-            this._dragOrigParent.add_actor(this._dragActor);
+            dragActor.reparent(this._dragOrigParent);
             dragActor.set_scale(this._dragOrigScale, this._dragOrigScale);
             dragActor.set_position(this._dragOrigX, this._dragOrigY);
         } else {
             dragActor.destroy();
         }
-        global.screen.set_cursor(Meta.Cursor.DEFAULT);
+        global.unset_cursor();
         this.emit('drag-end', eventTime, false);
 
         this._animationInProgress = false;
@@ -573,16 +578,32 @@ const _Draggable = new Lang.Class({
             this._dragComplete();
     },
 
+    // Actor is an actor we have entered or left during the drag; call
+    // st_widget_sync_hover on all StWidget ancestors
+    _syncHover: function(actor) {
+        while (actor) {
+            let parent = actor.get_parent();
+            if (actor instanceof St.Widget)
+                actor.sync_hover();
+
+            actor = parent;
+        }
+    },
+
     _dragComplete: function() {
         if (!this._actorDestroyed)
             Shell.util_set_hidden_from_pick(this._dragActor, false);
 
         this._ungrabEvents();
-        global.sync_pointer();
 
-        if (this._updateHoverId) {
-            GLib.source_remove(this._updateHoverId);
-            this._updateHoverId = 0;
+        if (this._firstLeaveActor) {
+            this._syncHover(this._firstLeaveActor);
+            this._firstLeaveActor = null;
+        }
+
+        if (this._lastEnterActor) {
+            this._syncHover(this._lastEnterActor);
+            this._lastEnterActor = null;
         }
 
         this._dragActor = undefined;

js/ui/endSessionDialog.js

@@ -13,11 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
  */
 
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
+const Signals = imports.signals;
 
 const AccountsService = imports.gi.AccountsService;
 const Clutter = imports.gi.Clutter;
@@ -25,154 +28,97 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const Pango = imports.gi.Pango;
-const Polkit = imports.gi.Polkit;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 
-const CheckBox = imports.ui.checkBox;
 const GnomeSession = imports.misc.gnomeSession;
-const LoginManager = imports.misc.loginManager;
+const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
-const UserWidget = imports.ui.userWidget;
+const UserAvatar = imports.ui.userAvatar;
 
 let _endSessionDialog = null;
 
-const TRIGGER_OFFLINE_UPDATE = '/usr/libexec/pk-trigger-offline-update';
-
 const _ITEM_ICON_SIZE = 48;
-const _DIALOG_ICON_SIZE = 48;
+const _DIALOG_ICON_SIZE = 32;
 
 const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
 
-const EndSessionDialogIface = '<node> \
-<interface name="org.gnome.SessionManager.EndSessionDialog"> \
-<method name="Open"> \
-    <arg type="u" direction="in" /> \
-    <arg type="u" direction="in" /> \
-    <arg type="u" direction="in" /> \
-    <arg type="ao" direction="in" /> \
-</method> \
-<method name="Close" /> \
-<signal name="ConfirmedLogout" /> \
-<signal name="ConfirmedReboot" /> \
-<signal name="ConfirmedShutdown" /> \
-<signal name="Canceled" /> \
-<signal name="Closed" /> \
-</interface> \
-</node>';
+const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessionDialog">
+<method name="Open">
+    <arg type="u" direction="in" />
+    <arg type="u" direction="in" />
+    <arg type="u" direction="in" />
+    <arg type="ao" direction="in" />
+</method>
+<method name="Close" />
+<signal name="ConfirmedLogout" />
+<signal name="ConfirmedReboot" />
+<signal name="ConfirmedShutdown" />
+<signal name="Canceled" />
+<signal name="Closed" />
+</interface>;
 
 const logoutDialogContent = {
     subjectWithUser: C_("title", "Log Out %s"),
     subject: C_("title", "Log Out"),
-    descriptionWithUser: function(user, seconds) {
+    inhibitedDescription: _("Click Log Out to quit these applications and log out of the system."),
+    uninhibitedDescriptionWithUser: function(user, seconds) {
         return ngettext("%s will be logged out automatically in %d second.",
                         "%s will be logged out automatically in %d seconds.",
                         seconds).format(user, seconds);
     },
-    description: function(seconds) {
+    uninhibitedDescription: function(seconds) {
         return ngettext("You will be logged out automatically in %d second.",
                         "You will be logged out automatically in %d seconds.",
                         seconds).format(seconds);
     },
-    showBatteryWarning: false,
+    endDescription: _("Logging out of the system."),
     confirmButtons: [{ signal: 'ConfirmedLogout',
                        label:  C_("button", "Log Out") }],
-    iconStyleClass: 'end-session-dialog-logout-icon',
-    showOtherSessions: false,
+    iconStyleClass: 'end-session-dialog-logout-icon'
 };
 
 const shutdownDialogContent = {
     subject: C_("title", "Power Off"),
-    subjectWithUpdates: C_("title", "Install Updates & Power Off"),
-    description: function(seconds) {
+    inhibitedDescription: _("Click Power Off to quit these applications and power off the system."),
+    uninhibitedDescription: function(seconds) {
         return ngettext("The system will power off automatically in %d second.",
                         "The system will power off automatically in %d seconds.",
                         seconds).format(seconds);
     },
-    checkBoxText: C_("checkbox", "Install pending software updates"),
-    showBatteryWarning: true,
+    endDescription: _("Powering off the system."),
     confirmButtons: [{ signal: 'ConfirmedReboot',
                        label:  C_("button", "Restart") },
                      { signal: 'ConfirmedShutdown',
                        label:  C_("button", "Power Off") }],
     iconName: 'system-shutdown-symbolic',
-    iconStyleClass: 'end-session-dialog-shutdown-icon',
-    showOtherSessions: true,
+    iconStyleClass: 'end-session-dialog-shutdown-icon'
 };
 
 const restartDialogContent = {
     subject: C_("title", "Restart"),
-    description: function(seconds) {
+    inhibitedDescription: _("Click Restart to quit these applications and restart the system."),
+    uninhibitedDescription: function(seconds) {
         return ngettext("The system will restart automatically in %d second.",
                         "The system will restart automatically in %d seconds.",
                         seconds).format(seconds);
     },
-    showBatteryWarning: false,
+    endDescription: _("Restarting the system."),
     confirmButtons: [{ signal: 'ConfirmedReboot',
                        label:  C_("button", "Restart") }],
     iconName: 'view-refresh-symbolic',
-    iconStyleClass: 'end-session-dialog-shutdown-icon',
-    showOtherSessions: true,
-};
-
-const restartInstallDialogContent = {
-
-    subject: C_("title", "Restart & Install Updates"),
-    description: function(seconds) {
-        return ngettext("The system will automatically restart and install updates in %d second.",
-                        "The system will automatically restart and install updates in %d seconds.",
-                        seconds).format(seconds);
-    },
-    showBatteryWarning: true,
-    confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label:  C_("button", "Restart &amp; Install") }],
-    unusedFutureButtonForTranslation: C_("button", "Install &amp; Power Off"),
-    unusedFutureCheckBoxForTranslation: C_("checkbox", "Power off after updates are installed"),
-    iconName: 'view-refresh-symbolic',
-    iconStyleClass: 'end-session-dialog-shutdown-icon',
-    showOtherSessions: true,
+    iconStyleClass: 'end-session-dialog-shutdown-icon'
 };
 
 const DialogContent = {
     0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */: logoutDialogContent,
     1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */: shutdownDialogContent,
-    2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */: restartDialogContent,
-    3: restartInstallDialogContent
+    2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */: restartDialogContent
 };
 
-const MAX_USERS_IN_SESSION_DIALOG = 5;
-
-const LogindSessionIface = '<node> \
-<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> \
-</node>';
-
-const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface);
-
-const UPowerIface = '<node> \
-<interface name="org.freedesktop.UPower"> \
-    <property name="OnBattery" type="b" access="read"/> \
-</interface> \
-</node>';
-
-const UPowerProxy = Gio.DBusProxy.makeProxyWrapper(UPowerIface);
-
 function findAppFromInhibitor(inhibitor) {
-    let desktopFile;
-    try {
-        [desktopFile] = inhibitor.GetAppIdSync();
-    } catch(e) {
-        // XXX -- sometimes JIT inhibitors generated by gnome-session
-        // get removed too soon. Don't fail in this case.
-        log('gnome-session gave us a dead inhibitor: %s'.format(inhibitor.get_object_path()));
-        return null;
-    }
+    let [desktopFile] = inhibitor.GetAppIdSync();
 
     if (!GLib.str_has_suffix(desktopFile, '.desktop'))
         desktopFile += '.desktop';
@@ -180,6 +126,58 @@ function findAppFromInhibitor(inhibitor) {
     return Shell.AppSystem.get_default().lookup_heuristic_basename(desktopFile);
 }
 
+const ListItem = new Lang.Class({
+    Name: 'ListItem',
+
+    _init: function(app, reason) {
+        this._app = app;
+        this._reason = reason;
+
+        if (this._reason == null)
+          this._reason = '';
+
+        let layout = new St.BoxLayout({ vertical: false});
+
+        this.actor = new St.Button({ style_class: 'end-session-dialog-app-list-item',
+                                     can_focus:   true,
+                                     child:       layout,
+                                     reactive:    true,
+                                     x_align:     St.Align.START,
+                                     x_fill:      true });
+
+        this._icon = this._app.create_icon_texture(_ITEM_ICON_SIZE);
+
+        let iconBin = new St.Bin({ style_class: 'end-session-dialog-app-list-item-icon',
+                                   child:       this._icon });
+        layout.add(iconBin);
+
+        let textLayout = new St.BoxLayout({ style_class: 'end-session-dialog-app-list-item-text-box',
+                                            vertical:    true });
+        layout.add(textLayout);
+
+        this._nameLabel = new St.Label({ text:        this._app.get_name(),
+                                         style_class: 'end-session-dialog-app-list-item-name' });
+        textLayout.add(this._nameLabel,
+                       { expand: false,
+                         x_fill: true });
+
+        this._descriptionLabel = new St.Label({ text:        this._reason,
+                                                style_class: 'end-session-dialog-app-list-item-description' });
+        this.actor.label_actor = this._nameLabel;
+        textLayout.add(this._descriptionLabel,
+                       { expand: true,
+                         x_fill: true });
+
+        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+    },
+
+    _onClicked: function() {
+        this.emit('activate');
+        this._app.activate();
+    }
+});
+Signals.addSignalMethods(ListItem.prototype);
+
 // The logout timer only shows updates every 10 seconds
 // until the last 10 seconds, then it shows updates every
 // second.  This function takes a given time and returns
@@ -215,18 +213,6 @@ function _setLabelText(label, text) {
     }
 }
 
-function _setCheckBoxLabel(checkBox, text) {
-    let label = checkBox.getLabelActor();
-
-    if (text) {
-        label.set_text(text);
-        checkBox.actor.show();
-    } else {
-        label.set_text('');
-        checkBox.actor.hide();
-    }
-}
-
 function init() {
     // This always returns the same singleton object
     // By instantiating it initially, we register the
@@ -242,37 +228,22 @@ const EndSessionDialog = new Lang.Class({
         this.parent({ styleClass: 'end-session-dialog',
                       destroyOnClose: false });
 
-        this._loginManager = LoginManager.getLoginManager();
-        this._userManager = AccountsService.UserManager.get_default();
-        this._user = this._userManager.get_user(GLib.get_user_name());
-        this._updatesFile = Gio.File.new_for_path('/system-update');
-        this._preparedUpdateFile = Gio.File.new_for_path('/var/lib/PackageKit/prepared-update');
-
-        this._powerProxy = new UPowerProxy(Gio.DBus.system,
-                                           'org.freedesktop.UPower',
-                                           '/org/freedesktop/UPower',
-                                           Lang.bind(this, function(proxy, error) {
-                                               if (error) {
-                                                   log(error.message);
-                                                   return;
-                                               }
-                                               this._powerProxy.connect('g-properties-changed',
-                                                                        Lang.bind(this, this._sync));
-                                               this._sync();
-                                           }));
+        this._user = AccountsService.UserManager.get_default().get_user(GLib.get_user_name());
 
         this._secondsLeft = 0;
         this._totalSecondsToStayOpen = 0;
-        this._applications = [];
-        this._sessions = [];
+        this._inhibitors = [];
 
         this.connect('destroy',
                      Lang.bind(this, this._onDestroy));
         this.connect('opened',
                      Lang.bind(this, this._onOpened));
 
-        this._userLoadedId = this._user.connect('notify::is_loaded', Lang.bind(this, this._sync));
-        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._sync));
+        this._userLoadedId = this._user.connect('notify::is_loaded',
+                                                Lang.bind(this, this._updateContent));
+
+        this._userChangedId = this._user.connect('changed',
+                                                 Lang.bind(this, this._updateContent));
 
         let mainContentLayout = new St.BoxLayout({ vertical: false });
         this.contentLayout.add(mainContentLayout,
@@ -286,17 +257,14 @@ const EndSessionDialog = new Lang.Class({
                                 x_align: St.Align.END,
                                 y_align: St.Align.START });
 
-        let messageLayout = new St.BoxLayout({ vertical: true,
-                                               style_class: 'end-session-dialog-layout' });
+        let messageLayout = new St.BoxLayout({ vertical: true });
         mainContentLayout.add(messageLayout,
                               { y_align: St.Align.START });
 
         this._subjectLabel = new St.Label({ style_class: 'end-session-dialog-subject' });
 
         messageLayout.add(this._subjectLabel,
-                          { x_fill: false,
-                            y_fill:  false,
-                            x_align: St.Align.START,
+                          { y_fill:  false,
                             y_align: St.Align.START });
 
         this._descriptionLabel = new St.Label({ style_class: 'end-session-dialog-description' });
@@ -307,46 +275,28 @@ const EndSessionDialog = new Lang.Class({
                           { y_fill:  true,
                             y_align: St.Align.START });
 
-        this._checkBox = new CheckBox.CheckBox();
-        this._checkBox.actor.connect('clicked', Lang.bind(this, this._sync));
-        messageLayout.add(this._checkBox.actor);
-
-        this._batteryWarning = new St.Label({ style_class: 'end-session-dialog-warning',
-                                              text: _("Running on battery power: please plug in before installing updates.") });
-        this._batteryWarning.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._batteryWarning.clutter_text.line_wrap = true;
-        messageLayout.add(this._batteryWarning);
-
-        this._scrollView = new St.ScrollView({ style_class: 'end-session-dialog-list' });
-        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this.contentLayout.add(this._scrollView,
+        let scrollView = new St.ScrollView({ style_class: 'end-session-dialog-app-list'});
+        scrollView.set_policy(Gtk.PolicyType.NEVER,
+                              Gtk.PolicyType.AUTOMATIC);
+        this.contentLayout.add(scrollView,
                                { x_fill: true,
                                  y_fill: true });
-        this._scrollView.hide();
+        scrollView.hide();
 
-        this._inhibitorSection = new St.BoxLayout({ vertical: true,
-                                                    style_class: 'end-session-dialog-inhibitor-layout' });
-        this._scrollView.add_actor(this._inhibitorSection);
+        this._applicationList = new St.BoxLayout({ vertical: true });
+        scrollView.add_actor(this._applicationList);
 
-        this._applicationHeader = new St.Label({ style_class: 'end-session-dialog-list-header',
-                                                 text: _("Some applications are busy or have unsaved work.") });
-        this._applicationList = new St.BoxLayout({ style_class: 'end-session-dialog-app-list',
-                                                   vertical: true });
-        this._inhibitorSection.add_actor(this._applicationHeader);
-        this._inhibitorSection.add_actor(this._applicationList);
+        this._applicationList.connect('actor-added',
+                                      Lang.bind(this, function() {
+                                          if (this._applicationList.get_n_children() == 1)
+                                              scrollView.show();
+                                      }));
 
-        this._sessionHeader = new St.Label({ style_class: 'end-session-dialog-list-header',
-                                             text: _("Other users are logged in.") });
-        this._sessionList = new St.BoxLayout({ style_class: 'end-session-dialog-session-list',
-                                               vertical: true });
-        this._inhibitorSection.add_actor(this._sessionHeader);
-        this._inhibitorSection.add_actor(this._sessionList);
-
-        try {
-            this._updatesPermission = Polkit.Permission.new_sync("org.freedesktop.packagekit.trigger-offline-update", null, null);
-        } catch(e) {
-            log('No permission to trigger offline updates: %s'.format(e.toString()));
-        }
+        this._applicationList.connect('actor-removed',
+                                      Lang.bind(this, function() {
+                                          if (this._applicationList.get_n_children() == 0)
+                                              scrollView.hide();
+                                      }));
 
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
@@ -357,51 +307,52 @@ const EndSessionDialog = new Lang.Class({
         this._user.disconnect(this._userChangedId);
     },
 
-    _sync: function() {
-        let open = (this.state == ModalDialog.State.OPENING || this.state == ModalDialog.State.OPENED);
-        if (!open)
+    _updateDescription: function() {
+        if (this.state != ModalDialog.State.OPENING &&
+            this.state != ModalDialog.State.OPENED)
             return;
 
         let dialogContent = DialogContent[this._type];
 
         let subject = dialogContent.subject;
-
-        // Use different title when we are installing updates
-        if (dialogContent.subjectWithUpdates && this._checkBox.actor.checked)
-            subject = dialogContent.subjectWithUpdates;
-
-        if (dialogContent.showBatteryWarning) {
-            // Warn when running on battery power
-            if (this._powerProxy.OnBattery && this._checkBox.actor.checked)
-                this._batteryWarning.opacity = 255;
-            else
-                this._batteryWarning.opacity = 0;
-        }
-
         let description;
-        let displayTime = _roundSecondsToInterval(this._totalSecondsToStayOpen,
-                                                  this._secondsLeft,
-                                                  10);
 
-        if (this._user.is_loaded) {
-            let realName = this._user.get_real_name();
+        if (this._inhibitors.length > 0) {
+            this._stopTimer();
+            description = dialogContent.inhibitedDescription;
+        } else if (this._secondsLeft > 0 && this._inhibitors.length == 0) {
+            let displayTime = _roundSecondsToInterval(this._totalSecondsToStayOpen,
+                                                      this._secondsLeft,
+                                                      10);
 
-            if (realName != null) {
-                if (dialogContent.subjectWithUser)
-                    subject = dialogContent.subjectWithUser.format(realName);
+            if (this._user.is_loaded) {
+                let realName = this._user.get_real_name();
 
-                if (dialogContent.descriptionWithUser)
-                    description = dialogContent.descriptionWithUser(realName, displayTime);
-                else
-                    description = dialogContent.description(displayTime);
+                if (realName != null) {
+                    if (dialogContent.subjectWithUser)
+                        subject = dialogContent.subjectWithUser.format(realName);
+
+                    if (dialogContent.uninhibitedDescriptionWithUser)
+                        description = dialogContent.uninhibitedDescriptionWithUser(realName, displayTime);
+                    else
+                        description = dialogContent.uninhibitedDescription(displayTime);
+                }
             }
+
+            if (!description)
+                description = dialogContent.uninhibitedDescription(displayTime);
+        } else {
+            description = dialogContent.endDescription;
         }
 
-        if (!description)
-            description = dialogContent.description(displayTime);
-
-        _setLabelText(this._descriptionLabel, description);
         _setLabelText(this._subjectLabel, subject);
+        _setLabelText(this._descriptionLabel, description);
+    },
+
+    _updateContent: function() {
+        if (this.state != ModalDialog.State.OPENING &&
+            this.state != ModalDialog.State.OPENED)
+            return;
 
         let dialogContent = DialogContent[this._type];
         if (dialogContent.iconName) {
@@ -409,18 +360,14 @@ const EndSessionDialog = new Lang.Class({
                                                 icon_size: _DIALOG_ICON_SIZE,
                                                 style_class: dialogContent.iconStyleClass });
         } else {
-            let avatarWidget = new UserWidget.Avatar(this._user,
-                                                     { iconSize: _DIALOG_ICON_SIZE,
-                                                       styleClass: dialogContent.iconStyleClass });
+            let avatarWidget = new UserAvatar.UserAvatar(this._user,
+                                                         { iconSize: _DIALOG_ICON_SIZE,
+                                                           styleClass: dialogContent.iconStyleClass });
             this._iconBin.child = avatarWidget.actor;
             avatarWidget.update();
         }
 
-        let hasApplications = this._applications.length > 0;
-        let hasSessions = this._sessions.length > 0;
-        this._scrollView.visible = hasApplications || hasSessions;
-        this._applicationHeader.visible = hasApplications;
-        this._sessionHeader.visible = hasSessions;
+        this._updateDescription();
     },
 
     _updateButtons: function() {
@@ -460,73 +407,14 @@ const EndSessionDialog = new Lang.Class({
     },
 
     _confirm: function(signal) {
-        let callback = Lang.bind(this, function() {
-            this._fadeOutDialog();
-            this._stopTimer();
-            this._dbusImpl.emit_signal(signal, null);
-        });
-
-        // Offline update not available; just emit the signal
-        if (!this._checkBox.actor.visible) {
-            callback();
-            return;
-        }
-
-        // Trigger the offline update as requested
-        if (this._checkBox.actor.checked) {
-            switch (signal) {
-                case "ConfirmedReboot":
-                    this._triggerOfflineUpdateReboot(callback);
-                    break;
-                case "ConfirmedShutdown":
-                    // To actually trigger the offline update, we need to
-                    // reboot to do the upgrade. When the upgrade is complete,
-                    // the computer will shut down automatically.
-                    signal = "ConfirmedReboot";
-                    this._triggerOfflineUpdateShutdown(callback);
-                    break;
-                default:
-                    callback();
-                    break;
-            }
-        } else {
-            this._triggerOfflineUpdateCancel(callback);
-        }
+        this._fadeOutDialog();
+        this._stopTimer();
+        this._dbusImpl.emit_signal(signal, null);
     },
 
     _onOpened: function() {
-        this._sync();
-    },
-
-    _triggerOfflineUpdateReboot: function(callback) {
-        this._pkexecSpawn([TRIGGER_OFFLINE_UPDATE, 'reboot'], callback);
-    },
-
-    _triggerOfflineUpdateShutdown: function(callback) {
-        this._pkexecSpawn([TRIGGER_OFFLINE_UPDATE, 'power-off'], callback);
-    },
-
-    _triggerOfflineUpdateCancel: function(callback) {
-        this._pkexecSpawn([TRIGGER_OFFLINE_UPDATE, '--cancel'], callback);
-    },
-
-    _pkexecSpawn: function(argv, callback) {
-        let ret, pid;
-        try {
-            [ret, pid] = GLib.spawn_async(null, ['pkexec'].concat(argv), null,
-                                          GLib.SpawnFlags.DO_NOT_REAP_CHILD | GLib.SpawnFlags.SEARCH_PATH,
-                                          null);
-        } catch (e) {
-            log('Error spawning "pkexec %s": %s'.format(argv.join(' '), e.toString()));
-            callback();
-            return;
-        }
-
-        GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function(pid, status) {
-            GLib.spawn_close_pid(pid);
-
-            callback();
-        });
+        if (this._inhibitors.length == 0)
+            this._startTimer();
     },
 
     _startTimer: function() {
@@ -540,22 +428,20 @@ const EndSessionDialog = new Lang.Class({
 
                 this._secondsLeft = this._totalSecondsToStayOpen - secondsElapsed;
                 if (this._secondsLeft > 0) {
-                    this._sync();
-                    return GLib.SOURCE_CONTINUE;
+                    this._updateDescription();
+                    return true;
                 }
 
                 let dialogContent = DialogContent[this._type];
                 let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
                 this._confirm(button.signal);
-                this._timerId = 0;
 
-                return GLib.SOURCE_REMOVE;
+                return false;
             }));
-        GLib.Source.set_name_by_id(this._timerId, '[gnome-shell] this._confirm');
     },
 
     _stopTimer: function() {
-        if (this._timerId > 0) {
+        if (this._timerId != 0) {
             Mainloop.source_remove(this._timerId);
             this._timerId = 0;
         }
@@ -563,33 +449,8 @@ const EndSessionDialog = new Lang.Class({
         this._secondsLeft = 0;
     },
 
-    _constructListItemForApp: function(inhibitor, app) {
-        let actor = new St.BoxLayout({ style_class: 'end-session-dialog-app-list-item',
-                                       can_focus: true });
-        actor.add(app.create_icon_texture(_ITEM_ICON_SIZE));
-
-        let textLayout = new St.BoxLayout({ vertical: true,
-                                            y_expand: true,
-                                            y_align: Clutter.ActorAlign.CENTER });
-        actor.add(textLayout);
-
-        let nameLabel = new St.Label({ text: app.get_name(),
-                                       style_class: 'end-session-dialog-app-list-item-name' });
-        textLayout.add(nameLabel);
-        actor.label_actor = nameLabel;
-
-        let [reason] = inhibitor.GetReasonSync();
-        if (reason) {
-            let reasonLabel = new St.Label({ text: reason,
-                                             style_class: 'end-session-dialog-app-list-item-description' });
-            textLayout.add(reasonLabel);
-        }
-
-        return actor;
-    },
-
     _onInhibitorLoaded: function(inhibitor) {
-        if (this._applications.indexOf(inhibitor) < 0) {
+        if (this._inhibitors.indexOf(inhibitor) < 0) {
             // Stale inhibitor
             return;
         }
@@ -597,94 +458,28 @@ const EndSessionDialog = new Lang.Class({
         let app = findAppFromInhibitor(inhibitor);
 
         if (app) {
-            let actor = this._constructListItemForApp(inhibitor, app);
-            this._applicationList.add(actor);
+            let [reason] = inhibitor.GetReasonSync();
+            let item = new ListItem(app, reason);
+            item.connect('activate',
+                         Lang.bind(this, function() {
+                             this.close();
+                         }));
+            this._applicationList.add(item.actor, { x_fill: true });
+            this._stopTimer();
         } else {
             // inhibiting app is a service, not an application
-            this._applications.splice(this._applications.indexOf(inhibitor), 1);
+            this._inhibitors.splice(this._inhibitors.indexOf(inhibitor), 1);
         }
 
-        this._sync();
-    },
-
-    _constructListItemForSession: function(session) {
-        let avatar = new UserWidget.Avatar(session.user, { iconSize: _ITEM_ICON_SIZE });
-        avatar.update();
-
-        let userName = session.user.get_real_name() ? session.user.get_real_name() : session.username;
-        let userLabelText;
-
-        if (session.remote)
-            /* Translators: Remote here refers to a remote session, like a ssh login */
-            userLabelText = _("%s (remote)").format(userName);
-        else if (session.type == "tty")
-            /* Translators: Console here refers to a tty like a VT console */
-            userLabelText = _("%s (console)").format(userName);
-        else
-            userLabelText = userName;
-
-        let actor = new St.BoxLayout({ style_class: 'end-session-dialog-session-list-item',
-                                       can_focus: true });
-        actor.add(avatar.actor);
-
-        let nameLabel = new St.Label({ text: userLabelText,
-                                       style_class: 'end-session-dialog-session-list-item-name',
-                                       y_expand: true,
-                                       y_align: Clutter.ActorAlign.CENTER });
-        actor.add(nameLabel);
-        actor.label_actor = nameLabel;
-
-        return actor;
-    },
-
-    _loadSessions: function() {
-        this._loginManager.listSessions(Lang.bind(this, function(result) {
-            let n = 0;
-            for (let i = 0; i < result.length; i++) {
-                let[id, uid, userName, seat, sessionPath] = result[i];
-                let proxy = new LogindSession(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;
-
-                let session = { user: this._userManager.get_user(userName),
-                                username: userName,
-                                type: proxy.Type,
-                                remote: proxy.Remote };
-                this._sessions.push(session);
-
-                let actor = this._constructListItemForSession(session);
-                this._sessionList.add(actor);
-
-                // limit the number of entries
-                n++;
-                if (n == MAX_USERS_IN_SESSION_DIALOG)
-                    break;
-            }
-
-            this._sync();
-        }));
+        this._updateContent();
     },
 
     OpenAsync: function(parameters, invocation) {
         let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters;
         this._totalSecondsToStayOpen = totalSecondsToStayOpen;
-        this._type = type;
-
-        if (this._type == 2 && this._updatesFile.query_exists(null))
-            this._type = 3;
-
-        this._applications = [];
+        this._inhibitors = [];
         this._applicationList.destroy_all_children();
-
-        this._sessions = [];
-        this._sessionList.destroy_all_children();
+        this._type = type;
 
         if (!(this._type in DialogContent)) {
             invocation.return_dbus_error('org.gnome.Shell.ModalDialog.TypeError',
@@ -692,33 +487,14 @@ const EndSessionDialog = new Lang.Class({
             return;
         }
 
-        let dialogContent = DialogContent[this._type];
-
         for (let i = 0; i < inhibitorObjectPaths.length; i++) {
             let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], Lang.bind(this, function(proxy, error) {
                 this._onInhibitorLoaded(proxy);
             }));
 
-            this._applications.push(inhibitor);
+            this._inhibitors.push(inhibitor);
         }
 
-        if (dialogContent.showOtherSessions)
-            this._loadSessions();
-
-        let preparedUpdate = this._preparedUpdateFile.query_exists(null);
-        let updateAlreadyTriggered = this._updatesFile.query_exists(null);
-        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
-
-        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText);
-        this._checkBox.actor.visible = (dialogContent.checkBoxText && preparedUpdate && updatesAllowed);
-        this._checkBox.actor.checked = (preparedUpdate && updateAlreadyTriggered);
-
-        // We show the warning either together with the checkbox, or when
-        // updates have already been triggered, but the user doesn't have
-        // enough permissions to cancel them.
-        this._batteryWarning.visible = (dialogContent.showBatteryWarning &&
-                                        (this._checkBox.actor.visible || preparedUpdate && updateAlreadyTriggered && !updatesAllowed));
-
         this._updateButtons();
 
         if (!this.open(timestamp)) {
@@ -727,8 +503,7 @@ const EndSessionDialog = new Lang.Class({
             return;
         }
 
-        this._startTimer();
-        this._sync();
+        this._updateContent();
 
         let signalId = this.connect('opened',
                                     Lang.bind(this, function() {

js/ui/environment.js

@@ -5,14 +5,11 @@ imports.gi.versions.Gio = '2.0';
 imports.gi.versions.Gdk = '3.0';
 imports.gi.versions.GdkPixbuf = '2.0';
 imports.gi.versions.Gtk = '3.0';
-imports.gi.versions.TelepathyGLib = '0.12';
-imports.gi.versions.TelepathyLogger = '0.2';
 
 const Clutter = imports.gi.Clutter;;
 const Gettext = imports.gettext;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
@@ -42,25 +39,6 @@ function _patchContainerClass(containerClass) {
     };
 }
 
-function _patchLayoutClass(layoutClass, styleProps) {
-    if (styleProps)
-        layoutClass.prototype.hookup_style = function(container) {
-            container.connect('style-changed', Lang.bind(this, function() {
-                let node = container.get_theme_node();
-                for (let prop in styleProps) {
-                    let [found, length] = node.lookup_length(styleProps[prop], false);
-                    if (found)
-                        this[prop] = length;
-                }
-            }));
-        };
-    layoutClass.prototype.child_set = function(actor, props) {
-        let meta = this.get_child_meta(actor.get_parent(), actor);
-        for (let prop in props)
-            meta[prop] = props[prop];
-    };
-}
-
 function _makeLoggingFunc(func) {
     return function() {
         return func([].join.call(arguments, ', '));
@@ -82,12 +60,6 @@ function init() {
     _patchContainerClass(St.BoxLayout);
     _patchContainerClass(St.Table);
 
-    _patchLayoutClass(Clutter.TableLayout, { row_spacing: 'spacing-rows',
-                                             column_spacing: 'spacing-columns' });
-    _patchLayoutClass(Clutter.GridLayout, { row_spacing: 'spacing-rows',
-                                            column_spacing: 'spacing-columns' });
-    _patchLayoutClass(Clutter.BoxLayout, { spacing: 'spacing' });
-
     Clutter.Actor.prototype.toString = function() {
         return St.describe_actor(this);
     };

js/ui/extensionDownloader.js

@@ -201,7 +201,7 @@ const InstallExtensionDialog = new Lang.Class({
                            default: true
                          }]);
 
-        let message = _("Download and install “%s” from extensions.gnome.org?").format(info.name);
+        let message = _("Download and install '%s' from extensions.gnome.org?").format(info.name);
 
         let box = new St.BoxLayout();
         this.contentLayout.add(box);

js/ui/extensionSystem.js

@@ -38,7 +38,6 @@ const connect = Lang.bind(_signals, _signals.connect);
 const disconnect = Lang.bind(_signals, _signals.disconnect);
 
 const ENABLED_EXTENSIONS_KEY = 'enabled-extensions';
-const EXTENSION_DISABLE_VERSION_CHECK_KEY = 'disable-extension-version-validation';
 
 var initted = false;
 var enabled;
@@ -77,11 +76,7 @@ function disableExtension(uuid) {
         theme.unload_stylesheet(extension.stylesheet.get_path());
     }
 
-    try {
-        extension.stateObj.disable();
-    } catch(e) {
-        logExtensionError(uuid, e);
-    }
+    extension.stateObj.disable();
 
     for (let i = 0; i < order.length; i++) {
         let uuid = order[i];
@@ -94,10 +89,8 @@ function disableExtension(uuid) {
 
     extensionOrder.splice(orderIdx, 1);
 
-    if ( extension.state != ExtensionState.ERROR ) {
-        extension.state = ExtensionState.DISABLED;
-        _signals.emit('extension-state-changed', extension);
-    }
+    extension.state = ExtensionState.DISABLED;
+    _signals.emit('extension-state-changed', extension);
 }
 
 function enableExtension(uuid) {
@@ -124,15 +117,10 @@ function enableExtension(uuid) {
         }
     }
 
-    try {
-        extension.stateObj.enable();
-        extension.state = ExtensionState.ENABLED;
-        _signals.emit('extension-state-changed', extension);
-        return;
-    } catch(e) {
-        logExtensionError(uuid, e);
-        return;
-    }
+    extension.stateObj.enable();
+
+    extension.state = ExtensionState.ENABLED;
+    _signals.emit('extension-state-changed', extension);
 }
 
 function logExtensionError(uuid, error) {
@@ -157,15 +145,12 @@ function loadExtension(extension) {
     // Default to error, we set success as the last step
     extension.state = ExtensionState.ERROR;
 
-    let checkVersion = !global.settings.get_boolean(EXTENSION_DISABLE_VERSION_CHECK_KEY);
-
-    if (checkVersion && ExtensionUtils.isOutOfDate(extension)) {
+    if (ExtensionUtils.isOutOfDate(extension)) {
         extension.state = ExtensionState.OUT_OF_DATE;
     } else {
         let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
         if (enabled) {
-            if (!initExtension(extension.uuid))
-                return;
+            initExtension(extension.uuid);
             if (extension.state == ExtensionState.DISABLED)
                 enableExtension(extension.uuid);
         } else {
@@ -220,12 +205,7 @@ function initExtension(uuid) {
     extensionModule = extension.imports.extension;
 
     if (extensionModule.init) {
-        try {
-            extensionState = extensionModule.init(extension);
-        } catch(e) {
-            logExtensionError(uuid, e);
-            return false;
-        }
+        extensionState = extensionModule.init(extension);
     }
 
     if (!extensionState)
@@ -234,7 +214,6 @@ function initExtension(uuid) {
 
     extension.state = ExtensionState.DISABLED;
     _signals.emit('extension-loaded', uuid);
-    return true;
 }
 
 function getEnabledExtensions() {
@@ -256,7 +235,11 @@ function onEnabledExtensionsChanged() {
     newEnabledExtensions.filter(function(uuid) {
         return enabledExtensions.indexOf(uuid) == -1;
     }).forEach(function(uuid) {
-        enableExtension(uuid);
+        try {
+            enableExtension(uuid);
+        } catch(e) {
+            logExtensionError(uuid, e);
+        }
     });
 
     // Find and disable all the newly disabled extensions: UUIDs found in the
@@ -264,30 +247,27 @@ function onEnabledExtensionsChanged() {
     enabledExtensions.filter(function(item) {
         return newEnabledExtensions.indexOf(item) == -1;
     }).forEach(function(uuid) {
-        disableExtension(uuid);
+        try {
+            disableExtension(uuid);
+        } catch(e) {
+            logExtensionError(uuid, e);
+        }
     });
 
     enabledExtensions = newEnabledExtensions;
 }
 
-function _onVersionValidationChanged() {
-    if (Main.sessionMode.allowExtensions) {
-        enabledExtensions.forEach(function(uuid) {
-            if (ExtensionUtils.extensions[uuid])
-                reloadExtension(ExtensionUtils.extensions[uuid]);
-        });
-    }
-}
-
 function _loadExtensions() {
     global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
-    global.settings.connect('changed::' + EXTENSION_DISABLE_VERSION_CHECK_KEY, _onVersionValidationChanged);
-
     enabledExtensions = getEnabledExtensions();
 
     let finder = new ExtensionUtils.ExtensionFinder();
-    finder.connect('extension-found', function(finder, extension) {
-        loadExtension(extension);
+    finder.connect('extension-found', function(signals, extension) {
+        try {
+            loadExtension(extension);
+        } catch(e) {
+            logExtensionError(extension.uuid, e);
+        }
     });
     finder.scanExtensions();
 }

js/ui/focusCaretTracker.js

@@ -1,87 +0,0 @@
-/** -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- * Copyright 2012 Inclusive Design Research Centre, OCAD University.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   Joseph Scheuhammer <clown@alum.mit.edu>
- * Contributor:
- *   Magdalen Berns <m.berns@sms.ed.ac.uk>
- */
-
-const Atspi = imports.gi.Atspi;
-const Lang = imports.lang;
-const Signals = imports.signals;
-
-const CARETMOVED        = 'object:text-caret-moved';
-const STATECHANGED      = 'object:state-changed';
-
-const FocusCaretTracker = new Lang.Class({
-    Name: 'FocusCaretTracker',
-
-    _init: function() {
-        Atspi.init();
-        Atspi.set_timeout(250, 250);
-
-        this._atspiListener = Atspi.EventListener.new(Lang.bind(this, this._onChanged));
-
-        this._focusListenerRegistered = false;
-        this._caretListenerRegistered = false;
-    },
-
-    _onChanged: function(event) {
-        if (event.type.indexOf(STATECHANGED) == 0)
-            this.emit('focus-changed', event);
-        else if (event.type == CARETMOVED)
-            this.emit('caret-moved', event);
-    },
-
-    registerFocusListener: function() {
-        if (this._focusListenerRegistered)
-            return;
-
-        // Ignore the return value, we get an exception if they fail
-        // And they should never fail
-        this._atspiListener.register(STATECHANGED + ':focused');
-        this._atspiListener.register(STATECHANGED + ':selected');
-        this._focusListenerRegistered = true;
-    },
-
-    registerCaretListener: function() {
-        if (this._caretListenerRegistered)
-            return;
-
-        this._atspiListener.register(CARETMOVED);
-        this._caretListenerRegistered = true;
-    },
-
-    deregisterFocusListener: function() {
-        if (!this._focusListenerRegistered)
-            return;
-
-        this._atspiListener.deregister(STATECHANGED + ':focused');
-        this._atspiListener.deregister(STATECHANGED + ':selected');
-        this._focusListenerRegistered = false;
-    },
-
-    deregisterCaretListener: function() {
-        if (!this._caretListenerRegistered)
-            return;
-
-        this._atspiListener.deregister(CARETMOVED);
-        this._caretListenerRegistered = false;
-    }
-});
-Signals.addSignalMethods(FocusCaretTracker.prototype);

js/ui/grabHelper.js

@@ -10,31 +10,6 @@ const St = imports.gi.St;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 
-let _capturedEventId = 0;
-let _grabHelperStack = [];
-function _onCapturedEvent(actor, event) {
-    let grabHelper = _grabHelperStack[_grabHelperStack.length - 1];
-    return grabHelper.onCapturedEvent(event);
-}
-
-function _pushGrabHelper(grabHelper) {
-    _grabHelperStack.push(grabHelper);
-
-    if (_capturedEventId == 0)
-        _capturedEventId = global.stage.connect('captured-event', _onCapturedEvent);
-}
-
-function _popGrabHelper(grabHelper) {
-    let poppedHelper = _grabHelperStack.pop();
-    if (poppedHelper != grabHelper)
-        throw new Error("incorrect grab helper pop");
-
-    if (_grabHelperStack.length == 0) {
-        global.stage.disconnect(_capturedEventId);
-        _capturedEventId = 0;
-    }
-}
-
 // GrabHelper:
 // @owner: the actor that owns the GrabHelper
 // @params: optional parameters to pass to Main.pushModal()
@@ -56,9 +31,14 @@ const GrabHelper = new Lang.Class({
         this._grabStack = [];
 
         this._actors = [];
+        this._capturedEventId = 0;
+        this._keyFocusNotifyId = 0;
+        this._focusWindowChangedId = 0;
         this._ignoreRelease = false;
+        this._isUngrabbingCount = 0;
 
         this._modalCount = 0;
+        this._grabFocusCount = 0;
     },
 
     // addActor:
@@ -138,36 +118,38 @@ const GrabHelper = new Lang.Class({
     // grab:
     // @params: A bunch of parameters, see below
     //
-    // The general effect of a "grab" is to ensure that the passed in actor
-    // and all actors inside the grab get exclusive control of the mouse and
-    // keyboard, with the grab automatically being dropped if the user tries
-    // to dismiss it. The actor is passed in through @params.actor.
+    // Grabs the mouse and keyboard, according to the GrabHelper's
+    // parameters. If @newFocus is not %null, then the keyboard focus
+    // is moved to the first #StWidget:can-focus widget inside it.
     //
-    // grab() can be called multiple times, with the scope of the grab being
-    // changed to a different actor every time. A nested grab does not have
-    // to have its grabbed actor inside the parent grab actors.
+    // The grab will automatically be dropped if:
+    //   - The user clicks outside the grabbed actors
+    //   - The user types Escape
+    //   - The keyboard focus is moved outside the grabbed actors
+    //   - A window is focused
     //
-    // Grabs can be automatically dropped if the user tries to dismiss it
-    // in one of two ways: the user clicking outside the currently grabbed
-    // actor, or the user typing the Escape key.
+    // If @params.actor is not null, then it will be focused as the
+    // new actor. If you attempt to grab an already focused actor, the
+    // request to be focused will be ignored. The actor will not be
+    // added to the grab stack, so do not call a paired ungrab().
     //
-    // If the user clicks outside the grabbed actors, and the clicked on
-    // actor is part of a previous grab in the stack, grabs will be popped
-    // until that grab is active. However, the click event will not be
-    // replayed to the actor.
+    // If @params contains { modal: true }, then grab() will push a modal
+    // on the owner of the GrabHelper. As long as there is at least one
+    // { modal: true } actor on the grab stack, the grab will be kept.
+    // When the last { modal: true } actor is ungrabbed, then the modal
+    // will be dropped. A modal grab can fail if there is already a grab
+    // in effect from aother application; in this case the function returns
+    // false and nothing happens. Non-modal grabs can never fail.
     //
-    // If the user types the Escape key, one grab from the grab stack will
-    // be popped.
-    //
-    // When a grab is popped by user interacting as described above, if you
-    // pass a callback as @params.onUngrab, it will be called with %true.
-    //
-    // If @params.focus is not null, we'll set the key focus directly
-    // to that actor instead of navigating in @params.actor. This is for
-    // use cases like menus, where we want to grab the menu actor, but keep
-    // focus on the clicked on menu item.
+    // If @params contains { grabFocus: true }, then if you call grab()
+    // while the shell is outside the overview, it will set the stage
+    // input mode to %Shell.StageInputMode.FOCUSED, and ungrab() will
+    // revert it back, and re-focus the previously-focused window (if
+    // another window hasn't been explicitly focused before then).
     grab: function(params) {
         params = Params.parse(params, { actor: null,
+                                        modal: false,
+                                        grabFocus: false,
                                         focus: null,
                                         onUngrab: null });
 
@@ -180,18 +162,24 @@ const GrabHelper = new Lang.Class({
 
         params.savedFocus = focus;
 
-        if (!this._takeModalGrab())
+        if (params.modal && !this._takeModalGrab())
+            return false;
+
+        if (params.grabFocus && !this._takeFocusGrab(hadFocus))
             return false;
 
         this._grabStack.push(params);
 
         if (params.focus) {
             params.focus.grab_key_focus();
-        } else if (newFocus && hadFocus) {
+        } else if (newFocus && (hadFocus || params.grabFocus)) {
             if (!newFocus.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false))
                 newFocus.grab_key_focus();
         }
 
+        if ((params.grabFocus || params.modal) && !this._capturedEventId)
+            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+
         return true;
     },
 
@@ -200,8 +188,6 @@ const GrabHelper = new Lang.Class({
         if (firstGrab) {
             if (!Main.pushModal(this._owner, this._modalParams))
                 return false;
-
-            _pushGrabHelper(this);
         }
 
         this._modalCount++;
@@ -213,14 +199,56 @@ const GrabHelper = new Lang.Class({
         if (this._modalCount > 0)
             return;
 
-        _popGrabHelper(this);
-
-        this._ignoreRelease = false;
-
         Main.popModal(this._owner);
         global.sync_pointer();
     },
 
+    _takeFocusGrab: function(hadFocus) {
+        let firstGrab = (this._grabFocusCount == 0);
+        if (firstGrab) {
+            let metaDisplay = global.screen.get_display();
+
+            this._grabbedFromKeynav = hadFocus;
+            this._preGrabInputMode = global.stage_input_mode;
+
+            if (this._preGrabInputMode == Shell.StageInputMode.NORMAL)
+                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+
+            this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
+            this._focusWindowChangedId = metaDisplay.connect('notify::focus-window', Lang.bind(this, this._focusWindowChanged));
+        }
+
+        this._grabFocusCount++;
+        return true;
+    },
+
+    _releaseFocusGrab: function() {
+        this._grabFocusCount--;
+        if (this._grabFocusCount > 0)
+            return;
+
+        if (this._keyFocusNotifyId > 0) {
+            global.stage.disconnect(this._keyFocusNotifyId);
+            this._keyFocusNotifyId = 0;
+        }
+
+        if (this._focusWindowChangedId > 0) {
+            let metaDisplay = global.screen.get_display();
+            metaDisplay.disconnect(this._focusWindowChangedId);
+            this._focusWindowChangedId = 0;
+        }
+
+        let prePopInputMode = global.stage_input_mode;
+
+        if (this._grabbedFromKeynav) {
+            if (this._preGrabInputMode == Shell.StageInputMode.FOCUSED &&
+                prePopInputMode != Shell.StageInputMode.FULLSCREEN)
+                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+        }
+
+        global.screen.focus_default_window(global.display.get_current_time_roundtrip());
+    },
+
     // ignoreRelease:
     //
     // Make sure that the next button release event evaluated by the
@@ -234,14 +262,10 @@ const GrabHelper = new Lang.Class({
     // ungrab:
     // @params: The parameters for the grab; see below.
     //
-    // Pops @params.actor from the grab stack, potentially dropping
-    // the grab. If the actor is not on the grab stack, this call is
-    // ignored with no ill effects.
+    // Pops an actor from the grab stack, potentially dropping the grab.
     //
-    // If the actor is not at the top of the grab stack, grabs are
-    // popped until the grabbed actor is at the top of the grab stack.
-    // The onUngrab callback for every grab is called for every popped
-    // grab with the parameter %false.
+    // If the actor that was popped from the grab stack was not the actor
+    // That was passed in, this call is ignored.
     ungrab: function(params) {
         params = Params.parse(params, { actor: this.currentGrab.actor,
                                         isUser: false });
@@ -250,6 +274,14 @@ const GrabHelper = new Lang.Class({
         if (grabStackIndex < 0)
             return;
 
+        // We may get key focus changes when calling onUngrab, which
+        // would cause an extra ungrab() on the next actor in the
+        // stack, which is wrong. Ignore key focus changes during the
+        // ungrab, and restore the saved key focus ourselves afterwards.
+        // We use a count as ungrab() may be re-entrant, as onUngrab()
+        // may ungrab additional actors.
+        this._isUngrabbingCount++;
+
         let focus = global.stage.key_focus;
         let hadFocus = focus && this._isWithinGrabbedActor(focus);
 
@@ -264,7 +296,18 @@ const GrabHelper = new Lang.Class({
             if (poppedGrab.onUngrab)
                 poppedGrab.onUngrab(params.isUser);
 
-            this._releaseModalGrab();
+            if (poppedGrab.modal)
+                this._releaseModalGrab();
+
+            if (poppedGrab.grabFocus)
+                this._releaseFocusGrab();
+        }
+
+        if (!this.grabbed && this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+
+            this._ignoreRelease = false;
         }
 
         if (hadFocus) {
@@ -272,15 +315,17 @@ const GrabHelper = new Lang.Class({
             if (poppedGrab.savedFocus)
                 poppedGrab.savedFocus.grab_key_focus();
         }
+
+        this._isUngrabbingCount--;
     },
 
-    onCapturedEvent: function(event) {
+    _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 Clutter.EVENT_STOP;
+            return true;
         }
 
         let press = type == Clutter.EventType.BUTTON_PRESS;
@@ -289,14 +334,17 @@ const GrabHelper = new Lang.Class({
 
         if (release && this._ignoreRelease) {
             this._ignoreRelease = false;
-            return Clutter.EVENT_STOP;
+            return true;
         }
 
+        if (!button && this._modalCount == 0)
+            return false;
+
         if (this._isWithinGrabbedActor(event.get_source()))
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         if (Main.keyboard.shouldTakeEvent(event))
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         if (button) {
             // If we have a press event, ignore the next event,
@@ -305,9 +353,24 @@ const GrabHelper = new Lang.Class({
                 this._ignoreRelease = true;
             let i = this._actorInGrabStack(event.get_source()) + 1;
             this.ungrab({ actor: this._grabStack[i].actor, isUser: true });
-            return Clutter.EVENT_STOP;
+            return true;
         }
 
-        return Clutter.EVENT_STOP;
+        return this._modalCount > 0;
     },
+
+    _onKeyFocusChanged: function() {
+        if (this._isUngrabbingCount > 0)
+            return;
+
+        let focus = global.stage.key_focus;
+        if (!focus || !this._isWithinGrabbedActor(focus))
+            this.ungrab({ isUser: true });
+    },
+
+    _focusWindowChanged: function() {
+        let metaDisplay = global.screen.get_display();
+        if (metaDisplay.focus_window != null)
+            this.ungrab({ isUser: true });
+    }
 });

js/ui/ibusCandidatePopup.js

@@ -32,7 +32,6 @@ const CandidateArea = new Lang.Class({
             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());
-                return Clutter.EVENT_PROPAGATE;
             }));
         }
 
@@ -115,6 +114,9 @@ const CandidatePopup = new Lang.Class({
     Name: 'CandidatePopup',
 
     _init: function() {
+        this._cursor = new St.Bin({ opacity: 0 });
+        Main.uiGroup.add_actor(this._cursor);
+
         this._boxPointer = new BoxPointer.BoxPointer(St.Side.TOP);
         this._boxPointer.actor.visible = false;
         this._boxPointer.actor.style_class = 'candidate-popup-boxpointer';
@@ -155,9 +157,10 @@ const CandidatePopup = new Lang.Class({
 
         panelService.connect('set-cursor-location',
                              Lang.bind(this, function(ps, x, y, w, h) {
-                                 Main.layoutManager.setDummyCursorGeometry(x, y, w, h);
+                                 this._cursor.set_position(x, y);
+                                 this._cursor.set_size(w, h);
                                  if (this._boxPointer.actor.visible)
-                                     this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
+                                     this._boxPointer.setPosition(this._cursor, 0);
                              }));
         panelService.connect('update-preedit-text',
                              Lang.bind(this, function(ps, text, cursorPosition, visible) {
@@ -249,7 +252,7 @@ const CandidatePopup = new Lang.Class({
                          this._candidateArea.actor.visible);
 
         if (isVisible) {
-            this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
+            this._boxPointer.setPosition(this._cursor, 0);
             this._boxPointer.show(BoxPointer.PopupAnimation.NONE);
             this._boxPointer.actor.raise_top();
         } else {

js/ui/iconGrid.js

@@ -1,20 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
 
 const Lang = imports.lang;
 const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;
 
-const ICON_SIZE = 96;
-const MIN_ICON_SIZE = 16;
+const ICON_SIZE = 48;
 
-const EXTRA_SPACE_ANIMATION_TIME = 0.25;
 
 const BaseIcon = new Lang.Class({
     Name: 'BaseIcon',
@@ -23,12 +17,7 @@ const BaseIcon = new Lang.Class({
         params = Params.parse(params, { createIcon: null,
                                         setSizeManually: false,
                                         showLabel: true });
-
-        let styleClass = 'overview-icon';
-        if (params.showLabel)
-            styleClass += ' overview-icon-with-label';
-
-        this.actor = new St.Bin({ style_class: styleClass,
+        this.actor = new St.Bin({ style_class: 'overview-icon',
                                   x_fill: true,
                                   y_fill: true });
         this.actor._delegate = this;
@@ -143,6 +132,11 @@ const BaseIcon = new Lang.Class({
         this.icon = this.createIcon(this.iconSize);
 
         this._iconBin.child = this.icon;
+
+        // The icon returned by createIcon() might actually be smaller than
+        // the requested icon size (for instance StTextureCache does this
+        // for fallback icons), so set the size explicitly.
+        this._iconBin.set_size(this.iconSize, this.iconSize);
     },
 
     _onStyleChanged: function() {
@@ -182,31 +176,19 @@ const IconGrid = new Lang.Class({
     _init: function(params) {
         params = Params.parse(params, { rowLimit: null,
                                         columnLimit: null,
-                                        minRows: 1,
-                                        minColumns: 1,
                                         fillParent: false,
-                                        xAlign: St.Align.MIDDLE,
-                                        padWithSpacing: false });
+                                        xAlign: St.Align.MIDDLE });
         this._rowLimit = params.rowLimit;
         this._colLimit = params.columnLimit;
-        this._minRows = params.minRows;
-        this._minColumns = params.minColumns;
         this._xAlign = params.xAlign;
         this._fillParent = params.fillParent;
-        this._padWithSpacing = params.padWithSpacing;
-
-        this.topPadding = 0;
-        this.bottomPadding = 0;
-        this.rightPadding = 0;
-        this.leftPadding = 0;
 
         this.actor = new St.BoxLayout({ style_class: 'icon-grid',
                                         vertical: true });
-        this._items = [];
+
         // Pulled from CSS, but hardcode some defaults here
         this._spacing = 0;
         this._hItemSize = this._vItemSize = ICON_SIZE;
-        this._fixedHItemSize = this._fixedVItemSize = undefined;
         this._grid = new Shell.GenericContainer();
         this.actor.add(this._grid, { expand: true, y_align: St.Align.START });
         this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));
@@ -214,20 +196,6 @@ const IconGrid = new Lang.Class({
         this._grid.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this._grid.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this._grid.connect('allocate', Lang.bind(this, this._allocate));
-        this._grid.connect('actor-added', Lang.bind(this, this._childAdded));
-        this._grid.connect('actor-removed', Lang.bind(this, this._childRemoved));
-    },
-
-    _keyFocusIn: function(actor) {
-        this.emit('key-focus-in', actor);
-    },
-
-    _childAdded: function(grid, child) {
-        child._iconGridKeyFocusInId = child.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
-    },
-
-    _childRemoved: function(grid, child) {
-        child.disconnect(child._iconGridKeyFocusInId);
     },
 
     _getPreferredWidth: function (grid, forHeight, alloc) {
@@ -236,16 +204,16 @@ const IconGrid = new Lang.Class({
             // later we'll allocate as many children as fit the parent
             return;
 
-        let nChildren = this._grid.get_n_children();
+        let children = this._grid.get_children();
         let nColumns = this._colLimit ? Math.min(this._colLimit,
-                                                 nChildren)
-                                      : nChildren;
-        let totalSpacing = Math.max(0, nColumns - 1) * this._getSpacing();
+                                                 children.length)
+                                      : children.length;
+        let totalSpacing = Math.max(0, nColumns - 1) * this._spacing;
         // Kind of a lie, but not really an issue right now.  If
         // we wanted to support some sort of hidden/overflow that would
         // need higher level design
-        alloc.min_size = this._getHItemSize() + this.leftPadding + this.rightPadding;
-        alloc.natural_size = nColumns * this._getHItemSize() + totalSpacing + this.leftPadding + this.rightPadding;
+        alloc.min_size = this._hItemSize;
+        alloc.natural_size = nColumns * this._hItemSize + totalSpacing;
     },
 
     _getVisibleChildren: function() {
@@ -263,11 +231,13 @@ const IconGrid = new Lang.Class({
             return;
 
         let children = this._getVisibleChildren();
-        let nColumns;
-        if (forWidth < 0)
+        let nColumns, spacing;
+        if (forWidth < 0) {
             nColumns = children.length;
-        else
-            [nColumns, ] = this._computeLayout(forWidth);
+            spacing = this._spacing;
+        } else {
+            [nColumns, , spacing] = this._computeLayout(forWidth);
+        }
 
         let nRows;
         if (nColumns > 0)
@@ -276,8 +246,8 @@ const IconGrid = new Lang.Class({
             nRows = 0;
         if (this._rowLimit)
             nRows = Math.min(nRows, this._rowLimit);
-        let totalSpacing = Math.max(0, nRows - 1) * this._getSpacing();
-        let height = nRows * this._getVItemSize() + totalSpacing + this.topPadding + this.bottomPadding;
+        let totalSpacing = Math.max(0, nRows - 1) * spacing;
+        let height = nRows * this._vItemSize + totalSpacing;
         alloc.min_size = height;
         alloc.natural_size = height;
     },
@@ -293,30 +263,48 @@ const IconGrid = new Lang.Class({
         let children = this._getVisibleChildren();
         let availWidth = box.x2 - box.x1;
         let availHeight = box.y2 - box.y1;
-        let spacing = this._getSpacing();
-        let [nColumns, usedWidth] = this._computeLayout(availWidth);
 
-        let leftEmptySpace;
+        let [nColumns, usedWidth, spacing] = this._computeLayout(availWidth);
+
+        let leftPadding;
         switch(this._xAlign) {
             case St.Align.START:
-                leftEmptySpace = 0;
+                leftPadding = 0;
                 break;
             case St.Align.MIDDLE:
-                leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
+                leftPadding = Math.floor((availWidth - usedWidth) / 2);
                 break;
             case St.Align.END:
-                leftEmptySpace = availWidth - usedWidth;
+                leftPadding = availWidth - usedWidth;
         }
 
-        let x = box.x1 + leftEmptySpace + this.leftPadding;
-        let y = box.y1 + this.topPadding;
+        let x = box.x1 + leftPadding;
+        let y = box.y1;
         let columnIndex = 0;
         let rowIndex = 0;
         for (let i = 0; i < children.length; i++) {
-            let childBox = this._calculateChildBox(children[i], x, y, box);
+            let [childMinWidth, childMinHeight, childNaturalWidth, childNaturalHeight]
+                = children[i].get_preferred_size();
+
+            /* Center the item in its allocation horizontally */
+            let width = Math.min(this._hItemSize, childNaturalWidth);
+            let childXSpacing = Math.max(0, width - childNaturalWidth) / 2;
+            let height = Math.min(this._vItemSize, childNaturalHeight);
+            let childYSpacing = Math.max(0, height - childNaturalHeight) / 2;
+
+            let childBox = new Clutter.ActorBox();
+            if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
+                let _x = box.x2 - (x + width);
+                childBox.x1 = Math.floor(_x - childXSpacing);
+            } else {
+                childBox.x1 = Math.floor(x + childXSpacing);
+            }
+            childBox.y1 = Math.floor(y + childYSpacing);
+            childBox.x2 = childBox.x1 + width;
+            childBox.y2 = childBox.y1 + height;
 
             if (this._rowLimit && rowIndex >= this._rowLimit ||
-                this._fillParent && childBox.y2 > availHeight - this.bottomPadding) {
+                this._fillParent && childBox.y2 > availHeight) {
                 this._grid.set_skip_paint(children[i], true);
             } else {
                 children[i].allocate(childBox, flags);
@@ -330,38 +318,15 @@ const IconGrid = new Lang.Class({
             }
 
             if (columnIndex == 0) {
-                y += this._getVItemSize() + spacing;
-                x = box.x1 + leftEmptySpace + this.leftPadding;
+                y += this._vItemSize + spacing;
+                x = box.x1 + leftPadding;
             } else {
-                x += this._getHItemSize() + spacing;
+                x += this._hItemSize + spacing;
             }
         }
     },
 
-    _calculateChildBox: function(child, x, y, box) {
-        let [childMinWidth, childMinHeight, childNaturalWidth, childNaturalHeight] =
-             child.get_preferred_size();
-
-        /* Center the item in its allocation horizontally */
-        let width = Math.min(this._getHItemSize(), childNaturalWidth);
-        let childXSpacing = Math.max(0, width - childNaturalWidth) / 2;
-        let height = Math.min(this._getVItemSize(), childNaturalHeight);
-        let childYSpacing = Math.max(0, height - childNaturalHeight) / 2;
-
-        let childBox = new Clutter.ActorBox();
-        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
-            let _x = box.x2 - (x + width);
-            childBox.x1 = Math.floor(_x - childXSpacing);
-        } else {
-            childBox.x1 = Math.floor(x + childXSpacing);
-        }
-        childBox.y1 = Math.floor(y + childYSpacing);
-        childBox.x2 = childBox.x1 + width;
-        childBox.y2 = childBox.y1 + height;
-        return childBox;
-    },
-
-    columnsForWidth: function(rowWidth) {
+    childrenInRow: function(rowWidth) {
         return this._computeLayout(rowWidth)[0];
     },
 
@@ -371,19 +336,26 @@ const IconGrid = new Lang.Class({
 
     _computeLayout: function (forWidth) {
         let nColumns = 0;
-        let usedWidth = this.leftPadding + this.rightPadding;
-        let spacing = this._getSpacing();
+        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._getHItemSize() <= forWidth)) {
-            usedWidth += this._getHItemSize() + spacing;
+               (usedWidth + this._hItemSize <= forWidth)) {
+            usedWidth += this._hItemSize + spacing;
             nColumns += 1;
         }
 
         if (nColumns > 0)
             usedWidth -= spacing;
 
-        return [nColumns, usedWidth];
+        return [nColumns, usedWidth, spacing];
     },
 
     _onStyleChanged: function() {
@@ -394,56 +366,15 @@ const IconGrid = new Lang.Class({
         this._grid.queue_relayout();
     },
 
-    nRows: function(forWidth) {
-        let children = this._getVisibleChildren();
-        let nColumns = (forWidth < 0) ? children.length : this._computeLayout(forWidth)[0];
-        let nRows = (nColumns > 0) ? Math.ceil(children.length / nColumns) : 0;
-        if (this._rowLimit)
-            nRows = Math.min(nRows, this._rowLimit);
-        return nRows;
-    },
-
-    rowsForHeight: function(forHeight) {
-        return Math.floor((forHeight - (this.topPadding + this.bottomPadding) + this._getSpacing()) / (this._getVItemSize() + this._getSpacing()));
-    },
-
-    usedHeightForNRows: function(nRows) {
-        return (this._getVItemSize() + this._getSpacing()) * nRows - this._getSpacing() + this.topPadding + this.bottomPadding;
-    },
-
-    usedWidth: function(forWidth) {
-        return this.usedWidthForNColumns(this.columnsForWidth(forWidth));
-    },
-
-    usedWidthForNColumns: function(columns) {
-        let usedWidth = columns  * (this._getHItemSize() + this._getSpacing());
-        usedWidth -= this._getSpacing();
-        return usedWidth + this.leftPadding + this.rightPadding;
-    },
-
     removeAll: function() {
-        this._items = [];
-        this._grid.remove_all_children();
-    },
-
-    destroyAll: function() {
-        this._items = [];
         this._grid.destroy_all_children();
     },
 
-    addItem: function(item, index) {
-        if (!item.icon instanceof BaseIcon)
-            throw new Error('Only items with a BaseIcon icon property can be added to IconGrid');
-
-        this._items.push(item);
+    addItem: function(actor, index) {
         if (index !== undefined)
-            this._grid.insert_child_at_index(item.actor, index);
+            this._grid.insert_child_at_index(actor, index);
         else
-            this._grid.add_actor(item.actor);
-    },
-
-    removeItem: function(item) {
-        this._grid.remove_child(item.actor);
+            this._grid.add_actor(actor);
     },
 
     getItemAtIndex: function(index) {
@@ -452,316 +383,5 @@ const IconGrid = new Lang.Class({
 
     visibleItemsCount: function() {
         return this._grid.get_n_children() - this._grid.get_n_skip_paint();
-    },
-
-    setSpacing: function(spacing) {
-        this._fixedSpacing = spacing;
-    },
-
-    _getSpacing: function() {
-        return this._fixedSpacing ? this._fixedSpacing : this._spacing;
-    },
-
-    _getHItemSize: function() {
-        return this._fixedHItemSize ? this._fixedHItemSize : this._hItemSize;
-    },
-
-    _getVItemSize: function() {
-        return this._fixedVItemSize ? this._fixedVItemSize : this._vItemSize;
-    },
-
-    _updateSpacingForSize: function(availWidth, availHeight) {
-        let maxEmptyVArea = availHeight - this._minRows * this._getVItemSize();
-        let maxEmptyHArea = availWidth - this._minColumns * this._getHItemSize();
-        let maxHSpacing, maxVSpacing;
-
-        if (this._padWithSpacing) {
-            // minRows + 1 because we want to put spacing before the first row, so it is like we have one more row
-            // to divide the empty space
-            maxVSpacing = Math.floor(maxEmptyVArea / (this._minRows +1));
-            maxHSpacing = Math.floor(maxEmptyHArea / (this._minColumns +1));
-        } else {
-            if (this._minRows <=  1)
-                maxVSpacing = maxEmptyVArea;
-            else
-                maxVSpacing = Math.floor(maxEmptyVArea / (this._minRows - 1));
-
-            if (this._minColumns <=  1)
-                maxHSpacing = maxEmptyHArea;
-            else
-                maxHSpacing = Math.floor(maxEmptyHArea / (this._minColumns - 1));
-        }
-
-        let maxSpacing = Math.min(maxHSpacing, maxVSpacing);
-        // Limit spacing to the item size
-        maxSpacing = Math.min(maxSpacing, Math.min(this._getVItemSize(), this._getHItemSize()));
-        // The minimum spacing, regardless of whether it satisfies the row/columng minima,
-        // is the spacing we get from CSS.
-        let spacing = Math.max(this._spacing, maxSpacing);
-        this.setSpacing(spacing);
-        if (this._padWithSpacing)
-            this.topPadding = this.rightPadding = this.bottomPadding = this.leftPadding = spacing;
-    },
-
-    /**
-     * This function must to be called before iconGrid allocation,
-     * to know how much spacing can the grid has
-     */
-    adaptToSize: function(availWidth, availHeight) {
-        this._fixedHItemSize = this._hItemSize;
-        this._fixedVItemSize = this._vItemSize;
-        this._updateSpacingForSize(availWidth, availHeight);
-        let spacing = this._getSpacing();
-
-        if (this.columnsForWidth(availWidth) < this._minColumns || this.rowsForHeight(availHeight) < this._minRows) {
-            let neededWidth = this.usedWidthForNColumns(this._minColumns) - availWidth ;
-            let neededHeight = this.usedHeightForNRows(this._minRows) - availHeight ;
-
-            let neededSpacePerItem = (neededWidth > neededHeight) ? Math.ceil(neededWidth / this._minColumns)
-                                                                  : Math.ceil(neededHeight / this._minRows);
-            this._fixedHItemSize = Math.max(this._hItemSize - neededSpacePerItem, MIN_ICON_SIZE);
-            this._fixedVItemSize = Math.max(this._vItemSize - neededSpacePerItem, MIN_ICON_SIZE);
-
-            if (this._fixedHItemSize < MIN_ICON_SIZE)
-                this._fixedHItemSize = MIN_ICON_SIZE;
-            if (this._fixedVItemSize < MIN_ICON_SIZE)
-                this._fixedVItemSize = MIN_ICON_SIZE;
-
-            this._updateSpacingForSize(availWidth, availHeight);
-        }
-        let scale = Math.min(this._fixedHItemSize, this._fixedVItemSize) / Math.max(this._hItemSize, this._vItemSize);
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() { this._updateChildrenScale(scale); }));
-    },
-
-    // Note that this is ICON_SIZE as used by BaseIcon, not elsewhere in IconGrid; it's a bit messed up
-    _updateChildrenScale: function(scale) {
-        for (let i in this._items) {
-            let newIconSize = Math.floor(ICON_SIZE * scale);
-            this._items[i].icon.setIconSize(newIconSize);
-        }
     }
 });
-Signals.addSignalMethods(IconGrid.prototype);
-
-const PaginatedIconGrid = new Lang.Class({
-    Name: 'PaginatedIconGrid',
-    Extends: IconGrid,
-
-    _init: function(params) {
-        this.parent(params);
-        this._nPages = 0;
-        this._rowsPerPage = 0;
-        this._spaceBetweenPages = 0;
-        this._childrenPerPage = 0;
-    },
-
-    _getPreferredHeight: function (grid, forWidth, alloc) {
-        alloc.min_size = (this._availableHeightPerPageForItems() + this.bottomPadding + this.topPadding) * this._nPages + this._spaceBetweenPages * this._nPages;
-        alloc.natural_size = (this._availableHeightPerPageForItems() + this.bottomPadding + this.topPadding) * this._nPages + this._spaceBetweenPages * this._nPages;
-    },
-
-    _allocate: function (grid, box, flags) {
-         if (this._childrenPerPage == 0)
-            log('computePages() must be called before allocate(); pagination will not work.');
-
-        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 spacing = this._getSpacing();
-        let [nColumns, usedWidth] = this._computeLayout(availWidth);
-
-        let leftEmptySpace;
-        switch(this._xAlign) {
-            case St.Align.START:
-                leftEmptySpace = 0;
-                break;
-            case St.Align.MIDDLE:
-                leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
-                break;
-            case St.Align.END:
-                leftEmptySpace = availWidth - usedWidth;
-        }
-
-        let x = box.x1 + leftEmptySpace + this.leftPadding;
-        let y = box.y1 + this.topPadding;
-        let columnIndex = 0;
-        let rowIndex = 0;
-
-        for (let i = 0; i < children.length; i++) {
-            let childBox = this._calculateChildBox(children[i], x, y, box);
-            children[i].allocate(childBox, flags);
-            this._grid.set_skip_paint(children[i], false);
-
-            columnIndex++;
-            if (columnIndex == nColumns) {
-                columnIndex = 0;
-                rowIndex++;
-            }
-            if (columnIndex == 0) {
-                y += this._getVItemSize() + spacing;
-                if ((i + 1) % this._childrenPerPage == 0)
-                    y +=  this._spaceBetweenPages - spacing + this.bottomPadding + this.topPadding;
-                x = box.x1 + leftEmptySpace + this.leftPadding;
-            } else
-                x += this._getHItemSize() + spacing;
-        }
-    },
-
-    _computePages: function (availWidthPerPage, availHeightPerPage) {
-        let [nColumns, usedWidth] = this._computeLayout(availWidthPerPage);
-        let nRows;
-        let children = this._getVisibleChildren();
-        if (nColumns > 0)
-            nRows = Math.ceil(children.length / nColumns);
-        else
-            nRows = 0;
-        if (this._rowLimit)
-            nRows = Math.min(nRows, this._rowLimit);
-
-        let spacing = this._getSpacing();
-        // We want to contain the grid inside the parent box with padding
-        this._rowsPerPage = this.rowsForHeight(availHeightPerPage);
-        this._nPages = Math.ceil(nRows / this._rowsPerPage);
-        this._spaceBetweenPages = availHeightPerPage - (this.topPadding + this.bottomPadding) - this._availableHeightPerPageForItems();
-        this._childrenPerPage = nColumns * this._rowsPerPage;
-    },
-
-    adaptToSize: function(availWidth, availHeight) {
-        this.parent(availWidth, availHeight);
-        this._computePages(availWidth, availHeight);
-    },
-
-    _availableHeightPerPageForItems: function() {
-        return this.usedHeightForNRows(this._rowsPerPage) - (this.topPadding + this.bottomPadding);
-    },
-
-    nPages: function() {
-        return this._nPages;
-    },
-
-    getPageHeight: function() {
-        return this._availableHeightPerPageForItems();
-    },
-
-    getPageY: function(pageNumber) {
-        if (!this._nPages)
-            return 0;
-
-        let firstPageItem = pageNumber * this._childrenPerPage
-        let childBox = this._getVisibleChildren()[firstPageItem].get_allocation_box();
-        return childBox.y1 - this.topPadding;
-    },
-
-    getItemPage: function(item) {
-        let children = this._getVisibleChildren();
-        let index = children.indexOf(item);
-        if (index == -1) {
-            throw new Error('Item not found.');
-            return 0;
-        }
-        return Math.floor(index / this._childrenPerPage);
-    },
-
-    /**
-    * openExtraSpace:
-    * @sourceItem: the item for which to create extra space
-    * @side: where @sourceItem should be located relative to the created space
-    * @nRows: the amount of space to create
-    *
-    * Pan view to create extra space for @nRows above or below @sourceItem.
-    */
-    openExtraSpace: function(sourceItem, side, nRows) {
-        let children = this._getVisibleChildren();
-        let index = children.indexOf(sourceItem.actor);
-        if (index == -1) {
-            throw new Error('Item not found.');
-            return;
-        }
-        let pageIndex = Math.floor(index / this._childrenPerPage);
-        let pageOffset = pageIndex * this._childrenPerPage;
-
-        let childrenPerRow = this._childrenPerPage / this._rowsPerPage;
-        let sourceRow = Math.floor((index - pageOffset) / childrenPerRow);
-
-        let nRowsAbove = (side == St.Side.TOP) ? sourceRow + 1
-                                               : sourceRow;
-        let nRowsBelow = this._rowsPerPage - nRowsAbove;
-
-        let nRowsUp, nRowsDown;
-        if (side == St.Side.TOP) {
-            nRowsDown = Math.min(nRowsBelow, nRows);
-            nRowsUp = nRows - nRowsDown;
-        } else {
-            nRowsUp = Math.min(nRowsAbove, nRows);
-            nRowsDown = nRows - nRowsUp;
-        }
-
-        let childrenDown = children.splice(pageOffset +
-                                           nRowsAbove * childrenPerRow,
-                                           nRowsBelow * childrenPerRow);
-        let childrenUp = children.splice(pageOffset,
-                                         nRowsAbove * childrenPerRow);
-
-        // Special case: On the last row with no rows below the icon,
-        // there's no need to move any rows either up or down
-        if (childrenDown.length == 0 && nRowsUp == 0) {
-            this._translatedChildren = [];
-            this.emit('space-opened');
-        } else {
-            this._translateChildren(childrenUp, Gtk.DirectionType.UP, nRowsUp);
-            this._translateChildren(childrenDown, Gtk.DirectionType.DOWN, nRowsDown);
-            this._translatedChildren = childrenUp.concat(childrenDown);
-        }
-    },
-
-    _translateChildren: function(children, direction, nRows) {
-        let translationY = nRows * (this._getVItemSize() + this._getSpacing());
-        if (translationY == 0)
-            return;
-
-        if (direction == Gtk.DirectionType.UP)
-            translationY *= -1;
-
-        for (let i = 0; i < children.length; i++) {
-            children[i].translation_y = 0;
-            let params = { translation_y: translationY,
-                           time: EXTRA_SPACE_ANIMATION_TIME,
-                           transition: 'easeInOutQuad'
-                         };
-            if (i == (children.length - 1))
-                params.onComplete = Lang.bind(this,
-                    function() {
-                        this.emit('space-opened');
-                    });
-            Tweener.addTween(children[i], params);
-        }
-    },
-
-    closeExtraSpace: function() {
-        if (!this._translatedChildren || !this._translatedChildren.length) {
-            this.emit('space-closed');
-            return;
-        }
-
-        for (let i = 0; i < this._translatedChildren.length; i++) {
-            if (!this._translatedChildren[i].translation_y)
-                continue;
-            Tweener.addTween(this._translatedChildren[i],
-                             { translation_y: 0,
-                               time: EXTRA_SPACE_ANIMATION_TIME,
-                               transition: 'easeInOutQuad',
-                               onComplete: Lang.bind(this,
-                                   function() {
-                                       this.emit('space-closed');
-                                   })
-                             });
-        }
-    }
-});
-Signals.addSignalMethods(PaginatedIconGrid.prototype);

js/ui/keyboard.js

@@ -23,29 +23,27 @@ const KEYBOARD_TYPE = 'keyboard-type';
 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';
 
-const CaribouKeyboardIface = '<node> \
-<interface name="org.gnome.Caribou.Keyboard"> \
-<method name="Show"> \
-    <arg type="u" direction="in" /> \
-</method> \
-<method name="Hide"> \
-    <arg type="u" direction="in" /> \
-</method> \
-<method name="SetCursorLocation"> \
-    <arg type="i" direction="in" /> \
-    <arg type="i" direction="in" /> \
-    <arg type="i" direction="in" /> \
-    <arg type="i" direction="in" /> \
-</method> \
-<method name="SetEntryLocation"> \
-    <arg type="i" direction="in" /> \
-    <arg type="i" direction="in" /> \
-    <arg type="i" direction="in" /> \
-    <arg type="i" direction="in" /> \
-</method> \
-<property name="Name" access="read" type="s" /> \
-</interface> \
-</node>';
+const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
+<method name='Show'>
+    <arg type='u' direction='in' />
+</method>
+<method name='Hide'>
+    <arg type='u' direction='in' />
+</method>
+<method name='SetCursorLocation'>
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+</method>
+<method name='SetEntryLocation'>
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+    <arg type='i' direction='in' />
+</method>
+<property name='Name' access='read' type='s' />
+</interface>;
 
 const Key = new Lang.Class({
     Name: 'Key',
@@ -82,16 +80,8 @@ const Key = new Lang.Class({
                                       style_class: 'keyboard-key' });
 
         button.key_width = this._key.width;
-        button.connect('button-press-event', Lang.bind(this,
-            function () {
-                this._key.press();
-                return Clutter.EVENT_PROPAGATE;
-            }));
-        button.connect('button-release-event', Lang.bind(this,
-            function () {
-                this._key.release();
-                return Clutter.EVENT_PROPAGATE;
-            }));
+        button.connect('button-press-event', Lang.bind(this, function () { this._key.press(); }));
+        button.connect('button-release-event', Lang.bind(this, function () { this._key.release(); }));
 
         return button;
     },
@@ -114,16 +104,8 @@ const Key = new Lang.Class({
             let label = this._getUnichar(extended_key);
             let key = new St.Button({ label: label, style_class: 'keyboard-key' });
             key.extended_key = extended_key;
-            key.connect('button-press-event', Lang.bind(this,
-                function () {
-                    extended_key.press();
-                    return Clutter.EVENT_PROPAGATE;
-                }));
-            key.connect('button-release-event', Lang.bind(this,
-                function () {
-                    extended_key.release();
-                    return Clutter.EVENT_PROPAGATE;
-                }));
+            key.connect('button-press-event', Lang.bind(this, function () { extended_key.press(); }));
+            key.connect('button-release-event', Lang.bind(this, function () { extended_key.release(); }));
             this._extended_keyboard.add(key);
         }
         this._boxPointer.bin.add_actor(this._extended_keyboard);
@@ -266,14 +248,9 @@ const Keyboard = new Lang.Class({
             return;
         }
 
-        if (!this._showIdleId) {
-          this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE,
-                                           Lang.bind(this, function() {
-                                               this.Show(time);
-                                               return GLib.SOURCE_REMOVE;
-                                           }));
-          GLib.Source.set_name_by_id(this._showIdleId, '[gnome-shell] this.Show');
-        }
+        if (!this._showIdleId)
+            this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE,
+                                             Lang.bind(this, function() { this.Show(time); }));
     },
 
     _createLayersForGroup: function (gname) {
@@ -315,7 +292,7 @@ const Keyboard = new Lang.Class({
         else if (release && this._capturedPress)
             this._hideSubkeys();
 
-        return Clutter.EVENT_STOP;
+        return true;
     },
 
     _addRows : function (keys, layout) {
@@ -459,6 +436,7 @@ const Keyboard = new Lang.Class({
     _createSource: function () {
         if (this._source == null) {
             this._source = new KeyboardSource(this);
+            this._source.setTransient(true);
             Main.messageTray.add(this._source);
         }
     },
@@ -500,9 +478,7 @@ const Keyboard = new Lang.Class({
                                                    Lang.bind(this, function() {
                                                        this._clearKeyboardRestTimer();
                                                        this._show(monitor);
-                                                       return GLib.SOURCE_REMOVE;
                                                    }));
-        GLib.Source.set_name_by_id(this._keyboardRestingId, '[gnome-shell] this._clearKeyboardRestTimer');
     },
 
     _show: function(monitor) {
@@ -527,9 +503,7 @@ const Keyboard = new Lang.Class({
                                                    Lang.bind(this, function() {
                                                        this._clearKeyboardRestTimer();
                                                        this._hide();
-                                                       return GLib.SOURCE_REMOVE;
                                                    }));
-        GLib.Source.set_name_by_id(this._keyboardRestingId, '[gnome-shell] this._clearKeyboardRestTimer');
     },
 
     _hide: function() {

js/ui/layout.js

@@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
@@ -212,21 +213,12 @@ const LayoutManager = new Lang.Class({
         this.addChrome(this.trayBox);
         this._setupTrayPressure();
 
-        this.modalDialogGroup = new St.Widget({ name: 'modalDialogGroup',
-                                                layout_manager: new Clutter.BinLayout() });
-        this.uiGroup.add_actor(this.modalDialogGroup);
-
         this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
                                               reactive: true,
                                               track_hover: true });
         this.addChrome(this.keyboardBox);
         this._keyboardHeightNotifyId = 0;
 
-        // A dummy actor that tracks the mouse or text cursor, based on the
-        // position and size set in setDummyCursorGeometry.
-        this.dummyCursor = new St.Widget({ width: 0, height: 0 });
-        this.uiGroup.add_actor(this.dummyCursor);
-
         global.stage.remove_actor(global.top_window_group);
         this.uiGroup.add_actor(global.top_window_group);
 
@@ -235,6 +227,11 @@ const LayoutManager = new Lang.Class({
         this._backgroundGroup.lower_bottom();
         this._bgManagers = [];
 
+        // This blocks the XDND picks from finding the activities button
+        // and we never attempt to pick anything from it anyway so make
+        // it invisible from picks
+        Shell.util_set_hidden_from_pick(global.top_window_group, true);
+
         // Need to update struts on new workspaces when they are added
         global.screen.connect('notify::n-workspaces',
                               Lang.bind(this, this._queueUpdateRegions));
@@ -259,7 +256,7 @@ const LayoutManager = new Lang.Class({
 
         this._inOverview = true;
         this._updateVisibility();
-        this._updateRegions();
+        this._queueUpdateRegions();
     },
 
     hideOverview: function() {
@@ -360,26 +357,26 @@ const LayoutManager = new Lang.Class({
         this.emit('hot-corners-changed');
     },
 
-    _addBackgroundMenu: function(bgManager) {
-        BackgroundMenu.addBackgroundMenu(bgManager.background.actor, this);
-    },
-
-    _createBackgroundManager: function(monitorIndex) {
+    _createBackground: function(monitorIndex) {
         let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup,
                                                            layoutManager: this,
                                                            monitorIndex: monitorIndex });
+        BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
 
-        bgManager.connect('changed', Lang.bind(this, this._addBackgroundMenu));
-        this._addBackgroundMenu(bgManager);
+        bgManager.connect('changed', Lang.bind(this, function() {
+                              BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
+                          }));
 
-        return bgManager;
+        this._bgManagers.push(bgManager);
+
+        return bgManager.background;
     },
 
-    _showSecondaryBackgrounds: function() {
+    _createSecondaryBackgrounds: function() {
         for (let i = 0; i < this.monitors.length; i++) {
             if (i != this.primaryIndex) {
-                let background = this._bgManagers[i].background;
-                background.actor.show();
+                let background = this._createBackground(i);
+
                 background.actor.opacity = 0;
                 Tweener.addTween(background.actor,
                                  { opacity: 255,
@@ -389,6 +386,10 @@ const LayoutManager = new Lang.Class({
         }
     },
 
+    _createPrimaryBackground: function() {
+        this._createBackground(this.primaryIndex);
+    },
+
     _updateBackgrounds: function() {
         let i;
         for (i = 0; i < this._bgManagers.length; i++)
@@ -399,12 +400,11 @@ const LayoutManager = new Lang.Class({
         if (Main.sessionMode.isGreeter)
             return;
 
-        for (let i = 0; i < this.monitors.length; i++) {
-            let bgManager = this._createBackgroundManager(i);
-            this._bgManagers.push(bgManager);
+        if (this._startingUp)
+            return;
 
-            if (i != this.primaryIndex && this._startingUp)
-                bgManager.background.actor.hide();
+        for (let i = 0; i < this.monitors.length; i++) {
+            this._createBackground(i);
         }
     },
 
@@ -528,10 +528,17 @@ const LayoutManager = new Lang.Class({
     get focusIndex() {
         let i = Main.layoutManager.primaryIndex;
 
-        if (global.stage.key_focus != null)
-            i = this.findIndexForActor(global.stage.key_focus);
-        else if (global.display.focus_window != null)
-            i = global.display.focus_window.get_monitor();
+        if (global.stage_input_mode == Shell.StageInputMode.FOCUSED ||
+            global.stage_input_mode == Shell.StageInputMode.FULLSCREEN) {
+            let focusActor = global.stage.key_focus;
+            if (focusActor)
+                i = this.findIndexForActor(focusActor);
+        } else {
+            let focusWindow = global.display.focus_window;
+            if (focusWindow)
+                i = focusWindow.get_monitor();
+        }
+
         return i;
     },
 
@@ -589,21 +596,15 @@ const LayoutManager = new Lang.Class({
     // screen. So, we set no_clear_hint at the end of the animation.
 
     _prepareStartupAnimation: function() {
-        // During the initial transition, add a simple actor to block all events,
-        // so they don't get delivered to X11 windows that have been transformed.
-        this._coverPane = new Clutter.Actor({ opacity: 0,
-                                              width: global.screen_width,
-                                              height: global.screen_height,
-                                              reactive: true });
-        this.addChrome(this._coverPane);
+        // Set ourselves to FULLSCREEN input mode while the animation is running
+        // so events don't get delivered to X11 windows (which are distorted by the animation)
+        global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
 
         if (Main.sessionMode.isGreeter) {
             this.panelBox.translation_y = -this.panelBox.height;
         } else {
-            this._updateBackgrounds();
-
             // We need to force an update of the regions now before we scale
-            // the UI group to get the correct allocation for the struts.
+            // the UI group to get the coorect allocation for the struts.
             this._updateRegions();
 
             this.trayBox.hide();
@@ -615,7 +616,7 @@ const LayoutManager = new Lang.Class({
 
             this.uiGroup.set_pivot_point(x / global.screen_width,
                                          y / global.screen_height);
-            this.uiGroup.scale_x = this.uiGroup.scale_y = 0.75;
+            this.uiGroup.scale_x = this.uiGroup.scale_y = 0.5;
             this.uiGroup.opacity = 0;
             global.window_group.set_clip(monitor.x, monitor.y, monitor.width, monitor.height);
         }
@@ -628,11 +629,10 @@ const LayoutManager = new Lang.Class({
         // until the event loop is uncontended and idle.
         // This helps to prevent us from running the animation
         // when the system is bogged down
-        let id = GLib.idle_add(GLib.PRIORITY_LOW, Lang.bind(this, function() {
+        GLib.idle_add(GLib.PRIORITY_LOW, Lang.bind(this, function() {
             this._startupAnimation();
-            return GLib.SOURCE_REMOVE;
+            return false;
         }));
-        GLib.Source.set_name_by_id(id, '[gnome-shell] this._startupAnimation');
     },
 
     _startupAnimation: function() {
@@ -652,6 +652,7 @@ const LayoutManager = new Lang.Class({
     },
 
     _startupAnimationSession: function() {
+        this._createPrimaryBackground();
         Tweener.addTween(this.uiGroup,
                          { scale_x: 1,
                            scale_y: 1,
@@ -667,8 +668,7 @@ const LayoutManager = new Lang.Class({
         // we no longer need to clear the stage
         global.stage.no_clear_hint = true;
 
-        this._coverPane.destroy();
-        this._coverPane = null;
+        global.stage_input_mode = Shell.StageInputMode.NORMAL;
 
         this._systemBackground.actor.destroy();
         this._systemBackground = null;
@@ -679,7 +679,7 @@ const LayoutManager = new Lang.Class({
         this.keyboardBox.show();
 
         if (!Main.sessionMode.isGreeter) {
-            this._showSecondaryBackgrounds();
+            this._createSecondaryBackgrounds();
             global.window_group.remove_clip();
         }
 
@@ -729,21 +729,6 @@ const LayoutManager = new Lang.Class({
         this._updateRegions();
     },
 
-    // setDummyCursorGeometry:
-    //
-    // The cursor dummy is a standard widget commonly used for popup
-    // menus and box pointers to track, as the box pointer API only
-    // tracks actors. If you want to pop up a menu based on where the
-    // user clicked, or where the text cursor is, the cursor dummy
-    // is what you should use. Given that the menu should not track
-    // the actual mouse pointer as it moves, you need to call this
-    // function before you show the menu to ensure it is at the right
-    // position and has the right size.
-    setDummyCursorGeometry: function(x, y, w, h) {
-        this.dummyCursor.set_position(Math.round(x), Math.round(y));
-        this.dummyCursor.set_size(Math.round(w), Math.round(h));
-    },
-
     // addChrome:
     // @actor: an actor to add to the chrome
     // @params: (optional) additional params
@@ -764,8 +749,6 @@ const LayoutManager = new Lang.Class({
     // and shown otherwise)
     addChrome: function(actor, params) {
         this.uiGroup.add_actor(actor);
-        if (this.uiGroup.contains(global.top_window_group))
-            this.uiGroup.set_child_below_sibling(actor, global.top_window_group);
         this._trackActor(actor, params);
     },
 
@@ -835,12 +818,13 @@ const LayoutManager = new Lang.Class({
 
         let actorData = Params.parse(params, defaultParams);
         actorData.actor = actor;
+        actorData.isToplevel = actor.get_parent() == this.uiGroup;
         actorData.visibleId = actor.connect('notify::visible',
                                             Lang.bind(this, this._queueUpdateRegions));
         actorData.allocationId = actor.connect('notify::allocation',
                                                Lang.bind(this, this._queueUpdateRegions));
-        actorData.destroyId = actor.connect('destroy',
-                                            Lang.bind(this, this._untrackActor));
+        actorData.parentSetId = actor.connect('parent-set',
+                                              Lang.bind(this, this._actorReparented));
         // Note that destroying actor will unset its parent, so we don't
         // need to connect to 'destroy' too.
 
@@ -858,11 +842,22 @@ const LayoutManager = new Lang.Class({
         this._trackedActors.splice(i, 1);
         actor.disconnect(actorData.visibleId);
         actor.disconnect(actorData.allocationId);
-        actor.disconnect(actorData.destroyId);
+        actor.disconnect(actorData.parentSetId);
 
         this._queueUpdateRegions();
     },
 
+    _actorReparented: function(actor, oldParent) {
+        let newParent = actor.get_parent();
+        if (!newParent) {
+            this._untrackActor(actor);
+        } else {
+            let i = this._findActor(actor);
+            let actorData = this._trackedActors[i];
+            actorData.isToplevel = (newParent == this.uiGroup);
+        }
+    },
+
     _updateVisibility: function() {
         let windowsVisible = Main.sessionMode.hasWindows && !this._inOverview;
 
@@ -873,6 +868,8 @@ const LayoutManager = new Lang.Class({
             let actorData = this._trackedActors[i], visible;
             if (!actorData.trackFullscreen)
                 continue;
+            if (!actorData.isToplevel)
+                continue;
 
             if (!windowsVisible)
                 visible = true;
@@ -912,8 +909,8 @@ const LayoutManager = new Lang.Class({
             return;
 
         if (!this._updateRegionIdle)
-            this._updateRegionIdle = Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                                                    Lang.bind(this, this._updateRegions));
+            this._updateRegionIdle = Mainloop.idle_add(Lang.bind(this, this._updateRegions),
+                                                       Meta.PRIORITY_BEFORE_REDRAW);
     },
 
     _getWindowActorsForWorkspace: function(workspace) {
@@ -944,7 +941,7 @@ const LayoutManager = new Lang.Class({
         let rects = [], struts = [], i;
 
         if (this._updateRegionIdle) {
-            Meta.later_remove(this._updateRegionIdle);
+            Mainloop.source_remove(this._updateRegionIdle);
             delete this._updateRegionIdle;
         }
 
@@ -1018,39 +1015,19 @@ const LayoutManager = new Lang.Class({
                     continue;
 
                 // Ensure that the strut rects goes all the way to the screen edge,
-                // as this really what mutter expects. However skip this step
-                // in cases where this would render an entire monitor unusable.
+                // as this really what mutter expects.
                 switch (side) {
                 case Meta.Side.TOP:
-                    let hasMonitorsAbove = this.monitors.some(Lang.bind(this,
-                        function(mon) {
-                            return this._isAboveOrBelowPrimary(mon) &&
-                                   mon.y < primary.y;
-                        }));
-                    if (!hasMonitorsAbove)
-                        y1 = 0;
+                    y1 = 0;
                     break;
                 case Meta.Side.BOTTOM:
-                    if (this.primaryIndex == this.bottomIndex)
-                        y2 = global.screen_height;
+                    y2 = global.screen_height;
                     break;
                 case Meta.Side.LEFT:
-                    let hasMonitorsLeft = this.monitors.some(Lang.bind(this,
-                        function(mon) {
-                            return !this._isAboveOrBelowPrimary(mon) &&
-                                   mon.x < primary.x;
-                        }));
-                    if (!hasMonitorsLeft)
-                        x1 = 0;
+                    x1 = 0;
                     break;
                 case Meta.Side.RIGHT:
-                    let hasMonitorsRight = this.monitors.some(Lang.bind(this,
-                        function(mon) {
-                            return !this._isAboveOrBelowPrimary(mon) &&
-                                   mon.x > primary.x;
-                        }));
-                    if (!hasMonitorsRight)
-                        x2 = global.screen_width;
+                    x2 = global.screen_width;
                     break;
                 }
 
@@ -1069,7 +1046,7 @@ const LayoutManager = new Lang.Class({
             workspace.set_builtin_struts(struts);
         }
 
-        return GLib.SOURCE_REMOVE;
+        return false;
     }
 });
 Signals.addSignalMethods(LayoutManager.prototype);
@@ -1256,20 +1233,20 @@ const HotCorner = new Lang.Class({
             this._entered = true;
             this._toggleOverview();
         }
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     },
 
     _onCornerLeft : function(actor, event) {
         if (event.get_related() != this.actor)
             this._entered = false;
         // Consume event, otherwise this will confuse onEnvironsLeft
-        return Clutter.EVENT_STOP;
+        return true;
     },
 
     _onEnvironsLeft : function(actor, event) {
         if (event.get_related() != this._corner)
             this._entered = false;
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     }
 });
 

js/ui/lightbox.js

@@ -5,67 +5,11 @@ const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
 const DEFAULT_FADE_FACTOR = 0.4;
-const VIGNETTE_BRIGHTNESS = 0.8;
-const VIGNETTE_SHARPNESS = 0.7;
-
-const VIGNETTE_DECLARATIONS = '\
-uniform float brightness;\n\
-uniform float vignette_sharpness;\n';
-
-const VIGNETTE_CODE = '\
-cogl_color_out.a = cogl_color_in.a;\n\
-cogl_color_out.rgb = vec3(0.0, 0.0, 0.0);\n\
-vec2 position = cogl_tex_coord_in[0].xy - 0.5;\n\
-float t = length(2.0 * position);\n\
-t = clamp(t, 0.0, 1.0);\n\
-float pixel_brightness = mix(1.0, 1.0 - vignette_sharpness, t);\n\
-cogl_color_out.a = cogl_color_out.a * (1 - pixel_brightness * brightness);';
-
-const RadialShaderQuad = new Lang.Class({
-    Name: 'RadialShaderQuad',
-    Extends: Shell.GLSLQuad,
-
-    _init: function(params) {
-        this.parent(params);
-
-        this._brightnessLocation = this.get_uniform_location('brightness');
-        this._sharpnessLocation = this.get_uniform_location('vignette_sharpness');
-
-        this.brightness = 1.0;
-        this.vignetteSharpness = 0.0;
-    },
-
-    vfunc_build_pipeline: function() {
-        this.add_glsl_snippet(Shell.SnippetHook.FRAGMENT,
-                              VIGNETTE_DECLARATIONS, VIGNETTE_CODE, true);
-    },
-
-    get brightness() {
-        return this._brightness;
-    },
-
-    set brightness(v) {
-        this._brightness = v;
-        this.set_uniform_float(this._brightnessLocation,
-                               1, [this._brightness]);
-    },
-
-    get vignetteSharpness() {
-        return this._sharpness;
-    },
-
-    set vignetteSharpness(v) {
-        this._sharpness = v;
-        this.set_uniform_float(this._sharpnessLocation,
-                               1, [this._sharpness]);
-    }
-});
 
 /**
  * Lightbox:
@@ -98,24 +42,20 @@ const Lightbox = new Lang.Class({
         params = Params.parse(params, { inhibitEvents: false,
                                         width: null,
                                         height: null,
-                                        fadeFactor: DEFAULT_FADE_FACTOR,
-                                        radialEffect: false,
+                                        fadeInTime: null,
+                                        fadeOutTime: null,
+                                        fadeFactor: DEFAULT_FADE_FACTOR
                                       });
 
         this._container = container;
         this._children = container.get_children();
+        this._fadeInTime = params.fadeInTime;
+        this._fadeOutTime = params.fadeOutTime;
         this._fadeFactor = params.fadeFactor;
-        this._radialEffect = params.radialEffect;
-        if (params.radialEffect)
-            this.actor = new RadialShaderQuad({ x: 0,
-                                                y: 0,
-                                                reactive: params.inhibitEvents });
-        else
-            this.actor = new St.Bin({ x: 0,
-                                      y: 0,
-                                      opacity: 0,
-                                      style_class: 'lightbox',
-                                      reactive: params.inhibitEvents });
+        this.actor = new St.Bin({ x: 0,
+                                  y: 0,
+                                  style_class: 'lightbox',
+                                  reactive: params.inhibitEvents });
 
         container.add_actor(this.actor);
         this.actor.raise_top();
@@ -161,15 +101,14 @@ const Lightbox = new Lang.Class({
         }
     },
 
-    show: function(fadeInTime) {
-        fadeInTime = fadeInTime || 0;
-
+    show: function() {
         Tweener.removeTweens(this.actor);
-        if (this._radialEffect) {
+        if (this._fadeInTime) {
+            this.shown = false;
+            this.actor.opacity = 0;
             Tweener.addTween(this.actor,
-                             { brightness: VIGNETTE_BRIGHTNESS,
-                               vignetteSharpness: VIGNETTE_SHARPNESS,
-                               time: fadeInTime,
+                             { opacity: 255 * this._fadeFactor,
+                               time: this._fadeInTime,
                                transition: 'easeOutQuad',
                                onComplete: Lang.bind(this, function() {
                                    this.shown = true;
@@ -177,45 +116,27 @@ const Lightbox = new Lang.Class({
                                })
                              });
         } else {
-            Tweener.addTween(this.actor,
-                             { opacity: 255 * this._fadeFactor,
-                               time: fadeInTime,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this, function() {
-                                   this.shown = true;
-                                   this.emit('shown');
-                               })
-                             });
+            this.actor.opacity = 255 * this._fadeFactor;
+            this.shown = true;
+            this.emit('shown');
         }
-
         this.actor.show();
     },
 
-    hide: function(fadeOutTime) {
-        fadeOutTime = fadeOutTime || 0;
-
+    hide: function() {
         this.shown = false;
         Tweener.removeTweens(this.actor);
-        if (this._radialEffect) {
+        if (this._fadeOutTime) {
             Tweener.addTween(this.actor,
-                             { brightness: 1.0,
-                               vignetteSharpness: 0.0,
-                               opacity: 0,
-                               time: fadeOutTime,
+                             { opacity: 0,
+                               time: this._fadeOutTime,
                                transition: 'easeOutQuad',
                                onComplete: Lang.bind(this, function() {
                                    this.actor.hide();
                                })
                              });
         } else {
-            Tweener.addTween(this.actor,
-                             { opacity: 0,
-                               time: fadeOutTime,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this, function() {
-                                   this.actor.hide();
-                               })
-                             });
+            this.actor.hide();
         }
     },
 

js/ui/lookingGlass.js

@@ -27,8 +27,6 @@ const CHEVRON = '>>> ';
 /* Imports...feel free to add here as needed */
 var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                     'const GLib = imports.gi.GLib; ' +
-                    'const GObject = imports.gi.GObject; ' +
-                    'const Gio = imports.gi.Gio; ' +
                     'const Gtk = imports.gi.Gtk; ' +
                     'const Mainloop = imports.mainloop; ' +
                     'const Meta = imports.gi.Meta; ' +
@@ -111,7 +109,6 @@ const AutoComplete = new Lang.Class({
             }
             this._lastTabTime = currTime;
         }
-        return Clutter.EVENT_PROPAGATE;
     },
 
     // Insert characters of text not already included in head at cursor position.  i.e., if text="abc" and head="a",
@@ -561,7 +558,7 @@ const Inspector = new Lang.Class({
     _onKeyPressEvent: function (actor, event) {
         if (event.get_key_symbol() == Clutter.Escape)
             this._close();
-        return Clutter.EVENT_STOP;
+        return true;
     },
 
     _onButtonPressEvent: function (actor, event) {
@@ -570,7 +567,7 @@ const Inspector = new Lang.Class({
             this.emit('target', this._target, stageX, stageY);
         }
         this._close();
-        return Clutter.EVENT_STOP;
+        return true;
     },
 
     _onScrollEvent: function (actor, event) {
@@ -604,12 +601,12 @@ const Inspector = new Lang.Class({
         default:
             break;
         }
-        return Clutter.EVENT_STOP;
+        return true;
     },
 
     _onMotionEvent: function (actor, event) {
         this._update(event);
-        return Clutter.EVENT_STOP;
+        return true;
     },
 
     _update: function(event) {
@@ -632,6 +629,55 @@ const Inspector = new Lang.Class({
 
 Signals.addSignalMethods(Inspector.prototype);
 
+const Memory = new Lang.Class({
+    Name: 'Memory',
+
+    _init: function() {
+        this.actor = new St.BoxLayout({ vertical: true });
+        this._glibc_uordblks = new St.Label();
+        this.actor.add(this._glibc_uordblks);
+
+        this._js_bytes = new St.Label();
+        this.actor.add(this._js_bytes);
+
+        this._gjs_boxed = new St.Label();
+        this.actor.add(this._gjs_boxed);
+
+        this._gjs_gobject = new St.Label();
+        this.actor.add(this._gjs_gobject);
+
+        this._gjs_function = new St.Label();
+        this.actor.add(this._gjs_function);
+
+        this._gjs_closure = new St.Label();
+        this.actor.add(this._gjs_closure);
+
+        this._last_gc_seconds_ago = new St.Label();
+        this.actor.add(this._last_gc_seconds_ago);
+
+        this._gcbutton = new St.Button({ label: 'Full GC',
+                                         style_class: 'lg-obj-inspector-button' });
+        this._gcbutton.connect('clicked', Lang.bind(this, function () { System.gc(); this._renderText(); }));
+        this.actor.add(this._gcbutton, { x_align: St.Align.START,
+                                         x_fill: false });
+
+        this.actor.connect('notify::mapped', Lang.bind(this, this._renderText));
+    },
+
+    _renderText: function() {
+        if (!this.actor.mapped)
+            return;
+        let memInfo = global.get_memory_info();
+        this._glibc_uordblks.text = 'glibc_uordblks: ' + memInfo.glibc_uordblks;
+        this._js_bytes.text = 'js bytes: ' + memInfo.js_bytes;
+        this._gjs_boxed.text = 'gjs_boxed: ' + memInfo.gjs_boxed;
+        this._gjs_gobject.text = 'gjs_gobject: ' + memInfo.gjs_gobject;
+        this._gjs_function.text = 'gjs_function: ' + memInfo.gjs_function;
+        this._gjs_closure.text = 'gjs_closure: ' + memInfo.gjs_closure;
+        this._last_gc_seconds_ago.text = 'last_gc_seconds_ago: ' + memInfo.last_gc_seconds_ago;
+    }
+});
+
 const Extensions = new Lang.Class({
     Name: 'Extensions',
 
@@ -672,13 +718,13 @@ const Extensions = new Lang.Class({
     _onViewSource: function (actor) {
         let extension = actor._extension;
         let uri = extension.dir.get_uri();
-        Gio.app_info_launch_default_for_uri(uri, global.create_app_launch_context(0, -1));
+        Gio.app_info_launch_default_for_uri(uri, global.create_app_launch_context());
         this._lookingGlass.close();
     },
 
     _onWebPage: function (actor) {
         let extension = actor._extension;
-        Gio.app_info_launch_default_for_uri(extension.metadata.url, global.create_app_launch_context(0, -1));
+        Gio.app_info_launch_default_for_uri(extension.metadata.url, global.create_app_launch_context());
         this._lookingGlass.close();
     },
 
@@ -803,9 +849,8 @@ const LookingGlass = new Lang.Class({
         this._updateFont();
 
         // We want it to appear to slide out from underneath the panel
-        Main.uiGroup.add_actor(this.actor);
-        Main.uiGroup.set_child_below_sibling(this.actor,
-                                             Main.layoutManager.panelBox);
+        Main.layoutManager.panelBox.add_actor(this.actor);
+        this.actor.lower_bottom();
         Main.layoutManager.panelBox.connect('allocation-changed',
                                             Lang.bind(this, this._queueResize));
         Main.layoutManager.keyboardBox.connect('allocation-changed',
@@ -831,23 +876,7 @@ const LookingGlass = new Lang.Class({
                 global.stage.set_key_focus(this._entry);
             }));
             this.actor.hide();
-            return Clutter.EVENT_STOP;
-        }));
-
-        let gcIcon = new St.Icon({ icon_name: 'gnome-fs-trash-full',
-                                   icon_size: 24 });
-        toolbar.add_actor(gcIcon);
-        gcIcon.reactive = true;
-        gcIcon.connect('button-press-event', Lang.bind(this, function () {
-           gcIcon.icon_name = 'gnome-fs-trash-empty';
-           System.gc();
-           this._timeoutId = Mainloop.timeout_add(500, Lang.bind(this, function () {
-                gcIcon.icon_name = 'gnome-fs-trash-full';
-                this._timeoutId = 0;
-                return GLib.SOURCE_REMOVE;
-           }));
-           GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] gcIcon.icon_name = \'gnome-fs-trash-full\'');
-           return Clutter.EVENT_PROPAGATE;
+            return true;
         }));
 
         let notebook = new Notebook();
@@ -877,6 +906,9 @@ const LookingGlass = new Lang.Class({
         this._windowList = new WindowList(this);
         notebook.appendPage('Windows', this._windowList.actor);
 
+        this._memory = new Memory();
+        notebook.appendPage('Memory', this._memory.actor);
+
         this._extensions = new Extensions(this);
         notebook.appendPage('Extensions', this._extensions.actor);
 
@@ -887,7 +919,7 @@ const LookingGlass = new Lang.Class({
             let text = o.get_text();
             // Ensure we don't get newlines in the command; the history file is
             // newline-separated.
-            text = text.replace('\n', ' ');
+            text.replace('\n', ' ');
             // Strip leading and trailing whitespace
             text = text.replace(/^\s+/g, '').replace(/\s+$/g, '');
             if (text == '')
@@ -1039,15 +1071,15 @@ const LookingGlass = new Lang.Class({
         let myWidth = primary.width * 0.7;
         let availableHeight = primary.height - Main.layoutManager.keyboardBox.height;
         let myHeight = Math.min(primary.height * 0.7, availableHeight * 0.9);
-        this.actor.x = primary.x + (primary.width - myWidth) / 2;
-        this._hiddenY = primary.y + Main.layoutManager.panelBox.height - myHeight - 4; // -4 to hide the top corners
+        this.actor.x = (primary.width - myWidth) / 2;
+        this._hiddenY = this.actor.get_parent().height - myHeight - 4; // -4 to hide the top corners
         this._targetY = this._hiddenY + myHeight;
         this.actor.y = this._hiddenY;
         this.actor.width = myWidth;
         this.actor.height = myHeight;
         this._objInspector.actor.set_size(Math.floor(myWidth * 0.8), Math.floor(myHeight * 0.8));
-        this._objInspector.actor.set_position(this.actor.x + Math.floor(myWidth * 0.1),
-                                              this._targetY + Math.floor(myHeight * 0.1));
+        this._objInspector.actor.set_position(primary.x + this.actor.x + Math.floor(myWidth * 0.1),
+                                              primary.y + this._targetY + Math.floor(myHeight * 0.1));
     },
 
     insertObject: function(obj) {
@@ -1069,7 +1101,7 @@ const LookingGlass = new Lang.Class({
             } else {
                 this.close();
             }
-            return Clutter.EVENT_STOP;
+            return true;
         }
         // Ctrl+PgUp and Ctrl+PgDown switches tabs in the notebook view
         if (modifierState & Clutter.ModifierType.CONTROL_MASK) {
@@ -1079,7 +1111,7 @@ const LookingGlass = new Lang.Class({
                 this._notebook.nextTab();
             }
         }
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     },
 
     open : function() {
@@ -1117,7 +1149,7 @@ const LookingGlass = new Lang.Class({
 
         Main.popModal(this._entry);
 
-        Tweener.addTween(this.actor, { time: Math.min(0.5 / St.get_slow_down_factor(), 0.5),
+        Tweener.addTween(this.actor, { time: 0.5 / St.get_slow_down_factor(),
                                        transition: 'easeOutQuad',
                                        y: this._hiddenY,
                                        onComplete: Lang.bind(this, function () {

js/ui/magnifier.js

@@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Atspi = imports.gi.Atspi;
 const Clutter = imports.gi.Clutter;
 const GDesktopEnums = imports.gi.GDesktopEnums;
 const Gio = imports.gi.Gio;
@@ -8,11 +7,8 @@ const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 
-const Background = imports.ui.background;
-const FocusCaretTracker = imports.ui.focusCaretTracker;
 const Main = imports.ui.main;
 const MagnifierDBus = imports.ui.magnifierDBus;
 const Params = imports.misc.params;
@@ -40,8 +36,6 @@ const CONTRAST_BLUE_KEY         = 'contrast-blue';
 const LENS_MODE_KEY             = 'lens-mode';
 const CLAMP_MODE_KEY            = 'scroll-at-edges';
 const MOUSE_TRACKING_KEY        = 'mouse-tracking';
-const FOCUS_TRACKING_KEY        = 'focus-tracking';
-const CARET_TRACKING_KEY        = 'caret-tracking';
 const SHOW_CROSS_HAIRS_KEY      = 'show-cross-hairs';
 const CROSS_HAIRS_THICKNESS_KEY = 'cross-hairs-thickness';
 const CROSS_HAIRS_COLOR_KEY     = 'cross-hairs-color';
@@ -59,9 +53,9 @@ const Magnifier = new Lang.Class({
         this._zoomRegions = [];
 
         // Create small clutter tree for the magnified mouse.
-        let cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
+        let xfixesCursor = Shell.XFixesCursor.get_for_stage(global.stage);
         this._mouseSprite = new Clutter.Texture();
-        Shell.util_cursor_tracker_to_clutter(cursorTracker, this._mouseSprite);
+        xfixesCursor.update_texture_image(this._mouseSprite);
         this._cursorRoot = new Clutter.Actor();
         this._cursorRoot.add_actor(this._mouseSprite);
 
@@ -76,8 +70,8 @@ const Magnifier = new Lang.Class({
         let showAtLaunch = this._settingsInit(aZoomRegion);
         aZoomRegion.scrollContentsTo(this.xMouse, this.yMouse);
 
-        cursorTracker.connect('cursor-changed', Lang.bind(this, this._updateMouseSprite));
-        this._cursorTracker = cursorTracker;
+        xfixesCursor.connect('cursor-change', Lang.bind(this, this._updateMouseSprite));
+        this._xfixesCursor = xfixesCursor;
 
         // Export to dbus.
         magDBusService = new MagnifierDBus.ShellMagnifier();
@@ -89,7 +83,7 @@ const Magnifier = new Lang.Class({
      * Show the system mouse pointer.
      */
     showSystemCursor: function() {
-        this._cursorTracker.set_pointer_visible(true);
+        this._xfixesCursor.show();
     },
 
     /**
@@ -97,7 +91,7 @@ const Magnifier = new Lang.Class({
      * Hide the system mouse pointer.
      */
     hideSystemCursor: function() {
-        this._cursorTracker.set_pointer_visible(false);
+        this._xfixesCursor.hide();
     },
 
     /**
@@ -106,26 +100,19 @@ const Magnifier = new Lang.Class({
      * @activate:   Boolean to activate or de-activate the magnifier.
      */
     setActive: function(activate) {
-        let isActive = this.isActive();
-
         this._zoomRegions.forEach (function(zoomRegion, index, array) {
             zoomRegion.setActive(activate);
         });
 
-        if (isActive != activate) {
-            if (activate) {
-                Meta.disable_unredirect_for_screen(global.screen);
-                this.startTrackingMouse();
-            } else {
-                Meta.enable_unredirect_for_screen(global.screen);
-                this.stopTrackingMouse();
-            }
-        }
+        if (activate)
+            this.startTrackingMouse();
+        else
+            this.stopTrackingMouse();
 
         // Make sure system mouse pointer is shown when all zoom regions are
         // invisible.
         if (!activate)
-            this._cursorTracker.set_pointer_visible(true);
+            this._xfixesCursor.show();
 
         // Notify interested parties of this change
         this.emit('active-changed', activate);
@@ -435,8 +422,9 @@ const Magnifier = new Lang.Class({
     //// Private methods ////
 
     _updateMouseSprite: function() {
-        Shell.util_cursor_tracker_to_clutter(this._cursorTracker, this._mouseSprite);
-        let [xHot, yHot] = this._cursorTracker.get_hot();
+        this._xfixesCursor.update_texture_image(this._mouseSprite);
+        let xHot = this._xfixesCursor.get_hot_x();
+        let yHot = this._xfixesCursor.get_hot_y();
         this._mouseSprite.set_anchor_point(xHot, yHot);
     },
 
@@ -461,14 +449,6 @@ const Magnifier = new Lang.Class({
             if (aPref)
                 zoomRegion.setMouseTrackingMode(aPref);
 
-            aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
-            if (aPref)
-                zoomRegion.setFocusTrackingMode(aPref);
-
-            aPref = this._settings.get_enum(CARET_TRACKING_KEY);
-            if (aPref)
-                zoomRegion.setCaretTrackingMode(aPref);
-
             aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
             if (aPref)
                 zoomRegion.setInvertLightness(aPref);
@@ -508,10 +488,6 @@ const Magnifier = new Lang.Class({
                                Lang.bind(this, this._updateClampMode));
         this._settings.connect('changed::' + MOUSE_TRACKING_KEY,
                                Lang.bind(this, this._updateMouseTrackingMode));
-        this._settings.connect('changed::' + FOCUS_TRACKING_KEY,
-                               Lang.bind(this, this._updateFocusTrackingMode));
-        this._settings.connect('changed::' + CARET_TRACKING_KEY,
-                               Lang.bind(this, this._updateCaretTrackingMode));
 
         this._settings.connect('changed::' + INVERT_LIGHTNESS_KEY,
                                Lang.bind(this, this._updateInvertLightness));
@@ -561,6 +537,7 @@ const Magnifier = new Lang.Class({
                                Lang.bind(this, function() {
             this.setCrosshairsClip(this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY));
         }));
+
         return this._appSettings.get_boolean(SHOW_KEY);
    },
 
@@ -608,24 +585,6 @@ const Magnifier = new Lang.Class({
         }
     },
 
-    _updateFocusTrackingMode: function() {
-        // Applies only to the first zoom region.
-        if (this._zoomRegions.length) {
-            this._zoomRegions[0].setFocusTrackingMode(
-                this._settings.get_enum(FOCUS_TRACKING_KEY)
-            );
-        }
-    },
-
-    _updateCaretTrackingMode: function() {
-        // Applies only to the first zoom region.
-        if (this._zoomRegions.length) {
-            this._zoomRegions[0].setCaretTrackingMode(
-                this._settings.get_enum(CARET_TRACKING_KEY)
-            );
-        }
-    },
-
     _updateInvertLightness: function() {
         // Applies only to the first zoom region.
         if (this._zoomRegions.length) {
@@ -664,7 +623,7 @@ const Magnifier = new Lang.Class({
             contrast.b = this._settings.get_double(CONTRAST_BLUE_KEY);
             this._zoomRegions[0].setContrast(contrast);
         }
-    }
+    },
 });
 Signals.addSignalMethods(Magnifier.prototype);
 
@@ -673,11 +632,8 @@ const ZoomRegion = new Lang.Class({
 
     _init: function(magnifier, mouseSourceActor) {
         this._magnifier = magnifier;
-        this._focusCaretTracker = new FocusCaretTracker.FocusCaretTracker();
 
         this._mouseTrackingMode = GDesktopEnums.MagnifierMouseTrackingMode.NONE;
-        this._focusTrackingMode = GDesktopEnums.MagnifierFocusTrackingMode.NONE;
-        this._caretTrackingMode = GDesktopEnums.MagnifierCaretTrackingMode.NONE;
         this._clampScrollingAtEdges = false;
         this._lensMode = false;
         this._screenPosition = GDesktopEnums.MagnifierScreenPosition.FULL_SCREEN;
@@ -703,50 +659,9 @@ const ZoomRegion = new Lang.Class({
         this._xMagFactor = 1;
         this._yMagFactor = 1;
         this._followingCursor = false;
-        this._xFocus = 0;
-        this._yFocus = 0;
-        this._xCaret = 0;
-        this._yCaret = 0;
 
         Main.layoutManager.connect('monitors-changed',
                                    Lang.bind(this, this._monitorsChanged));
-        this._focusCaretTracker.connect('caret-moved',
-                                    Lang.bind(this, this._updateCaret));
-        this._focusCaretTracker.connect('focus-changed',
-                                    Lang.bind(this, this._updateFocus));
-    },
-
-    _updateFocus: function(caller, event) {
-        let component = event.source.get_component_iface();
-        if (!component || event.detail1 != 1)
-            return;
-        let extents;
-        try {
-            extents = component.get_extents(Atspi.CoordType.SCREEN);
-        } catch(e) {
-            log('Failed to read extents of focused component: ' + e.message);
-            return;
-        }
-
-        [this._xFocus, this._yFocus] = [extents.x + (extents.width / 2),
-                                        extents.y + (extents.height / 2)];
-        this._centerFromFocusPosition();
-    },
-
-    _updateCaret: function(caller, event) {
-        let text = event.source.get_text_iface();
-        if (!text)
-            return;
-        let extents;
-        try {
-            extents = text.get_character_extents(text.get_caret_offset(), 0);
-        } catch(e) {
-            log('Failed to read extents of text caret: ' + e.message);
-            return;
-        }
-
-        [this._xCaret, this._yCaret] = [extents.x, extents.y];
-        this._centerFromCaretPosition();
     },
 
     /**
@@ -754,22 +669,16 @@ const ZoomRegion = new Lang.Class({
      * @activate:   Boolean to show/hide the ZoomRegion.
      */
     setActive: function(activate) {
-        if (activate == this.isActive())
-            return;
-
-        if (activate) {
+        if (activate && !this.isActive()) {
             this._createActors();
             if (this._isMouseOverRegion())
                 this._magnifier.hideSystemCursor();
             this._updateMagViewGeometry();
             this._updateCloneGeometry();
             this._updateMousePosition();
-        } else {
+        } else if (!activate && this.isActive()) {
             this._destroyActors();
         }
-
-        this._syncCaretTracking();
-        this._syncFocusTracking();
     },
 
     /**
@@ -823,44 +732,6 @@ const ZoomRegion = new Lang.Class({
         return this._mouseTrackingMode;
     },
 
-    /**
-     * setFocusTrackingMode
-     * @mode:     One of the enum FocusTrackingMode values.
-     */
-    setFocusTrackingMode: function(mode) {
-        this._focusTrackingMode = mode;
-        this._syncFocusTracking();
-    },
-
-    /**
-     * setCaretTrackingMode
-     * @mode:     One of the enum CaretTrackingMode values.
-     */
-    setCaretTrackingMode: function(mode) {
-        this._caretTrackingMode = mode;
-        this._syncCaretTracking();
-    },
-
-    _syncFocusTracking: function() {
-        let enabled = this._focusTrackingMode != GDesktopEnums.MagnifierFocusTrackingMode.NONE &&
-            this.isActive();
-
-        if (enabled)
-            this._focusCaretTracker.registerFocusListener();
-        else
-            this._focusCaretTracker.deregisterFocusListener();
-    },
-
-    _syncCaretTracking: function() {
-        let enabled = this._caretTrackingMode != GDesktopEnums.MagnifierCaretTrackingMode.NONE &&
-            this.isActive();
-
-        if (enabled)
-            this._focusCaretTracker.registerCaretListener();
-        else
-            this._focusCaretTracker.deregisterCaretListener();
-    },
-
     /**
      * setViewPort
      * Sets the position and size of the ZoomRegion on screen.
@@ -1152,6 +1023,20 @@ const ZoomRegion = new Lang.Class({
             this._magShaderEffects.setBrightness(this._brightness);
     },
 
+    /**
+     * getBrightness:
+     * Retrive the current brightness of the Zoom Region.
+     * @return  Object containing the brightness change for the red, green,
+     *          and blue channels.
+     */
+    getBrightness: function() {
+        let brightness = {};
+        brightness.r = this._brightness.r;
+        brightness.g = this._brightness.g;
+        brightness.b = this._brightness.b;
+        return brightness;
+    },
+
     /**
      * setContrast:
      * Alter the contrast of the magnified view.
@@ -1199,17 +1084,13 @@ const ZoomRegion = new Lang.Class({
         // Add a background for when the magnified uiGroup is scrolled
         // out of view (don't want to see desktop showing through).
         this._background = new Clutter.Actor({ background_color: Main.DEFAULT_BACKGROUND_COLOR,
-                                               layout_manager: new Clutter.BinLayout(),
                                                width: global.screen_width,
                                                height: global.screen_height });
-        let noiseTexture = (new Background.SystemBackground()).actor;
-        this._background.add_actor(noiseTexture);
         mainGroup.add_actor(this._background);
 
         // Clone the group that contains all of UI on the screen.  This is the
         // chrome, the windows, etc.
-        this._uiGroupClone = new Clutter.Clone({ source: Main.uiGroup,
-                                                 clip_to_allocation: true });
+        this._uiGroupClone = new Clutter.Clone({ source: Main.uiGroup });
         mainGroup.add_actor(this._uiGroupClone);
 
         // Add either the given mouseSourceActor to the ZoomRegion, or a clone of
@@ -1362,47 +1243,19 @@ const ZoomRegion = new Lang.Class({
         let yMouse = this._magnifier.yMouse;
 
         if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PROPORTIONAL) {
-            return this._centerFromPointProportional(xMouse, yMouse);
+            return this._centerFromMouseProportional(xMouse, yMouse);
         }
         else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PUSH) {
-            return this._centerFromPointPush(xMouse, yMouse);
+            return this._centerFromMousePush(xMouse, yMouse);
         }
         else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.CENTERED) {
-            return this._centerFromPointCentered(xMouse, yMouse);
+            return this._centerFromMouseCentered(xMouse, yMouse);
         }
 
         return null; // Should never be hit
     },
 
-    _centerFromCaretPosition: function() {
-        let xCaret = this._xCaret;
-        let yCaret = this._yCaret;
-
-        if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.PROPORTIONAL)
-            [xCaret, yCaret] = this._centerFromPointProportional(xCaret, yCaret);
-        else if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.PUSH)
-            [xCaret, yCaret] = this._centerFromPointPush(xCaret, yCaret);
-        else if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.CENTERED)
-            [xCaret, yCaret] = this._centerFromPointCentered(xCaret, yCaret);
-
-        this.scrollContentsTo(xCaret, yCaret);
-    },
-
-    _centerFromFocusPosition: function() {
-        let xFocus = this._xFocus;
-        let yFocus = this._yFocus;
-
-        if (this._focusTrackingMode == GDesktopEnums.MagnifierFocusTrackingMode.PROPORTIONAL)
-            [xFocus, yFocus] = this._centerFromPointProportional(xFocus, yFocus);
-        else if (this._focusTrackingMode == GDesktopEnums.MagnifierFocusTrackingMode.PUSH)
-            [xFocus, yFocus] = this._centerFromPointPush(xFocus, yFocus);
-        else if (this._focusTrackingMode == GDesktopEnums.MagnifierFocusTrackingMode.CENTERED)
-            [xFocus, yFocus] = this._centerFromPointCentered(xFocus, yFocus);
-
-        this.scrollContentsTo(xFocus, yFocus);
-    },
-
-    _centerFromPointPush: function(xPoint, yPoint) {
+    _centerFromMousePush: function(xMouse, yMouse) {
         let [xRoi, yRoi, widthRoi, heightRoi] = this.getROI();
         let [cursorWidth, cursorHeight] = this._mouseSourceActor.get_size();
         let xPos = xRoi + widthRoi / 2;
@@ -1410,20 +1263,20 @@ const ZoomRegion = new Lang.Class({
         let xRoiRight = xRoi + widthRoi - cursorWidth;
         let yRoiBottom = yRoi + heightRoi - cursorHeight;
 
-        if (xPoint < xRoi)
-            xPos -= (xRoi - xPoint);
-        else if (xPoint > xRoiRight)
-            xPos += (xPoint - xRoiRight);
+        if (xMouse < xRoi)
+            xPos -= (xRoi - xMouse);
+        else if (xMouse > xRoiRight)
+            xPos += (xMouse - xRoiRight);
 
-        if (yPoint < yRoi)
-            yPos -= (yRoi - yPoint);
-        else if (yPoint > yRoiBottom)
-            yPos += (yPoint - yRoiBottom);
+        if (yMouse < yRoi)
+            yPos -= (yRoi - yMouse);
+        else if (yMouse > yRoiBottom)
+            yPos += (yMouse - yRoiBottom);
 
         return [xPos, yPos];
     },
 
-    _centerFromPointProportional: function(xPoint, yPoint) {
+    _centerFromMouseProportional: function(xMouse, yMouse) {
         let [xRoi, yRoi, widthRoi, heightRoi] = this.getROI();
         let halfScreenWidth = global.screen_width / 2;
         let halfScreenHeight = global.screen_height / 2;
@@ -1432,16 +1285,16 @@ const ZoomRegion = new Lang.Class({
         let unscaledPadding = Math.min(this._viewPortWidth, this._viewPortHeight) / 5;
         let xPadding = unscaledPadding / this._xMagFactor;
         let yPadding = unscaledPadding / this._yMagFactor;
-        let xProportion = (xPoint - halfScreenWidth) / halfScreenWidth;   // -1 ... 1
-        let yProportion = (yPoint - halfScreenHeight) / halfScreenHeight; // -1 ... 1
-        let xPos = xPoint - xProportion * (widthRoi / 2 - xPadding);
-        let yPos = yPoint - yProportion * (heightRoi /2 - yPadding);
+        let xProportion = (xMouse - halfScreenWidth) / halfScreenWidth;   // -1 ... 1
+        let yProportion = (yMouse - halfScreenHeight) / halfScreenHeight; // -1 ... 1
+        let xPos = xMouse - xProportion * (widthRoi / 2 - xPadding);
+        let yPos = yMouse - yProportion * (heightRoi /2 - yPadding);
 
         return [xPos, yPos];
     },
 
-    _centerFromPointCentered: function(xPoint, yPoint) {
-        return [xPoint, yPoint];
+    _centerFromMouseCentered: function(xMouse, yMouse) {
+        return [xMouse, yMouse];
     },
 
     _screenToViewPort: function(screenX, screenY) {
@@ -1658,6 +1511,15 @@ const Crosshairs = new Lang.Class({
         this._vertBottomHair.set_opacity(opacity);
     },
 
+    /**
+     * getOpacity:
+     * Retriev how opaque the crosshairs are.
+     * @return: A value between 0 (transparent) and 255 (opaque).
+     */
+    getOpacity: function() {
+        return this._horizLeftHair.get_opacity();
+    },
+
     /**
      * setLength:
      * Set the length of the vertical and horizontal lines in the crosshairs.
@@ -1701,6 +1563,15 @@ const Crosshairs = new Lang.Class({
         }
      },
 
+    /**
+     * getClip:
+     * Get the dimensions of the clip rectangle.
+     * @return:   An array of the form [width, height].
+     */
+    getClip: function() {
+        return this._clipSize;
+    },
+
     /**
      * show:
      * Show the crosshairs.
@@ -1796,10 +1667,23 @@ const MagShaderEffects = new Lang.Class({
         this._inverse.set_enabled(invertFlag);
     },
 
+    /**
+     * getInvertLightness:
+     * Report whether the inversion effect is enabled.
+     * @return:     Boolean.
+     */
+    getInvertLightness: function() {
+        return this._inverse.get_enabled();
+    },
+
     setColorSaturation: function(factor) {
         this._colorDesaturation.set_factor(1.0 - factor);
     },
 
+    getColorSaturation: function() {
+        return 1.0 - this._colorDesaturation.get_factor();
+    },
+
     /**
      * setBrightness:
      * Set the brightness of the magnified view.
@@ -1824,6 +1708,24 @@ const MagShaderEffects = new Lang.Class({
         );
     },
 
+    /**
+     * getBrightness:
+     * Retrieve current brightness of the magnified view.
+     * @return: Object containing the brightness for the red, green,
+     *          and blue channels.  Values of 0.0 represent "standard" 
+     *          brightness (no change), whereas values less or greater than
+     *          0.0 indicate decreased or incresaed brightness, respectively.
+     */
+    getBrightness: function() {
+        let result = {};
+        let [bRed, bGreen, bBlue] = this._brightnessContrast.get_brightness();
+        result.r = bRed;
+        result.g = bGreen;
+        result.b = bBlue;
+
+        return result;
+    },
+
     /**
      * Set the contrast of the magnified view.
      * @contrast:   Object containing the contrast for the red, green,
@@ -1848,4 +1750,21 @@ const MagShaderEffects = new Lang.Class({
              bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE
         );
     },
+
+    /**
+     * Retrieve current contrast of the magnified view.
+     * @return: Object containing the contrast for the red, green,
+     *          and blue channels.  Values of 0.0 represent "standard"
+     *          contrast (no change), whereas values less or greater than
+     *          0.0 indicate decreased or incresaed contrast, respectively.
+     */
+    getContrast: function() {
+        let resutl = {};
+        let [cRed, cGreen, cBlue] = this._brightnessContrast.get_contrast();
+        result.r = cRed;
+        result.g = cGreen;
+        result.b = cBlue;
+
+        return result;
+    }
 });

js/ui/magnifierDBus.js

@@ -4,94 +4,92 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Main = imports.ui.main;
 
+const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
 const MAG_SERVICE_PATH = '/org/gnome/Magnifier';
+const ZOOM_SERVICE_NAME = 'org.gnome.Magnifier.ZoomRegion';
 const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
 
 // Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
 // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
-const MagnifierIface = '<node> \
-<interface name="org.gnome.Magnifier"> \
-<method name="setActive"> \
-    <arg type="b" direction="in" /> \
-</method> \
-<method name="isActive"> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="showCursor" /> \
-<method name="hideCursor" /> \
-<method name="createZoomRegion"> \
-    <arg type="d" direction="in" /> \
-    <arg type="d" direction="in" /> \
-    <arg type="ai" direction="in" /> \
-    <arg type="ai" direction="in" /> \
-    <arg type="o" direction="out" /> \
-</method> \
-<method name="addZoomRegion"> \
-    <arg type="o" direction="in" /> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="getZoomRegions"> \
-    <arg type="ao" direction="out" /> \
-</method> \
-<method name="clearAllZoomRegions" /> \
-<method name="fullScreenCapable"> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="setCrosswireSize"> \
-    <arg type="i" direction="in" /> \
-</method> \
-<method name="getCrosswireSize"> \
-    <arg type="i" direction="out" /> \
-</method> \
-<method name="setCrosswireLength"> \
-    <arg type="i" direction="in" /> \
-</method> \
-<method name="getCrosswireLength"> \
-    <arg type="i" direction="out" /> \
-</method> \
-<method name="setCrosswireClip"> \
-    <arg type="b" direction="in" /> \
-</method> \
-<method name="getCrosswireClip"> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="setCrosswireColor"> \
-    <arg type="u" direction="in" /> \
-</method> \
-<method name="getCrosswireColor"> \
-    <arg type="u" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const MagnifierIface = <interface name={MAG_SERVICE_NAME}>
+<method name="setActive">
+    <arg type="b" direction="in" />
+</method>
+<method name="isActive">
+    <arg type="b" direction="out" />
+</method>
+<method name="showCursor" />
+<method name="hideCursor" />
+<method name="createZoomRegion">
+    <arg type="d" direction="in" />
+    <arg type="d" direction="in" />
+    <arg type="ai" direction="in" />
+    <arg type="ai" direction="in" />
+    <arg type="o" direction="out" />
+</method>
+<method name="addZoomRegion">
+    <arg type="o" direction="in" />
+    <arg type="b" direction="out" />
+</method>
+<method name="getZoomRegions">
+    <arg type="ao" direction="out" />
+</method>
+<method name="clearAllZoomRegions" />
+<method name="fullScreenCapable">
+    <arg type="b" direction="out" />
+</method>
+<method name="setCrosswireSize">
+    <arg type="i" direction="in" />
+</method>
+<method name="getCrosswireSize">
+    <arg type="i" direction="out" />
+</method>
+<method name="setCrosswireLength">
+    <arg type="i" direction="in" />
+</method>
+<method name="getCrosswireLength">
+    <arg type="i" direction="out" />
+</method>
+<method name="setCrosswireClip">
+    <arg type="b" direction="in" />
+</method>
+<method name="getCrosswireClip">
+    <arg type="b" direction="out" />
+</method>
+<method name="setCrosswireColor">
+    <arg type="u" direction="in" />
+</method>
+<method name="getCrosswireColor">
+    <arg type="u" direction="out" />
+</method>
+</interface>;
 
 // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
 // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
-const ZoomRegionIface = '<node> \
-<interface name="org.gnome.Magnifier.ZoomRegion"> \
-<method name="setMagFactor"> \
-    <arg type="d" direction="in" /> \
-    <arg type="d" direction="in" /> \
-</method> \
-<method name="getMagFactor"> \
-    <arg type="d" direction="out" /> \
-    <arg type="d" direction="out" /> \
-</method> \
-<method name="setRoi"> \
-    <arg type="ai" direction="in" /> \
-</method> \
-<method name="getRoi"> \
-    <arg type="ai" direction="out" /> \
-</method> \
-<method name="shiftContentsTo"> \
-    <arg type="i" direction="in" /> \
-    <arg type="i" direction="in" /> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="moveResize"> \
-    <arg type="ai" direction="in" /> \
-</method> \
-</interface> \
-</node>';
+const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}>
+<method name="setMagFactor">
+    <arg type="d" direction="in" />
+    <arg type="d" direction="in" />
+</method>
+<method name="getMagFactor">
+    <arg type="d" direction="out" />
+    <arg type="d" direction="out" />
+</method>
+<method name="setRoi">
+    <arg type="ai" direction="in" />
+</method>
+<method name="getRoi">
+    <arg type="ai" direction="out" />
+</method>
+<method name="shiftContentsTo">
+    <arg type="i" direction="in" />
+    <arg type="i" direction="in" />
+    <arg type="b" direction="out" />
+</method>
+<method name="moveResize">
+    <arg type="ai" direction="in" />
+</method>
+</interface>;
 
 // For making unique ZoomRegion DBus proxy object paths of the form:
 // '/org/gnome/Magnifier/ZoomRegion/zoomer0',

js/ui/main.js

@@ -9,7 +9,6 @@ const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const GSystem = imports.gi.GSystem;
 
 const Components = imports.ui.components;
 const CtrlAltTab = imports.ui.ctrlAltTab;
@@ -29,7 +28,6 @@ const LoginManager = imports.misc.loginManager;
 const LookingGlass = imports.ui.lookingGlass;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
-const Screencast = imports.ui.screencast;
 const ScreenShield = imports.ui.screenShield;
 const Scripting = imports.ui.scripting;
 const SessionMode = imports.ui.sessionMode;
@@ -44,7 +42,6 @@ const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
 
 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
 const STICKY_KEYS_ENABLE = 'stickykeys-enable';
-const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a';
 
 let componentManager = null;
 let panel = null;
@@ -57,12 +54,11 @@ let screenShield = null;
 let notificationDaemon = null;
 let windowAttentionHandler = null;
 let ctrlAltTabManager = null;
-let osdWindowManager = null;
+let osdWindow = null;
 let sessionMode = null;
 let shellDBusService = null;
 let shellMountOpDBusService = null;
 let screenSaverDBus = null;
-let screencastService = null;
 let modalCount = 0;
 let keybindingMode = Shell.KeyBindingMode.NONE;
 let modalActorFocusStack = [];
@@ -75,7 +71,6 @@ let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
 let _a11ySettings = null;
-let dynamicWorkspacesSchema = null;
 
 function _sessionUpdated() {
     _loadDefaultStylesheet();
@@ -92,12 +87,8 @@ function _sessionUpdated() {
                                   Shell.KeyBindingMode.OVERVIEW,
                                   sessionMode.hasRunDialog ? openRunDialog : null);
 
-    if (!sessionMode.hasRunDialog) {
-        if (runDialog)
-            runDialog.close();
-        if (lookingGlass)
-            lookingGlass.close();
-    }
+    if (!sessionMode.hasRunDialog && lookingGlass)
+        lookingGlass.close();
 }
 
 function start() {
@@ -111,8 +102,12 @@ 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);
-    _initializePrefs();
     _initializeUI();
 
     shellDBusService = new ShellDBus.GnomeShell();
@@ -121,17 +116,6 @@ function start() {
     _sessionUpdated();
 }
 
-function _initializePrefs() {
-    let keys = new Gio.Settings({ schema: sessionMode.overridesSchema }).list_keys();
-    for (let i = 0; i < keys.length; i++)
-        Meta.prefs_override_preference_schema(keys[i], sessionMode.overridesSchema);
-
-    if (keys.indexOf('dynamic-workspaces') > -1)
-        dynamicWorkspacesSchema = sessionMode.overridesSchema;
-    else
-        dynamicWorkspacesSchema = 'org.gnome.mutter';
-}
-
 function _initializeUI() {
     // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
     // also initialize ShellAppSystem first.  ShellAppSystem
@@ -154,10 +138,9 @@ function _initializeUI() {
     // working until it's updated.
     uiGroup = layoutManager.uiGroup;
 
-    screencastService = new Screencast.ScreencastService();
     xdndHandler = new XdndHandler.XdndHandler();
     ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
-    osdWindowManager = new OsdWindow.OsdWindowManager();
+    osdWindow = new OsdWindow.OsdWindow();
     overview = new Overview.Overview();
     wm = new WindowManager.WindowManager();
     magnifier = new Magnifier.Magnifier();
@@ -190,6 +173,8 @@ function _initializeUI() {
 
     _startDate = new Date();
 
+    log('GNOME Shell started at ' + _startDate);
+
     let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
     if (perfModuleName) {
         let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
@@ -213,12 +198,6 @@ function _initializeUI() {
                               if (screenShield) {
                                   screenShield.lockIfWasLocked();
                               }
-                              if (LoginManager.haveSystemd() && sessionMode.currentMode === 'user') {
-                                  GSystem.log_structured_print('GNOME Shell started at ' + _startDate,
-                                                               ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
-                              } else {
-                                  log('GNOME Shell started at ' + _startDate);
-                              }
                           });
 }
 
@@ -268,7 +247,11 @@ function loadTheme() {
     let themeContext = St.ThemeContext.get_for_stage (global.stage);
     let previousTheme = themeContext.get_theme();
 
-    let theme = new St.Theme ({ application_stylesheet: _cssStylesheet,
+    let cssStylesheet = _defaultCssStylesheet;
+    if (_cssStylesheet != null)
+        cssStylesheet = _cssStylesheet;
+
+    let theme = new St.Theme ({ application_stylesheet: cssStylesheet,
                                 default_stylesheet: _defaultCssStylesheet });
 
     if (previousTheme) {
@@ -360,6 +343,8 @@ function pushModal(actor, params) {
         Meta.disable_unredirect_for_screen(global.screen);
     }
 
+    global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
+
     modalCount += 1;
     let actorDestroyId = actor.connect('destroy', function() {
         let index = _findModal(actor);
@@ -408,6 +393,7 @@ function popModal(actor, timestamp) {
     if (focusIndex < 0) {
         global.stage.set_key_focus(null);
         global.end_modal(timestamp);
+        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
         keybindingMode = Shell.KeyBindingMode.NORMAL;
 
         throw new Error('incorrect pop');
@@ -455,6 +441,7 @@ function popModal(actor, timestamp) {
         return;
 
     global.end_modal(timestamp);
+    global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
     Meta.enable_unredirect_for_screen(global.screen);
     keybindingMode = Shell.KeyBindingMode.NORMAL;
 }
@@ -612,8 +599,7 @@ function queueDeferredWork(workId) {
         _deferredTimeoutId = Mainloop.timeout_add_seconds(DEFERRED_TIMEOUT_SECONDS, function () {
             _runAllDeferredWork();
             _deferredTimeoutId = 0;
-            return GLib.SOURCE_REMOVE;
+            return false;
         });
-        GLib.Source.set_name_by_id(_deferredTimeoutId, '[gnome-shell] _runAllDeferredWork');
     }
 }

js/ui/modalDialog.js

@@ -41,6 +41,7 @@ const ModalDialog = new Lang.Class({
     _init: function(params) {
         params = Params.parse(params, { shellReactive: false,
                                         styleClass: null,
+                                        parentActor: Main.uiGroup,
                                         keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL,
                                         shouldFadeIn: true,
                                         destroyOnClose: true });
@@ -56,7 +57,7 @@ const ModalDialog = new Lang.Class({
                                       x: 0,
                                       y: 0,
                                       accessible_role: Atk.Role.DIALOG });
-        Main.layoutManager.modalDialogGroup.add_actor(this._group);
+        params.parentActor.add_actor(this._group);
 
         let constraint = new Clutter.BindConstraint({ source: global.stage,
                                                       coordinate: Clutter.BindCoordinate.ALL });
@@ -78,18 +79,13 @@ const ModalDialog = new Lang.Class({
 
         this.dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog',
                                                vertical:    true });
-        // modal dialogs are fixed width and grow vertically; set the request
-        // mode accordingly so wrapped labels are handled correctly during
-        // size requests.
-        this.dialogLayout.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH;
-
-        if (params.styleClass != null)
+        if (params.styleClass != null) {
             this.dialogLayout.add_style_class_name(params.styleClass);
+        }
 
         if (!this._shellReactive) {
             this._lightbox = new Lightbox.Lightbox(this._group,
-                                                   { inhibitEvents: true,
-                                                     radialEffect: true });
+                                                   { inhibitEvents: true });
             this._lightbox.highlight(this._backgroundBin);
 
             this._eventBlocker = new Clutter.Actor({ reactive: true });
@@ -100,8 +96,7 @@ const ModalDialog = new Lang.Class({
 
         this.contentLayout = new St.BoxLayout({ vertical: true });
         this.dialogLayout.add(this.contentLayout,
-                              { expand:  true,
-                                x_fill:  true,
+                              { x_fill:  true,
                                 y_fill:  true,
                                 x_align: St.Align.MIDDLE,
                                 y_align: St.Align.START });
@@ -109,7 +104,8 @@ const ModalDialog = new Lang.Class({
         this.buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
                                                vertical: false });
         this.dialogLayout.add(this.buttonLayout,
-                              { x_align: St.Align.MIDDLE,
+                              { expand:  true,
+                                x_align: St.Align.MIDDLE,
                                 y_align: St.Align.END });
 
         global.focus_manager.add_group(this.dialogLayout);
@@ -229,7 +225,6 @@ const ModalDialog = new Lang.Class({
 
     _onKeyPressEvent: function(object, event) {
         this._pressedKey = event.get_key_symbol();
-        return Clutter.EVENT_PROPAGATE;
     },
 
     _onKeyReleaseEvent: function(object, event) {
@@ -238,21 +233,21 @@ const ModalDialog = new Lang.Class({
 
         let symbol = event.get_key_symbol();
         if (symbol != pressedKey)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         let buttonInfo = this._buttonKeys[symbol];
         if (!buttonInfo)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         let button = buttonInfo['button'];
         let action = buttonInfo['action'];
 
         if (action && button.reactive) {
             action();
-            return Clutter.EVENT_STOP;
+            return true;
         }
 
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     },
 
     _onGroupDestroy: function() {
@@ -362,9 +357,8 @@ const ModalDialog = new Lang.Class({
         if (this._savedKeyFocus) {
             this._savedKeyFocus.grab_key_focus();
             this._savedKeyFocus = null;
-        } else {
+        } else
             this._initialKeyFocus.grab_key_focus();
-        }
 
         if (!this._shellReactive)
             this._eventBlocker.lower_bottom();

js/ui/notificationDaemon.js

@@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const GdkPixbuf = imports.gi.GdkPixbuf;
 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 Mainloop = imports.mainloop;
@@ -16,56 +15,54 @@ const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;
 const Util = imports.misc.util;
 
+let nextNotificationId = 1;
+
 // Should really be defined in Gio.js
-const BusIface = '<node> \
-<interface name="org.freedesktop.DBus"> \
-<method name="GetConnectionUnixProcessID"> \
-    <arg type="s" direction="in" /> \
-    <arg type="u" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const BusIface = <interface name="org.freedesktop.DBus">
+<method name="GetConnectionUnixProcessID">
+    <arg type="s" direction="in" />
+    <arg type="u" direction="out" />
+</method>
+</interface>;
 
 var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface);
 function Bus() {
     return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
 }
 
-const FdoNotificationsIface = '<node> \
-<interface name="org.freedesktop.Notifications"> \
-<method name="Notify"> \
-    <arg type="s" direction="in"/> \
-    <arg type="u" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="as" direction="in"/> \
-    <arg type="a{sv}" direction="in"/> \
-    <arg type="i" direction="in"/> \
-    <arg type="u" direction="out"/> \
-</method> \
-<method name="CloseNotification"> \
-    <arg type="u" direction="in"/> \
-</method> \
-<method name="GetCapabilities"> \
-    <arg type="as" direction="out"/> \
-</method> \
-<method name="GetServerInformation"> \
-    <arg type="s" direction="out"/> \
-    <arg type="s" direction="out"/> \
-    <arg type="s" direction="out"/> \
-    <arg type="s" direction="out"/> \
-</method> \
-<signal name="NotificationClosed"> \
-    <arg type="u"/> \
-    <arg type="u"/> \
-</signal> \
-<signal name="ActionInvoked"> \
-    <arg type="u"/> \
-    <arg type="s"/> \
-</signal> \
-</interface> \
-</node>';
+const NotificationDaemonIface = <interface name="org.freedesktop.Notifications">
+<method name="Notify">
+    <arg type="s" direction="in"/>
+    <arg type="u" direction="in"/>
+    <arg type="s" direction="in"/>
+    <arg type="s" direction="in"/>
+    <arg type="s" direction="in"/>
+    <arg type="as" direction="in"/>
+    <arg type="a{sv}" direction="in"/>
+    <arg type="i" direction="in"/>
+    <arg type="u" direction="out"/>
+</method>
+<method name="CloseNotification">
+    <arg type="u" direction="in"/>
+</method>
+<method name="GetCapabilities">
+    <arg type="as" direction="out"/>
+</method>
+<method name="GetServerInformation">
+    <arg type="s" direction="out"/>
+    <arg type="s" direction="out"/>
+    <arg type="s" direction="out"/>
+    <arg type="s" direction="out"/>
+</method>
+<signal name="NotificationClosed">
+    <arg type="u"/>
+    <arg type="u"/>
+</signal>
+<signal name="ActionInvoked">
+    <arg type="u"/>
+    <arg type="s"/>
+</signal>
+</interface>;
 
 const NotificationClosedReason = {
     EXPIRED: 1,
@@ -106,11 +103,131 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
     'ibus-ui-gtk': 'keyboard'
 };
 
-const FdoNotificationDaemon = new Lang.Class({
-    Name: 'FdoNotificationDaemon',
+const NotificationGenericPolicy = new Lang.Class({
+    Name: 'NotificationGenericPolicy',
+    Extends: MessageTray.NotificationPolicy,
 
     _init: function() {
-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(FdoNotificationsIface, this);
+        // 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',
+
+    _init: function() {
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications');
 
         this._sources = [];
@@ -118,8 +235,6 @@ const FdoNotificationDaemon = new Lang.Class({
         this._notifications = {};
         this._busProxy = new Bus();
 
-        this._nextNotificationId = 1;
-
         this._trayManager = new Shell.TrayManager();
         this._trayIconAddedId = this._trayManager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
         this._trayIconRemovedId = this._trayManager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
@@ -181,10 +296,12 @@ const FdoNotificationDaemon = new Lang.Class({
     },
 
     // Returns the source associated with ndata.notification if it is set.
-    // If the existing or requested source is associated with a tray icon
-    // and passed in pid matches a pid of an existing source, the title
-    // match is ignored to enable representing a tray icon and notifications
-    // from the same application with a single source.
+    // Otherwise, returns the source associated with the title and pid if
+    // such source is stored in this._sources and the notification is not
+    // transient. If the existing or requested source is associated with
+    // a tray icon and passed in pid matches a pid of an existing source,
+    // the title match is ignored to enable representing a tray icon and
+    // notifications from the same application with a single source.
     //
     // If no existing source is found, a new source is created as long as
     // pid is provided.
@@ -202,20 +319,32 @@ const FdoNotificationDaemon = new Lang.Class({
         if (ndata && ndata.notification)
             return ndata.notification.source;
 
-        let source = this._lookupSource(title, pid, trayIcon);
-        if (source) {
-            source.setTitle(title);
-            return source;
+        let isForTransientNotification = (ndata && ndata.hints['transient'] == true);
+
+        // We don't want to override a persistent notification
+        // with a transient one from the same sender, so we
+        // always create a new source object for new transient notifications
+        // and never add it to this._sources .
+        if (!isForTransientNotification) {
+            let source = this._lookupSource(title, pid, trayIcon);
+            if (source) {
+                source.setTitle(title);
+                return source;
+            }
         }
 
-        let source = new FdoNotificationDaemonSource(title, pid, sender, trayIcon, ndata ? ndata.hints['desktop-entry'] : null);
+        let source = new Source(title, pid, sender, trayIcon, ndata ? ndata.hints['desktop-entry'] : null);
+        source.setTransient(isForTransientNotification);
 
-        this._sources.push(source);
-        source.connect('destroy', Lang.bind(this, function() {
-            let index = this._sources.indexOf(source);
-            if (index >= 0)
-                this._sources.splice(index, 1);
-        }));
+        if (!isForTransientNotification) {
+            this._sources.push(source);
+            source.connect('destroy', Lang.bind(this,
+                function() {
+                    let index = this._sources.indexOf(source);
+                    if (index >= 0)
+                        this._sources.splice(index, 1);
+                }));
+        }
 
         Main.messageTray.add(source);
         return source;
@@ -243,13 +372,12 @@ const FdoNotificationDaemon = new Lang.Class({
               hints['category'] == 'presence.offline')) {
             // Ignore replacesId since we already sent back a
             // NotificationClosed for that id.
-            id = this._nextNotificationId++;
-            let idle_id = Mainloop.idle_add(Lang.bind(this,
-                                            function () {
-                                                this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
-                                                return GLib.SOURCE_REMOVE;
-                                            }));
-            GLib.Source.set_name_by_id(idle_id, '[gnome-shell] this._emitNotificationClosed');
+            id = nextNotificationId++;
+            Mainloop.idle_add(Lang.bind(this,
+                                        function () {
+                                            this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
+                                            return false;
+                                        }));
             return invocation.return_value(GLib.Variant.new('(u)', [id]));
         }
 
@@ -268,13 +396,12 @@ const FdoNotificationDaemon = new Lang.Class({
         if (!hints['image-path'] && hints['image_path'])
             hints['image-path'] = hints['image_path']; // version 1.1 of the spec
 
-        if (!hints['image-data']) {
+        if (!hints['image-data'])
             if (hints['image_data'])
                 hints['image-data'] = hints['image_data']; // version 1.1 of the spec
             else if (hints['icon_data'] && !hints['image-path'])
                 // early versions of the spec; 'icon_data' should only be used if 'image-path' is not available
                 hints['image-data'] = hints['icon_data'];
-        }
 
         let ndata = { appName: appName,
                       icon: icon,
@@ -288,7 +415,7 @@ const FdoNotificationDaemon = new Lang.Class({
             ndata.notification = this._notifications[replacesId].notification;
         } else {
             replacesId = 0;
-            ndata.id = id = this._nextNotificationId++;
+            ndata.id = id = nextNotificationId++;
         }
         this._notifications[id] = ndata;
 
@@ -323,29 +450,26 @@ const FdoNotificationDaemon = new Lang.Class({
             let [pid] = result;
             source = this._getSource(appName, pid, ndata, sender, null);
 
-            this._senderToPid[sender] = pid;
-            source.connect('destroy', Lang.bind(this, function() {
-                delete this._senderToPid[sender];
-            }));
+            // We only store sender-pid entries for persistent sources.
+            // Removing the entries once the source is destroyed
+            // would result in the entries associated with transient
+            // sources removed once the notification is shown anyway.
+            // However, keeping these pairs would mean that we would
+            // possibly remove an entry associated with a persistent
+            // source when a transient source for the same sender is
+            // distroyed.
+            if (!source.isTransient) {
+                this._senderToPid[sender] = pid;
+                source.connect('destroy', Lang.bind(this, function() {
+                    delete this._senderToPid[sender];
+                }));
+            }
             this._notifyForSource(source, ndata);
         }));
 
         return invocation.return_value(GLib.Variant.new('(u)', [id]));
     },
 
-    _makeButton: function(id, label, useActionIcons) {
-        let button = new St.Button({ can_focus: true });
-        let iconName = id.endsWith('-symbolic') ? id : id + '-symbolic';
-        if (useActionIcons && Gtk.IconTheme.get_default().has_icon(iconName)) {
-            button.add_style_class_name('notification-icon-button');
-            button.child = new St.Icon({ icon_name: iconName });
-        } else {
-            button.add_style_class_name('notification-button');
-            button.label = label;
-        }
-        return button;
-    },
-
     _notifyForSource: function(source, ndata) {
         let [id, icon, summary, body, actions, hints, notification] =
             [ndata.id, ndata.icon, ndata.summary, ndata.body,
@@ -371,6 +495,10 @@ const FdoNotificationDaemon = new Lang.Class({
                     }
                     this._emitNotificationClosed(ndata.id, notificationClosedReason);
                 }));
+            notification.connect('action-invoked', Lang.bind(this,
+                function(n, actionId) {
+                    this._emitActionInvoked(ndata.id, actionId);
+                }));
         }
 
         // Mark music notifications so they can be shown in the screen shield
@@ -404,33 +532,18 @@ const FdoNotificationDaemon = new Lang.Class({
                                              soundName: hints['sound-name'] });
         notification.setImage(image);
 
-        let hasDefaultAction = false;
-
         if (actions.length) {
-            let useActionIcons = (hints['action-icons'] == true);
-
+            notification.setUseActionIcons(hints['action-icons'] == true);
             for (let i = 0; i < actions.length - 1; i += 2) {
-                let [actionId, label] = [actions[i], actions[i+1]];
-                if (actionId == 'default') {
-                    hasDefaultAction = true;
-                } else {
-                    notification.addButton(this._makeButton(actionId, label, useActionIcons), Lang.bind(this, function() {
-                        this._emitActionInvoked(ndata.id, actionId);
-                    }));
-                }
+                if (actions[i] == 'default')
+                    notification.connect('clicked', Lang.bind(this,
+                        function() {
+                            this._emitActionInvoked(ndata.id, "default");
+                        }));
+                else
+                    notification.addButton(actions[i], actions[i + 1]);
             }
         }
-
-        if (hasDefaultAction) {
-            notification.connect('clicked', Lang.bind(this, function() {
-                this._emitActionInvoked(ndata.id, 'default');
-            }));
-        } else {
-            notification.connect('clicked', Lang.bind(this, function() {
-                source.open();
-            }));
-        }
-
         switch (hints.urgency) {
             case Urgency.LOW:
                 notification.setUrgency(MessageTray.Urgency.LOW);
@@ -523,8 +636,8 @@ const FdoNotificationDaemon = new Lang.Class({
     }
 });
 
-const FdoNotificationDaemonSource = new Lang.Class({
-    Name: 'FdoNotificationDaemonSource',
+const Source = new Lang.Class({
+    Name: 'NotificationDaemonSource',
     Extends: MessageTray.Source,
 
     _init: function(title, pid, sender, trayIcon, appId) {
@@ -559,11 +672,11 @@ const FdoNotificationDaemonSource = new Lang.Class({
     },
 
     _createPolicy: function() {
-        if (this.app && this.app.get_app_info()) {
+        if (this.app) {
             let id = this.app.get_id().replace(/\.desktop$/,'');
-            return new MessageTray.NotificationApplicationPolicy(id);
+            return new NotificationApplicationPolicy(id);
         } else {
-            return new MessageTray.NotificationGenericPolicy();
+            return new NotificationGenericPolicy();
         }
     },
 
@@ -604,8 +717,8 @@ const FdoNotificationDaemonSource = new Lang.Class({
             this.notifications.length > 0)
             return false;
 
-        let id = global.stage.connect('deactivate', Lang.bind(this, function () {
-            global.stage.disconnect(id);
+        let id = global.connect('notify::stage-input-mode', Lang.bind(this, function () {
+            global.disconnect(id);
             this.trayIcon.click(event);
         }));
 
@@ -621,11 +734,7 @@ const FdoNotificationDaemonSource = new Lang.Class({
             return app;
 
         if (this.trayIcon) {
-            app = Shell.AppSystem.get_default().lookup_startup_wmclass(this.trayIcon.wm_class);
-            if (app != null)
-                return app;
-
-            app = Shell.AppSystem.get_default().lookup_desktop_wmclass(this.trayIcon.wm_class);
+            app = Shell.AppSystem.get_default().lookup_wmclass(this.trayIcon.wm_class);
             if (app != null)
                 return app;
         }
@@ -639,6 +748,22 @@ const FdoNotificationDaemonSource = new Lang.Class({
         return null;
     },
 
+    _setApp: function(appId) {
+        if (this.app)
+            return;
+
+        this.app = this._getApp(appId);
+        if (!this.app)
+            return;
+
+        // Only override the icon if we were previously using
+        // notification-based icons (ie, not a trayicon) or if it was unset before
+        if (!this.trayIcon) {
+            this.useNotificationIcon = false;
+            this.iconUpdated();
+        }
+    },
+
     setTitle: function(title) {
         // Do nothing if .app is set, we don't want to override the
         // app name with whatever is provided through libnotify (usually
@@ -649,9 +774,9 @@ const FdoNotificationDaemonSource = new Lang.Class({
         this.parent(title);
     },
 
-    open: function() {
-        this.openApp();
+    open: function(notification) {
         this.destroyNonResidentNotifications();
+        this.openApp();
     },
 
     _lastNotificationRemoved: function() {
@@ -663,8 +788,11 @@ const FdoNotificationDaemonSource = new Lang.Class({
         if (this.app == null)
             return;
 
-        this.app.activate();
-        Main.overview.hide();
+        let windows = this.app.get_windows();
+        if (windows.length > 0) {
+            let mostRecentWindow = windows[0];
+            Main.activateWindow(mostRecentWindow);
+        }
     },
 
     destroy: function() {
@@ -691,276 +819,3 @@ const FdoNotificationDaemonSource = new Lang.Class({
         }
     }
 });
-
-
-const GtkNotificationDaemonNotification = new Lang.Class({
-    Name: 'GtkNotificationDaemonNotification',
-    Extends: MessageTray.Notification,
-
-    _init: function(source, notification) {
-        this.parent(source);
-        this._serialized = GLib.Variant.new('a{sv}', notification);
-
-        let { "title": title,
-              "body": body,
-              "icon": gicon,
-              "urgent": urgent,
-              "buttons": buttons,
-              "default-action": defaultAction,
-              "default-action-target": defaultActionTarget } = notification;
-
-        this.setUrgency(urgent.unpack() ? MessageTray.Urgency.CRITICAL
-                                        : MessageTray.Urgency.NORMAL);
-
-        if (buttons) {
-            buttons.deep_unpack().forEach(Lang.bind(this, function(button) {
-                this.addAction(button.label.unpack(),
-                               Lang.bind(this, this._onButtonClicked, button));
-            }));
-        }
-
-        this._defaultAction = defaultAction ? defaultAction.unpack() : null;
-        this._defaultActionTarget = defaultActionTarget;
-
-        this.update(title.unpack(), body ? body.unpack() : null,
-                    { gicon: gicon ? Gio.icon_deserialize(gicon) : null });
-    },
-
-    _activateAction: function(namespacedActionId, target) {
-        if (namespacedActionId) {
-            if (namespacedActionId.startsWith('app.')) {
-                let actionId = namespacedActionId.slice('app.'.length);
-                this.source.activateAction(actionId, target);
-            }
-        } else {
-            this.source.open();
-        }
-    },
-
-    _onButtonClicked: function(button) {
-        let { 'action': action, 'target': actionTarget } = button;
-        this._activateAction(action.unpack(), actionTarget);
-    },
-
-    _onClicked: function() {
-        this._activateAction(this._defaultAction, this._defaultActionTarget);
-        this.parent();
-    },
-
-    serialize: function() {
-        return this._serialized;
-    },
-});
-
-const FdoApplicationIface = '<node> \
-<interface name="org.freedesktop.Application"> \
-<method name="ActivateAction"> \
-    <arg type="s" direction="in" /> \
-    <arg type="av" direction="in" /> \
-    <arg type="a{sv}" direction="in" /> \
-</method> \
-<method name="Activate"> \
-    <arg type="a{sv}" direction="in" /> \
-</method> \
-</interface> \
-</node>';
-const FdoApplicationProxy = Gio.DBusProxy.makeProxyWrapper(FdoApplicationIface);
-
-function objectPathFromAppId(appId) {
-    return '/' + appId.replace(/\./g, '/');
-}
-
-function getPlatformData() {
-    let startupId = GLib.Variant.new('s', '_TIME' + global.get_current_time());
-    return { "desktop-startup-id": startupId };
-}
-
-function InvalidAppError() {}
-
-const GtkNotificationDaemonAppSource = new Lang.Class({
-    Name: 'GtkNotificationDaemonAppSource',
-    Extends: MessageTray.Source,
-
-    _init: function(appId) {
-        this._appId = appId;
-        this._objectPath = objectPathFromAppId(appId);
-
-        this._app = Shell.AppSystem.get_default().lookup_app(appId + '.desktop');
-        if (!this._app)
-            throw new InvalidAppError();
-
-        this._notifications = {};
-
-        this.parent(this._app.get_name());
-    },
-
-    createIcon: function(size) {
-        return this._app.create_icon_texture(size);
-    },
-
-    _createPolicy: function() {
-        return new MessageTray.NotificationApplicationPolicy(this._appId);
-    },
-
-    _createApp: function() {
-        return new FdoApplicationProxy(Gio.DBus.session, this._appId, this._objectPath);
-    },
-
-    activateAction: function(actionId, target) {
-        let app = this._createApp();
-        app.ActivateActionRemote(actionId, target ? [target] : [], getPlatformData());
-    },
-
-    open: function() {
-        let app = this._createApp();
-        app.ActivateRemote(getPlatformData());
-    },
-
-    addNotification: function(notificationId, notificationParams, showBanner) {
-        if (this._notifications[notificationId])
-            this._notifications[notificationId].destroy();
-
-        let notification = new GtkNotificationDaemonNotification(this, notificationParams);
-        notification.connect('destroy', Lang.bind(this, function() {
-            delete this._notifications[notificationId];
-        }));
-        this._notifications[notificationId] = notification;
-
-        if (showBanner)
-            this.notify(notification);
-        else
-            this.pushNotification(notification);
-    },
-
-    removeNotification: function(notificationId) {
-        if (this._notifications[notificationId])
-            this._notifications[notificationId].destroy(MessageTray.NotificationDestroyedReason.SOURCE_CLOSED);
-    },
-
-    serialize: function() {
-        let notifications = [];
-        for (let notificationId in this._notifications) {
-            let notification = this._notifications[notificationId];
-            notifications.push([notificationId, notification.serialize()]);
-        }
-        return [this._appId, notifications];
-    },
-});
-
-const GtkNotificationsIface = '<node> \
-<interface name="org.gtk.Notifications"> \
-<method name="AddNotification"> \
-    <arg type="s" direction="in" /> \
-    <arg type="s" direction="in" /> \
-    <arg type="a{sv}" direction="in" /> \
-</method> \
-<method name="RemoveNotification"> \
-    <arg type="s" direction="in" /> \
-    <arg type="s" direction="in" /> \
-</method> \
-</interface> \
-</node>';
-
-const GtkNotificationDaemon = new Lang.Class({
-    Name: 'GtkNotificationDaemon',
-
-    _init: function() {
-        this._sources = {};
-
-        this._loadNotifications();
-
-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GtkNotificationsIface, this);
-        this._dbusImpl.export(Gio.DBus.session, '/org/gtk/Notifications');
-
-        Gio.DBus.session.own_name('org.gtk.Notifications', Gio.BusNameOwnerFlags.REPLACE, null, null);
-    },
-
-    _ensureAppSource: function(appId) {
-        if (this._sources[appId])
-            return this._sources[appId];
-
-        let source = new GtkNotificationDaemonAppSource(appId);
-
-        source.connect('destroy', Lang.bind(this, function() {
-            delete this._sources[appId];
-            this._saveNotifications();
-        }));
-        source.connect('count-updated', Lang.bind(this, this._saveNotifications));
-        Main.messageTray.add(source);
-        this._sources[appId] = source;
-        return source;
-    },
-
-    _loadNotifications: function() {
-        this._isLoading = true;
-
-        let value = global.get_persistent_state('a(sa(sv))', 'notifications');
-        if (value) {
-            let sources = value.deep_unpack();
-            sources.forEach(Lang.bind(this, function([appId, notifications]) {
-                if (notifications.length == 0)
-                    return;
-
-                let source;
-                try {
-                    source = this._ensureAppSource(appId);
-                } catch(e if e instanceof InvalidAppError) {
-                    return;
-                }
-
-                notifications.forEach(function([notificationId, notification]) {
-                    source.addNotification(notificationId, notification.deep_unpack(), false);
-                });
-            }));
-        }
-
-        this._isLoading = false;
-    },
-
-    _saveNotifications: function() {
-        if (this._isLoading)
-            return;
-
-        let sources = [];
-        for (let appId in this._sources) {
-            let source = this._sources[appId];
-            sources.push(source.serialize());
-        }
-
-        global.set_persistent_state('notifications', new GLib.Variant('a(sa(sv))', sources));
-    },
-
-    AddNotificationAsync: function(params, invocation) {
-        let [appId, notificationId, notification] = params;
-
-        let source;
-        try {
-            source = this._ensureAppSource(appId);
-        } catch(e if e instanceof InvalidAppError) {
-            invocation.return_dbus_error('org.gtk.Notifications.InvalidApp', 'The app by ID "%s" could not be found'.format(appId));
-            return;
-        }
-
-        source.addNotification(notificationId, notification, true);
-
-        invocation.return_value(null);
-    },
-
-    RemoveNotificationAsync: function(params, invocation) {
-        let [appId, notificationId] = params;
-        let source = this._sources[appId];
-        if (source)
-            source.removeNotification(notificationId);
-
-        invocation.return_value(null);
-    },
-});
-
-const NotificationDaemon = new Lang.Class({
-    Name: 'NotificationDaemon',
-
-    _init: function() {
-        this._fdoNotificationDaemon = new FdoNotificationDaemon();
-        this._gtkNotificationDaemon = new GtkNotificationDaemon();
-    },
-});

js/ui/osdWindow.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const St = imports.gi.St;
 
 const Lang = imports.lang;
@@ -66,24 +65,19 @@ const LevelBar = new Lang.Class({
         cr.arc(radius, h - radius, radius, 0.5 * Math.PI, Math.PI);
         cr.arc(radius, radius, radius, Math.PI, 1.5 * Math.PI);
         cr.fill();
-        cr.$dispose();
     }
 });
 
 const OsdWindow = new Lang.Class({
     Name: 'OsdWindow',
 
-    _init: function(monitorIndex) {
+    _init: function() {
         this._popupSize = 0;
         this.actor = new St.Widget({ x_expand: true,
                                      y_expand: true,
                                      x_align: Clutter.ActorAlign.CENTER,
                                      y_align: Clutter.ActorAlign.CENTER });
-
-        this._monitorIndex = monitorIndex;
-        let constraint = new Layout.MonitorConstraint({ index: monitorIndex });
-        this.actor.add_constraint(constraint);
-
+        this.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);
@@ -112,6 +106,7 @@ const OsdWindow = new Lang.Class({
         Main.layoutManager.connect('monitors-changed',
                                    Lang.bind(this, this._monitorsChanged));
         this._monitorsChanged();
+
         Main.uiGroup.add_child(this.actor);
     },
 
@@ -127,15 +122,13 @@ const OsdWindow = new Lang.Class({
 
     setLevel: function(level) {
         this._level.actor.visible = (level != undefined);
-        if (level != undefined) {
-            if (this.actor.visible)
-                Tweener.addTween(this._level,
-                                 { level: level,
-                                   time: LEVEL_ANIMATION_TIME,
-                                   transition: 'easeOutQuad' });
-            else
-                this._level.level = level;
-        }
+        if (this.actor.visible)
+            Tweener.addTween(this._level,
+                             { level: level,
+                               time: LEVEL_ANIMATION_TIME,
+                               transition: 'easeOutQuad' });
+        else
+            this._level.level = level;
     },
 
     show: function() {
@@ -143,10 +136,8 @@ const OsdWindow = new Lang.Class({
             return;
 
         if (!this.actor.visible) {
-            Meta.disable_unredirect_for_screen(global.screen);
             this.actor.show();
             this.actor.opacity = 0;
-            this.actor.get_parent().set_child_above_sibling(this.actor, null);
 
             Tweener.addTween(this.actor,
                              { opacity: 255,
@@ -158,7 +149,6 @@ const OsdWindow = new Lang.Class({
             Mainloop.source_remove(this._hideTimeoutId);
         this._hideTimeoutId = Mainloop.timeout_add(HIDE_TIMEOUT,
                                                    Lang.bind(this, this._hide));
-        GLib.Source.set_name_by_id(this._hideTimeoutId, '[gnome-shell] this._hide');
     },
 
     cancel: function() {
@@ -166,21 +156,16 @@ const OsdWindow = new Lang.Class({
             return;
 
         Mainloop.source_remove(this._hideTimeoutId);
+        this._hideTimeoutId = 0;
         this._hide();
     },
 
     _hide: function() {
-        this._hideTimeoutId = 0;
         Tweener.addTween(this.actor,
                          { opacity: 0,
                            time: FADE_TIME,
                            transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                              this._reset();
-                              Meta.enable_unredirect_for_screen(global.screen);
-                           })
-                         });
-        return GLib.SOURCE_REMOVE;
+                           onComplete: Lang.bind(this, this._reset) });
     },
 
     _reset: function() {
@@ -191,16 +176,14 @@ const OsdWindow = new Lang.Class({
 
     _monitorsChanged: function() {
         /* assume 110x110 on a 640x480 display and scale from there */
-        let monitor = Main.layoutManager.monitors[this._monitorIndex];
-
+        let monitor = Main.layoutManager.primaryMonitor;
         let scalew = monitor.width / 640.0;
         let scaleh = monitor.height / 480.0;
         let scale = Math.min(scalew, scaleh);
         this._popupSize = 110 * Math.max(1, scale);
 
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._icon.icon_size = this._popupSize / (2 * scaleFactor);
         this._box.translation_y = monitor.height / 4;
+        this._icon.icon_size = this._popupSize / 2;
         this._box.style_changed();
     },
 
@@ -216,60 +199,6 @@ const OsdWindow = new Lang.Class({
         let minWidth = this._popupSize - verticalPadding - leftBorder - rightBorder;
         let minHeight = this._popupSize - horizontalPadding - topBorder - bottomBorder;
 
-        // minWidth/minHeight here are in real pixels,
-        // but the theme takes measures in unscaled dimensions
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._box.style = 'min-height: %dpx;'.format(Math.max(minWidth, minHeight) / scaleFactor);
-    }
-});
-
-const OsdWindowManager = new Lang.Class({
-    Name: 'OsdWindowManager',
-
-    _init: function() {
-        this._osdWindows = [];
-        Main.layoutManager.connect('monitors-changed',
-                                    Lang.bind(this, this._monitorsChanged));
-        this._monitorsChanged();
-    },
-
-    _monitorsChanged: function() {
-        for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
-            if (this._osdWindows[i] == undefined)
-                this._osdWindows[i] = new OsdWindow(i);
-        }
-
-        for (let i = Main.layoutManager.monitors.length; i < this._osdWindows.length; i++) {
-            this._osdWindows[i].actor.destroy();
-            this._osdWindows[i] = null;
-        }
-
-        this._osdWindows.length = Main.layoutManager.monitors.length;
-    },
-
-    _showOsdWindow: function(monitorIndex, icon, label, level) {
-        this._osdWindows[monitorIndex].setIcon(icon);
-        this._osdWindows[monitorIndex].setLabel(label);
-        this._osdWindows[monitorIndex].setLevel(level);
-        this._osdWindows[monitorIndex].show();
-    },
-
-    show: function(monitorIndex, icon, label, level) {
-        if (monitorIndex != -1) {
-            for (let i = 0; i < this._osdWindows.length; i++) {
-                if (i == monitorIndex)
-                    this._showOsdWindow(i, icon, label, level);
-                else
-                    this._osdWindows[i].cancel();
-            }
-        } else {
-            for (let i = 0; i < this._osdWindows.length; i++)
-                this._showOsdWindow(i, icon, label, level);
-        }
-    },
-
-    hideAll: function() {
-        for (let i = 0; i < this._osdWindows.length; i++)
-            this._osdWindows[i].cancel();
+        this._box.style = 'min-height: %dpx;'.format(Math.max(minWidth, minHeight));
     }
 });

js/ui/overview.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Mainloop = imports.mainloop;
@@ -14,7 +13,6 @@ const Gdk = imports.gi.Gdk;
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const LayoutManager = imports.ui.layout;
-const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const OverviewControls = imports.ui.overviewControls;
@@ -80,8 +78,10 @@ const ShellInfo = new Lang.Class({
         }
 
         this._undoCallback = undoCallback;
-        if (undoCallback)
-            notification.addAction(_("Undo"), Lang.bind(this, this._onUndoClicked));
+        if (undoCallback) {
+            notification.addButton('system-undo', _("Undo"));
+            notification.connect('action-invoked', Lang.bind(this, this._onUndoClicked));
+        }
 
         this._source.notify(notification);
     }
@@ -114,6 +114,9 @@ const Overview = new Lang.Class({
         // rendering options without duplicating the texture data.
         let monitor = Main.layoutManager.primaryMonitor;
 
+        this._desktopFade = new St.Bin();
+        Main.layoutManager.overviewGroup.add_child(this._desktopFade);
+
         let layout = new Clutter.BinLayout();
         this._stack = new Clutter.Actor({ layout_manager: layout });
         this._stack.add_constraint(new LayoutManager.MonitorConstraint({ primary: true }));
@@ -132,9 +135,6 @@ const Overview = new Lang.Class({
         Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
         this._bgManagers = [];
 
-        this._desktopFade = new St.Widget();
-        Main.layoutManager.overviewGroup.add_child(this._desktopFade);
-
         this._activationTime = 0;
 
         this.visible = false;           // animating to overview, in overview, animating out
@@ -148,8 +148,8 @@ const Overview = new Lang.Class({
         // Dash elements, or mouseover handlers in the workspaces.
         this._coverPane = new Clutter.Actor({ opacity: 0,
                                               reactive: true });
-        Main.layoutManager.overviewGroup.add_child(this._coverPane);
-        this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return Clutter.EVENT_STOP; }));
+        this._overview.add_actor(this._coverPane);
+        this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return true; }));
 
         this._stack.add_actor(this._overview);
         Main.layoutManager.overviewGroup.add_child(this._stack);
@@ -197,7 +197,11 @@ const Overview = new Lang.Class({
 
             Tweener.addTween(background,
                              { brightness: 1.0,
-                               vignetteSharpness: 0.0,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+            Tweener.addTween(background,
+                             { vignetteSharpness: 0.0,
                                time: SHADE_ANIMATION_TIME,
                                transition: 'easeOutQuad'
                              });
@@ -210,8 +214,12 @@ const Overview = new Lang.Class({
             let background = backgrounds[i]._delegate;
 
             Tweener.addTween(background,
-                             { brightness: Lightbox.VIGNETTE_BRIGHTNESS,
-                               vignetteSharpness: Lightbox.VIGNETTE_SHARPNESS,
+                             { brightness: 0.8,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+            Tweener.addTween(background,
+                             { vignetteSharpness: 0.7,
                                time: SHADE_ANIMATION_TIME,
                                transition: 'easeOutQuad'
                              });
@@ -257,7 +265,7 @@ const Overview = new Lang.Class({
         // Create controls
         this._controls = new OverviewControls.ControlsManager(this._searchEntry);
         this._dash = this._controls.dash;
-        this.viewSelector = this._controls.viewSelector;
+        this._viewSelector = this._controls.viewSelector;
 
         // Add our same-line elements after the search entry
         this._overview.add(this._controls.actor, { y_fill: true, expand: true });
@@ -277,11 +285,11 @@ const Overview = new Lang.Class({
     },
 
     addSearchProvider: function(provider) {
-        this.viewSelector.addSearchProvider(provider);
+        this._viewSelector.addSearchProvider(provider);
     },
 
     removeSearchProvider: function(provider) {
-        this.viewSelector.removeSearchProvider(provider);
+        this._viewSelector.removeSearchProvider(provider);
     },
 
     //
@@ -357,15 +365,12 @@ const Overview = new Lang.Class({
             this._lastHoveredWindow = dragEvent.targetActor._delegate.metaWindow;
             this._windowSwitchTimeoutId = Mainloop.timeout_add(DND_WINDOW_SWITCH_TIMEOUT,
                                             Lang.bind(this, function() {
-                                                this._windowSwitchTimeoutId = 0;
                                                 this._needsFakePointerEvent = true;
                                                 Main.activateWindow(dragEvent.targetActor._delegate.metaWindow,
                                                                     this._windowSwitchTimestamp);
                                                 this.hide();
                                                 this._lastHoveredWindow = null;
-                                                return GLib.SOURCE_REMOVE;
                                             }));
-            GLib.Source.set_name_by_id(this._windowSwitchTimeoutId, '[gnome-shell] Main.activateWindow');
         }
 
         return DND.DragMotionResult.CONTINUE;
@@ -373,7 +378,6 @@ const Overview = new Lang.Class({
 
     _onScrollEvent: function(actor, event) {
         this.emit('scroll-event', event);
-        return Clutter.EVENT_PROPAGATE;
     },
 
     addAction: function(action) {
@@ -441,17 +445,17 @@ const Overview = new Lang.Class({
         this._inDrag = false;
     },
 
-    beginWindowDrag: function(clone) {
-        this.emit('window-drag-begin', clone);
+    beginWindowDrag: function(source) {
+        this.emit('window-drag-begin');
         this._inDrag = true;
     },
 
-    cancelledWindowDrag: function(clone) {
-        this.emit('window-drag-cancelled', clone);
+    cancelledWindowDrag: function(source) {
+        this.emit('window-drag-cancelled');
     },
 
-    endWindowDrag: function(clone) {
-        this.emit('window-drag-end', clone);
+    endWindowDrag: function(source) {
+        this.emit('window-drag-end');
         this._inDrag = false;
     },
 
@@ -487,13 +491,8 @@ const Overview = new Lang.Class({
     },
 
     fadeOutDesktop: function() {
-        if (!this._desktopFade.get_n_children()) {
-            let clone = this._getDesktopClone();
-            if (!clone)
-                return;
-
-            this._desktopFade.add_child(clone);
-        }
+        if (!this._desktopFade.child)
+            this._desktopFade.child = this._getDesktopClone();
 
         this._desktopFade.opacity = 255;
         this._desktopFade.show();
@@ -513,8 +512,17 @@ const Overview = new Lang.Class({
         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
+        // increases performance of the Overview especially when there are many
+        // windows visible.
+        //
+        // If we switched to displaying the actors in the Overview rather than
+        // clones of them, this would obviously no longer be necessary.
+        //
+        // Disable unredirection while in the overview
         Meta.disable_unredirect_for_screen(global.screen);
-        this.viewSelector.show();
+        this._viewSelector.show();
 
         this._stack.opacity = 0;
         Tweener.addTween(this._stack,
@@ -621,7 +629,7 @@ const Overview = new Lang.Class({
         this.animationInProgress = true;
         this.visibleTarget = false;
 
-        this.viewSelector.zoomFromOverview();
+        this._viewSelector.zoomFromOverview();
 
         // Make other elements fade out.
         Tweener.addTween(this._stack,
@@ -656,7 +664,7 @@ const Overview = new Lang.Class({
         // Re-enable unredirection
         Meta.enable_unredirect_for_screen(global.screen);
 
-        this.viewSelector.hide();
+        this._viewSelector.hide();
         this._desktopFade.hide();
         this._coverPane.hide();
 

js/ui/overviewControls.js

@@ -36,7 +36,6 @@ const SlideLayout = new Lang.Class({
 
     _init: function(params) {
         this._slideX = 1;
-        this._translationX = 0;
         this._direction = SlideDirection.LEFT;
 
         this.parent(params);
@@ -56,21 +55,18 @@ const SlideLayout = new Lang.Class({
     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 [, natWidth] = child.get_preferred_width(availHeight);
 
-        // Align the actor inside the clipped box, as the actor's alignment
-        // flags only determine what to do if the allocated box is bigger
-        // than the actor's box.
         let realDirection = getRtlSlideDirection(this._direction, child);
-        let alignX = (realDirection == SlideDirection.LEFT) ? (availWidth - natWidth) : 0;
+        let translationX = (realDirection == SlideDirection.LEFT) ?
+            (availWidth - natWidth) : (natWidth - availWidth);
 
-        let actorBox = new Clutter.ActorBox();
-        actorBox.x1 = box.x1 + alignX + this._translationX;
-        actorBox.x2 = actorBox.x1 + (child.x_expand ? availWidth : natWidth);
-        actorBox.y1 = box.y1;
-        actorBox.y2 = actorBox.y1 + availHeight;
+        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);
     },
@@ -91,16 +87,7 @@ const SlideLayout = new Lang.Class({
 
     get slideDirection() {
         return this._direction;
-    },
-
-    set translationX(value) {
-        this._translationX = value;
-        this.layout_changed();
-    },
-
-    get translationX() {
-        return this._translationX;
-    },
+    }
 });
 
 const SlidingControl = new Lang.Class({
@@ -109,8 +96,8 @@ const SlidingControl = new Lang.Class({
     _init: function(params) {
         params = Params.parse(params, { slideDirection: SlideDirection.LEFT });
 
-        this._visible = true;
-        this._inDrag = false;
+        this.visible = true;
+        this.inDrag = false;
 
         this.layout = new SlideLayout();
         this.layout.slideDirection = params.slideDirection;
@@ -119,7 +106,6 @@ const SlidingControl = new Lang.Class({
                                      clip_to_allocation: true });
 
         Main.overview.connect('showing', Lang.bind(this, this._onOverviewShowing));
-        Main.overview.connect('hiding', Lang.bind(this, this._onOverviewHiding));
 
         Main.overview.connect('item-drag-begin', Lang.bind(this, this._onDragBegin));
         Main.overview.connect('item-drag-end', Lang.bind(this, this._onDragEnd));
@@ -130,12 +116,12 @@ const SlidingControl = new Lang.Class({
         Main.overview.connect('window-drag-end', Lang.bind(this, this._onWindowDragEnd));
     },
 
-    _getSlide: function() {
+    getSlide: function() {
         throw new Error('getSlide() must be overridden');
     },
 
-    _updateSlide: function() {
-        Tweener.addTween(this.layout, { slideX: this._getSlide(),
+    updateSlide: function() {
+        Tweener.addTween(this.layout, { slideX: this.getSlide(),
                                         time: SIDE_CONTROLS_ANIMATION_TIME,
                                         transition: 'easeOutQuad' });
     },
@@ -162,30 +148,28 @@ const SlidingControl = new Lang.Class({
         let translationEnd = 0;
         let translation = this._getTranslation();
 
-        if (this._visible) {
+        if (this.visible) {
             translationStart = translation;
         } else {
             translationEnd = translation;
         }
 
-        if (this.layout.translationX == translationEnd)
+        if (this.actor.translation_x == translationEnd)
             return;
 
-        this.layout.translationX = translationStart;
-        Tweener.addTween(this.layout, { translationX: translationEnd,
-                                        time: SIDE_CONTROLS_ANIMATION_TIME,
-                                        transition: 'easeOutQuad' });
+        this.actor.translation_x = translationStart;
+        Tweener.addTween(this.actor, { translation_x: translationEnd,
+                                       time: SIDE_CONTROLS_ANIMATION_TIME,
+                                       transition: 'easeOutQuad'
+                                     });
     },
 
     _onOverviewShowing: function() {
-        this._visible = true;
-        this.layout.slideX = this._getSlide();
-        this.layout.translationX = this._getTranslation();
-        this.slideIn();
-    },
-
-    _onOverviewHiding: function() {
-        this.slideOut();
+        // 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() {
@@ -197,14 +181,14 @@ const SlidingControl = new Lang.Class({
     },
 
     _onDragBegin: function() {
-        this._inDrag = true;
-        this.layout.translationX = 0;
-        this._updateSlide();
+        this.inDrag = true;
+        this.actor.translation_x = 0;
+        this.updateSlide();
     },
 
     _onDragEnd: function() {
-        this._inDrag = false;
-        this._updateSlide();
+        this.inDrag = false;
+        this.updateSlide();
     },
 
     fadeIn: function() {
@@ -222,13 +206,12 @@ const SlidingControl = new Lang.Class({
     },
 
     slideIn: function() {
-        this._visible = true;
-        this._updateTranslation();
+        this.visible = true;
         // we will update slideX and the translation from pageEmpty
     },
 
     slideOut: function() {
-        this._visible = false;
+        this.visible = false;
         this._updateTranslation();
         // we will update slideX from pageEmpty
     },
@@ -238,7 +221,7 @@ const SlidingControl = new Lang.Class({
         // 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.layout.slideX = this.getSlide();
         this._updateTranslation();
     }
 });
@@ -252,25 +235,25 @@ const ThumbnailsSlider = new Lang.Class({
 
         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));
-        global.window_manager.connect('switch-workspace', Lang.bind(this, this._updateSlide));
+        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this.updateSlide));
+        this.actor.connect('notify::hover', Lang.bind(this, this.updateSlide));
         this._thumbnailsBox.actor.bind_property('visible', this.actor, 'visible', GObject.BindingFlags.SYNC_CREATE);
     },
 
     _getAlwaysZoomOut: function() {
         // Always show the pager when hover, during a drag, or if workspaces are
-        // actually used, e.g. there are windows on any non-active workspace
-        let alwaysZoomOut = this.actor.hover ||
-                            this._inDrag ||
-                            !Meta.prefs_get_dynamic_workspaces() ||
-                            global.screen.n_workspaces > 2 ||
-                            global.screen.get_active_workspace_index() != 0;
+        // actually used, e.g. there are windows on more than one
+        let alwaysZoomOut = this.actor.hover || this.inDrag || !Meta.prefs_get_dynamic_workspaces() || global.screen.n_workspaces > 2;
 
         if (!alwaysZoomOut) {
             let monitors = Main.layoutManager.monitors;
@@ -295,8 +278,8 @@ const ThumbnailsSlider = new Lang.Class({
         return child.get_theme_node().get_length('visible-width');
     },
 
-    _getSlide: function() {
-        if (!this._visible)
+    getSlide: function() {
+        if (!this.visible)
             return 0;
 
         let alwaysZoomOut = this._getAlwaysZoomOut();
@@ -332,18 +315,18 @@ const DashSlider = new Lang.Class({
         // 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.x_expand = true;
         this.actor.x_align = Clutter.ActorAlign.START;
         this.actor.y_expand = true;
 
         this.actor.add_actor(this._dash.actor);
 
-        this._dash.connect('icon-size-changed', Lang.bind(this, this._updateSlide));
+        this._dash.connect('icon-size-changed', Lang.bind(this, this.updateSlide));
     },
 
-    _getSlide: function() {
-        if (this._visible || this._inDrag)
+    getSlide: function() {
+        if (this.visible || this.inDrag)
             return 1;
         else
             return 0;
@@ -465,6 +448,9 @@ const MessagesIndicator = new Lang.Class({
         if (source.trayIcon)
             return;
 
+        if (source.isTransient)
+            return;
+
         source.connect('count-updated', Lang.bind(this, this._updateCount));
         this._sources.push(source);
         this._updateCount();
@@ -501,17 +487,6 @@ const MessagesIndicator = new Lang.Class({
     }
 });
 
-const ControlsLayout = new Lang.Class({
-    Name: 'ControlsLayout',
-    Extends: Clutter.BinLayout,
-    Signals: { 'allocation-changed': { flags: GObject.SignalFlags.RUN_LAST } },
-
-    vfunc_allocate: function(container, box, flags) {
-        this.parent(container, box, flags);
-        this.emit('allocation-changed');
-    }
-});
-
 const ControlsManager = new Lang.Class({
     Name: 'ControlsManager',
 
@@ -532,8 +507,7 @@ const ControlsManager = new Lang.Class({
         this._indicator = new MessagesIndicator(this.viewSelector);
         this.indicatorActor = this._indicator.actor;
 
-        let layout = new ControlsLayout();
-        this.actor = new St.Widget({ layout_manager: layout,
+        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                      reactive: true,
                                      x_expand: true, y_expand: true,
                                      clip_to_allocation: true });
@@ -548,7 +522,7 @@ const ControlsManager = new Lang.Class({
                                                    expand: true });
         this._group.add_actor(this._thumbnailsSlider.actor);
 
-        layout.connect('allocation-changed', Lang.bind(this, this._updateWorkspacesGeometry));
+        this._group.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesGeometry));
 
         Main.overview.connect('showing', Lang.bind(this, this._updateSpacerVisibility));
         Main.overview.connect('item-drag-begin', Lang.bind(this,

js/ui/panel.js

@@ -189,6 +189,7 @@ const AppMenuButton = new Lang.Class({
 
         this.actor.bind_property("reactive", this.actor, "can-focus", 0);
         this.actor.reactive = false;
+        this._targetIsCurrent = false;
 
         this._container = new Shell.GenericContainer();
         bin.set_child(this._container);
@@ -206,23 +207,20 @@ const AppMenuButton = new Lang.Class({
         this._iconBox.connect('notify::allocation',
                               Lang.bind(this, this._updateIconBoxClip));
         this._container.add_actor(this._iconBox);
-
-        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        this._container.add_actor(this._hbox);
-
         this._label = new TextShadower();
-        this._label.actor.y_align = Clutter.ActorAlign.CENTER;
-        this._hbox.add_actor(this._label.actor);
-        this._arrow = PopupMenu.arrowIcon(St.Side.BOTTOM);
-        this._hbox.add_actor(this._arrow);
+        this._container.add_actor(this._label.actor);
 
         this._iconBottomClip = 0;
 
         this._visible = !Main.overview.visible;
         if (!this._visible)
             this.actor.hide();
-        this._overviewHidingId = Main.overview.connect('hiding', Lang.bind(this, this._sync));
-        this._overviewShowingId = Main.overview.connect('showing', Lang.bind(this, this._sync));
+        this._overviewHidingId = Main.overview.connect('hiding', Lang.bind(this, function () {
+            this.show();
+        }));
+        this._overviewShowingId = Main.overview.connect('showing', Lang.bind(this, function () {
+            this.hide();
+        }));
 
         this._stop = true;
 
@@ -245,8 +243,13 @@ const AppMenuButton = new Lang.Class({
             return;
 
         this._visible = true;
-        this.actor.reactive = true;
         this.actor.show();
+
+        if (!this._targetIsCurrent)
+            return;
+
+        this.actor.reactive = true;
+
         Tweener.removeTweens(this.actor);
         Tweener.addTween(this.actor,
                          { opacity: 255,
@@ -260,6 +263,11 @@ const AppMenuButton = new Lang.Class({
 
         this._visible = false;
         this.actor.reactive = false;
+        if (!this._targetIsCurrent) {
+            this.actor.hide();
+            return;
+        }
+
         Tweener.removeTweens(this.actor);
         Tweener.addTween(this.actor,
                          { opacity: 0,
@@ -278,8 +286,9 @@ const AppMenuButton = new Lang.Class({
             return;
         this._spinnerIcon = icon;
         this._spinner = new Animation.AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);
-        this._hbox.add_actor(this._spinner.actor);
+        this._container.add_actor(this._spinner.actor);
         this._spinner.actor.hide();
+        this._spinner.actor.lower_bottom();
     },
 
     _onIconBoxStyleChanged: function() {
@@ -288,19 +297,13 @@ const AppMenuButton = new Lang.Class({
         this._updateIconBoxClip();
     },
 
-    _syncIcon: function() {
-        if (!this._targetApp)
-            return;
-
-        let icon = this._targetApp.get_faded_icon(2 * PANEL_ICON_SIZE, this._iconBox.text_direction);
-        this._iconBox.set_child(icon);
-    },
-
     _onIconThemeChanged: function() {
         if (this._iconBox.child == null)
             return;
 
-        this._syncIcon();
+        this._iconBox.child.destroy();
+        let icon = this._targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);
+        this._iconBox.set_child(icon);
     },
 
     _updateIconBoxClip: function() {
@@ -318,6 +321,7 @@ const AppMenuButton = new Lang.Class({
             return;
 
         this._stop = true;
+        this.actor.reactive = true;
 
         if (this._spinner == null)
             return;
@@ -337,6 +341,7 @@ const AppMenuButton = new Lang.Class({
 
     startAnimation: function() {
         this._stop = false;
+        this.actor.reactive = false;
 
         if (this._spinner == null)
             return;
@@ -349,7 +354,7 @@ const AppMenuButton = new Lang.Class({
         let [minSize, naturalSize] = this._iconBox.get_preferred_width(forHeight);
         alloc.min_size = minSize;
         alloc.natural_size = naturalSize;
-        [minSize, naturalSize] = this._hbox.get_preferred_width(forHeight);
+        [minSize, naturalSize] = this._label.actor.get_preferred_width(forHeight);
         alloc.min_size = alloc.min_size + Math.max(0, minSize - Math.floor(alloc.min_size / 2));
         alloc.natural_size = alloc.natural_size + Math.max(0, naturalSize - Math.floor(alloc.natural_size / 2));
     },
@@ -358,7 +363,7 @@ const AppMenuButton = new Lang.Class({
         let [minSize, naturalSize] = this._iconBox.get_preferred_height(forWidth);
         alloc.min_size = minSize;
         alloc.natural_size = naturalSize;
-        [minSize, naturalSize] = this._hbox.get_preferred_height(forWidth);
+        [minSize, naturalSize] = this._label.actor.get_preferred_height(forWidth);
         if (minSize > alloc.min_size)
             alloc.min_size = minSize;
         if (naturalSize > alloc.natural_size)
@@ -388,10 +393,11 @@ const AppMenuButton = new Lang.Class({
 
         let iconWidth = childBox.x2 - childBox.x1;
 
-        [minWidth, naturalWidth] = this._hbox.get_preferred_width(-1);
+        [minWidth, minHeight, naturalWidth, naturalHeight] = this._label.actor.get_preferred_size();
 
-        childBox.y1 = 0;
-        childBox.y2 = allocHeight;
+        yPadding = Math.floor(Math.max(0, allocHeight - naturalHeight) / 2);
+        childBox.y1 = yPadding;
+        childBox.y2 = childBox.y1 + Math.min(naturalHeight, allocHeight);
 
         if (direction == Clutter.TextDirection.LTR) {
             childBox.x1 = Math.floor(iconWidth / 2);
@@ -400,7 +406,24 @@ const AppMenuButton = new Lang.Class({
             childBox.x2 = allocWidth - Math.floor(iconWidth / 2);
             childBox.x1 = Math.max(0, childBox.x2 - naturalWidth);
         }
-        this._hbox.allocate(childBox, flags);
+        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;
+            childBox.y1 = box.y1;
+            childBox.y2 = box.y2 - 1;
+            this._spinner.actor.allocate(childBox, flags);
+        } else {
+            childBox.x1 = -this._spinner.actor.width;
+            childBox.x2 = childBox.x1 + this._spinner.actor.width;
+            childBox.y1 = box.y1;
+            childBox.y2 = box.y2 - 1;
+            this._spinner.actor.allocate(childBox, flags);
+        }
     },
 
     _onAppStateChanged: function(appSys, app) {
@@ -426,76 +449,104 @@ const AppMenuButton = new Lang.Class({
             // If the app has just lost focus to the panel, pretend
             // nothing happened; otherwise you can't keynav to the
             // app menu.
-            if (global.stage.key_focus != null)
+            if (global.stage_input_mode == Shell.StageInputMode.FOCUSED)
                 return;
         }
         this._sync();
     },
 
-    _findTargetApp: function() {
-        let workspace = global.screen.get_active_workspace();
+    _sync: function() {
         let tracker = Shell.WindowTracker.get_default();
         let focusedApp = tracker.focus_app;
-        if (focusedApp && focusedApp.is_on_workspace(workspace))
-            return focusedApp;
-
+        let lastStartedApp = null;
+        let workspace = global.screen.get_active_workspace();
         for (let i = 0; i < this._startingApps.length; i++)
             if (this._startingApps[i].is_on_workspace(workspace))
-                return this._startingApps[i];
+                lastStartedApp = this._startingApps[i];
 
-        return null;
-    },
+        let targetApp = focusedApp != null ? focusedApp : lastStartedApp;
 
-    _sync: function() {
-        let targetApp = this._findTargetApp();
+        if (targetApp == null) {
+            if (!this._targetIsCurrent)
+                return;
 
-        if (this._targetApp != targetApp) {
-            if (this._appMenuNotifyId) {
-                this._targetApp.disconnect(this._appMenuNotifyId);
-                this._appMenuNotifyId = 0;
-            }
-            if (this._actionGroupNotifyId) {
-                this._targetApp.disconnect(this._actionGroupNotifyId);
-                this._actionGroupNotifyId = 0;
-            }
+            this.actor.reactive = false;
+            this._targetIsCurrent = false;
 
-            this._targetApp = targetApp;
-
-            if (this._targetApp) {
-                this._appMenuNotifyId = this._targetApp.connect('notify::menu', Lang.bind(this, this._sync));
-                this._actionGroupNotifyId = this._targetApp.connect('notify::action-group', Lang.bind(this, this._sync));
-                this._label.setText(this._targetApp.get_name());
-                this.actor.set_accessible_name(this._targetApp.get_name());
-            }
+            Tweener.removeTweens(this.actor);
+            Tweener.addTween(this.actor, { opacity: 0,
+                                           time: Overview.ANIMATION_TIME,
+                                           transition: 'easeOutQuad' });
+            return;
         }
 
-        let visible = (this._targetApp != null && !Main.overview.visibleTarget);
-        if (visible)
-            this.show();
-        else
-            this.hide();
+        if (!targetApp.is_on_workspace(workspace))
+            return;
 
-        let isBusy = (this._targetApp != null &&
-                      (this._targetApp.get_state() == Shell.AppState.STARTING ||
-                       this._targetApp.get_state() == Shell.AppState.BUSY));
-        if (isBusy)
+        if (!this._targetIsCurrent) {
+            this.actor.reactive = true;
+            this._targetIsCurrent = true;
+
+            Tweener.removeTweens(this.actor);
+            Tweener.addTween(this.actor, { opacity: 255,
+                                           time: Overview.ANIMATION_TIME,
+                                           transition: 'easeOutQuad' });
+        }
+
+        if (targetApp == this._targetApp) {
+            if (targetApp &&
+                targetApp.get_state() != Shell.AppState.STARTING &&
+                targetApp.get_state() != Shell.AppState.BUSY) {
+                this.stopAnimation();
+                this._maybeSetMenu();
+            } else if (targetApp &&
+                       targetApp.get_state() == Shell.AppState.BUSY) {
+                this.startAnimation();
+            }
+            return;
+        }
+
+        if (this._spinner)
+            this._spinner.actor.hide();
+        if (this._iconBox.child != null)
+            this._iconBox.child.destroy();
+        this._iconBox.hide();
+        this._label.setText('');
+
+        if (this._appMenuNotifyId)
+            this._targetApp.disconnect(this._appMenuNotifyId);
+        if (this._actionGroupNotifyId)
+            this._targetApp.disconnect(this._actionGroupNotifyId);
+        if (targetApp) {
+            this._appMenuNotifyId = targetApp.connect('notify::menu', Lang.bind(this, this._sync));
+            this._actionGroupNotifyId = targetApp.connect('notify::action-group', Lang.bind(this, this._sync));
+        } else {
+            this._appMenuNotifyId = 0;
+            this._actionGroupNotifyId = 0;
+        }
+
+        this._targetApp = targetApp;
+        let icon = targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);
+
+        this._label.setText(targetApp.get_name());
+        this.setName(targetApp.get_name());
+
+        this._iconBox.set_child(icon);
+        this._iconBox.show();
+
+        if (targetApp.get_state() == Shell.AppState.STARTING ||
+            targetApp.get_state() == Shell.AppState.BUSY)
             this.startAnimation();
         else
-            this.stopAnimation();
+            this._maybeSetMenu();
 
-        this.actor.reactive = (visible && !isBusy);
-
-        this._syncIcon();
-        this._maybeSetMenu();
         this.emit('changed');
     },
 
     _maybeSetMenu: function() {
         let menu;
 
-        if (this._targetApp == null) {
-            menu = null;
-        } else if (this._targetApp.action_group && this._targetApp.menu) {
+        if (this._targetApp.action_group && this._targetApp.menu) {
             if (this.menu instanceof RemoteMenu.RemoteMenu &&
                 this.menu.actionGroup == this._targetApp.action_group)
                 return;
@@ -507,7 +558,7 @@ const AppMenuButton = new Lang.Class({
             }));
 
         } else {
-            if (this.menu && this.menu.isDummyQuitMenu)
+            if (this.menu.isDummyQuitMenu)
                 return;
 
             // fallback to older menu
@@ -519,8 +570,7 @@ const AppMenuButton = new Lang.Class({
         }
 
         this.setMenu(menu);
-        if (menu)
-            this._menuManager.addMenu(menu);
+        this._menuManager.addMenu(menu);
     },
 
     destroy: function() {
@@ -565,8 +615,7 @@ const ActivitiesButton = new Lang.Class({
 
         /* 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"),
-                                     y_align: Clutter.ActorAlign.CENTER });
+        this._label = new St.Label({ text: _("Activities") });
         this.actor.add_actor(this._label);
 
         this.actor.label_actor = this._label;
@@ -595,7 +644,6 @@ const ActivitiesButton = new Lang.Class({
             Mainloop.source_remove(this._xdndTimeOut);
         this._xdndTimeOut = Mainloop.timeout_add(BUTTON_DND_ACTIVATION_TIMEOUT,
                                                  Lang.bind(this, this._xdndToggleOverview, actor));
-        GLib.Source.set_name_by_id(this._xdndTimeOut, '[gnome-shell] this._xdndToggleOverview');
 
         return DND.DragMotionResult.CONTINUE;
     },
@@ -603,15 +651,13 @@ const ActivitiesButton = new Lang.Class({
     _onCapturedEvent: function(actor, event) {
         if (event.type() == Clutter.EventType.BUTTON_PRESS) {
             if (!Main.overview.shouldToggleByCornerOrButton())
-                return Clutter.EVENT_STOP;
+                return true;
         }
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     },
 
     _onButtonRelease: function() {
         Main.overview.toggle();
-        this.menu.close();
-        return Clutter.EVENT_PROPAGATE;
     },
 
     _onKeyRelease: function(actor, event) {
@@ -619,7 +665,6 @@ const ActivitiesButton = new Lang.Class({
         if (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_space) {
             Main.overview.toggle();
         }
-        return Clutter.EVENT_PROPAGATE;
     },
 
     _xdndToggleOverview: function(actor) {
@@ -631,7 +676,6 @@ const ActivitiesButton = new Lang.Class({
 
         Mainloop.source_remove(this._xdndTimeOut);
         this._xdndTimeOut = 0;
-        return GLib.SOURCE_REMOVE;
     }
 });
 
@@ -802,76 +846,31 @@ const PanelCorner = new Lang.Class({
     }
 });
 
-const AggregateMenu = new Lang.Class({
-    Name: 'AggregateMenu',
-    Extends: PanelMenu.Button,
-
-    _init: function() {
-        this.parent(0.0, _("Settings"), false);
-        this.menu.actor.add_style_class_name('aggregate-menu');
-
-        this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
-        this.actor.add_child(this._indicators);
-
-        if (Config.HAVE_NETWORKMANAGER) {
-            this._network = new imports.ui.status.network.NMApplet();
-        } else {
-            this._network = null;
-        }
-        if (Config.HAVE_BLUETOOTH) {
-            this._bluetooth = new imports.ui.status.bluetooth.Indicator();
-        } else {
-            this._bluetooth = null;
-        }
-
-        this._power = new imports.ui.status.power.Indicator();
-        this._rfkill = new imports.ui.status.rfkill.Indicator();
-        this._volume = new imports.ui.status.volume.Indicator();
-        this._brightness = new imports.ui.status.brightness.Indicator();
-        this._system = new imports.ui.status.system.Indicator();
-        this._screencast = new imports.ui.status.screencast.Indicator();
-        this._location = new imports.ui.status.location.Indicator();
-
-        this._indicators.add_child(this._screencast.indicators);
-        this._indicators.add_child(this._location.indicators);
-        if (this._network) {
-            this._indicators.add_child(this._network.indicators);
-        }
-        if (this._bluetooth) {
-            this._indicators.add_child(this._bluetooth.indicators);
-        }
-        this._indicators.add_child(this._rfkill.indicators);
-        this._indicators.add_child(this._volume.indicators);
-        this._indicators.add_child(this._power.indicators);
-        this._indicators.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-
-        this.menu.addMenuItem(this._volume.menu);
-        this.menu.addMenuItem(this._brightness.menu);
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        if (this._network) {
-            this.menu.addMenuItem(this._network.menu);
-        }
-        if (this._bluetooth) {
-            this.menu.addMenuItem(this._bluetooth.menu);
-        }
-        this.menu.addMenuItem(this._location.menu);
-        this.menu.addMenuItem(this._rfkill.menu);
-        this.menu.addMenuItem(this._power.menu);
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addMenuItem(this._system.menu);
-    },
-});
-
 const PANEL_ITEM_IMPLEMENTATIONS = {
     'activities': ActivitiesButton,
-    'aggregateMenu': AggregateMenu,
     '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,
     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
+    'powerMenu': imports.ui.auth.powerMenu.PowerMenuButton,
+    'userMenu': imports.ui.userMenu.UserMenuButton
 };
 
+if (Config.HAVE_BLUETOOTH)
+    PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
+        imports.ui.status.bluetooth.Indicator;
+
+try {
+    PANEL_ITEM_IMPLEMENTATIONS['network'] =
+        imports.ui.status.network.NMApplet;
+} catch(e) {
+    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+}
+
 const Panel = new Lang.Class({
     Name: 'Panel',
 
@@ -998,23 +997,23 @@ const Panel = new Lang.Class({
 
     _onButtonPress: function(actor, event) {
         if (Main.modalCount > 0)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         if (event.get_source() != actor)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         let button = event.get_button();
         if (button != 1)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         let focusWindow = global.display.focus_window;
         if (!focusWindow)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         let dragWindow = focusWindow.is_attached_dialog() ? focusWindow.get_transient_for()
                                                           : focusWindow;
         if (!dragWindow)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         let rect = dragWindow.get_outer_rect();
         let [stageX, stageY] = event.get_coords();
@@ -1023,7 +1022,7 @@ const Panel = new Lang.Class({
                         stageX > rect.x && stageX < rect.x + rect.width;
 
         if (!allowDrag)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         global.display.begin_grab_op(global.screen,
                                      dragWindow,
@@ -1035,7 +1034,7 @@ const Panel = new Lang.Class({
                                      event.get_time(),
                                      stageX, stageY);
 
-        return Clutter.EVENT_STOP;
+        return true;
     },
 
     toggleAppMenu: function() {

js/ui/panelMenu.js

@@ -86,8 +86,13 @@ const ButtonBox = new Lang.Class({
             childBox.x2 = availWidth - this._minHPadding;
         }
 
-        childBox.y1 = 0;
-        childBox.y2 = availHeight;
+        if (natHeight <= availHeight) {
+            childBox.y1 = Math.floor((availHeight - natHeight) / 2);
+            childBox.y2 = childBox.y1 + natHeight;
+        } else {
+            childBox.y1 = 0;
+            childBox.y2 = availHeight;
+        }
 
         child.allocate(childBox, flags);
     },
@@ -101,17 +106,17 @@ const Button = new Lang.Class({
         this.parent({ reactive: true,
                       can_focus: true,
                       track_hover: true,
-                      accessible_name: nameText ? nameText : "",
                       accessible_role: Atk.Role.MENU });
 
         this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
         this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));
-        this.actor.connect('notify::visible', Lang.bind(this, this._onVisibilityChanged));
 
         if (dontCreateMenu)
             this.menu = new PopupMenu.PopupDummyMenu(this.actor);
         else
             this.setMenu(new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0));
+
+        this.setName(nameText);
     },
 
     setSensitive: function(sensitive) {
@@ -120,6 +125,22 @@ const Button = new Lang.Class({
         this.actor.track_hover = sensitive;
     },
 
+    setName: function(text) {
+        if (text != null) {
+            // This is the easiest way to provide a accessible name to
+            // this widget. The label could be also used for other
+            // purposes in the future.
+            if (!this.label) {
+                this.label = new St.Label({ text: text });
+                this.actor.label_actor = this.label;
+            } else
+                this.label.text = text;
+        } else {
+            this.label = null;
+            this.actor.label_actor = null;
+        }
+    },
+
     setMenu: function(menu) {
         if (this.menu)
             this.menu.destroy();
@@ -137,43 +158,34 @@ const Button = new Lang.Class({
 
     _onButtonPress: function(actor, event) {
         if (!this.menu)
-            return Clutter.EVENT_PROPAGATE;
+            return;
 
         this.menu.toggle();
-        return Clutter.EVENT_PROPAGATE;
     },
 
     _onSourceKeyPress: function(actor, event) {
         if (!this.menu)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
             this.menu.toggle();
-            return Clutter.EVENT_STOP;
+            return true;
         } else if (symbol == Clutter.KEY_Escape && this.menu.isOpen) {
             this.menu.close();
-            return Clutter.EVENT_STOP;
+            return true;
         } else if (symbol == Clutter.KEY_Down) {
             if (!this.menu.isOpen)
                 this.menu.toggle();
             this.menu.actor.navigate_focus(this.actor, Gtk.DirectionType.DOWN, false);
-            return Clutter.EVENT_STOP;
+            return true;
         } else
-            return Clutter.EVENT_PROPAGATE;
-    },
-
-    _onVisibilityChanged: function() {
-        if (!this.menu)
-            return;
-
-        if (!this.actor.visible)
-            this.menu.close();
+            return false;
     },
 
     _onMenuKeyPress: function(actor, event) {
         if (global.focus_manager.navigate_from_event(event))
-            return Clutter.EVENT_STOP;
+            return true;
 
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
@@ -181,10 +193,10 @@ const Button = new Lang.Class({
             if (group) {
                 let direction = (symbol == Clutter.KEY_Left) ? Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
                 group.navigate_focus(this.actor, direction, false);
-                return Clutter.EVENT_STOP;
+                return true;
             }
         }
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     },
 
     _onOpenStateChanged: function(menu, open) {
@@ -212,35 +224,51 @@ const Button = new Lang.Class({
 });
 Signals.addSignalMethods(Button.prototype);
 
-/* SystemIndicator:
+/* SystemStatusButton:
  *
- * This class manages one system indicator, which are the icons
- * that you see at the top right. A system indicator is composed
- * of an icon and a menu section, which will be composed into the
- * aggregate menu.
+ * This class manages one System Status indicator (network, keyboard,
+ * volume, bluetooth...), which is just a PanelMenuButton with an
+ * icon.
  */
-const SystemIndicator = new Lang.Class({
-    Name: 'SystemIndicator',
+const SystemStatusButton = new Lang.Class({
+    Name: 'SystemStatusButton',
+    Extends: Button,
 
-    _init: function() {
-        this.indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box',
-                                             reactive: true });
-        this.indicators.hide();
-        this.menu = new PopupMenu.PopupMenuSection();
+    _init: function(iconName, nameText) {
+        this.parent(0.0, nameText);
+        this.actor.add_style_class_name('panel-status-button');
+
+        this._box = new St.BoxLayout({ style_class: 'panel-status-button-box' });
+        this.actor.add_actor(this._box);
+
+        if (iconName)
+            this.setIcon(iconName);
     },
 
-    _syncIndicatorsVisible: function() {
-        this.indicators.visible = this.indicators.get_children().some(function(actor) {
-            return actor.visible;
-        });
+    get icons() {
+        return this._box.get_children();
     },
 
-    _addIndicator: function() {
-        let icon = new St.Icon({ style_class: 'system-status-icon' });
-        this.indicators.add_actor(icon);
-        icon.connect('notify::visible', Lang.bind(this, this._syncIndicatorsVisible));
-        this._syncIndicatorsVisible();
+    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) {
+        if (!this.mainIcon)
+            this.mainIcon = this.addIcon(null);
+        this.mainIcon.icon_name = iconName;
+    },
+
+    setGIcon: function(gicon) {
+        if (this.mainIcon)
+            this.mainIcon.gicon = gicon;
+        else
+            this.mainIcon = this.addIcon(gicon);
     }
 });
-Signals.addSignalMethods(SystemIndicator.prototype);

js/ui/pointerWatcher.js

@@ -1,9 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 const GnomeDesktop = imports.gi.GnomeDesktop;
 const Shell = imports.gi.Shell;
 
@@ -43,7 +41,7 @@ const PointerWatcher = new Lang.Class({
     Name: 'PointerWatcher',
 
     _init: function() {
-        this._idleMonitor = Meta.IdleMonitor.get_core();
+        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;
         this._watches = [];
@@ -107,12 +105,11 @@ const PointerWatcher = new Lang.Class({
 
         this._timeoutId = Mainloop.timeout_add(minInterval,
                                                Lang.bind(this, this._onTimeout));
-        GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._onTimeout');
     },
 
     _onTimeout: function() {
         this._updatePointer();
-        return GLib.SOURCE_CONTINUE;
+        return true;
     },
 
     _updatePointer: function() {

js/ui/remoteMenu.js

@@ -120,7 +120,7 @@ const RemoteMenuItemMapper = new Lang.Class({
 
         this.menuItem = new PopupMenu.PopupBaseMenuItem();
         this._label = new St.Label();
-        this.menuItem.actor.add_child(this._label);
+        this.menuItem.addActor(this._label);
         this.menuItem.actor.label_actor = this._label;
 
         this.menuItem.connect('activate', Lang.bind(this, function() {

js/ui/remoteSearch.js

@@ -12,188 +12,181 @@ const Search = imports.ui.search;
 
 const KEY_FILE_GROUP = 'Shell Search Provider';
 
-const SearchProviderIface = '<node> \
-<interface name="org.gnome.Shell.SearchProvider"> \
-<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" /> \
-</method> \
-</interface> \
-</node>';
+const SearchProviderIface = <interface name="org.gnome.Shell.SearchProvider">
+<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" />
+</method>
+</interface>;
 
-const SearchProvider2Iface = '<node> \
-<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> \
-</node>';
+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 SearchProviderProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProviderIface);
-var SearchProvider2ProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProvider2Iface);
+var SearchProviderProxy = Gio.DBusProxy.makeProxyWrapper(SearchProviderIface);
+var SearchProvider2Proxy = Gio.DBusProxy.makeProxyWrapper(SearchProvider2Iface);
 
-function loadRemoteSearchProviders(callback) {
-    let objectPaths = {};
-    let loadedProviders = [];
+function loadRemoteSearchProviders(addProviderCallback) {
+    let data = { loadedProviders: [],
+                 objectPaths: {},
+                 addProviderCallback: addProviderCallback };
+    FileUtils.collectFromDatadirsAsync('search-providers',
+                                       { loadedCallback: remoteProvidersLoaded,
+                                         processFile: loadRemoteSearchProvider,
+                                         data: data
+                                       });
+}
 
-    function loadRemoteSearchProvider(file) {
-        let keyfile = new GLib.KeyFile();
-        let path = file.get_path();
+function loadRemoteSearchProvider(file, info, data) {
+    let keyfile = new GLib.KeyFile();
+    let path = file.get_path();
 
-        try {
-            keyfile.load_from_file(path, 0);
-        } catch(e) {
-            return;
-        }
-
-        if (!keyfile.has_group(KEY_FILE_GROUP))
-            return;
-
-        let remoteProvider;
-        try {
-            let group = KEY_FILE_GROUP;
-            let busName = keyfile.get_string(group, 'BusName');
-            let objectPath = keyfile.get_string(group, 'ObjectPath');
-
-            if (objectPaths[objectPath])
-                return;
-
-            let appInfo = null;
-            try {
-                let desktopId = keyfile.get_string(group, 'DesktopId');
-                appInfo = Gio.DesktopAppInfo.new(desktopId);
-            } catch (e) {
-                log('Ignoring search provider ' + path + ': missing DesktopId');
-                return;
-            }
-
-            let version = '1';
-            try {
-                version = keyfile.get_string(group, 'Version');
-            } catch (e) {
-                // ignore error
-            }
-
-            if (version >= 2)
-                remoteProvider = new RemoteSearchProvider2(appInfo, busName, objectPath);
-            else
-                remoteProvider = new RemoteSearchProvider(appInfo, busName, objectPath);
-
-            objectPaths[objectPath] = remoteProvider;
-            loadedProviders.push(remoteProvider);
-        } catch(e) {
-            log('Failed to add search provider %s: %s'.format(path, e.toString()));
-        }
-    }
-
-    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
-    if (searchSettings.get_boolean('disable-external')) {
-        callback([]);
+    try {
+        keyfile.load_from_file(path, 0);
+    } catch(e) {
         return;
     }
 
-    FileUtils.collectFromDatadirs('search-providers', false, loadRemoteSearchProvider);
+    if (!keyfile.has_group(KEY_FILE_GROUP))
+        return;
 
+    let remoteProvider;
+    try {
+        let group = KEY_FILE_GROUP;
+        let busName = keyfile.get_string(group, 'BusName');
+        let objectPath = keyfile.get_string(group, 'ObjectPath');
+
+        if (data.objectPaths[objectPath])
+            return;
+
+        let appInfo = null;
+        try {
+            let desktopId = keyfile.get_string(group, 'DesktopId');
+            appInfo = Gio.DesktopAppInfo.new(desktopId);
+        } catch (e) {
+            log('Ignoring search provider ' + path + ': missing DesktopId');
+            return;
+        }
+
+        let version = '1';
+        try {
+            version = keyfile.get_string(group, 'Version');
+        } catch (e) {
+            // ignore error
+        }
+
+        if (version >= 2)
+            remoteProvider = new RemoteSearchProvider2(appInfo, busName, objectPath);
+        else
+            remoteProvider = new RemoteSearchProvider(appInfo, busName, objectPath);
+
+        data.objectPaths[objectPath] = remoteProvider;
+        data.loadedProviders.push(remoteProvider);
+    } catch(e) {
+        log('Failed to add search provider %s: %s'.format(path, e.toString()));
+    }
+}
+
+function remoteProvidersLoaded(loadState) {
+    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
     let sortOrder = searchSettings.get_strv('sort-order');
 
     // Special case gnome-control-center to be always active and always first
     sortOrder.unshift('gnome-control-center.desktop');
 
-    loadedProviders = loadedProviders.filter(function(provider) {
-        let appId = provider.appInfo.get_id();
-        let disabled = searchSettings.get_strv('disabled');
-        return disabled.indexOf(appId) == -1;
-    });
+    loadState.loadedProviders.sort(
+        function(providerA, providerB) {
+            let idxA, idxB;
+            let appIdA, appIdB;
 
-    loadedProviders.sort(function(providerA, providerB) {
-        let idxA, idxB;
-        let appIdA, appIdB;
+            appIdA = providerA.appInfo.get_id();
+            appIdB = providerB.appInfo.get_id();
 
-        appIdA = providerA.appInfo.get_id();
-        appIdB = providerB.appInfo.get_id();
+            idxA = sortOrder.indexOf(appIdA);
+            idxB = sortOrder.indexOf(appIdB);
 
-        idxA = sortOrder.indexOf(appIdA);
-        idxB = sortOrder.indexOf(appIdB);
+            // if no provider is found in the order, use alphabetical order
+            if ((idxA == -1) && (idxB == -1)) {
+                let nameA = providerA.appInfo.get_name();
+                let nameB = providerB.appInfo.get_name();
 
-        // if no provider is found in the order, use alphabetical order
-        if ((idxA == -1) && (idxB == -1)) {
-            let nameA = providerA.appInfo.get_name();
-            let nameB = providerB.appInfo.get_name();
+                return GLib.utf8_collate(nameA, nameB);
+            }
 
-            return GLib.utf8_collate(nameA, nameB);
-        }
+            // if providerA isn't found, it's sorted after providerB
+            if (idxA == -1)
+                return 1;
 
-        // if providerA isn't found, it's sorted after providerB
-        if (idxA == -1)
-            return 1;
+            // if providerB isn't found, it's sorted after providerA
+            if (idxB == -1)
+                return -1;
 
-        // if providerB isn't found, it's sorted after providerA
-        if (idxB == -1)
-            return -1;
+            // finally, if both providers are found, return their order in the list
+            return (idxA - idxB);
+        });
 
-        // finally, if both providers are found, return their order in the list
-        return (idxA - idxB);
-    });
-
-    callback(loadedProviders);
+    loadState.loadedProviders.forEach(
+        function(provider) {
+            loadState.addProviderCallback(provider);
+        });
 }
 
 const RemoteSearchProvider = new Lang.Class({
     Name: 'RemoteSearchProvider',
 
-    _init: function(appInfo, dbusName, dbusPath, proxyInfo) {
-        if (!proxyInfo)
-            proxyInfo = SearchProviderProxyInfo;
+    _init: function(appInfo, dbusName, dbusPath, proxyType) {
+        if (!proxyType)
+            proxyType = SearchProviderProxy;
 
-        this.proxy = new Gio.DBusProxy({ g_bus_type: Gio.BusType.SESSION,
-                                         g_name: dbusName,
-                                         g_object_path: dbusPath,
-                                         g_interface_info: proxyInfo,
-                                         g_interface_name: proxyInfo.name,
-                                         g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION |
-                                                   Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-        this.proxy.init_async(GLib.PRIORITY_DEFAULT, null, null);
+        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;
+
+        this._cancellable = new Gio.Cancellable();
+    },
+
+    _onProxyConstructed: function(proxy) {
+        // Do nothing
     },
 
     createIcon: function(size, meta) {
-        let gicon = null;
-        let icon = null;
-
+        let gicon;
         if (meta['icon']) {
             gicon = Gio.icon_deserialize(meta['icon']);
         } else if (meta['gicon']) {
@@ -205,49 +198,44 @@ const RemoteSearchProvider = new Lang.Class({
                                                        bitsPerSample, width, height, rowStride);
         }
 
-        if (gicon)
-            icon = new St.Icon({ gicon: gicon,
-                                 icon_size: size });
-        return icon;
+        return new St.Icon({ gicon: gicon,
+                             icon_size: size });
     },
 
-    filterResults: function(results, maxNumber) {
-        if (results.length <= maxNumber)
-            return results;
-
-        let regularResults = results.filter(function(r) { return !r.startsWith('special:'); });
-        let specialResults = results.filter(function(r) { return r.startsWith('special:'); });
-
-        return regularResults.slice(0, maxNumber).concat(specialResults.slice(0, maxNumber));
-    },
-
-    _getResultsFinished: function(results, error, callback) {
-        if (error) {
-            if (!error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                log('Received error from DBus search provider %s: %s'.format(this.id, String(error)));
-            callback([]);
+    _getResultsFinished: function(results, error) {
+        if (error)
             return;
+        this.searchSystem.setResults(this, results[0]);
+    },
+
+    getInitialResultSet: function(terms) {
+        this._cancellable.cancel();
+        this._cancellable.reset();
+        try {
+            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()));
+            this.searchSystem.setResults(this, []);
         }
-
-        callback(results[0]);
     },
 
-    getInitialResultSet: function(terms, callback, cancellable) {
-        this.proxy.GetInitialResultSetRemote(terms,
-                                             Lang.bind(this, this._getResultsFinished, callback),
-                                             cancellable);
-    },
-
-    getSubsearchResultSet: function(previousResults, newTerms, callback, cancellable) {
-        this.proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
-                                               Lang.bind(this, this._getResultsFinished, callback),
-                                               cancellable);
+    getSubsearchResultSet: function(previousResults, newTerms) {
+        this._cancellable.cancel();
+        this._cancellable.reset();
+        try {
+            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()));
+            this.searchSystem.setResults(this, []);
+        }
     },
 
     _getResultMetasFinished: function(results, error, callback) {
         if (error) {
-            if (!error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                log('Received error from DBus search provider %s during GetResultMetas: %s'.format(this.id, String(error)));
             callback([]);
             return;
         }
@@ -269,10 +257,17 @@ const RemoteSearchProvider = new Lang.Class({
         callback(resultMetas);
     },
 
-    getResultMetas: function(ids, callback, cancellable) {
-        this.proxy.GetResultMetasRemote(ids,
-                                        Lang.bind(this, this._getResultMetasFinished, callback),
-                                        cancellable);
+    getResultMetas: function(ids, callback) {
+        this._cancellable.cancel();
+        this._cancellable.reset();
+        try {
+            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()));
+            callback([]);
+        }
     },
 
     activateResult: function(id) {
@@ -283,7 +278,7 @@ const RemoteSearchProvider = new Lang.Class({
         // the provider is not compatible with the new version of the interface, launch
         // the app itself but warn so we can catch the error in logs
         log('Search provider ' + this.appInfo.get_id() + ' does not implement LaunchSearch');
-        this.appInfo.launch([], global.create_app_launch_context(0, -1));
+        this.appInfo.launch([], global.create_app_launch_context());
     }
 });
 
@@ -292,7 +287,7 @@ const RemoteSearchProvider2 = new Lang.Class({
     Extends: RemoteSearchProvider,
 
     _init: function(appInfo, dbusName, dbusPath) {
-        this.parent(appInfo, dbusName, dbusPath, SearchProvider2ProxyInfo);
+        this.parent(appInfo, dbusName, dbusPath, SearchProvider2Proxy);
 
         this.canLaunchSearch = true;
     },

js/ui/runDialog.js

@@ -73,9 +73,7 @@ const RunDialog = new Lang.Class({
         let label = new St.Label({ style_class: 'run-dialog-label',
                                    text: _("Enter a Command") });
 
-        this.contentLayout.add(label, { x_fill: false,
-                                        x_align: St.Align.START,
-                                        y_align: St.Align.START });
+        this.contentLayout.add(label, { y_align: St.Align.START });
 
         let entry = new St.Entry({ style_class: 'run-dialog-entry',
                                    can_focus: true });
@@ -103,8 +101,6 @@ const RunDialog = new Lang.Class({
         this._errorMessage.clutter_text.line_wrap = true;
 
         this._errorBox.add(this._errorMessage, { expand: true,
-                                                 x_align: St.Align.START,
-                                                 x_fill: false,
                                                  y_align: St.Align.MIDDLE,
                                                  y_fill: false });
 
@@ -128,7 +124,7 @@ const RunDialog = new Lang.Class({
                     !this.pushModal())
                     this.close();
 
-                return Clutter.EVENT_STOP;
+                return true;
             }
             if (symbol == Clutter.Tab) {
                 let text = o.get_text();
@@ -142,9 +138,9 @@ const RunDialog = new Lang.Class({
                     o.insert_text(postfix, -1);
                     o.set_cursor_position(text.length + postfix.length);
                 }
-                return Clutter.EVENT_STOP;
+                return true;
             }
-            return Clutter.EVENT_PROPAGATE;
+            return false;
         }));
     },
 
@@ -233,7 +229,7 @@ const RunDialog = new Lang.Class({
                     let file = Gio.file_new_for_path(path);
                     try {
                         Gio.app_info_launch_default_for_uri(file.get_uri(),
-                                                            global.create_app_launch_context(0, -1));
+                                                            global.create_app_launch_context());
                     } catch (e) {
                         // The exception from gjs contains an error string like:
                         //     Error invoking Gio.app_info_launch_default_for_uri: No application

js/ui/screenShield.js

@@ -1,12 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const AccountsService = imports.gi.AccountsService;
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GnomeDesktop = imports.gi.GnomeDesktop;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@@ -17,15 +15,14 @@ const TweenerEquations = imports.tweener.equations;
 
 const Background = imports.ui.background;
 const GnomeSession = imports.misc.gnomeSession;
+const Hash = imports.misc.hash;
 const Layout = imports.ui.layout;
-const OVirt = imports.gdm.oVirt;
 const LoginManager = imports.misc.loginManager;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const MessageTray = imports.ui.messageTray;
 const ShellDBus = imports.ui.shellDBus;
-const SmartcardManager = imports.misc.smartcardManager;
 const Tweener = imports.ui.tweener;
 const Util = imports.misc.util;
 
@@ -52,10 +49,12 @@ const SUMMARY_ICON_SIZE = 48;
 //   or when cancelling the dialog
 // - BACKGROUND_FADE_TIME is used when the background changes to crossfade to new background
 // - CURTAIN_SLIDE_TIME is used when raising the shield before unlocking
+// - INITIAL_FADE_IN_TIME is used for the initial fade in at startup
 const STANDARD_FADE_TIME = 10;
 const MANUAL_FADE_TIME = 0.3;
 const BACKGROUND_FADE_TIME = 1.0;
 const CURTAIN_SLIDE_TIME = 0.3;
+const INITIAL_FADE_IN_TIME = 0.25;
 
 const Clock = new Lang.Class({
     Name: 'ScreenShieldClock',
@@ -105,16 +104,15 @@ const NotificationsBox = new Lang.Class({
         this._musicBin = new St.Bin({ style_class: 'screen-shield-notifications-box',
                                       visible: false });
 
-        this._scrollView = new St.ScrollView({ x_fill: false, x_align: St.Align.START,
-                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
+        let scrollView = new St.ScrollView({ x_fill: false, x_align: St.Align.START });
         this._notificationBox = new St.BoxLayout({ vertical: true,
                                                    style_class: 'screen-shield-notifications-box' });
-        this._scrollView.add_actor(this._notificationBox);
+        scrollView.add_actor(this._notificationBox);
 
         this.actor.add(this._musicBin);
-        this.actor.add(this._scrollView, { x_fill: true, x_align: St.Align.START });
+        this.actor.add(scrollView, { x_fill: true, x_align: St.Align.START });
 
-        this._sources = new Map();
+        this._sources = new Hash.Map();
         Main.messageTray.getSources().forEach(Lang.bind(this, function(source) {
             this._sourceAdded(Main.messageTray, source, true);
         }));
@@ -129,8 +127,9 @@ const NotificationsBox = new Lang.Class({
             this._sourceAddedId = 0;
         }
 
-        let items = this._sources.entries();
-        for (let [source, obj] of items) {
+        let items = this._sources.items();
+        for (let i = 0; i < items.length; i++) {
+            let [source, obj] = items[i];
             this._removeSource(source, obj);
         }
 
@@ -196,8 +195,8 @@ const NotificationsBox = new Lang.Class({
 
             let body = '';
             if (n.bannerBodyText) {
-                body = n.bannerBodyMarkup ? n.bannerBodyText
-                                          : GLib.markup_escape_text(n.bannerBodyText, -1);
+                body = n.bannerBodyMarkup ? n.bannerBodyText :
+                GLib.markup_escape_text(n.bannerBodyMarkup, -1);
             }
 
             let label = new St.Label({ style_class: 'screen-shield-notification-count-text' });
@@ -237,7 +236,11 @@ const NotificationsBox = new Lang.Class({
             (source.unseenCount > (musicNotification ? 1 : 0));
     },
 
-    _sourceAdded: function(tray, source, initial) {
+    _sourceAdded: function(tray, source, dontUpdateVisibility) {
+        // Ignore transient sources
+        if (source.isTransient)
+            return;
+
         let obj = {
             visible: source.policy.showInLockScreen,
             detailed: source.policy.detailsInLockScreen,
@@ -280,29 +283,8 @@ const NotificationsBox = new Lang.Class({
 
         this._sources.set(source, obj);
 
-        if (!initial) {
-            // block scrollbars while animating, if they're not needed now
-            let boxHeight = this._notificationBox.height;
-            if (this._scrollView.height >= boxHeight)
-                this._scrollView.vscrollbar_policy = Gtk.PolicyType.NEVER;
-
-            let widget = obj.sourceBox;
-            let [, natHeight] = widget.get_preferred_height(-1);
-            widget.height = 0;
-            Tweener.addTween(widget,
-                             { height: natHeight,
-                               transition: 'easeOutQuad',
-                               time: 0.25,
-                               onComplete: function() {
-                                   this._scrollView.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
-                                   widget.set_height(-1);
-                               },
-                               onCompleteScope: this
-                             });
-
+        if (!dontUpdateVisibility)
             this._updateVisibility();
-            this.emit('wake-up-screen');
-        }
     },
 
     _titleChanged: function(source, obj) {
@@ -324,10 +306,7 @@ const NotificationsBox = new Lang.Class({
 
         obj.sourceBox.visible = obj.visible &&
             (source.unseenCount > (obj.musicNotification ? 1 : 0));
-
         this._updateVisibility();
-        if (obj.sourceBox.visible)
-            this.emit('wake-up-screen');
     },
 
     _visibleChanged: function(source, obj) {
@@ -341,8 +320,6 @@ const NotificationsBox = new Lang.Class({
             source.unseenCount > (obj.musicNotification ? 1 : 0);
 
         this._updateVisibility();
-        if (obj.sourceBox.visible)
-            this.emit('wake-up-screen');
     },
 
     _detailedChanged: function(source, obj) {
@@ -380,7 +357,6 @@ const NotificationsBox = new Lang.Class({
         this._sources.delete(source);
     },
 });
-Signals.addSignalMethods(NotificationsBox.prototype);
 
 const Arrow = new Lang.Class({
     Name: 'Arrow',
@@ -414,7 +390,6 @@ const Arrow = new Lang.Class({
         cr.lineTo(w/2, thickness);
         cr.lineTo(w - thickness / 2, h - thickness / 2);
         cr.stroke();
-        cr.$dispose();
     },
 
     vfunc_style_changed: function() {
@@ -514,10 +489,16 @@ const ScreenShield = new Lang.Class({
 
         this._lockDialogGroup = new St.Widget({ x_expand: true,
                                                 y_expand: true,
-                                                reactive: true,
+                                                opacity: 0,
                                                 pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
                                                 name: 'lockDialogGroup' });
 
+        Tweener.addTween(this._lockDialogGroup,
+                         { opacity: 255,
+                           time: INITIAL_FADE_IN_TIME,
+                           transition: 'easeInQuad',
+                         });
+
         this.actor.add_actor(this._lockDialogGroup);
         this.actor.add_actor(this._lockScreenGroup);
 
@@ -535,20 +516,6 @@ const ScreenShield = new Lang.Class({
 
         this._screenSaverDBus = new ShellDBus.ScreenSaverDBus(this);
 
-        this._smartcardManager = SmartcardManager.getSmartcardManager();
-        this._smartcardManager.connect('smartcard-inserted',
-                                       Lang.bind(this, function(manager, token) {
-                                           if (this._isLocked && token.UsedToLogin)
-                                               this._liftShield(true, 0);
-                                       }));
-
-        this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
-        this._oVirtCredentialsManager.connect('user-authenticated',
-                                              Lang.bind(this, function() {
-                                                  if (this._isLocked)
-                                                      this._liftShield(true, 0);
-                                              }));
-
         this._inhibitor = null;
         this._aboutToSuspend = false;
         this._loginManager = LoginManager.getLoginManager();
@@ -575,20 +542,13 @@ const ScreenShield = new Lang.Class({
         this._becameActiveId = 0;
         this._lockTimeoutId = 0;
 
-        // The "long" lightbox is used for the longer (20 seconds) fade from session
-        // to idle status, the "short" is used for quickly fading to black when locking
-        // manually
-        this._longLightbox = new Lightbox.Lightbox(Main.uiGroup,
-                                                   { inhibitEvents: true,
-                                                     fadeFactor: 1 });
-        this._longLightbox.connect('shown', Lang.bind(this, this._onLongLightboxShown));
-        this._shortLightbox = new Lightbox.Lightbox(Main.uiGroup,
-                                                    { inhibitEvents: true,
-                                                      fadeFactor: 1 });
-        this._shortLightbox.connect('shown', Lang.bind(this, this._onShortLightboxShown));
+        this._lightbox = new Lightbox.Lightbox(Main.uiGroup,
+                                               { inhibitEvents: true,
+                                                 fadeInTime: STANDARD_FADE_TIME,
+                                                 fadeFactor: 1 });
+        this._lightbox.connect('shown', Lang.bind(this, this._onLightboxShown));
 
-        this.idleMonitor = Meta.IdleMonitor.get_core();
-        this._cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
+        this.idleMonitor = new GnomeDesktop.IdleMonitor();
     },
 
     _createBackground: function(monitorIndex) {
@@ -601,8 +561,7 @@ const ScreenShield = new Lang.Class({
 
         let bgManager = new Background.BackgroundManager({ container: widget,
                                                            monitorIndex: monitorIndex,
-                                                           controlPosition: false,
-                                                           settingsSchema: SCREENSAVER_SCHEMA });
+                                                           controlPosition: false });
 
         this._bgManagers.push(bgManager);
 
@@ -622,28 +581,13 @@ const ScreenShield = new Lang.Class({
 
     _liftShield: function(onPrimary, velocity) {
         if (this._isLocked) {
-            if (this._ensureUnlockDialog(onPrimary, true /* allowCancel */))
-                this._hideLockScreen(true /* animate */, velocity);
+            this._ensureUnlockDialog(onPrimary, true /* allowCancel */);
+            this._hideLockScreen(true /* animate */, velocity);
         } else {
             this.deactivate(true /* animate */);
         }
     },
 
-    _maybeCancelDialog: function() {
-        if (!this._dialog)
-            return;
-
-        this._dialog.cancel();
-        if (this._isGreeter) {
-            // LoginDialog.cancel() will grab the key focus
-            // on its own, so ensure it stays on lock screen
-            // instead
-            this._lockScreenGroup.grab_key_focus();
-        } else {
-            this._dialog = null;
-        }
-    },
-
     _becomeModal: function() {
         if (this._isModal)
             return true;
@@ -669,24 +613,24 @@ const ScreenShield = new Lang.Class({
         // down after cancel.
 
         if (this._lockScreenState != MessageTray.State.SHOWN)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         let isEnter = (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_KP_Enter);
         if (!isEnter && !(GLib.unichar_isprint(unichar) || symbol == Clutter.KEY_Escape))
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
-        if (this._isLocked &&
-            this._ensureUnlockDialog(true, true) &&
-            GLib.unichar_isgraph(unichar))
+        this._ensureUnlockDialog(true, true);
+
+        if (GLib.unichar_isgraph(unichar))
             this._dialog.addCharacter(unichar);
 
         this._liftShield(true, 0);
-        return Clutter.EVENT_STOP;
+        return true;
     },
 
     _onLockScreenScroll: function(actor, event) {
         if (this._lockScreenState != MessageTray.State.SHOWN)
-            return Clutter.EVENT_PROPAGATE;
+            return false;
 
         let delta = 0;
         if (event.get_scroll_direction() == Clutter.ScrollDirection.UP)
@@ -701,7 +645,7 @@ const ScreenShield = new Lang.Class({
             this._liftShield(true, 0);
         }
 
-        return Clutter.EVENT_STOP;
+        return true;
     },
 
     _inhibitSuspend: function() {
@@ -728,8 +672,6 @@ const ScreenShield = new Lang.Class({
             this.lock(true);
         } else {
             this._inhibitSuspend();
-
-            this._wakeUpScreen();
         }
     },
 
@@ -752,7 +694,7 @@ const ScreenShield = new Lang.Class({
                              });
         }
 
-        return GLib.SOURCE_CONTINUE;
+        return true;
     },
 
     _onDragBegin: function() {
@@ -778,8 +720,6 @@ const ScreenShield = new Lang.Class({
     },
 
     _onDragEnd: function(action, actor, eventX, eventY, modifiers) {
-        if (this._lockScreenState != MessageTray.State.HIDING)
-            return;
         if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) {
             // Complete motion automatically
 	    let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0);
@@ -801,7 +741,13 @@ const ScreenShield = new Lang.Class({
                                onCompleteScope: this,
                              });
 
-            this._maybeCancelDialog();
+            // If we have a unlock dialog, cancel it
+            if (this._dialog) {
+                this._dialog.cancel();
+                if (!this._isGreeter) {
+                    this._dialog = null;
+                }
+            }
         }
     },
 
@@ -809,9 +755,27 @@ const ScreenShield = new Lang.Class({
         if (status != GnomeSession.PresenceStatus.IDLE)
             return;
 
-        this._maybeCancelDialog();
+        if (this._dialog) {
+            this._dialog.cancel();
+            if (!this._isGreeter) {
+                this._dialog = null;
+            }
+        }
 
-        if (this._longLightbox.actor.visible ||
+        if (!this._becomeModal()) {
+            // We could not become modal, so we can't activate the
+            // screenshield. The user is probably very upset at this
+            // point, but any application using global grabs is broken
+            // Just tell him to stop using this app
+            // 
+            // XXX: another option is to kick the user into the gdm login
+            // screen, where we're not affected by grabs
+            Main.notifyError(_("Unable to lock"),
+                             _("Lock was blocked by an application"));
+            return;
+        }
+
+        if (this._lightbox.actor.visible ||
             this._isActive) {
             // We're either shown and active, or in the process of
             // showing.
@@ -824,22 +788,13 @@ const ScreenShield = new Lang.Class({
             return;
         }
 
-        if (!this._becomeModal()) {
-            // We could not become modal, so we can't activate the
-            // screenshield. The user is probably very upset at this
-            // point, but any application using global grabs is broken
-            // Just tell him to stop using this app
-            //
-            // XXX: another option is to kick the user into the gdm login
-            // screen, where we're not affected by grabs
-            Main.notifyError(_("Unable to lock"),
-                             _("Lock was blocked by an application"));
-            return;
-        }
+        this._lightbox.show();
 
         if (this._activationTime == 0)
             this._activationTime = GLib.get_monotonic_time();
 
+        this._becameActiveId = this.idleMonitor.add_user_active_watch(Lang.bind(this, this._onUserBecameActive));
+
         let shouldLock = this._settings.get_boolean(LOCK_ENABLED_KEY) && !this._isLocked;
 
         if (shouldLock) {
@@ -847,60 +802,48 @@ const ScreenShield = new Lang.Class({
             this._lockTimeoutId = Mainloop.timeout_add(lockTimeout * 1000,
                                                        Lang.bind(this, function() {
                                                            this._lockTimeoutId = 0;
-                                                           this.lock(false);
-                                                           return GLib.SOURCE_REMOVE;
+                                                           this.lock(true);
+                                                           return false;
                                                        }));
-            GLib.Source.set_name_by_id(this._lockTimeoutId, '[gnome-shell] this.lock');
         }
-
-        this._activateFade(this._longLightbox, STANDARD_FADE_TIME);
-    },
-
-    _activateFade: function(lightbox, time) {
-        lightbox.show(time);
-
-        if (this._becameActiveId == 0)
-            this._becameActiveId = this.idleMonitor.add_user_active_watch(Lang.bind(this, this._onUserBecameActive));
     },
 
     _onUserBecameActive: function() {
         // This function gets called here when the user becomes active
-        // after we activated a lightbox
-        // There are two possibilities here:
-        // - we're called when already locked/active; isLocked or isActive is true,
+        // after gnome-session changed the status to IDLE
+        // There are four possibilities here:
+        // - we're called when already locked; isActive and isLocked are true,
         //   we just go back to the lock screen curtain
-        //   (isActive == isLocked == true: normal case
-        //    isActive == false, isLocked == true: during the fade for manual locking
-        //    isActive == true, isLocked == false: after session idle, before lock-delay)
-        // - we're called because the session is IDLE but before the lightbox
-        //   is fully shown; at this point isActive is false, so we just hide
-        //   the lightbox, reset the activationTime and go back to the unlocked
-        //   desktop
-        //   using deactivate() is a little of overkill, but it ensures we
-        //   don't forget of some bit like modal, DBus properties or idle watches
-        //
-        // Note: if the (long) lightbox is shown then we're necessarily
-        // active, because we call activate() without animation.
+        // - we're called before the lightbox is fully shown; at this point
+        //   isActive is false, so we just hide the ligthbox, reset the activationTime
+        //   and go back to the unlocked desktop
+        // - we're called after showing the lightbox, but before the lock
+        //   delay; this is mostly like the case above, but isActive is true now
+        //   so we need to notify gnome-settings-daemon to go back to the normal
+        //   policies for blanking
+        //   (they're handled by the same code, and we emit one extra ActiveChanged
+        //   signal in the case above)
+        // - we're called after showing the lightbox and after lock-delay; the
+        //   session is effectivelly locked now, it's time to build and show
+        //   the lock screen
 
         this.idleMonitor.remove_watch(this._becameActiveId);
         this._becameActiveId = 0;
 
-        if (this._isActive || this._isLocked) {
-            this._longLightbox.hide();
-            this._shortLightbox.hide();
-        } else {
+        let lightboxWasShown = this._lightbox.shown;
+        this._lightbox.hide();
+
+        // Shortcircuit in case the mouse was moved before the fade completed
+        if (!lightboxWasShown) {
             this.deactivate(false);
+            return;
         }
     },
 
-    _onLongLightboxShown: function() {
+    _onLightboxShown: function() {
         this.activate(false);
     },
 
-    _onShortLightboxShown: function() {
-        this._completeLockScreenShown();
-    },
-
     showDialog: function() {
         // Ensure that the stage window is mapped, before taking a grab
         // otherwise X errors out
@@ -917,8 +860,8 @@ const ScreenShield = new Lang.Class({
         this.actor.show();
         this._isGreeter = Main.sessionMode.isGreeter;
         this._isLocked = true;
-        if (this._ensureUnlockDialog(true, true))
-            this._hideLockScreen(false, 0);
+        this._ensureUnlockDialog(true, true);
+        this._hideLockScreen(false, 0);
     },
 
     _hideLockScreenComplete: function() {
@@ -935,8 +878,6 @@ const ScreenShield = new Lang.Class({
 
         this._lockScreenState = MessageTray.State.HIDING;
 
-        Tweener.removeTweens(this._lockScreenGroup);
-
         if (animate) {
             // Tween the lock screen out of screen
             // if velocity is not specified (i.e. we come here from pressing ESC),
@@ -949,6 +890,7 @@ const ScreenShield = new Lang.Class({
             velocity = Math.max(min_velocity, velocity);
             let time = (delta / velocity) / 1000;
 
+            Tweener.removeTweens(this._lockScreenGroup);
             Tweener.addTween(this._lockScreenGroup,
                              { y: -h,
                                time: time,
@@ -959,7 +901,7 @@ const ScreenShield = new Lang.Class({
             this._hideLockScreenComplete();
         }
 
-        this._cursorTracker.set_pointer_visible(true);
+        global.stage.show_cursor();
     },
 
     _ensureUnlockDialog: function(onPrimary, allowCancel) {
@@ -968,7 +910,7 @@ const ScreenShield = new Lang.Class({
             if (!constructor) {
                 // This session mode has no locking capabilities
                 this.deactivate(true);
-                return false;
+                return;
             }
 
             this._dialog = new constructor(this._lockDialogGroup);
@@ -980,22 +922,24 @@ const ScreenShield = new Lang.Class({
                 // by the time we reach this...
                 log('Could not open login dialog: failed to acquire grab');
                 this.deactivate(true);
-                return false;
             }
 
             this._dialog.connect('failed', Lang.bind(this, this._onUnlockFailed));
+            this._dialog.connect('unlocked', Lang.bind(this, this._onUnlockSucceded));
         }
 
         this._dialog.allowCancel = allowCancel;
-        return true;
     },
 
     _onUnlockFailed: function() {
-        this._resetLockScreen({ animateLockScreen: true,
-                                fadeToBlack: false });
+        this._resetLockScreen(true, false);
     },
 
-    _resetLockScreen: function(params) {
+    _onUnlockSucceded: function() {
+        this.deactivate(true);
+    },
+
+    _resetLockScreen: function(animateLockScreen, animateLockDialog) {
         // Don't reset the lock screen unless it is completely hidden
         // This prevents the shield going down if the lock-delay timeout
         // fires while the user is dragging (which has the potential
@@ -1010,9 +954,7 @@ const ScreenShield = new Lang.Class({
         this._lockScreenGroup.show();
         this._lockScreenState = MessageTray.State.SHOWING;
 
-        let fadeToBlack = params.fadeToBlack;
-
-        if (params.animateLockScreen) {
+        if (animateLockScreen) {
             this._lockScreenGroup.y = -global.screen_height;
             Tweener.removeTweens(this._lockScreenGroup);
             Tweener.addTween(this._lockScreenGroup,
@@ -1020,15 +962,24 @@ const ScreenShield = new Lang.Class({
                                time: MANUAL_FADE_TIME,
                                transition: 'easeOutQuad',
                                onComplete: function() {
-                                   this._lockScreenShown({ fadeToBlack: fadeToBlack,
-                                                           animateFade: true });
+                                   this._lockScreenShown();
                                },
                                onCompleteScope: this
                              });
         } else {
             this._lockScreenGroup.fixed_position_set = false;
-            this._lockScreenShown({ fadeToBlack: fadeToBlack,
-                                    animateFade: false });
+            this._lockScreenShown();
+        }
+
+        if (animateLockDialog) {
+            this._lockDialogGroup.opacity = 0;
+            Tweener.removeTweens(this._lockDialogGroup);
+            Tweener.addTween(this._lockDialogGroup,
+                             { opacity: 255,
+                               time: MANUAL_FADE_TIME,
+                               transition: 'easeOutQuad' });
+        } else {
+            this._lockDialogGroup.opacity = 255;
         }
 
         this._lockScreenGroup.grab_key_focus();
@@ -1042,7 +993,6 @@ const ScreenShield = new Lang.Class({
 
         if (!this._arrowAnimationId) {
             this._arrowAnimationId = Mainloop.timeout_add(6000, Lang.bind(this, this._animateArrows));
-            GLib.Source.set_name_by_id(this._arrowAnimationId, '[gnome-shell] this._animateArrows');
             this._animateArrows();
         }
 
@@ -1085,7 +1035,7 @@ const ScreenShield = new Lang.Class({
             this._pauseArrowAnimation();
     },
 
-    _lockScreenShown: function(params) {
+    _lockScreenShown: function() {
         if (this._dialog && !this._isGreeter) {
             this._dialog.destroy();
             this._dialog = null;
@@ -1093,37 +1043,20 @@ const ScreenShield = new Lang.Class({
 
         this._checkArrowAnimation();
 
-        let motionId = global.stage.connect('captured-event', Lang.bind(this, function(stage, event) {
+        let motionId = global.stage.connect('captured-event', function(stage, event) {
             if (event.type() == Clutter.EventType.MOTION) {
-                this._cursorTracker.set_pointer_visible(true);
+                global.stage.show_cursor();
                 global.stage.disconnect(motionId);
             }
 
-            return Clutter.EVENT_PROPAGATE;
-        }));
-        this._cursorTracker.set_pointer_visible(false);
+            return false;
+        });
+        global.stage.hide_cursor();
 
         this._lockScreenState = MessageTray.State.SHOWN;
         this._lockScreenGroup.fixed_position_set = false;
         this._lockScreenScrollCounter = 0;
 
-        if (params.fadeToBlack && params.animateFade) {
-            // Take a beat
-
-            let id = Mainloop.timeout_add(1000 * MANUAL_FADE_TIME, Lang.bind(this, function() {
-                this._activateFade(this._shortLightbox, MANUAL_FADE_TIME);
-                return GLib.SOURCE_REMOVE;
-            }));
-            GLib.Source.set_name_by_id(id, '[gnome-shell] this._activateFade');
-        } else {
-            if (params.fadeToBlack)
-                this._activateFade(this._shortLightbox, 0);
-
-            this._completeLockScreenShown();
-        }
-    },
-
-    _completeLockScreenShown: function() {
         let prevIsActive = this._isActive;
         this._isActive = true;
 
@@ -1155,7 +1088,6 @@ const ScreenShield = new Lang.Class({
         this._lockScreenContents.add_actor(this._lockScreenContentsBox);
 
         this._notificationsBox = new NotificationsBox();
-        this._wakeUpScreenId = this._notificationsBox.connect('wake-up-screen', Lang.bind(this, this._wakeUpScreen));
         this._lockScreenContentsBox.add(this._notificationsBox.actor, { x_fill: true,
                                                                         y_fill: true,
                                                                         expand: true });
@@ -1163,17 +1095,11 @@ const ScreenShield = new Lang.Class({
         this._hasLockScreen = true;
     },
 
-    _wakeUpScreen: function() {
-        this._onUserBecameActive();
-        this.emit('wake-up-screen');
-    },
-
     _clearLockScreen: function() {
         this._clock.destroy();
         this._clock = null;
 
         if (this._notificationsBox) {
-            this._notificationsBox.disconnect(this._wakeUpScreenId);
             this._notificationsBox.destroy();
             this._notificationsBox = null;
         }
@@ -1198,15 +1124,6 @@ const ScreenShield = new Lang.Class({
     },
 
     deactivate: function(animate) {
-        if (this._dialog)
-            this._dialog.finish(Lang.bind(this, function() {
-                this._continueDeactivate(animate);
-            }));
-        else
-            this._continueDeactivate(animate);
-    },
-
-    _continueDeactivate: function(animate) {
         this._hideLockScreen(animate, 0);
 
         if (this._hasLockScreen)
@@ -1217,20 +1134,6 @@ const ScreenShield = new Lang.Class({
         if (Main.sessionMode.currentMode == 'unlock-dialog')
             Main.sessionMode.popMode('unlock-dialog');
 
-        if (this._isGreeter) {
-            // We don't want to "deactivate" any more than
-            // this. In particular, we don't want to drop
-            // the modal, hide ourselves or destroy the dialog
-            // But we do want to set isActive to false, so that
-            // gnome-session will reset the idle counter, and
-            // gnome-settings-daemon will stop blanking the screen
-
-            this._activationTime = 0;
-            this._isActive = false;
-            this.emit('active-changed');
-            return;
-        }
-
         if (this._dialog && !this._isGreeter)
             this._dialog.popModal();
 
@@ -1250,13 +1153,12 @@ const ScreenShield = new Lang.Class({
     },
 
     _completeDeactivate: function() {
-        if (this._dialog) {
+        if (this._dialog && !this._isGreeter) {
             this._dialog.destroy();
             this._dialog = null;
         }
 
-        this._longLightbox.hide();
-        this._shortLightbox.hide();
+        this._lightbox.hide();
         this.actor.hide();
 
         if (this._becameActiveId != 0) {
@@ -1290,8 +1192,7 @@ const ScreenShield = new Lang.Class({
                 Main.sessionMode.pushMode('unlock-dialog');
         }
 
-        this._resetLockScreen({ animateLockScreen: animate,
-                                fadeToBlack: true });
+        this._resetLockScreen(animate, animate);
         global.set_runtime_state(LOCKED_STATE_STR, GLib.Variant.new('b', true));
 
         // We used to set isActive and emit active-changed here,
@@ -1314,20 +1215,7 @@ const ScreenShield = new Lang.Class({
             return;
         }
 
-        // Clear the clipboard - otherwise, its contents may be leaked
-        // to unauthorized parties by pasting into the unlock dialog's
-        // password entry and unmasking the entry
-        St.Clipboard.get_default().set_text(St.ClipboardType.CLIPBOARD, '');
-        St.Clipboard.get_default().set_text(St.ClipboardType.PRIMARY, '');
-
-        let userManager = AccountsService.UserManager.get_default();
-        let user = userManager.get_user(GLib.get_user_name());
-
-        if (this._isGreeter)
-            this._isLocked = true;
-        else
-            this._isLocked = user.password_mode != AccountsService.UserPasswordMode.NONE;
-
+        this._isLocked = true;
         this.activate(animate);
 
         this.emit('locked-changed');